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=fdc333b2fb82f88d64da9894f8111d0be0f27812;hb=7c1f539de88c6ca79b2ac6dc891be3f45282abe2;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..fdc333b2 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
@@ -11,14 +11,15 @@ 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.g2d.canvas.Hints;
 import org.simantics.g2d.diagram.participant.pointertool.TranslateMode;
 import org.simantics.g2d.element.ElementUtils;
 import org.simantics.g2d.element.IElement;
-import org.simantics.g2d.element.handler.Move;
 
 public class DNTranslateMode extends TranslateMode {
 
@@ -28,13 +29,6 @@ public class DNTranslateMode extends TranslateMode {
     
     @Override
     protected boolean commit() {
-        for (IElement el : elementsToReallyTranslate) {
-            Move move = el.getElementClass().getAtMostOneItemOfClass(Move.class);
-            if (move != null) {
-                Point2D oldPos = move.getPosition(el);
-                move.moveTo(el, oldPos.getX() + dx, oldPos.getY() + dy);
-            }
-        }
         try {
             Simantics.getSession().syncRequest(new WriteRequest() {
                 @Override
@@ -43,27 +37,43 @@ public class DNTranslateMode extends TranslateMode {
                     DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
                     DiagramResource DIA = DiagramResource.getInstance(graph);
                     for (IElement e : elementsToReallyTranslate) {
+                        
+                        
                         Object obj = ElementUtils.getObject(e);
-                        if (obj instanceof Resource) {
+                        if (obj instanceof Resource && graph.isInstanceOf((Resource) obj, DN.Vertex)) {
+                            
                             Resource res = (Resource) obj;
+                            
+                            // Read current location from graph
+                            double[] currentCoords = graph.getRelatedValue2(res, DIA.HasLocation);
+                            
+                            double x = ModelledCRS.longitudeToX(currentCoords[0]);
+                            double y = ModelledCRS.latitudeToY(currentCoords[1]);
+                                    
+                            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 lat = ModelledCRS.yToLatitude(y + (-dy / at.getScaleY()));
+                                double lon = ModelledCRS.xToLongitude(x + (dx / 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();
+                                + " by (" + dx + "," + -dy + ") mm."));
                     }
                 }
             });