X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.imports.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fimports%2Fui%2FCSVImportWizard.java;h=76c30d98113adb381a39b1c38c47b80b479ab54b;hb=ac6ad8ff2b20a10e85e7b12c1af670500daebdd4;hp=80bf1447ae1bc9d602102e7ba7faa133d2661439;hpb=82fc4004ddaf355147e97fd951a18d3a3815e049;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
index 80bf1447..76c30d98 100644
--- a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
+++ b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
@@ -2,6 +2,8 @@ package org.simantics.district.imports.ui;
 
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.csv.CSVRecord;
@@ -23,13 +25,16 @@ import org.simantics.Simantics;
 import org.simantics.databoard.Bindings;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
+import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.request.Write;
+import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.district.imports.DistrictImportUtils;
 import org.simantics.district.network.DistrictNetworkUtil;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
 import org.simantics.district.network.ui.DNEdgeBuilder;
-import org.simantics.maps.MapScalingTransform;
+import org.simantics.district.network.ui.DNEdgeBuilder.ResourceVertex;
+import org.simantics.layer0.Layer0;
 import org.simantics.utils.ui.ExceptionUtils;
 
 public class CSVImportWizard extends Wizard implements IImportWizard {
@@ -38,6 +43,7 @@ public class CSVImportWizard extends Wizard implements IImportWizard {
     
     public CSVImportWizard() {
         setWindowTitle("Import CSV data");
+        setNeedsProgressMonitor(true);
     }
     
     
@@ -56,12 +62,12 @@ public class CSVImportWizard extends Wizard implements IImportWizard {
 
                 @Override
                 public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-                    monitor.beginTask("Importing CSV", 1000);
                     try {
                         Path csvFile = model.getSource();
                         char delim = model.getDelimiter();
                         
                         List<CSVRecord> rows = DistrictImportUtils.readRows(csvFile, delim, -1);
+                        monitor.beginTask("Importing CSV", rows.size());
                         
     //                    Path wktFile = model.getWKTFile();
                         
@@ -127,6 +133,13 @@ public class CSVImportWizard extends Wizard implements IImportWizard {
                                 
                                 DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
                                 
+                                Collection<Resource> vertices = graph.syncRequest(new ObjectsWithType(model.getParentDiagram(), Layer0.getInstance(graph).ConsistsOf, DistrictNetworkResource.getInstance(graph).Vertex));
+                                List<ResourceVertex> vv = new ArrayList<>(vertices.size());
+                                for (Resource vertex : vertices) {
+                                    double[] existingCoords = graph.getRelatedValue2(vertex, DiagramResource.getInstance(graph).HasLocation, Bindings.DOUBLE_ARRAY);
+                                    vv.add(new ResourceVertex(vertex, existingCoords));
+                                }
+                                
                                 for (int k = 1; k < rows.size(); k++) {
                                     CSVRecord row = rows.get(k);
                                     
@@ -136,7 +149,7 @@ public class CSVImportWizard extends Wizard implements IImportWizard {
                                         if (model.isVertexImport()) {
                                             String xCoords = row.get(xCoordColumnIndex);
                                             String yCoords = row.get(yCoordColumnIndex);
-                                            double xCoord = - Double.parseDouble(xCoords); // make negative for now
+                                            double xCoord = Double.parseDouble(xCoords);
                                             double yCoord = Double.parseDouble(yCoords);
                                             
                                             double z = 0;
@@ -159,9 +172,9 @@ public class CSVImportWizard extends Wizard implements IImportWizard {
                                                 DirectPosition res = actualTransform.transform(sourcePos, targetPos);
                                                 coords = res.getCoordinate();
                                             } else {
-                                                coords = new double[] { xCoord / MapScalingTransform.getScaleX(), yCoord / MapScalingTransform.getScaleY() };
+                                                coords = new double[] { xCoord, yCoord };
                                             }
-                                            Resource vertex = DistrictNetworkUtil.createVertex(graph, model.getParentDiagram(), new double[] { coords[1], -coords[0]}, model.getComponentMappings().get(mappingValue));
+                                            Resource vertex = DistrictNetworkUtil.createVertex(graph, model.getParentDiagram(), coords, model.getComponentMappings().get(mappingValue));
                                             
                                             writeStringValue(graph, row, idColumn, vertex, DN.HasId);
                                             
@@ -192,10 +205,10 @@ public class CSVImportWizard extends Wizard implements IImportWizard {
                                             String endXCoords = row.get(endXCoordColumnIndex);
                                             String endYCoords = row.get(endYCoordColumnIndex);
                                             
-                                            double startXCoord = - Double.parseDouble(startXCoords); // make negative
+                                            double startXCoord = Double.parseDouble(startXCoords); // make negative
                                             double startYCoord = Double.parseDouble(startYCoords);
                                             
-                                            double endXCoord = - Double.parseDouble(endXCoords); // make negative
+                                            double endXCoord = Double.parseDouble(endXCoords); // make negative
                                             double endYCoord = Double.parseDouble(endYCoords);
                                             
                                             double[] startCoords;
@@ -211,11 +224,11 @@ public class CSVImportWizard extends Wizard implements IImportWizard {
                                                 DirectPosition endRes = actualTransform.transform(endSourcePos, endTargetPos);
                                                 endCoords = endRes.getCoordinate();
                                             } else {
-                                                startCoords = new double[] { startXCoord / MapScalingTransform.getScaleX(), startYCoord / MapScalingTransform.getScaleY() };
-                                                endCoords = new double[] { endXCoord / MapScalingTransform.getScaleX(), endYCoord / MapScalingTransform.getScaleY() };
+                                                startCoords = new double[] { startXCoord , startYCoord };
+                                                endCoords = new double[] { endXCoord , endYCoord };
                                             }
-                                             
-                                            Resource edge = DNEdgeBuilder.create(graph, model.getParentDiagram(), model.getComponentMappings().get(mappingValue), new double[] { startCoords[1], -startCoords[0]}, new double[] { endCoords[1], -endCoords[0]}, padding);
+
+                                            Resource edge = DNEdgeBuilder.create(graph, vv, model.getParentDiagram(), model.getComponentMappings().get(mappingValue), startCoords, endCoords, padding);
                                             writeStringValue(graph, row, idColumn, edge, DN.HasId);
                                             
                                             writeValue(graph, row, diameterColumnIndex, edge, DN.Edge_HasDiameter);
@@ -229,6 +242,7 @@ public class CSVImportWizard extends Wizard implements IImportWizard {
                                     } catch (MismatchedDimensionException | TransformException | DatabaseException e) {
                                         throw new DatabaseException(e);
                                     }
+                                    monitor.worked(1);
                                 }
                             }
                         });