X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fprofile%2FDiagramSettingsRequest.java;h=6fdb9721f059b20d32498e75f0f423659ebfa5be;hb=29914be09d4a237840e5c793bdb562ec83093b8d;hp=726005eef7e088dfcd0024153988d0c2f2b50fc9;hpb=10fe42db158693adffc526131d37f58cbd5780b2;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/DiagramSettingsRequest.java b/org.simantics.district.network/src/org/simantics/district/network/profile/DiagramSettingsRequest.java
index 726005ee..6fdb9721 100644
--- a/org.simantics.district.network/src/org/simantics/district/network/profile/DiagramSettingsRequest.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/profile/DiagramSettingsRequest.java
@@ -5,15 +5,18 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.variable.Variable;
+import org.simantics.db.layer0.variable.Variables;
 import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
+import org.simantics.scl.runtime.function.Function1;
 
 /**
  * @author Tuukka Lehtonen
  */
 public class DiagramSettingsRequest extends ResourceRead<DiagramSettings> {
 
-	protected DiagramSettingsRequest(Resource runtimeDiagram) {
+	public DiagramSettingsRequest(Resource runtimeDiagram) {
 		super(runtimeDiagram);
 	}
 
@@ -22,28 +25,53 @@ public class DiagramSettingsRequest extends ResourceRead<DiagramSettings> {
 		DiagramResource DIA = DiagramResource.getInstance(graph);
 		DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
 
-		Resource edgeThicknessProperty = null;
-		Resource nodeScalingProperty = null;
-		double edgeThicknessScale = 1;
-		double nodeScalingScale = 1;
+		Function1<Resource, Double> edgeThicknessProperty = null;
+		Function1<Resource, Double> nodeScaleProperty = null;
+		double edgeThicknessGain = 1;
+		double edgeThicknessBias = 0;
+		double nodeScaleGain = 1;
+		double nodeScaleBias = 0;
 
 		Resource diagram = graph.getPossibleObject(resource, DIA.RuntimeDiagram_HasConfiguration);
 		if (diagram != null) {
 			Resource etp = graph.getPossibleObject(diagram, DN.Diagram_edgeThicknessProperty);
-			edgeThicknessProperty = graph.getPossibleObject(etp, DN.Edge_ThicknessProperty_value);
-//			Resource nsp = graph.getPossibleObject(diagram, DN.Diagram_nodeScalingProperty);
-//			nodeScalingProperty = graph.getPossibleObject(nsp, DN.Vertex_ScaleProperty_value);
+			//System.out.println("etp: " + NameUtils.getURIOrSafeNameInternal(graph, etp));
+			if (etp != null) {
+				Variable etpv = Variables.getPossibleVariable(graph, etp);
+				if (etpv != null) {
+					//System.out.println("etpv: " + etpv.getURI(graph));
+					edgeThicknessProperty = etpv.getPropertyValue(graph, DN.Edge_ThicknessProperty_value);
+				}
 
-			edgeThicknessScale =
-					safeDoubleProperty(graph, etp, DN.Edge_ThicknessProperty_scale, 1)
-					* safeDoubleProperty(graph, diagram, DN.Diagram_edgeThicknessScale, 1);
+				edgeThicknessGain =
+						safeDoubleProperty(graph, etp, DN.Edge_ThicknessProperty_gain, 1)
+						* safeDoubleProperty(graph, diagram, DN.Diagram_edgeThicknessGain, 1);
+				edgeThicknessBias =
+						safeDoubleProperty(graph, etp, DN.Edge_ThicknessProperty_bias, 0)
+						+ safeDoubleProperty(graph, diagram, DN.Diagram_edgeThicknessBias, 0);
+			}
+			Resource nsp = graph.getPossibleObject(diagram, DN.Diagram_nodeScaleProperty);
+			if (nsp != null) {
+				Variable nspv = Variables.getPossibleVariable(graph, nsp);
+				if (nspv != null) {
+					//System.out.println("nspv: " + nspv.getURI(graph));
+					nodeScaleProperty = nspv.getPropertyValue(graph, DN.Vertex_ScaleProperty_value);
+				}
 
-//			nodeScalingScale =
-//					safeDoubleProperty(graph, nsp, DN.Vertex_ScaleProperty_scale, 1)
-//					* safeDoubleProperty(graph, diagram, DN.Diagram_nodeScale, 1);
+				nodeScaleGain =
+						safeDoubleProperty(graph, nsp, DN.Vertex_ScaleProperty_gain, 1)
+						* safeDoubleProperty(graph, diagram, DN.Diagram_nodeScaleGain, 1);
+				nodeScaleBias =
+						safeDoubleProperty(graph, nsp, DN.Vertex_ScaleProperty_bias, 0)
+						+ safeDoubleProperty(graph, diagram, DN.Diagram_nodeScaleBias, 0);
+			}
 		}
 
-		return new DiagramSettings(nodeScalingProperty, nodeScalingScale, edgeThicknessProperty, edgeThicknessScale);
+		DiagramSettings ds = new DiagramSettings(
+				nodeScaleProperty, nodeScaleGain, nodeScaleBias,
+				edgeThicknessProperty, edgeThicknessGain, edgeThicknessBias);
+		//System.out.println("new diagram settings: " + ds);
+		return ds;
 	}
 
 	private static double safeDoubleProperty(ReadGraph graph, Resource r, Resource property, double defaultValue) throws DatabaseException {