X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fadapters%2FDistrictNetworkVertexElement.java;fp=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fadapters%2FDistrictNetworkVertexElement.java;h=7be6a14faa659abb28df213e694b14e9094dd848;hb=beab0411489f5730942d98d47dc3faf3107c6c02;hp=2a0cb1229c783f645d416e28a646af6d22311580;hpb=30591a1b91be88fa9061a00d179a3a8ee54fb7e4;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkVertexElement.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkVertexElement.java
index 2a0cb122..7be6a14f 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkVertexElement.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkVertexElement.java
@@ -13,7 +13,9 @@ import org.simantics.g2d.element.handler.InternalSize;
 import org.simantics.g2d.element.handler.SceneGraph;
 import org.simantics.g2d.element.handler.impl.DefaultTransform;
 import org.simantics.g2d.element.handler.impl.SimpleElementLayers;
+import org.simantics.scenegraph.INode;
 import org.simantics.scenegraph.g2d.G2DParentNode;
+import org.simantics.scenegraph.g2d.nodes.SVGNode;
 import org.simantics.utils.datastructures.hints.IHintContext.Key;
 import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
 
@@ -21,6 +23,7 @@ public class DistrictNetworkVertexElement {
 
     public static final Key KEY_DN_VERTEX = new KeyOf(DistrictNetworkVertex.class, "DN_VERTEX");
     public static final Key KEY_DN_VERTEX_NODE = new SceneGraphNodeKey(DistrictNetworkVertexNode.class, "DN_VERTEX_NODE");
+    public static final Key KEY_DN_VERTEX_SYMBOL_NODE = new SceneGraphNodeKey(SVGNode.class, "DN_VERTEX_SYMBOL_NODE");
     
     public static final ElementClass CLASS =
             ElementClass.compile(
@@ -47,7 +50,11 @@ public class DistrictNetworkVertexElement {
                 if (node == null) {
                     node = parent.addNode(ElementUtils.generateNodeId(vertexElement), DistrictNetworkVertexNode.class);
                     vertexElement.setHint(KEY_DN_VERTEX_NODE, node);
+                    
+                    SVGNode symbol = node.addNode(ElementUtils.generateNodeId(vertexElement), SVGNode.class);
+                    vertexElement.setHint(KEY_DN_VERTEX_SYMBOL_NODE, symbol);
                 }
+                
                 node.setVertex(vertex);
                 
                 node.setColor(ElementUtils.getAdditionalColor(vertexElement, Color.BLUE));
@@ -60,8 +67,13 @@ public class DistrictNetworkVertexElement {
 
         @Override
         public void cleanup(IElement edge) {
-            ElementUtils.removePossibleNode(edge, KEY_DN_VERTEX_NODE);
+            ElementUtils.removePossibleNode(edge, KEY_DN_VERTEX_SYMBOL_NODE);
+            INode node = ElementUtils.removePossibleNode(edge, KEY_DN_VERTEX_NODE);
+            if (node != null)
+                node.getParent().remove();
+            
             edge.removeHint(KEY_DN_VERTEX_NODE);
+            edge.removeHint(KEY_DN_VERTEX_SYMBOL_NODE);
         }
     }