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%2FDistrictNetworkEdgeNode.java;h=195472fcd2474b0b060de1df3b032c350c672c5e;hb=10cc983e56eaadd88e66aca478918a4bd841fdfd;hp=8c4af387cee34a288e888e0c03d74c943198424b;hpb=168c8cff360907f79153c0ab55cac2201dd482c6;p=simantics%2Fdistrict.git
diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
index 8c4af387..195472fc 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
@@ -26,14 +26,17 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
private static final long serialVersionUID = 8049769475036519806L;
- private static final BasicStroke STROKE = new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+ public 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 DistrictNetworkEdge edge;
private Rectangle2D bounds;
private transient Path2D path;
+ private transient Path2D detailedPath;
- private static boolean scaleStroke = true;
+ private transient int zoomLevel = 0;
+
+ static final boolean scaleStroke = true;
private Color color;
private Double stroke;
private transient Color dynamicColor = null;
@@ -47,12 +50,14 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
private static final Rectangle2D NORMAL = new Rectangle2D.Double(left, top, width, height);
private transient Point2D centerPoint;
+ private transient Point2D detailedCenterPoint;
+ private transient Point2D direction;
+ private transient Point2D detailedDirection;
+
private transient Rectangle2D symbolRect;
private transient AffineTransform symbolTransform;
private boolean hidden = false;
-
- private Double arrowLength;
private static double startX;
private static double startY;
@@ -71,6 +76,8 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
if (t != null && !t.isIdentity()) {
//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();
@@ -80,6 +87,8 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
}
}
+ zoomLevel = (Integer) g2d.getRenderingHint(DistrictRenderingHints.KEY_VIEW_ZOOM_LEVEL);
+
if (!hidden) {
Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -94,8 +103,7 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
bs = STROKE;
}
- int zoomLevel = (Integer) g2d.getRenderingHint(DistrictRenderingHints.KEY_VIEW_ZOOM_LEVEL);
- path = calculatePath(edge, path, zoomLevel > 13);
+ Path2D path = renderDetailed(zoomLevel) ? this.detailedPath : this.path;
if (isSelected()) {
g2d.setColor(SELECTION_COLOR);
@@ -107,61 +115,24 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
g2d.setStroke(bs);
g2d.draw(path);
- // Draw arrow
- if (arrowLength != null) {
- g2d.setColor(Color.BLACK);
- float lw = STROKE.getLineWidth() / (float)scale;
- g2d.setStroke(new BasicStroke(lw, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
-
- double l = arrowLength;
- double w = 2 * (double) lw * Math.signum(l);
- if (Math.abs(w) > Math.abs(l)) w = l;
- double offset = 2 * (double) lw;
-
- double centerX = (startX + endX) / 2, centerY = (startY + endY) / 2;
- double deltaX = endX - startX, deltaY = endY - startY;
- double length = Math.sqrt(deltaX * deltaX + deltaY * deltaY);
- deltaX /= length;
- deltaY /= length;
-
- double x0 = centerX - l/2 * deltaX + offset * deltaY;
- double y0 = centerY - l/2 * deltaY - offset * deltaX;
- double x1 = centerX + (l/2 - w) * deltaX + offset * deltaY;
- double y1 = centerY + (l/2 - w) * deltaY - offset * deltaX;
-
- g2d.draw(new Line2D.Double(x0, y0, x1, y1));
-
- Path2D path = new Path2D.Double();
- path.moveTo(x1 + w * deltaX, y1 + w * deltaY);
- path.lineTo(x1 + w * deltaY, y1 - w * deltaX);
- path.lineTo(x1 - w * deltaY, y1 + w * deltaX);
- path.closePath();
- g2d.fill(path);
- }
-
// Reset
g2d.setStroke(oldStroke);
g2d.setColor(oldColor);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint);
}
+ Point2D centerP = getCenterPoint(zoomLevel);
for (INode nn : getNodes()) {
- G2DNode g2dNode = (G2DNode)nn;
+ G2DNode g2dNode = (G2DNode) nn;
if (g2dNode instanceof SVGNode) {
- // Render SVG symbol
- double viewScaleRecip = 10;
- if (scaleStroke) {
- viewScaleRecip /= scale;
- }
-
// If the node is hidden from the start, then the center point cannot be calculated yet.
- Point2D p = getCenterPoint();
- if (p == null)
+ if (!isDefined(centerP))
break;
- symbolRect = DistrictNetworkNodeUtils.calculateDrawnGeometry(p, NORMAL, symbolRect, viewScaleRecip);
+ // Render SVG symbol
+ double viewScaleRecip = scaleStroke ? 10 / scale : 10;
+ symbolRect = DistrictNetworkNodeUtils.calculateDrawnGeometry(centerP, NORMAL, symbolRect, viewScaleRecip);
symbolTransform = DistrictNetworkNodeUtils.getTransformToRectangle(symbolRect, symbolTransform);
-
g2dNode.setTransform(symbolTransform);
}
g2dNode.render(g2d);
@@ -171,6 +142,14 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
g2d.setTransform(ot);
}
+ static boolean isDefined(Point2D p) {
+ return p != null && !(Double.isNaN(p.getX()) || Double.isNaN(p.getY()));
+ }
+
+ boolean renderDetailed(int zoomLevel) {
+ return zoomLevel > 13;
+ }
+
public float getStrokeWidth(AffineTransform tr, boolean selection) {
double scale = DistrictNetworkNodeUtils.getScale(tr);
float width = STROKE.getLineWidth() * getStrokeWidth(scale);
@@ -190,31 +169,16 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
}
public Path2D getPath() {
- return path;
+ return renderDetailed(zoomLevel) ? detailedPath : path;
}
-
- private Point2D getCenterPoint() {
- if (path == null)
- return null;
- if (centerPoint == null)
- centerPoint = new Point2D.Double();
- Rectangle2D bounds = path.getBounds2D();
- centerPoint.setLocation(bounds.getCenterX(), bounds.getCenterY());
- return centerPoint;
+
+ public Point2D getCenterPoint(int zoomLevel) {
+ return renderDetailed(zoomLevel) ? detailedCenterPoint : centerPoint;
}
-// public static Line2D calculateLine(DistrictNetworkEdge edge, Line2D result) {
-// // Convert to screen coordinates
-// double startX = ModelledCRS.longitudeToX(edge.getStartPoint().getX());
-// double startY = ModelledCRS.latitudeToY(-edge.getStartPoint().getY()); // Invert for Simantics
-// double endX = ModelledCRS.longitudeToX(edge.getEndPoint().getX());
-// double endY = ModelledCRS.latitudeToY(-edge.getEndPoint().getY());// Invert for Simantics
-//
-// if (result == null)
-// result = new Line2D.Double();
-// result.setLine(startX, startY, endX, endY);
-// return result;
-// }
+ public Point2D getDirection(int zoomLevel) {
+ return renderDetailed(zoomLevel) ? detailedDirection : direction;
+ }
public static Path2D calculatePath(DistrictNetworkEdge edge, Path2D result, boolean detailed) {
startX = ModelledCRS.longitudeToX(edge.getStartPoint().getX());
@@ -232,7 +196,6 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
double[] detailedGeometry = edge.getGeometry();
if (detailedGeometry != null && !DistrictNetworkEdgeElementFactory.EMPTY.equals(detailedGeometry)) {
// ok, lets do this
-
for (int i = 0; i < detailedGeometry.length; i += 2) {
double x = ModelledCRS.longitudeToX(detailedGeometry[i]);
double y = ModelledCRS.latitudeToY(-detailedGeometry[i+1]);// Invert for Simantics
@@ -260,12 +223,31 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
bounds = calculateBounds(oldBounds);
}
+ /**
+ * Calculates conservative bounds of the node provided by
+ * detailedPath. These might be larger than the simplified bounds
+ * of path but the conservative bounds ensure that spatial
+ * optimizations work properly.
+ */
private Rectangle2D calculateBounds(Rectangle2D rect) {
- return calculatePath(edge, null, false).getBounds2D();
+ if (detailedPath == null)
+ detailedPath = calculatePath(edge, detailedPath, true);
+ return detailedPath.getBounds2D();
}
public void setDNEdge(DistrictNetworkEdge edge) {
this.edge = edge;
+ path = calculatePath(edge, path, false);
+ detailedPath = calculatePath(edge, detailedPath, true);
+
+ centerPoint = new Point2D.Double();
+ detailedCenterPoint = new Point2D.Double();
+ direction = new Point2D.Double();
+ detailedDirection = new Point2D.Double();
+
+ DistrictNetworkNodeUtils.calculateCenterPointAndDirection(path, centerPoint, direction);
+ DistrictNetworkNodeUtils.calculateCenterPointAndDirection(detailedPath, detailedCenterPoint, detailedDirection);
+
updateBounds();
}
@@ -286,10 +268,14 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
public void setDynamicColor(Color color) {
this.dynamicColor = color;
}
-
+
@PropertySetter(value = "arrowLength")
public void setArrowLength(Double length) {
- arrowLength = length;
+ // find if there is a child deferred arrow node
+ DistrictNetworkEdgeArrayNode child = getOrCreateNode(DistrictNetworkEdgeArrayNode.NODE_KEY, DistrictNetworkEdgeArrayNode.class);
+ child.setEdgeNode(this);
+ child.setArrowLength(length);
+ //arrowLength = length;
}
@PropertySetter(value = "SVG")
@@ -298,10 +284,10 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
if (nn instanceof SVGNode)
((SVGNode)nn).setData(value);
}
-
@PropertySetter(value = "hidden")
public void setHidden(Boolean value) {
this.hidden = value;
}
+
}