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;h=339d51d4149d8f2664a2b154d87c4b48a5bd2a0e;hb=8034693a5c86d690649a70a62709d29c3fa197aa;hp=bb75ab0c4597d19705dec4a60e9af955f22e4c2c;hpb=31bcbe46c93a576cd6ade673a745ea9cb28672da;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 bb75ab0c..339d51d4 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
@@ -1,6 +1,7 @@
 package org.simantics.district.network.ui.adapters;
 
 import java.awt.Dimension;
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 
 import org.simantics.district.network.ui.nodes.DistrictNetworkVertexNode;
@@ -10,7 +11,7 @@ import org.simantics.g2d.element.IElement;
 import org.simantics.g2d.element.SceneGraphNodeKey;
 import org.simantics.g2d.element.handler.InternalSize;
 import org.simantics.g2d.element.handler.SceneGraph;
-import org.simantics.g2d.elementclass.connection.EdgeClass.FixedTransform;
+import org.simantics.g2d.element.handler.impl.DefaultTransform;
 import org.simantics.scenegraph.g2d.G2DParentNode;
 import org.simantics.utils.datastructures.hints.IHintContext.Key;
 import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
@@ -22,7 +23,7 @@ public class DistrictNetworkVertexElement {
     
     public static final ElementClass CLASS =
             ElementClass.compile(
-                    FixedTransform.INSTANCE,
+                    DefaultTransform.INSTANCE,
                     DNVertexInternalSize.INSTANCE,
                     DNVertexSceneGraph.INSTANCE
             ).setId(DistrictNetworkVertexElement.class.getSimpleName());
@@ -45,6 +46,10 @@ public class DistrictNetworkVertexElement {
                     edgeElement.setHint(KEY_DN_VERTEX_NODE, node);
                 }
                 node.setVertex(vertex);
+                
+                AffineTransform at = ElementUtils.getTransform(edgeElement);
+                if(at != null)
+                    node.setTransform(at);
             }
         }
 
@@ -63,10 +68,9 @@ public class DistrictNetworkVertexElement {
 
         @Override
         public Rectangle2D getBounds(IElement e, Rectangle2D size) {
-            DistrictNetworkVertex vertex = e.getHint(KEY_DN_VERTEX);
             if (size == null)
                 size = new Rectangle2D.Double();
-            size.setFrame(vertex.getPoint(), new Dimension(1, 1));
+            size.setFrame(-0.5, -0.5, 1, 1);
             return size;
         }