]> gerrit.simantics Code Review - simantics/district.git/commitdiff
Connection lines for control inputs. 63/2763/2
authorReino Ruusu <reino.ruusu@semantum.fi>
Thu, 7 Mar 2019 19:13:33 +0000 (21:13 +0200)
committerReino Ruusu <reino.ruusu@semantum.fi>
Fri, 8 Mar 2019 11:43:14 +0000 (11:43 +0000)
gitlab #37

Change-Id: I9d784032ccae42e50bfa13fbdb6600601a63ab5d

org.simantics.district.network.ontology/graph/DistrictNetworkProfiles.pgraph
org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
org.simantics.district.network.ui/META-INF/MANIFEST.MF
org.simantics.district.network.ui/adapters.xml
org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/ConnectionLineStyle.java [new file with mode: 0644]
org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java

index a5c5cee59b445966d6c01034e43c20dead2ffcd8..54700829336935bb9a8d9ea2cc2d0adc88a7a72f 100644 (file)
@@ -24,6 +24,7 @@ DN.VertexSizeStyle : DIA.Style
 DN.EdgeThicknessStyle : DIA.Style
 DN.HideStyle : DIA.Style
 DN.VertexSymbolStyle : DIA.Style
+DN.ConnectionLineStyle : DIA.Style
 
 // Function for dynamic selection of symbols for a vertex
 // The input of the function is a DN.Vertex
index c2b154373ea4c88097f681e308ff2ce435982f7b..178dbc2898bcacd53997192280728deaac974c1b 100644 (file)
@@ -18,6 +18,7 @@ public class DistrictNetworkResource {
     public final Resource BrowseContext;
     public final Resource Composite;
     public final Resource Connection;
+    public final Resource ConnectionLineStyle;
     public final Resource Diagram;
     public final Resource Diagram_MappedDiagram;
     public final Resource Diagram_MappedFromDiagram;
@@ -296,6 +297,7 @@ public class DistrictNetworkResource {
         public static final String BrowseContext = "http://www.simantics.org/DistrictNetwork-1.0/BrowseContext";
         public static final String Composite = "http://www.simantics.org/DistrictNetwork-1.0/Composite";
         public static final String Connection = "http://www.simantics.org/DistrictNetwork-1.0/Connection";
+        public static final String ConnectionLineStyle = "http://www.simantics.org/DistrictNetwork-1.0/ConnectionLineStyle";
         public static final String Diagram = "http://www.simantics.org/DistrictNetwork-1.0/Diagram";
         public static final String Diagram_MappedDiagram = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/MappedDiagram";
         public static final String Diagram_MappedFromDiagram = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/MappedFromDiagram";
@@ -584,6 +586,7 @@ public class DistrictNetworkResource {
         BrowseContext = getResourceOrNull(graph, URIs.BrowseContext);
         Composite = getResourceOrNull(graph, URIs.Composite);
         Connection = getResourceOrNull(graph, URIs.Connection);
+        ConnectionLineStyle = getResourceOrNull(graph, URIs.ConnectionLineStyle);
         Diagram = getResourceOrNull(graph, URIs.Diagram);
         Diagram_MappedDiagram = getResourceOrNull(graph, URIs.Diagram_MappedDiagram);
         Diagram_MappedFromDiagram = getResourceOrNull(graph, URIs.Diagram_MappedFromDiagram);
index 6638242ded2f64371fcbcc351ef2bf0370263ff2..d2c3962a99b9fabe8d99efe3a63e5c648e2ccf0e 100644 (file)
@@ -31,7 +31,8 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.1.100.v20150
  org.eclipse.e4.core.contexts,
  org.eclipse.jface,
  org.simantics.scl.osgi,
- org.simantics.district.route
+ org.simantics.district.route,
+ org.simantics.scenegraph.profile
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
   javax.inject;version="1.0.0"
index eda331ba784dc63fbe56d3ca1ed57945d76a80a0..590cb0c693efa1884beb9ea77fe9057f078d4731 100644 (file)
         </type>
     </target>
     
+    <target interface="org.simantics.scenegraph.profile.Style">
+        <resource uri="http://www.simantics.org/DistrictNetwork-1.0/ConnectionLineStyle"
+            class="org.simantics.district.network.ui.nodes.ConnectionLineStyle">
+        </resource>
+    </target>
+    
     <target interface="org.simantics.g2d.diagram.DiagramClass">
         <baseType uri="http://www.simantics.org/DistrictNetwork-1.0/Diagram" />
         <adapter uri="http://www.simantics.org/DistrictNetwork-1.0/Diagram"
diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/ConnectionLineStyle.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/ConnectionLineStyle.java
new file mode 100644 (file)
index 0000000..75a46fd
--- /dev/null
@@ -0,0 +1,180 @@
+package org.simantics.district.network.ui.nodes;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+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.db.layer0.util.Layer0Utils;
+import org.simantics.diagram.profile.StyleBase;
+import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.district.network.ontology.DistrictNetworkResource;
+import org.simantics.layer0.Layer0;
+import org.simantics.modeling.ModelingResources;
+import org.simantics.scenegraph.INode;
+import org.simantics.scenegraph.g2d.G2DNode;
+import org.simantics.scenegraph.profile.EvaluationContext;
+import org.simantics.scenegraph.profile.common.ProfileVariables;
+import org.simantics.scenegraph.utils.GeometryUtils;
+import org.simantics.structural.stubs.StructuralResource2;
+
+public class ConnectionLineStyle extends StyleBase<List<Point2D>> {
+       
+       public static class ConnectionLineNode extends G2DNode {
+               private static final BasicStroke STROKE = new BasicStroke(1.f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1.f, new float[] {4.f, 2.f}, 0.f);
+               private static final Color[] colors = { Color.RED, Color.GREEN, Color.BLUE, Color.ORANGE, Color.CYAN, Color.PINK };
+               
+               private float strokeWidth;
+               private Line2D[] lines;
+
+               public ConnectionLineNode() {
+                       super();
+               }
+               
+               private static final long serialVersionUID = 1L;
+
+               @Override
+               public Rectangle2D getBoundsInLocal() {
+                       return null;
+               }
+
+               @Override
+               public Rectangle2D getBoundsInLocal(boolean b) {
+                       return null;
+               }
+
+               @Override
+               public Rectangle2D getBounds() {
+                       return null;
+               }
+               
+               public void setStrokeWidth(float w) {
+                       strokeWidth = w;
+               }
+               
+               public void setPoints(List<Point2D> result) {
+                       Point2D p0 = DistrictNetworkNodeUtils.calculatePoint2D(result.get(0), null);
+                       lines = new Line2D[result.size() - 1];
+                       for (int i = 1; i < result.size(); i++) 
+                       {
+                               Point2D p = result.get(i);
+                               lines[i-1] = p != null ? new Line2D.Double(p0, DistrictNetworkNodeUtils.calculatePoint2D(p, null)) : null;
+                       }
+               }
+               
+               @Override
+               public void render(Graphics2D g2d) {
+                       if (lines == null || lines.length == 0)
+                               return;
+                       
+                       // Keep fixed line width on screen
+                       float scaleRecip = (float) GeometryUtils.getScale(g2d.getTransform());
+                       g2d.setStroke(GeometryUtils.scaleStroke(STROKE, strokeWidth / scaleRecip));
+                       
+                       for (int i = 0; i < lines.length; i++) {
+                               if (lines[i] != null) {
+                                       g2d.setColor(colors[i % colors.length]);
+                                       g2d.draw(lines[i]);
+                               }
+                       }
+               }
+       }
+       
+       @Override
+       public List<Point2D> calculateStyle(ReadGraph graph, Resource runtimeDiagram, Resource entry, Resource groupItem)
+                       throws DatabaseException {
+               return graph.syncRequest(new ElementConnectionRequest(groupItem), TransientCacheListener.instance());
+       }
+       
+       @Override
+       public void applyStyleForNode(EvaluationContext observer, INode parent, List<Point2D> result) {
+               if (result == null || result.size() < 2) {
+                       ProfileVariables.denyChild(parent, "*", "districtNetworkConnection");
+                       return;
+               }
+               
+               ConnectionLineNode node = ProfileVariables.claimChild(parent, "*", "districtNetworkConnection", ConnectionLineNode.class, observer);
+               if (node == null)
+                       return;
+               
+               node.setPoints(result);
+               node.setZIndex(0);
+               node.setStrokeWidth(2.f);
+       }
+
+       @Override
+       protected void cleanupStyleForNode(EvaluationContext evaluationContext, INode parent) {
+               ProfileVariables.denyChild(parent, "*", "districtNetworkConnection");
+       }
+       
+       private static final class ElementConnectionRequest extends ResourceRead<List<Point2D>> {
+               private ElementConnectionRequest(Resource resource) {
+                       super(resource);
+               }
+       
+               @Override
+               public List<Point2D> perform(ReadGraph graph) throws DatabaseException {
+                       DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+                       ModelingResources MOD = ModelingResources.getInstance(graph);
+                       StructuralResource2 STR = StructuralResource2.getInstance(graph);
+                       
+                       Resource vertex = resource;
+                       if (!graph.isInstanceOf(vertex, DN.Vertex))
+                               return Collections.emptyList();
+                       
+                       double[] coords = graph.getRelatedValue(vertex, DiagramResource.getInstance(graph).HasLocation);
+                       
+                       Resource element = graph.getPossibleObject(vertex, DN.MappedComponent);
+                       if (element == null)
+                               return Collections.emptyList();
+                       Resource component = graph.getPossibleObject(element, MOD.ElementToComponent);
+                       if (component == null)
+                               return Collections.emptyList();
+                       Resource componentType = graph.getPossibleType(component, STR.Component);
+                       if (componentType == null)
+                               return Collections.emptyList();
+                       
+                       Resource actionsModule = Layer0Utils.getPossibleChild(graph, componentType, "Actions");
+                       if (actionsModule == null || !graph.isInstanceOf(actionsModule, Layer0.getInstance(graph).SCLModule))
+                               return Collections.emptyList();
+                       
+                       List<Resource> components;
+                       try {
+                               components = Simantics.applySCL(graph.getURI(actionsModule), "getConnectedComponents", graph, component);
+                       }
+                       catch (DatabaseException e) {
+                               return Collections.emptyList();
+                       }
+                       
+                       if (components == null || components.isEmpty())
+                               return Collections.emptyList();
+                       
+                       List<Point2D> result = new ArrayList<>(components.size() + 1);
+                       result.add(new Point2D.Double(coords[0], coords[1]));
+                       for (Resource comp : components) {
+                               Resource e = comp != null ? graph.getPossibleObject(comp, MOD.ComponentToElement) : null;
+                               Resource mappingElement = e != null ? graph.getPossibleObject(e, DN.MappedFromElement) : null;
+                               if (mappingElement != null) {
+                                       double[] coords2 = graph.getRelatedValue(mappingElement, DiagramResource.getInstance(graph).HasLocation);
+                                       result.add(new Point2D.Double(coords2[0], coords2[1]));
+                               }
+                               else {
+                                       result.add(null);
+                               }
+                       }
+                       
+                       return result;
+               }
+       }
+}
index 6fb075eb8fd0c95b4ce1561a3d56f59280e472c3..221ed714ac562cfcf0aa38f2915f65c760db66ef 100644 (file)
@@ -109,8 +109,10 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti
         // Render SVG symbol
         for (INode nn : getNodes()) {
             G2DNode g2dNode = (G2DNode)nn;
-            symbolTransform = DistrictNetworkNodeUtils.getTransformToRectangle(toDraw, symbolTransform);
-            g2dNode.setTransform(symbolTransform);
+            if (nn instanceof SVGNode) {
+                symbolTransform = DistrictNetworkNodeUtils.getTransformToRectangle(toDraw, symbolTransform);
+                g2dNode.setTransform(symbolTransform);
+            }
             g2dNode.render(g2d);
         }