X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fprofile%2FVertexSymbolStyle.java;h=26a5564d5fade5e47180b437fd12b5c56f66032f;hb=e764d663bb48dbc4ce86ca5d90c80167d30338a8;hp=65304502adc19c0f4de55ac7b540927a40db1282;hpb=beab0411489f5730942d98d47dc3faf3107c6c02;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/VertexSymbolStyle.java b/org.simantics.district.network/src/org/simantics/district/network/profile/VertexSymbolStyle.java
index 65304502..26a5564d 100644
--- a/org.simantics.district.network/src/org/simantics/district/network/profile/VertexSymbolStyle.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/profile/VertexSymbolStyle.java
@@ -1,36 +1,57 @@
 package org.simantics.district.network.profile;
 
+import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
 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.diagram.profile.StyleBase;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
+import org.simantics.layer0.Layer0;
 import org.simantics.scenegraph.INode;
 import org.simantics.scenegraph.g2d.G2DSceneGraph;
 import org.simantics.scenegraph.g2d.nodes.SingleElementNode;
 import org.simantics.scenegraph.profile.EvaluationContext;
 import org.simantics.scenegraph.profile.common.ProfileVariables;
 import org.simantics.scl.runtime.function.Function;
+import org.simantics.scl.runtime.function.FunctionImpl1;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class VertexSymbolStyle extends StyleBase<String> {
+public class VertexSymbolStyle extends ThrottledStyleBase<String> {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(VertexSymbolStyle.class);
+	
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
-	public String calculateStyle(ReadGraph graph, Resource runtimeDiagram, Resource entry, Resource groupItem) throws DatabaseException {
-		DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
-		Resource symbolFunctionResource = graph.getPossibleObject(entry, DN.HasSymbolFunction);
-		if (symbolFunctionResource == null)
-			return null;
-		
-		Function symbolFunction = (Function) graph.getPossibleValue2(symbolFunctionResource, null);
-		if (symbolFunction == null)
-			return null;
-		
-		return (String) symbolFunction.apply(graph, entry);
+	public String calculateThrottledStyle(ReadGraph graph, Resource runtimeDiagram, Resource entry, Resource groupItem) throws DatabaseException {
+		// Prevent PendingVariableExceptions from coming through
+		boolean wasSynchronous = graph.setSynchronous(true);
+		try {
+			Function symbolFunction = getSymbolFunction(graph, entry);
+			if (symbolFunction == null)
+				return null;
+			
+			try {
+				return (String) Simantics.applySCLRead(graph, symbolFunction, groupItem);
+			} catch (Exception e) {
+				LOGGER.error("Getting dynamic symbol for " + groupItem + " (" + graph.getPossibleRelatedValue(groupItem, Layer0.getInstance(graph).HasName) + ") failed", e);
+				return null;
+			}
+		}
+		finally {
+			graph.setSynchronous(wasSynchronous);
+		}
+	}
+
+	@SuppressWarnings("rawtypes")
+	protected static Function getSymbolFunction(ReadGraph graph, Resource entry) throws DatabaseException {
+		// Cache function read for profile entry
+		return graph.syncRequest(new SymbolFunctionRequest(entry), TransientCacheListener.<Function>instance());
 	}
 
 	@Override
-	public void applyStyleForNode(EvaluationContext observer, INode node, String value) {
+	public void applyThrottledStyleForNode(EvaluationContext observer, INode node, String value) {
 		SingleElementNode n = (SingleElementNode) node;
 		for (INode nn : n.getNodes())
 			ProfileVariables.claimNodeProperty(nn, "SVG", value, observer);
@@ -44,4 +65,29 @@ public class VertexSymbolStyle extends StyleBase<String> {
 			ProfileVariables.claimNodeProperty(nn, "SVG", null, evaluationContext);
 	}
 
+	@SuppressWarnings("rawtypes")
+	protected static final class SymbolFunctionRequest extends ResourceRead<Function> {
+		protected static final Function CONST_NULL = new FunctionImpl1<Resource, String>() {
+			@Override
+			public String apply(Resource p0) {
+				return null;
+			}
+		};
+		
+		public SymbolFunctionRequest(Resource entry) {
+			super(entry);
+		}
+
+		@Override
+		public Function perform(ReadGraph graph) throws DatabaseException {
+			DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+			
+			Function symbolFunction = (Function) graph.getPossibleRelatedValue2(resource, DN.HasSymbolFunction, resource);
+			if (symbolFunction == null)
+				symbolFunction = CONST_NULL;
+			
+			return symbolFunction;
+		}
+	}
+
 }