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=75c5ad4e7eb51d606126c75d0f3dcbb8c374d78d;hb=1f2a40b668c8f75992713262d64ae5ab8a659337;hp=e452a17b1f52188d8ab43b48de2a4302c5ad2a8a;hpb=38cb4b0b42c4c35a696bb46ffcf8129ca8d89103;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 e452a17b..75c5ad4e 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
@@ -9,6 +9,7 @@ import org.simantics.db.Resource;
 import org.simantics.db.common.procedure.adapter.TransientCacheListener;
 import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.exception.MissingVariableException;
 import org.simantics.db.layer0.exception.MissingVariableValueException;
 import org.simantics.db.layer0.exception.PendingVariableException;
 import org.simantics.db.layer0.util.Layer0Utils;
@@ -19,22 +20,32 @@ 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.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.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;
 
 public class DistrictNetworkStaticInfoStyle extends StyleBase<DistrictNetworkStaticInfoStyle.StyleResult> {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DistrictNetworkStaticInfoStyle.class);
+
 	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) {
@@ -49,7 +60,7 @@ public class DistrictNetworkStaticInfoStyle extends StyleBase<DistrictNetworkSta
 	}
 	
 	public DistrictNetworkStaticInfoStyle(Resource style) {
-		super(style);
+		super();
 	}
 	
 	@Override
@@ -94,6 +105,11 @@ public class DistrictNetworkStaticInfoStyle extends StyleBase<DistrictNetworkSta
 			result = Simantics.applySCLRead(graph, function, moduleVariable);
 		} catch (PendingVariableException | MissingVariableValueException e) {
 			result = null;
+		} catch (MissingVariableException e) {
+		    // the requested variable is missing from the UC
+	        String message = e.getMessage();
+		    LOGGER.warn("Missing variable for calculating style with function {} {}", function, message);
+		    result = "<" + message + ">";
 		}
 		
 		if (isVertex) {
@@ -122,6 +138,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;