Implement district features to Simantics platform

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / adapters / DistrictNetworkVertexElement.java

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