import org.simantics.district.network.ModelledCRS;
import org.simantics.district.network.ui.DistrictNetworkEdge;
import org.simantics.district.network.ui.adapters.DistrictNetworkEdgeElementFactory;
-import org.simantics.maps.MapScalingTransform;
import org.simantics.scenegraph.INode;
import org.simantics.scenegraph.ISelectionPainterNode;
-import org.simantics.scenegraph.INode.PropertySetter;
import org.simantics.scenegraph.g2d.G2DNode;
import org.simantics.scenegraph.g2d.G2DParentNode;
+import org.simantics.scenegraph.g2d.G2DRenderingHints;
import org.simantics.scenegraph.g2d.nodes.SVGNode;
import org.simantics.scenegraph.utils.GeometryUtils;
import org.simantics.scenegraph.utils.NodeUtil;
private Rectangle2D bounds;
private transient Path2D path;
- private boolean scaleStroke = true;
+ private static boolean scaleStroke = true;
private Color color;
private Double stroke;
private transient Color dynamicColor = null;
public void render(Graphics2D g2d) {
AffineTransform ot = null;
AffineTransform t = getTransform();
+ double scale = scaleStroke ? (Double) g2d.getRenderingHint(DistrictRenderingHints.KEY_VIEW_SCALE_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);
+ g2d.transform(t);
+ if (scaleStroke) {
+ AffineTransform work = DistrictNetworkNodeUtils.sharedTransform.get();
+ work.setTransform(ot);
+ work.concatenate(t);
+ scale = DistrictNetworkNodeUtils.getScale(work);
+ }
}
- double scale = 1.0;
- if (scaleStroke) {
- AffineTransform tr = g2d.getTransform();
- scale = DistrictNetworkNodeUtils.getScale(tr);
- }
-
if (!hidden) {
Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
} else {
bs = STROKE;
}
-
- int zoomLevel = MapScalingTransform.zoomLevel(ot);
+
+ int zoomLevel = (Integer) g2d.getRenderingHint(DistrictRenderingHints.KEY_VIEW_ZOOM_LEVEL);
path = calculatePath(edge, path, zoomLevel > 15);
if (isSelected()) {
g2d.setColor(oldColor);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint);
}
-
+
for (INode nn : getNodes()) {
G2DNode g2dNode = (G2DNode)nn;
if (g2dNode instanceof SVGNode) {
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)
+ break;
+
symbolRect = DistrictNetworkNodeUtils.calculateDrawnGeometry(p, NORMAL, symbolRect, viewScaleRecip);
symbolTransform = DistrictNetworkNodeUtils.getTransformToRectangle(symbolRect, symbolTransform);
-
+
g2dNode.setTransform(symbolTransform);
}
g2dNode.render(g2d);
}
-
+
if (ot != null)
g2d.setTransform(ot);
}
}
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;
}
@PropertySetter(value = "arrowLength")
- public void setArroLength(Double length) {
+ public void setArrowLength(Double length) {
arrowLength = length;
}