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;fp=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FDNEdgeBuilder.java;h=0270fea0277eaa0c799fb8556a4367bc50e6c578;hb=ac6ad8ff2b20a10e85e7b12c1af670500daebdd4;hp=c2238d8e56eb0e082ce7ce4482cb402a7faba869;hpb=82fc4004ddaf355147e97fd951a18d3a3815e049;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 c2238d8e..0270fea0 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,7 +1,9 @@
 package org.simantics.district.network.ui;
 
 import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.db.Resource;
@@ -37,10 +39,16 @@ public class DNEdgeBuilder {
     }
 
     public static Resource create(WriteGraph graph, Resource diagramResource, double[] start, double[] end, double padding) throws DatabaseException {
-        return create(graph, diagramResource, null, start, end, padding);
+        Collection<Resource> vertices = graph.syncRequest(new ObjectsWithType(diagramResource, Layer0.getInstance(graph).ConsistsOf, DistrictNetworkResource.getInstance(graph).Vertex));
+        List<ResourceVertex> vv = new ArrayList<>(vertices.size());
+        for (Resource vertex : vertices) {
+            double[] existingCoords = graph.getRelatedValue2(vertex, DiagramResource.getInstance(graph).HasLocation, Bindings.DOUBLE_ARRAY);
+            vv.add(new ResourceVertex(vertex, existingCoords));
+        }
+        return create(graph, vv, diagramResource, null, start, end, padding);
     }
     
-    public static Resource create(WriteGraph graph, Resource diagramResource, Resource mapping, double[] start, double[] end, double padding) throws DatabaseException {
+    public static Resource create(WriteGraph graph, Collection<ResourceVertex> vertices, Resource diagramResource, Resource mapping, double[] start, double[] end, double padding) throws DatabaseException {
         
         DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
         
@@ -48,24 +56,23 @@ public class DNEdgeBuilder {
         Resource edge = getOrCreateEdge(graph, diagramResource, mapping);
         
         // 2. Add vertices
-        Collection<Resource> vertices = graph.syncRequest(new ObjectsWithType(diagramResource, Layer0.getInstance(graph).ConsistsOf, DistrictNetworkResource.getInstance(graph).Vertex));
-        Resource startVertex = getOrCreateVertex(graph, diagramResource, vertices, start, padding);
-        Resource endVertex = getOrCreateVertex(graph, diagramResource, vertices, end, padding);
+        Resource startVertex = getOrCreateVertex(graph, diagramResource, vertices, start, padding, null);
+        Resource endVertex = getOrCreateVertex(graph, diagramResource, vertices, end, padding, startVertex);
         
         graph.claim(edge, DN.HasStartVertex, startVertex);
         graph.claim(edge, DN.HasEndVertex, endVertex);
         
         // We need to put GraphLayer to newLayers so...
-        for (Resource layer : graph.getObjects(diagramResource, DiagramResource.getInstance(graph).HasLayer)) {
-            IGraphLayerUtil layerUtil = graph.adapt(graph.getSingleObject(layer, Layer0.getInstance(graph).InstanceOf), IGraphLayerUtil.class);
-            
-            GraphLayer gl = layerUtil.loadLayer(graph, layer);
-            gl.forEachTag(tag -> {
-                DiagramGraphUtil.tag(graph, startVertex, tag, true);
-                DiagramGraphUtil.tag(graph, endVertex, tag, true);
-            });
-        }
-        
+//        for (Resource layer : graph.getObjects(diagramResource, DiagramResource.getInstance(graph).HasLayer)) {
+//            IGraphLayerUtil layerUtil = graph.adapt(graph.getSingleObject(layer, Layer0.getInstance(graph).InstanceOf), IGraphLayerUtil.class);
+//            
+//            GraphLayer gl = layerUtil.loadLayer(graph, layer);
+//            gl.forEachTag(tag -> {
+//                DiagramGraphUtil.tag(graph, startVertex, tag, true);
+//                DiagramGraphUtil.tag(graph, endVertex, tag, true);
+//            });
+//        }
+//        
         return edge;
     }
     public void create(WriteGraph graph,  double[] start, double[] end, double padding) throws DatabaseException {
@@ -85,23 +92,24 @@ public class DNEdgeBuilder {
         glm.putElementOnVisibleLayers(diagram, graph, res);
     }
 
-    private static Resource getOrCreateVertex(WriteGraph graph, Resource diagramResource, Collection<Resource> vertices, double[] coords, double padding) throws DatabaseException {
+    private static Resource getOrCreateVertex(WriteGraph graph, Resource diagramResource, Collection<ResourceVertex> vertices, double[] coords, double padding, Resource startVertex) throws DatabaseException {
         Resource vertex = null;
         double halfPadding = padding / 2;
         double maxDistance = Double.MAX_VALUE;
-        for (Resource vertx : vertices) {
-            double[] existingCoords = graph.getRelatedValue2(vertx, DiagramResource.getInstance(graph).HasLocation, Bindings.DOUBLE_ARRAY);
-            Rectangle2D existing = new Rectangle2D.Double(existingCoords[0] - halfPadding, existingCoords[1] - halfPadding, padding, padding);
+        for (ResourceVertex vertx : vertices) {
+            Rectangle2D existing = new Rectangle2D.Double(vertx.coords[0] - halfPadding, vertx.coords[1] - halfPadding, padding, padding);
             Rectangle2D tobecreated = new Rectangle2D.Double(coords[0] - halfPadding, coords[1] - halfPadding, padding, padding);
             if (existing.intersects(tobecreated)) {
-                double dist = Math.sqrt((Math.pow(coords[0] - existingCoords[0], 2) + (Math.pow(coords[1] - existingCoords[1], 2))));
-                if (dist <= maxDistance) {
-                    vertex = vertx;
+                double dist = Math.sqrt((Math.pow(coords[0] - vertx.coords[0], 2) + (Math.pow(coords[1] - vertx.coords[1], 2))));
+                if (dist <= maxDistance && !vertx.vertex.equals(startVertex)) {
+                    vertex = vertx.vertex;
+                    maxDistance = dist;
                 }
             }
         }
         if (vertex == null) {
             vertex = DistrictNetworkUtil.createVertex(graph, diagramResource, coords); 
+            vertices.add(new ResourceVertex(vertex, coords));
         }
         return vertex;
     }
@@ -110,4 +118,14 @@ public class DNEdgeBuilder {
         return DistrictNetworkUtil.createEdge(graph, diagramResource, mapping);
     }
 
+    public static class ResourceVertex {
+        
+        final Resource vertex;
+        final double[] coords;
+        
+        public ResourceVertex(Resource vertex, double[] coords) {
+            this.vertex = vertex;
+            this.coords = coords;
+        }
+    }
 }