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=0270fea0277eaa0c799fb8556a4367bc50e6c578;hb=refs%2Fchanges%2F71%2F1971%2F3;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..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,80 +1,131 @@ -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.ArrayList; +import java.util.Collection; +import java.util.List; + +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.DiagramGraphUtil; +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.synchronization.graph.layer.IGraphLayerUtil; +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 static Resource create(WriteGraph graph, Resource diagramResource, double[] start, double[] end, double padding) throws DatabaseException { + Collection vertices = graph.syncRequest(new ObjectsWithType(diagramResource, Layer0.getInstance(graph).ConsistsOf, DistrictNetworkResource.getInstance(graph).Vertex)); + List 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, Collection vertices, Resource diagramResource, Resource mapping, double[] start, double[] end, double padding) throws DatabaseException { + + DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); + + // 1. Get diagram edge to construct + Resource edge = getOrCreateEdge(graph, diagramResource, mapping); + + // 2. Add vertices + 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); +// }); +// } +// + return edge; + } + public void create(WriteGraph graph, double[] start, double[] end, double padding) throws DatabaseException { + + Resource edge = create(graph, diagramResource, start, end, padding); + // 7. Put the element on all the currently active layers if possible. + if (glm != null) { + putOnActiveLayer(graph, edge); + } + + 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 static Resource getOrCreateVertex(WriteGraph graph, Resource diagramResource, Collection vertices, double[] coords, double padding, Resource startVertex) throws DatabaseException { + Resource vertex = null; + double halfPadding = padding / 2; + double maxDistance = Double.MAX_VALUE; + 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] - 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; + } + + private static Resource getOrCreateEdge(WriteGraph graph, Resource diagramResource, Resource mapping) throws DatabaseException { + 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; + } + } +}