First draft of vertex size adjusting district network diagram profiles

[simantics/district.git] / org.simantics.district.network / src / org / simantics / district / network / profile / EdgeThicknessStyle.java

diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/EdgeStyle.java b/org.simantics.district.network/src/org/simantics/district/network/profile/EdgeThicknessStyle.java
similarity index 83%
rename from org.simantics.district.network/src/org/simantics/district/network/profile/EdgeStyle.java
rename to org.simantics.district.network/src/org/simantics/district/network/profile/EdgeThicknessStyle.java
index 4ee26ad4f7b00f1014668d78feeeed2d8443e0eb..45b55549333848a94c3d808fbfe4e824e94af877 100644 (file)
--- a/org.simantics.district.network/src/org/simantics/district/network/profile/EdgeStyle.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/profile/EdgeThicknessStyle.java
@@ -1,6 +1,6 @@
 package org.simantics.district.network.profile;
 
-import org.simantics.databoard.Bindings;
+import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.procedure.adapter.TransientCacheAsyncListener;
@@ -12,7 +12,7 @@ import org.simantics.scenegraph.g2d.nodes.ConnectionNode;
 import org.simantics.scenegraph.profile.EvaluationContext;
 import org.simantics.scenegraph.profile.common.ProfileVariables;
 
-public class EdgeStyle extends StyleBase<Double> {
+public class EdgeThicknessStyle extends StyleBase<Double> {
 
        private static final Double PENDING = Double.NaN;
        private static final Double ONE = 1.0;
@@ -22,12 +22,12 @@ public class EdgeStyle extends StyleBase<Double> {
                DiagramSettings ds = graph.syncRequest(new DiagramSettingsRequest(runtimeDiagram), TransientCacheAsyncListener.instance());
                Double thickness = ONE;
                if (ds.edgeThicknessProperty.isPresent()) {
-                       thickness = graph.getPossibleRelatedValue2(groupItem, ds.edgeThicknessProperty.get(), Bindings.DOUBLE);
-                       //System.out.println("read thickness: " + thickness + " : " + ds.edgeThicknessProperty);
+                       thickness = Simantics.applySCLRead(graph, ds.edgeThicknessProperty.get(), groupItem);
+//                     System.out.println("read thickness: " + thickness + " : " + ds.edgeThicknessProperty);
                        if (thickness == null) {
                                thickness = ONE;
                        } else {
-                               thickness = thickness * ds.edgeThicknessScale;
+                               thickness = thickness * ds.edgeThicknessGain + ds.edgeThicknessBias;
                        }
                }
                return thickness;
@@ -35,7 +35,7 @@ public class EdgeStyle extends StyleBase<Double> {
 
        @Override
        public void applyStyleForNode(EvaluationContext observer, INode node, Double value) {
-               //System.out.println("apply: " + node + " : " + value);
+//             System.out.println("apply: " + node + " : " + value);
                ConnectionNode n = (ConnectionNode) node;
                if (value == PENDING) {
                        ((G2DSceneGraph)node.getRootNode()).setPending(node);