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=0cd5ea884fd29058c2e12907eca01112a3e2dbe0;hb=985b0e7fb25091941011286a135731ad44809633;hp=99eb3cc117b7fb91cbb8352016a62da7e9836249;hpb=ac6ad8ff2b20a10e85e7b12c1af670500daebdd4;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 99eb3cc1..0cd5ea88 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 @@ -4,111 +4,129 @@ import java.awt.BasicStroke; import java.awt.Color; import java.awt.Graphics2D; import java.awt.RenderingHints; -import java.awt.Stroke; import java.awt.geom.AffineTransform; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import org.simantics.district.network.ModelledCRS; import org.simantics.district.network.ui.adapters.DistrictNetworkVertex; -import org.simantics.scenegraph.ParentNode; +import org.simantics.scenegraph.ISelectionPainterNode; import org.simantics.scenegraph.g2d.G2DNode; import org.simantics.scenegraph.utils.GeometryUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.simantics.scenegraph.utils.NodeUtil; -public class DistrictNetworkVertexNode extends G2DNode { +public class DistrictNetworkVertexNode extends G2DNode implements ISelectionPainterNode { + + //private static final Logger LOGGER = LoggerFactory.getLogger(DistrictNetworkVertexNode.class); - private static final Logger LOGGER = LoggerFactory.getLogger(DistrictNetworkVertexNode.class); - private static final long serialVersionUID = -2641639101400236719L; - private DistrictNetworkVertex vertex; + + 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 = -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 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 Stroke stroke = new BasicStroke(2); + + private DistrictNetworkVertex vertex; + private boolean scaleStroke = true; private boolean hover; private Color color; + private transient Color dynamicColor; private Rectangle2D bounds; + private transient Point2D point; + private transient Rectangle2D rect; - private Double strokee; + private double nodeSize = 1; @Override public void init() { setZIndex(2); } - + @Override public void render(Graphics2D g2d) { + if (nodeSize <= 0.0) + return; + AffineTransform ot = null; AffineTransform t = getTransform(); if (t != null && !t.isIdentity()) { ot = g2d.getTransform(); g2d.transform(getTransform()); } - + + Object oaaHint = null; Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - + if (aaHint != RenderingHints.VALUE_ANTIALIAS_OFF) { + oaaHint = aaHint; + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); + } + Color oldColor = g2d.getColor(); - Stroke oldStroke = g2d.getStroke(); - - g2d.setColor(color); - - double scaleRecip = 1; + Color newColor = dynamicColor != null ? dynamicColor : color; + boolean changeColor = !oldColor.equals(newColor); + + double viewScaleRecip = 1; if (scaleStroke) { double scale = GeometryUtils.getScale(g2d.getTransform()); - double str; - if (strokee != null) - str = strokee; - else - str = 1.0; - //System.out.println("scale: " + scale); - scaleRecip = 1.0 / scale; + scale = Math.max(10000, Math.min(scale, 50000)); + viewScaleRecip = 1.0 / scale; } - scaleRecip = 8.0 * scaleRecip; - + double scaleRecip = viewScaleRecip * nodeSize; + // Translate lat and lon to X and Y - Point2D res = calculatePoint2D(vertex); - - Rectangle2D toDraw; - if (hover) { - toDraw = new Rectangle2D.Double(res.getX() - (HOVERED.getWidth() / 2 * scaleRecip), res.getY() - (HOVERED.getHeight() / 2 * scaleRecip), HOVERED.getWidth() * scaleRecip, HOVERED.getHeight() * scaleRecip); - } else { - toDraw = new Rectangle2D.Double(res.getX() - (NORMAL.getWidth() / 2 * scaleRecip), res.getY() - (NORMAL.getHeight() / 2 * scaleRecip), NORMAL.getWidth() * scaleRecip, NORMAL.getHeight() * scaleRecip); + Point2D p = point = calculatePoint2D(vertex, point); + Rectangle2D toDraw = 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*5); + g2d.setStroke(ss); + g2d.draw(toDraw); } + // render + if (changeColor) + g2d.setColor(newColor); g2d.fill(toDraw); - - // Reset stats - g2d.setColor(oldColor); - g2d.setStroke(oldStroke); - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint); - + + // Reset settings + if (changeColor) + g2d.setColor(oldColor); + if (oaaHint != null) + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint); if (ot != null) g2d.setTransform(ot); } + private Rectangle2D calculateDrawnGeometry(Point2D p, Rectangle2D margin, Rectangle2D result, double scaleRecip) { + if (result == null) + result = new Rectangle2D.Double(); + double mw = margin.getWidth(); + double mh = margin.getHeight(); + result.setFrame(p.getX() - (mw / 2 * scaleRecip), p.getY() - (mh / 2 * scaleRecip), mw * scaleRecip, mh * scaleRecip); + return result; + } + @Override public Rectangle2D getBounds() { return super.getBounds(); } - + @Override public Rectangle2D getBoundsInLocal() { return bounds; } - + private void updateBounds() { Rectangle2D oldBounds = bounds; if (oldBounds == null) @@ -122,33 +140,34 @@ public class DistrictNetworkVertexNode extends G2DNode { // Update bounds updateBounds(); } - + @Override public AffineTransform getTransform() { return super.getTransform(); } - + private Rectangle2D calculateBounds(Rectangle2D rect) { - Point2D calcPoint = calculatePoint2D(vertex); + Point2D calcPoint = calculatePoint2D(vertex, point); AffineTransform at = getTransform(); - return new Rectangle2D.Double(calcPoint.getX(), calcPoint.getY(), 1 / at.getScaleX(), 1 / at.getScaleY()).getBounds2D(); + return new Rectangle2D.Double(calcPoint.getX(), calcPoint.getY(), width / at.getScaleX(), height / at.getScaleY()).getBounds2D(); } - private static Point2D calculatePoint2D(DistrictNetworkVertex vertex) { - Point2D point= vertex.getPoint(); + private static Point2D calculatePoint2D(DistrictNetworkVertex vertex, Point2D result) { + Point2D point = vertex.getPoint(); double x = ModelledCRS.longitudeToX(point.getX()); double y = ModelledCRS.latitudeToY(-point.getY()); // Inverse because Simantics Diagram is inverted - - // Apply the scaling - Point2D res = new Point2D.Double(x, y); - return res; + if (result == null) + result = new Point2D.Double(x, y); + else + result.setLocation(x, y); + return result; } public void setVertex(DistrictNetworkVertex vertex) { this.vertex = vertex; updateBounds(); } - + public boolean hover(boolean hover) { // if (hover && LOGGER.isDebugEnabled()) // LOGGER.debug("Hovering " + this); @@ -163,13 +182,28 @@ public class DistrictNetworkVertexNode extends G2DNode { public void setColor(Color color) { this.color = color; } - + public Color getColor() { return color; } - @PropertySetter(value = "stroke") - public void setStroke(Double stroke) { - this.strokee = stroke / 10; + @PropertySetter(value = "size") + public void setSize(Double size) { + boolean changed = false; + if (size != null) { + changed = size != this.nodeSize; + this.nodeSize = size; + } else { + changed = this.nodeSize != 1.0; + this.nodeSize = 1.0; + } + if (changed) + updateBounds(); + } + + @PropertySetter(value = "dynamicColor") + public void setDynamicColor(Color color) { + this.dynamicColor = color; } + }