From 415a01dee406d277eabee9ab4a3780a4d056a719 Mon Sep 17 00:00:00 2001 From: jsimomaa Date: Wed, 19 Feb 2020 14:05:50 +0200 Subject: [PATCH] Add connected components to visualisation from profiles District profiles should all be implemented now with dynamic visualisations gitlab #59 Change-Id: Ie3747b37b9d5b68f8feb5182e3b3b0af4bd67d11 --- .../graph/DistrictNetwork.pgraph | 2 + .../graph/DistrictNetworkProfiles.pgraph | 2 +- .../adapters.xml | 7 - .../network/ui/nodes/ConnectionLineNode.java | 75 +++++++ .../network/ui/nodes/ConnectionLineStyle.java | 198 ------------------ .../ui/nodes/DistrictNetworkVertexNode.java | 14 +- .../ui/styles/ConnectionLineStyle.java | 163 +++++--------- .../DynamicVisualisationsUI.java | 11 + .../META-INF/MANIFEST.MF | 3 +- .../ActiveDynamicVisualisationsRequest.java | 8 +- .../visualisations/DynamicVisualisations.java | 10 + .../model/DynamicVisualisation.java | 23 +- .../model/VisualisationComponent.java | 32 +++ 13 files changed, 218 insertions(+), 330 deletions(-) create mode 100644 org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/ConnectionLineNode.java delete mode 100644 org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/ConnectionLineStyle.java create mode 100644 org.simantics.district.network/src/org/simantics/district/network/visualisations/model/VisualisationComponent.java diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph index 4405434e..4c1e3382 100644 --- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph +++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph @@ -283,6 +283,8 @@ DN.Diagram.Visualisations -- DN.Diagram.Visualisations.NotInSimulation @defProperty "Not in Simulation" L0.Boolean + >-- DN.Diagram.Visualisations.ShowConnectedComponents + @defProperty "Show Connected Components" L0.Boolean DN.Diagram.Visualisations.ColorContribution - - - - - - 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]); + } + } + } +} \ No newline at end of file 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 deleted file mode 100644 index 5b3d2b43..00000000 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/ConnectionLineStyle.java +++ /dev/null @@ -1,198 +0,0 @@ -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.DistrictNetworkUtil; -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.scl.compiler.top.ValueNotFound; -import org.simantics.scl.osgi.SCLOsgi; -import org.simantics.scl.runtime.SCLContext; -import org.simantics.scl.runtime.function.Function1; -import org.simantics.structural.stubs.StructuralResource2; - -public class ConnectionLineStyle extends StyleBase> { - - 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 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 calculateStyle(ReadGraph graph, Resource runtimeDiagram, Resource entry, Resource groupItem) - throws DatabaseException { - DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); - ModelingResources MOD = ModelingResources.getInstance(graph); - StructuralResource2 STR = StructuralResource2.getInstance(graph); - - Resource vertex = groupItem; - if (!graph.isInstanceOf(vertex, DN.Vertex)) - return Collections.emptyList(); - - double[] coords = graph.getRelatedValue(vertex, DiagramResource.getInstance(graph).HasLocation); - - Resource component = DistrictNetworkUtil.getMappedComponentCached(graph, vertex); - if (component == null) - return Collections.emptyList(); - - Resource componentType = graph.getPossibleType(component, STR.Component); - if (componentType == null) - return Collections.emptyList(); - - Function1> fun = getConnectedComponentsFunctionCached(graph, componentType); - if (fun == null) - return Collections.emptyList(); - - List components = Simantics.applySCLRead(graph, fun, component); - - if (components == null || components.isEmpty()) - return Collections.emptyList(); - - List 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; - } - - @Override - public void applyStyleForNode(EvaluationContext observer, INode parent, List 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 Function1> getConnectedComponentsFunctionCached(ReadGraph graph, Resource componentType) - throws DatabaseException { - return graph.syncRequest(new ConnectedComponentsFunctionRequest(componentType), TransientCacheListener.instance()); - } - - private static final class ConnectedComponentsFunctionRequest - extends ResourceRead>> { - public ConnectedComponentsFunctionRequest(Resource resource) { - super(resource); - } - - @SuppressWarnings("unchecked") - @Override - public Function1> perform(ReadGraph graph) throws DatabaseException { - Resource actionsModule = Layer0Utils.getPossibleChild(graph, resource, "Actions"); - if (actionsModule == null || !graph.isInstanceOf(actionsModule, Layer0.getInstance(graph).SCLModule)) - return null; - - String uri = graph.getURI(actionsModule); - SCLContext sclContext = SCLContext.getCurrent(); - Object oldGraph = sclContext.get("graph"); - try { - sclContext.put("graph", graph); - return (Function1>) SCLOsgi.MODULE_REPOSITORY.getValue(uri, "getConnectedComponents"); - } catch (ValueNotFound e1) { - return null; - } finally { - sclContext.put("graph", oldGraph); - } - } - } -} diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java index b1bb1468..4ea8bbf1 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java @@ -7,6 +7,7 @@ import java.awt.RenderingHints; import java.awt.geom.AffineTransform; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; +import java.util.List; import java.util.Optional; import org.simantics.district.network.ui.adapters.DistrictNetworkVertex; @@ -257,7 +258,7 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti child.setInfo(null); } } - + public void setInSimulation(Optional isInSimulation) { if (!isInSimulation.isPresent()) { removeNode(NotInSimulationNode.NODE_NAME); @@ -267,4 +268,15 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti child.setIsInSimulation(isInSimulation.get()); } } + + public void setConnectionLinePoints(List points) { + if (points == null) { + removeNode(ConnectionLineNode.NODE_NAME); + } else { + ConnectionLineNode child = getOrCreateNode(ConnectionLineNode.NODE_NAME, ConnectionLineNode.class); + child.setZIndex(0); + child.setStrokeWidth(2.f); + child.setPoints(points); + } + } } diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/ConnectionLineStyle.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/ConnectionLineStyle.java index b74cbba6..d8d2f118 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/ConnectionLineStyle.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/ConnectionLineStyle.java @@ -1,11 +1,6 @@ package org.simantics.district.network.ui.styles; -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; @@ -21,137 +16,79 @@ import org.simantics.diagram.profile.StyleBase; import org.simantics.diagram.stubs.DiagramResource; import org.simantics.district.network.DistrictNetworkUtil; import org.simantics.district.network.ontology.DistrictNetworkResource; -import org.simantics.district.network.ui.nodes.DistrictNetworkNodeUtils; +import org.simantics.district.network.ui.nodes.ConnectionLineNode; 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.scl.compiler.top.ValueNotFound; import org.simantics.scl.osgi.SCLOsgi; import org.simantics.scl.runtime.SCLContext; import org.simantics.scl.runtime.function.Function1; import org.simantics.structural.stubs.StructuralResource2; +@Deprecated public class ConnectionLineStyle extends StyleBase> { - 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; + @Override + public List calculateStyle(ReadGraph graph, Resource runtimeDiagram, Resource entry, Resource groupItem) + throws DatabaseException { + return doCalculateConnectedComponentPoints(graph, groupItem); + } - public ConnectionLineNode() { - super(); - } - - private static final long serialVersionUID = 1L; + public static List doCalculateConnectedComponentPoints(ReadGraph graph, Resource vertex) throws DatabaseException { + DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); + ModelingResources MOD = ModelingResources.getInstance(graph); + StructuralResource2 STR = StructuralResource2.getInstance(graph); + + if (!graph.isInstanceOf(vertex, DN.Vertex)) + return Collections.emptyList(); - @Override - public Rectangle2D getBoundsInLocal() { - return null; - } + double[] coords = graph.getRelatedValue(vertex, DiagramResource.getInstance(graph).HasLocation); - @Override - public Rectangle2D getBoundsInLocal(boolean b) { - return null; - } + Resource component = DistrictNetworkUtil.getMappedComponentCached(graph, vertex); + if (component == null) + return Collections.emptyList(); - @Override - public Rectangle2D getBounds() { - return null; - } - - public void setStrokeWidth(float w) { - strokeWidth = w; - } - - public void setPoints(List 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 calculateStyle(ReadGraph graph, Resource runtimeDiagram, Resource entry, Resource groupItem) - throws DatabaseException { - DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); - ModelingResources MOD = ModelingResources.getInstance(graph); - StructuralResource2 STR = StructuralResource2.getInstance(graph); - - Resource vertex = groupItem; - if (!graph.isInstanceOf(vertex, DN.Vertex)) - return Collections.emptyList(); - - double[] coords = graph.getRelatedValue(vertex, DiagramResource.getInstance(graph).HasLocation); - - Resource component = DistrictNetworkUtil.getMappedComponentCached(graph, vertex); - if (component == null) - return Collections.emptyList(); - - Resource componentType = graph.getPossibleType(component, STR.Component); - if (componentType == null) - return Collections.emptyList(); - - Function1> fun = getConnectedComponentsFunctionCached(graph, componentType); - if (fun == null) - return Collections.emptyList(); + Resource componentType = graph.getPossibleType(component, STR.Component); + if (componentType == null) + return Collections.emptyList(); + + Function1> fun = getConnectedComponentsFunctionCached(graph, componentType); + if (fun == null) + return Collections.emptyList(); + + List components = Simantics.applySCLRead(graph, fun, component); + + if (components == null || components.isEmpty()) + return Collections.emptyList(); + + List 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; + } - List components = Simantics.applySCLRead(graph, fun, component); - - if (components == null || components.isEmpty()) - return Collections.emptyList(); - - List 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; - } - @Override public void applyStyleForNode(EvaluationContext observer, INode parent, List result) { if (result == null || result.size() < 2) { - ProfileVariables.denyChild(parent, "*", "districtNetworkConnection"); + ProfileVariables.denyChild(parent, "*", ConnectionLineNode.NODE_NAME); return; } - ConnectionLineNode node = ProfileVariables.claimChild(parent, "*", "districtNetworkConnection", ConnectionLineNode.class, observer); + ConnectionLineNode node = ProfileVariables.claimChild(parent, "*", ConnectionLineNode.NODE_NAME, ConnectionLineNode.class, observer); if (node == null) return; @@ -162,7 +99,7 @@ public class ConnectionLineStyle extends StyleBase> { @Override protected void cleanupStyleForNode(EvaluationContext evaluationContext, INode parent) { - ProfileVariables.denyChild(parent, "*", "districtNetworkConnection"); + ProfileVariables.denyChild(parent, "*", ConnectionLineNode.NODE_NAME); } private static Function1> getConnectedComponentsFunctionCached(ReadGraph graph, Resource componentType) diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/visualisations/DynamicVisualisationsUI.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/visualisations/DynamicVisualisationsUI.java index e21bcb2a..c8d34072 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/visualisations/DynamicVisualisationsUI.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/visualisations/DynamicVisualisationsUI.java @@ -103,6 +103,7 @@ public class DynamicVisualisationsUI { private Button hoveringEdgesEnabledButton; private Button elevationServerEnabledButton; private Button notInSimulationButton; + private Button showConnectedComponentsButton; private List>> edgeArrowSuppliers; @@ -289,6 +290,10 @@ public class DynamicVisualisationsUI { elevationServerEnabledButton = new Button(parent, SWT.CHECK); elevationServerEnabledButton.setText("Elevation Server Bounding Box"); addSelectionListener(elevationServerEnabledButton); + + showConnectedComponentsButton = new Button(parent, SWT.CHECK); + showConnectedComponentsButton.setText("Show Connected Components"); + addSelectionListener(showConnectedComponentsButton); } private void initializeHoverElements(Composite parent) { @@ -671,6 +676,7 @@ public class DynamicVisualisationsUI { boolean elevationServerBoundingBox = elevationServerEnabledButton.getSelection(); boolean notInSimulation = notInSimulationButton.getSelection(); + boolean showConnectedComponents = showConnectedComponentsButton.getSelection(); Simantics.getSession().asyncRequest(new WriteRequest() { @@ -713,6 +719,7 @@ public class DynamicVisualisationsUI { DynamicVisualisations.setElevationServerBoundingBox(graph, exist, elevationServerBoundingBox); DynamicVisualisations.setNotInSimulation(graph, exist, notInSimulation); + DynamicVisualisations.setShowConnectedComponents(graph, exist, showConnectedComponents); } }); } @@ -1488,6 +1495,10 @@ public class DynamicVisualisationsUI { hoveringVertexEnabledButton.setSelection(visualisation.isKeyVariablesVertexHover()); hoveringEdgesEnabledButton.setSelection(visualisation.isKeyVariablesEdgesHover()); + showConnectedComponentsButton.setSelection(visualisation.showConnectedComponents()); + notInSimulationButton.setSelection(visualisation.isInSimulation()); + elevationServerEnabledButton.setSelection(visualisation.isShowElevationServerBoundingBox()); + hideConsumersButton.setSelection(visualisation.isHideConsumers()); hideEdgesButton.setSelection(visualisation.isHideEdges()); hideProducersButton.setSelection(visualisation.isHideProducers()); diff --git a/org.simantics.district.network/META-INF/MANIFEST.MF b/org.simantics.district.network/META-INF/MANIFEST.MF index 5ab8e0de..f5976e26 100644 --- a/org.simantics.district.network/META-INF/MANIFEST.MF +++ b/org.simantics.district.network/META-INF/MANIFEST.MF @@ -21,7 +21,8 @@ Require-Bundle: org.simantics.db, org.simantics.db.indexing, org.simantics.scl.osgi, org.eclipse.collections.eclipse-collections, - org.eclipse.collections.eclipse-collections-api + org.eclipse.collections.eclipse-collections-api, + org.simantics.structural.synchronization.client Export-Package: org.simantics.district.network, org.simantics.district.network.changeset, org.simantics.district.network.profile, diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/ActiveDynamicVisualisationsRequest.java b/org.simantics.district.network/src/org/simantics/district/network/profile/ActiveDynamicVisualisationsRequest.java index 08a1b013..3bd05948 100644 --- a/org.simantics.district.network/src/org/simantics/district/network/profile/ActiveDynamicVisualisationsRequest.java +++ b/org.simantics.district.network/src/org/simantics/district/network/profile/ActiveDynamicVisualisationsRequest.java @@ -89,8 +89,9 @@ public class ActiveDynamicVisualisationsRequest extends ResourceRead colorContributions, @@ -76,7 +77,8 @@ public class DynamicVisualisation { boolean keyVariablesVertexHover, boolean keyVariablesEdgesHover, boolean showElevationServerBoundingBox, - boolean isInSimulation + boolean isInSimulation, + boolean showConnectedComponents ) { this.name = name; this.visualisationResource = visualisationResource; @@ -114,6 +116,7 @@ public class DynamicVisualisation { this.showElevationServerBoundingBox = showElevationServerBoundingBox; this.isInSimulation = isInSimulation; + this.showConnectedComponents = showConnectedComponents; } public String getName() { @@ -239,4 +242,12 @@ public class DynamicVisualisation { public Map getDynamicSymbolContributions() { return dynamicSymbolContributions; } + + public boolean isShowElevationServerBoundingBox() { + return showElevationServerBoundingBox; + } + + public boolean showConnectedComponents() { + return showConnectedComponents; + } } diff --git a/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/VisualisationComponent.java b/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/VisualisationComponent.java new file mode 100644 index 00000000..336a8e97 --- /dev/null +++ b/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/VisualisationComponent.java @@ -0,0 +1,32 @@ +package org.simantics.district.network.visualisations.model; + +import java.awt.geom.Point2D; +import java.util.List; + +import org.simantics.db.Resource; +import org.simantics.structural.synchronization.base.ComponentBase; + +public class VisualisationComponent { + + private final Resource resource; + private final ComponentBase component; + private final List connectedComponents; + + public VisualisationComponent(Resource resource, ComponentBase component, List connectedComponents) { + this.resource = resource; + this.component = component; + this.connectedComponents = connectedComponents; + } + + public Resource getResource() { + return resource; + } + + public ComponentBase getComponent() { + return component; + } + + public List getConnectedComponents() { + return connectedComponents; + } +} -- 2.45.2