X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FDNEdgeBuilder.java;h=687ca337b85689f6dd749fcba1fbfde04a9bec7b;hb=5747d0df198d3b3de66c51796369a7f6af314ea7;hp=b9b73e542308882d51f0b2c0c925bcedd128f5c6;hpb=8034693a5c86d690649a70a62709d29c3fa197aa;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DNEdgeBuilder.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DNEdgeBuilder.java
index b9b73e54..687ca337 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DNEdgeBuilder.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DNEdgeBuilder.java
@@ -1,80 +1,93 @@
-package org.simantics.district.network.ui;
-
-import org.simantics.db.Resource;
-import org.simantics.db.WriteGraph;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.exception.ServiceException;
-import org.simantics.db.layer0.util.Layer0Utils;
-import org.simantics.diagram.synchronization.IModifiableSynchronizationContext;
-import org.simantics.diagram.synchronization.SynchronizationHints;
-import org.simantics.diagram.synchronization.graph.AddElement;
-import org.simantics.diagram.synchronization.graph.GraphSynchronizationHints;
-import org.simantics.diagram.synchronization.graph.layer.GraphLayer;
-import org.simantics.diagram.synchronization.graph.layer.GraphLayerManager;
-import org.simantics.diagram.ui.DiagramModelHints;
-import org.simantics.district.network.DistrictNetworkUtil;
-import org.simantics.district.network.ontology.DistrictNetworkResource;
-import org.simantics.g2d.diagram.IDiagram;
-
-public class DNEdgeBuilder {
-    
-    private Resource diagramResource;
-    private IDiagram diagram;
-    private GraphLayerManager glm;
-
-    public DNEdgeBuilder(Resource diagramResource, IDiagram diagram) {
-        this.diagramResource = diagramResource;
-        this.diagram = diagram;
-        
-        IModifiableSynchronizationContext context = diagram.getHint(SynchronizationHints.CONTEXT);
-        glm = context.get(GraphSynchronizationHints.GRAPH_LAYER_MANAGER);
-    }
-
-    public void create(WriteGraph graph, double[] start, double[] end) throws DatabaseException {
-        
-        DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
-        
-        // 1. Get diagram edge to construct
-        Resource edge = getOrCreateEdge(graph);
-        
-        // 1.1 Give running name to connection and increment the counter attached to the diagram.
-        AddElement.claimFreshElementName(graph, diagramResource, edge);
-        
-        // 2. Add vertices
-        Resource startVertex = getOrCreateVertex(graph, start);
-        Resource endVertex = getOrCreateVertex(graph, end);
-        
-        graph.claim(edge, DN.HasStartVertex, startVertex);
-        graph.claim(edge, DN.HasEndVertex, endVertex);
-        
-        // 7. Put the element on all the currently active layers if possible.
-        if (glm != null) {
-            putOnActiveLayer(graph, edge);
-            putOnActiveLayer(graph, startVertex);
-            putOnActiveLayer(graph, endVertex);
-        }
-        
-        Layer0Utils.addCommentMetadata(graph, "Added edge " + edge);
-        graph.markUndoPoint();
-    }
-    
-    private void putOnActiveLayer(WriteGraph graph, Resource res) throws DatabaseException {
-        glm.removeFromAllLayers(graph, res);
-        glm.putElementOnVisibleLayers(diagram, graph, res);
-    }
-
-    private Resource getOrCreateVertex(WriteGraph graph, double[] coords) throws DatabaseException {
-        // TODO: check if vertex exists already, for now create always new
-        Resource vertex = null;
-        if (vertex == null) {
-            vertex = DistrictNetworkUtil.createVertex(graph, diagramResource, coords); 
-            AddElement.claimFreshElementName(graph, diagramResource, vertex);
-        }
-        return vertex;
-    }
-
-    private Resource getOrCreateEdge(WriteGraph graph) throws DatabaseException {
-        return DistrictNetworkUtil.createEdge(graph, diagramResource);
-    }
-
-}
+package org.simantics.district.network.ui;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Collection;
+
+import org.simantics.databoard.Bindings;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.request.ObjectsWithType;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.util.Layer0Utils;
+import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.diagram.synchronization.IModifiableSynchronizationContext;
+import org.simantics.diagram.synchronization.SynchronizationHints;
+import org.simantics.diagram.synchronization.graph.AddElement;
+import org.simantics.diagram.synchronization.graph.GraphSynchronizationHints;
+import org.simantics.diagram.synchronization.graph.layer.GraphLayerManager;
+import org.simantics.district.network.DistrictNetworkUtil;
+import org.simantics.district.network.ontology.DistrictNetworkResource;
+import org.simantics.g2d.diagram.IDiagram;
+import org.simantics.layer0.Layer0;
+
+public class DNEdgeBuilder {
+    
+    private Resource diagramResource;
+    private IDiagram diagram;
+    private GraphLayerManager glm;
+
+    public DNEdgeBuilder(Resource diagramResource, IDiagram diagram) {
+        this.diagramResource = diagramResource;
+        this.diagram = diagram;
+        
+        IModifiableSynchronizationContext context = diagram.getHint(SynchronizationHints.CONTEXT);
+        glm = context.get(GraphSynchronizationHints.GRAPH_LAYER_MANAGER);
+    }
+
+    public void create(WriteGraph graph, double[] start, double[] end) throws DatabaseException {
+        
+        DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+        
+        // 1. Get diagram edge to construct
+        Resource edge = getOrCreateEdge(graph);
+        
+        // 1.1 Give running name to connection and increment the counter attached to the diagram.
+        AddElement.claimFreshElementName(graph, diagramResource, edge);
+        
+        // 2. Add vertices
+        Collection<Resource> vertices = graph.syncRequest(new ObjectsWithType(diagramResource, Layer0.getInstance(graph).ConsistsOf, DistrictNetworkResource.getInstance(graph).Vertex));
+        Resource startVertex = getOrCreateVertex(graph, vertices, start);
+        Resource endVertex = getOrCreateVertex(graph, vertices, end);
+        
+        graph.claim(edge, DN.HasStartVertex, startVertex);
+        graph.claim(edge, DN.HasEndVertex, endVertex);
+        
+        // 7. Put the element on all the currently active layers if possible.
+        if (glm != null) {
+            putOnActiveLayer(graph, edge);
+            putOnActiveLayer(graph, startVertex);
+            putOnActiveLayer(graph, endVertex);
+        }
+        
+        Layer0Utils.addCommentMetadata(graph, "Added edge " + edge);
+        graph.markUndoPoint();
+    }
+    
+    private void putOnActiveLayer(WriteGraph graph, Resource res) throws DatabaseException {
+        glm.removeFromAllLayers(graph, res);
+        glm.putElementOnVisibleLayers(diagram, graph, res);
+    }
+
+    private Resource getOrCreateVertex(WriteGraph graph, Collection<Resource> vertices, double[] coords) throws DatabaseException {
+        Resource vertex = null;
+        for (Resource vertx : vertices) {
+            double[] existingCoords = graph.getRelatedValue2(vertx, DiagramResource.getInstance(graph).HasLocation, Bindings.DOUBLE_ARRAY);
+            Rectangle2D existing = new Rectangle2D.Double(existingCoords[0], existingCoords[1], 1, 1);
+            Rectangle2D tobecreated = new Rectangle2D.Double(coords[0], coords[1], 1, 1);
+            if (existing.intersects(tobecreated)) {
+                vertex = vertx;
+                break;
+            }
+        }
+        if (vertex == null) {
+            vertex = DistrictNetworkUtil.createVertex(graph, diagramResource, coords); 
+            AddElement.claimFreshElementName(graph, diagramResource, vertex);
+        }
+        return vertex;
+    }
+
+    private Resource getOrCreateEdge(WriteGraph graph) throws DatabaseException {
+        return DistrictNetworkUtil.createEdge(graph, diagramResource);
+    }
+
+}