X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scenegraph%2Fsrc%2Forg%2Fsimantics%2Fscenegraph%2Fg2d%2Fnodes%2Fconnection%2FRouteGraphNode.java;h=687731f4c2f9d8528ab40cc0c6189151672828f4;hb=5f0ad7a26810df602600c5eddad317588fce0ac4;hp=ad71bb126185c1ef6c49bcb3e5c654440b19171f;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/connection/RouteGraphNode.java b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/connection/RouteGraphNode.java index ad71bb126..687731f4c 100644 --- a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/connection/RouteGraphNode.java +++ b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/connection/RouteGraphNode.java @@ -124,12 +124,22 @@ public class RouteGraphNode extends G2DNode implements ISelectionPainterNode, In protected transient Map dynamicStyles = null; + private transient boolean ignoreSelection = false; + @Override public void initValues() { dynamicColor = null; wrapRenderer(); } + public void setIgnoreSelection(boolean value) { + ignoreSelection = value; + } + + public boolean getIgnoreSelection() { + return ignoreSelection; + } + @PropertySetter("color") @SyncField(value = {"dynamicColor"}) public void setDynamicColor(Color color) { @@ -215,20 +225,20 @@ public class RouteGraphNode extends G2DNode implements ISelectionPainterNode, In if(dynamicColor != null || dynamicStroke != null) { BasicConnectionStyle baseStyle = (BasicConnectionStyle)tryGetStyle(baseRenderer); try { - Constructor c = baseStyle.getClass().getConstructor(Color.class, Color.class, double.class, Stroke.class, Stroke.class, double.class); + Constructor c = baseStyle.getClass().getConstructor(Color.class, Color.class, double.class, Stroke.class, Stroke.class, double.class, double.class); renderer = new StyledRouteGraphRenderer(c.newInstance( dynamicColor != null ? dynamicColor : baseStyle.getLineColor(), baseStyle.getBranchPointColor(), baseStyle.getBranchPointRadius(), dynamicStroke != null ? dynamicStroke : baseStyle.getLineStroke(), dynamicStroke != null ? dynamicStroke : baseStyle.getRouteLineStroke(), - baseStyle.getDegeneratedLineLength())); + baseStyle.getDegeneratedLineLength(), baseStyle.getRounding())); } catch (Exception e) { renderer = new StyledRouteGraphRenderer(new BasicConnectionStyle( dynamicColor != null ? dynamicColor : baseStyle.getLineColor(), baseStyle.getBranchPointColor(), baseStyle.getBranchPointRadius(), dynamicStroke != null ? dynamicStroke : baseStyle.getLineStroke(), dynamicStroke != null ? dynamicStroke : baseStyle.getRouteLineStroke(), - baseStyle.getDegeneratedLineLength())); + baseStyle.getDegeneratedLineLength(), baseStyle.getRounding())); } @@ -347,7 +357,9 @@ public class RouteGraphNode extends G2DNode implements ISelectionPainterNode, In Object aaHint = g.getRenderingHint(RenderingHints.KEY_ANTIALIASING); g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - boolean selected = NodeUtil.isSelected(this, 1); + boolean selected = ignoreSelection ? false : NodeUtil.isSelected(this, 1); + + rg.updateTerminals(); if (currentAction != null) { currentAction.render(g, renderer, mouseX, mouseY);