X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fparticipants%2FDNTranslateMode.java;h=8603add13e995f670265ec0845abfe2476210e84;hb=refs%2Fchanges%2F16%2F616%2F1;hp=7d8af3d67f1103c4bca0db0765f374f19bca101f;hpb=5747d0df198d3b3de66c51796369a7f6af314ea7;p=simantics%2Fdistrict.git

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 7d8af3d6..8603add1 100644
--- 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;
 
@@ -11,9 +12,13 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.common.CommentMetadata;
 import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.diagram.elements.ElementTransforms;
 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;
@@ -43,27 +48,40 @@ 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;
+                            AffineTransform at = ElementUtils.getLocalTransform(e, new AffineTransform());
                             if (graph.isInstanceOf(res, DN.Vertex)) {
-                                AffineTransform at = ElementUtils.getLocalTransform(e, new AffineTransform());
-                                transformed.add( new TransformedObject((Resource) obj, at) );
                                 
+                                double x = at.getTranslateX();
+                                double y = at.getTranslateY();
+
+                                double lat = ModelledCRS.yToLatitude(y / at.getScaleY());
+                                double lon = ModelledCRS.xToLongitude(x / at.getScaleX());
                                 
                                 // write to db
-                                double[] coords = new double[] { at.getTranslateX(), at.getTranslateY() };
+                                double[] coords = new double[] { lon, lat };
                                 graph.claimLiteral(res, DIA.HasLocation, coords);
+                            } else {
+                                // fallback to normal HasTransforms
+                                transformed.add( new TransformedObject((Resource) obj, at) );
                             }
                         }
                     }
-                    
                     if (!transformed.isEmpty()) {
+                        graph.markUndoPoint();
+                        // Normal transforms
+                        ElementTransforms.setTransformRequest(transformed).perform(graph);
+                        
                         CommentMetadata cm = graph.getMetadata(CommentMetadata.class);
                         graph.addMetadata(cm.add("Translated " + transformed.size() + " "
                                 + (transformed.size() == 1 ? "element" : "elements")
                                 + " by (" + dx + "," + dy + ") mm."));
-                        graph.markUndoPoint();
                     }
                 }
             });