Some cleaning and fixing of district functionalities

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / participants / DNTranslateMode.java

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNTranslateMode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNTranslateMode.java
index 7bec07dc138507ae14f4b344081e8d5b5c9c4fcf..8603add13e995f670265ec0845abfe2476210e84 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNTranslateMode.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNTranslateMode.java
@@ -2,6 +2,7 @@ package org.simantics.district.network.ui.participants;
 
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.Collection;
 
@@ -16,6 +17,8 @@ import org.simantics.diagram.elements.ElementTransforms.TransformedObject;
 import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.district.network.ModelledCRS;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
+import org.simantics.district.network.ui.adapters.DistrictNetworkVertexElement;
+import org.simantics.district.network.ui.nodes.DistrictNetworkVertexNode;
 import org.simantics.g2d.canvas.Hints;
 import org.simantics.g2d.diagram.participant.pointertool.TranslateMode;
 import org.simantics.g2d.element.ElementUtils;
@@ -45,6 +48,10 @@ public class DNTranslateMode extends TranslateMode {
                     DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
                     DiagramResource DIA = DiagramResource.getInstance(graph);
                     for (IElement e : elementsToReallyTranslate) {
+                        
+                        DistrictNetworkVertexNode node = e.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
+                        Rectangle2D bounds = node.getBounds();
+                        
                         Object obj = ElementUtils.getObject(e);
                         if (obj instanceof Resource) {
                             Resource res = (Resource) obj;
@@ -53,11 +60,9 @@ public class DNTranslateMode extends TranslateMode {
                                 
                                 double x = at.getTranslateX();
                                 double y = at.getTranslateY();
-                                // TODO: Fix scale!
-                                double scale = 100000;
-//                                double scale = 1;
-                                double lat = ModelledCRS.yToLatitude(y / scale);
-                                double lon = ModelledCRS.xToLongitude(x / scale);
+
+                                double lat = ModelledCRS.yToLatitude(y / at.getScaleY());
+                                double lon = ModelledCRS.xToLongitude(x / at.getScaleX());
                                 
                                 // write to db
                                 double[] coords = new double[] { lon, lat };