X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fnodes%2FDistrictNetworkVertexNode.java;h=1639d5712b8abaaf3fc8e542d74d9d9110444a4b;hb=4d0c114c0f53694180f808747b63d64fcefb0932;hp=377c7f7e8d11840ff6c706b0798a52e9e61fe43f;hpb=db34439af303d45eb67cee78cb3f68c9b6666da4;p=simantics%2Fdistrict.git diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java index 377c7f7e..1639d571 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java @@ -9,34 +9,37 @@ import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import org.simantics.district.network.ui.adapters.DistrictNetworkVertex; +import org.simantics.maps.MapScalingTransform; import org.simantics.scenegraph.INode; import org.simantics.scenegraph.ISelectionPainterNode; import org.simantics.scenegraph.g2d.G2DNode; import org.simantics.scenegraph.g2d.G2DParentNode; +import org.simantics.scenegraph.g2d.G2DRenderingHints; +import org.simantics.scenegraph.g2d.IG2DNode; import org.simantics.scenegraph.g2d.nodes.SVGNode; import org.simantics.scenegraph.utils.GeometryUtils; import org.simantics.scenegraph.utils.NodeUtil; -public class DistrictNetworkVertexNode extends G2DParentNode implements ISelectionPainterNode { +public class DistrictNetworkVertexNode extends G2DParentNode implements ISelectionPainterNode, HoverSensitiveNode { //private static final Logger LOGGER = LoggerFactory.getLogger(DistrictNetworkVertexNode.class); private static final long serialVersionUID = -2641639101400236719L; - private static final BasicStroke STROKE = new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND); - private static final Color SELECTION_COLOR = new Color(255, 0, 255, 96); + private static final double left = -15; + private static final double top = left; + public static final double width = 30; + private static final double height = width; - private static final double left = -0.25; - private static final double top = -0.25; - private static final double width = 0.5; - private static final double height = 0.5; + private static final BasicStroke STROKE = new BasicStroke((float)width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND); + private static final Color SELECTION_COLOR = new Color(255, 0, 255, 96); private static final Rectangle2D NORMAL = new Rectangle2D.Double(left, top, width, height); - private static final Rectangle2D HOVERED = new Rectangle2D.Double(left * 3, top * 3, width * 3, height * 3); + private static final Rectangle2D HOVERED = new Rectangle2D.Double(left * 2, top * 2, width * 2, height * 2); private DistrictNetworkVertex vertex; - private boolean scaleStroke = true; + private static boolean scaleStroke = true; private boolean hover; private Color color; @@ -47,7 +50,9 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti private transient Rectangle2D rect; private transient AffineTransform symbolTransform; - private double nodeSize = 1; + private double nodeSize = 1.0; + + private boolean hidden = false; @Override public void init() { @@ -56,63 +61,72 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti @Override public void render(Graphics2D g2d) { - if (nodeSize <= 0.0) - return; - AffineTransform ot = null; AffineTransform t = getTransform(); + double viewScaleRecip = scaleStroke ? (Double) g2d.getRenderingHint(DistrictRenderingHints.KEY_VIEW_SCALE_RECIPROCAL_UNDER_SPATIAL_ROOT) : 1.0; if (t != null && !t.isIdentity()) { - ot = g2d.getTransform(); - g2d.transform(getTransform()); + //ot = g2d.getTransform(); + ot = (AffineTransform) g2d.getRenderingHint(G2DRenderingHints.KEY_TRANSFORM_UNDER_SPATIAL_ROOT); + if (ot == null) + ot = g2d.getTransform(); + g2d.transform(t); + + if (scaleStroke) { + AffineTransform work = DistrictNetworkNodeUtils.sharedTransform.get(); + work.setTransform(ot); + work.concatenate(t); + viewScaleRecip = DistrictNetworkNodeUtils.calculateScaleRecip(work); + } } - Object oaaHint = null; - Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING); - if (aaHint != RenderingHints.VALUE_ANTIALIAS_OFF) { - oaaHint = aaHint; - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - } - - Color oldColor = g2d.getColor(); - Color newColor = dynamicColor != null ? dynamicColor : color; - boolean changeColor = !oldColor.equals(newColor); - - double viewScaleRecip = 10; - if (scaleStroke) { - double scale = GeometryUtils.getScale(g2d.getTransform()); - scale = Math.max(10000, Math.min(scale, 50000)); - viewScaleRecip /= scale; - } - double scaleRecip = viewScaleRecip * nodeSize; - // Translate lat and lon to X and Y Point2D p = point = DistrictNetworkNodeUtils.calculatePoint2D(vertex.getPoint(), point); - Rectangle2D toDraw = rect = DistrictNetworkNodeUtils.calculateDrawnGeometry(p, hover ? HOVERED : NORMAL, rect, scaleRecip); - - if (NodeUtil.isSelected(this, 1)) { - changeColor = true; - g2d.setColor(SELECTION_COLOR); - BasicStroke ss = GeometryUtils.scaleStroke(STROKE, (float) (viewScaleRecip*0.5)); - g2d.setStroke(ss); - g2d.draw(toDraw); - } - // render - if (changeColor) - g2d.setColor(newColor); - g2d.fill(toDraw); - - // Reset settings - if (changeColor) - g2d.setColor(oldColor); - if (oaaHint != null) - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint); + if (!hidden && nodeSize > 0.0) { + Object oaaHint = null; + Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING); + if (aaHint != RenderingHints.VALUE_ANTIALIAS_OFF) { + oaaHint = aaHint; + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); + } + + Color oldColor = g2d.getColor(); + Color newColor = dynamicColor != null ? dynamicColor : color; + boolean changeColor = !oldColor.equals(newColor); + + double scaleRecip = viewScaleRecip * nodeSize; + + Rectangle2D toDraw = rect = DistrictNetworkNodeUtils.calculateDrawnGeometry(p, hover ? HOVERED : NORMAL, rect, scaleRecip); + + if (NodeUtil.isSelected(this, 1)) { + changeColor = true; + g2d.setColor(SELECTION_COLOR); + BasicStroke ss = GeometryUtils.scaleStroke(STROKE, (float)viewScaleRecip); + g2d.setStroke(ss); + g2d.draw(toDraw); + } + + // render + if (changeColor) + g2d.setColor(newColor); + g2d.fill(toDraw); + + // Reset settings + if (changeColor) + g2d.setColor(oldColor); + if (oaaHint != null) + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint); + } // Render SVG symbol for (INode nn : getNodes()) { G2DNode g2dNode = (G2DNode)nn; - symbolTransform = DistrictNetworkNodeUtils.getTransformToRectangle(toDraw, symbolTransform); - g2dNode.setTransform(symbolTransform); + if (nn instanceof SVGNode) { + Rectangle2D toDraw = rect = DistrictNetworkNodeUtils.calculateDrawnGeometry(p, hover ? HOVERED : NORMAL, rect, viewScaleRecip); + symbolTransform = DistrictNetworkNodeUtils.getTransformToRectangle(toDraw, symbolTransform); + g2dNode.setTransform(symbolTransform); + } + g2dNode.render(g2d); } @@ -127,6 +141,7 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti @Override public Rectangle2D getBoundsInLocal() { + updateBounds(); return bounds; } @@ -144,15 +159,19 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti updateBounds(); } - @Override - public AffineTransform getTransform() { - return super.getTransform(); - } - private Rectangle2D calculateBounds(Rectangle2D rect) { Point2D calcPoint = DistrictNetworkNodeUtils.calculatePoint2D(vertex.getPoint(), point); - AffineTransform at = getTransform(); - return new Rectangle2D.Double(calcPoint.getX(), calcPoint.getY(), width / at.getScaleX(), height / at.getScaleY()).getBounds2D(); + AffineTransform at = NodeUtil.getLocalToGlobalTransform(this); + at.concatenate(MapScalingTransform.INSTANCE); + double x = calcPoint.getX(); + double y = calcPoint.getY(); + double scaleRecip = DistrictNetworkNodeUtils.calculateScaleRecip(at); + double widthh = width * scaleRecip * nodeSize; + double heighth = height * scaleRecip * nodeSize; + if (rect == null) + rect = new Rectangle2D.Double(); + rect.setRect(x - widthh/2, y - heighth/2, widthh, heighth); + return rect; } public void setVertex(DistrictNetworkVertex vertex) { @@ -160,16 +179,28 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti updateBounds(); } - public boolean hover(boolean hover) { -// if (hover && LOGGER.isDebugEnabled()) -// LOGGER.debug("Hovering " + this); - boolean changed = false; - if (this.hover != hover) { - this.hover = hover; - changed = true; + @Override + public boolean hover(boolean hover, boolean isConnectionTool) { + // Only react to hover when the connection tool is active + boolean doHover = hover && isConnectionTool; + boolean changed = this.hover != doHover; + this.hover = doHover; + + for (IG2DNode child : getNodes()) { + if (child instanceof HoverSensitiveNode) + changed = ((HoverSensitiveNode)child).hover(hover, isConnectionTool) || changed; } + return changed; } + + @Override + public void setMousePosition(Point2D p) { + for (IG2DNode child : getNodes()) { + if (child instanceof HoverSensitiveNode) + ((HoverSensitiveNode) child).setMousePosition(p); + } + } public void setColor(Color color) { this.color = color; @@ -206,4 +237,8 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti this.dynamicColor = color; } + @PropertySetter(value = "hidden") + public void setHidden(Boolean value) { + this.hidden = value; + } }