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=b1bb1468dd63653ee1c423a9653fbc307088bc8e;hb=3730466cd1e90c50c988292e107639952448d6a6;hp=0533e3117bf38b32a4f94191139fe55d8876e148;hpb=731368eea74c3292199315a38d6914b09b813632;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 0533e311..b1bb1468 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 @@ -7,6 +7,7 @@ import java.awt.RenderingHints; import java.awt.geom.AffineTransform; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; +import java.util.Optional; import org.simantics.district.network.ui.adapters.DistrictNetworkVertex; import org.simantics.maps.MapScalingTransform; @@ -14,6 +15,7 @@ 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; @@ -38,7 +40,7 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti private DistrictNetworkVertex vertex; - private boolean scaleStroke = true; + private static boolean scaleStroke = true; private boolean hover; private Color color; @@ -51,6 +53,8 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti private double nodeSize = 1.0; + private boolean hidden = false; + @Override public void init() { setZIndex(2); @@ -58,63 +62,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(); + //ot = g2d.getTransform(); + ot = (AffineTransform) g2d.getRenderingHint(G2DRenderingHints.KEY_TRANSFORM_UNDER_SPATIAL_ROOT); + if (ot == null) + ot = g2d.getTransform(); g2d.transform(t); - } - - 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 = 1; - if (scaleStroke) { - viewScaleRecip *= DistrictNetworkNodeUtils.calculateScaleRecip(g2d.getTransform()); + if (scaleStroke) { + AffineTransform work = DistrictNetworkNodeUtils.sharedTransform.get(); + work.setTransform(ot); + work.concatenate(t); + viewScaleRecip = DistrictNetworkNodeUtils.calculateScaleRecip(work); + } } - 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); - 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; 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); } @@ -147,11 +160,6 @@ 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 = NodeUtil.getLocalToGlobalTransform(this); @@ -172,6 +180,10 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti updateBounds(); } + public DistrictNetworkVertex getVertex() { + return vertex; + } + @Override public boolean hover(boolean hover, boolean isConnectionTool) { // Only react to hover when the connection tool is active @@ -186,6 +198,14 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti 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; @@ -222,4 +242,29 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti this.dynamicColor = color; } + @PropertySetter(value = "hidden") + public void setHidden(Boolean value) { + this.hidden = value; + } + + public void setStaticInformation(Optional staticInformation) { + DistrictNetworkStaticInfoNode child = getOrCreateNode(DistrictNetworkStaticInfoNode.NODE_KEY, DistrictNetworkStaticInfoNode.class); + Point2D calculatePoint2D = DistrictNetworkNodeUtils.calculatePoint2D(vertex.getPoint(), null); + child.setLocation(calculatePoint2D, new Point2D.Double(1.0, 0.0)); + if (staticInformation.isPresent()) { + child.setInfo(staticInformation.get()); + } else { + child.setInfo(null); + } + } + + public void setInSimulation(Optional isInSimulation) { + if (!isInSimulation.isPresent()) { + removeNode(NotInSimulationNode.NODE_NAME); + } else { + NotInSimulationNode child = getOrCreateNode(NotInSimulationNode.NODE_NAME, NotInSimulationNode.class); + child.setZIndex(1000); + child.setIsInSimulation(isInSimulation.get()); + } + } }