X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fstyles%2FDistrictNetworkStaticInfoStyle.java;h=5c5c80b7f6cc3b644c630936551fd6f5092c61fc;hb=86d471d96d6bc11bf7629113e57c6d9a9916e608;hp=8a4a143ce39050875d4d930b2f015420015024c8;hpb=2f414faa80051f046a020840105847099c655195;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkStaticInfoStyle.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkStaticInfoStyle.java
index 8a4a143c..5c5c80b7 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkStaticInfoStyle.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkStaticInfoStyle.java
@@ -20,19 +20,26 @@ import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.district.network.DistrictNetworkUtil;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
 import org.simantics.district.network.profile.MidBranchEdgeSetRequest;
+import org.simantics.district.network.ui.nodes.DeferredRenderingNode;
+import org.simantics.district.network.ui.nodes.DistrictNetworkEdgeNode;
 import org.simantics.district.network.ui.nodes.DistrictNetworkNodeUtils;
 import org.simantics.district.network.ui.nodes.DistrictNetworkStaticInfoNode;
 import org.simantics.layer0.Layer0;
 import org.simantics.scenegraph.INode;
+import org.simantics.scenegraph.ParentNode;
+import org.simantics.scenegraph.g2d.IG2DNode;
+import org.simantics.scenegraph.g2d.nodes.ConnectionNode;
+import org.simantics.scenegraph.g2d.nodes.spatial.RTreeNode;
 import org.simantics.scenegraph.profile.EvaluationContext;
 import org.simantics.scenegraph.profile.common.ProfileVariables;
+import org.simantics.scenegraph.utils.NodeUtil;
 import org.simantics.scl.compiler.top.ValueNotFound;
 import org.simantics.scl.osgi.SCLOsgi;
 import org.simantics.scl.runtime.SCLContext;
 import org.simantics.scl.runtime.function.Function1;
 import org.simantics.structural.stubs.StructuralResource2;
-import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DistrictNetworkStaticInfoStyle extends StyleBase<DistrictNetworkStaticInfoStyle.StyleResult> {
 
@@ -40,6 +47,8 @@ public class DistrictNetworkStaticInfoStyle extends StyleBase<DistrictNetworkSta
 
 	private static final String ACTIONS_MODULE = "Actions";
 	private static final String PIPELINE_INFO = "pipelineInfo";
+
+	public static final String STATIC_INFO_DEFERRED = "staticInfo";
 	
 	public static class StyleResult {
 		public StyleResult(Point2D p1, Point2D p2, String info) {
@@ -54,7 +63,7 @@ public class DistrictNetworkStaticInfoStyle extends StyleBase<DistrictNetworkSta
 	}
 	
 	public DistrictNetworkStaticInfoStyle(Resource style) {
-		super(style);
+		super();
 	}
 	
 	@Override
@@ -132,6 +141,12 @@ public class DistrictNetworkStaticInfoStyle extends StyleBase<DistrictNetworkSta
 			return;
 		}
 		
+		ParentNode<?> root = (ParentNode<?>) NodeUtil.getNearestParentOfType(parent, RTreeNode.class);
+		if (root != null) {
+			DeferredRenderingNode deferred = ProfileVariables.claimChild(root, "", STATIC_INFO_DEFERRED, DeferredRenderingNode.class, evaluationContext);
+			deferred.setZIndex(Integer.MAX_VALUE-1);
+		}
+		
 		DistrictNetworkStaticInfoNode node = ProfileVariables.claimChild(parent, "*", DistrictNetworkStaticInfoNode.NODE_KEY, DistrictNetworkStaticInfoNode.class, evaluationContext);
 		if (node == null)
 			return;
@@ -148,6 +163,12 @@ public class DistrictNetworkStaticInfoStyle extends StyleBase<DistrictNetworkSta
 			Point2D direction = new Point2D.Double(0.5 * sign * (p1.getX() - p2.getX()), 0.5 * sign * (p1.getY() - p2.getY()));
 			
 			node.setLocation(origin, direction);
+			
+			for (IG2DNode n : ((ConnectionNode)parent).getNodes()) {
+				if (n instanceof DistrictNetworkEdgeNode) {
+					node.setEdgeNode((DistrictNetworkEdgeNode) n);
+				}
+			}
 		}
 		
 		node.setInfo(result.info);