Merge remote-tracking branch 'origin/master' into release/1.35.2

[simantics/district.git] / org.simantics.district.imports.ui / src / org / simantics / district / imports / ui / CSVImportWizardPage.java

diff --git a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java
index b7e46475dcec4f00c2b4069476de5084364b8b4e..268ed310df432885378907646e6976046793c607 100644 (file)
--- a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java
+++ b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java
@@ -33,6 +33,7 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
 import org.geotools.referencing.CRS;
+import org.simantics.district.imports.CSVImportModel;
 import org.simantics.district.imports.ui.controls.DynamicComboFieldEditor;
 
 public class CSVImportWizardPage extends WizardPage {
@@ -52,12 +53,12 @@ public class CSVImportWizardPage extends WizardPage {
     // Common for vertex and edge
     private DynamicComboFieldEditor componentMappingSelector;
     private DynamicComboFieldEditor idSelector;
-    private DynamicComboFieldEditor labelSelector;
     
     // For vertex import
     private DynamicComboFieldEditor xCoordSelector;
     private DynamicComboFieldEditor yCoordSelector;
     private DynamicComboFieldEditor zValueSelector;
+    private DynamicComboFieldEditor altElevationValueSelector;
 
     private DynamicComboFieldEditor supplyTempValueSelector;
     private DynamicComboFieldEditor returnTempValueSelector;
@@ -66,6 +67,7 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor dpSelector;
     private DynamicComboFieldEditor dtSelector;
     private DynamicComboFieldEditor heatPowerSelector;
+    private DynamicComboFieldEditor peakPowerSelector;
     private DynamicComboFieldEditor nominalHeadMSelector;
     private DynamicComboFieldEditor nominalHeadBSelector;
     private DynamicComboFieldEditor nominalFlowSelector;
@@ -87,6 +89,7 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor endXCoordSelector;
     private DynamicComboFieldEditor endYCoordSelector;
     private DynamicComboFieldEditor endZValueSelector;
+    private DynamicComboFieldEditor detailedGeometrySelector;
 
     private Text edgeConnectionPadding;
     
@@ -299,8 +302,8 @@ public class CSVImportWizardPage extends WizardPage {
                 @Override
                 public void modifyText(ModifyEvent e) {
                     try {
-                        double padding = Double.parseDouble("");
-                        model.setEdgePapping(padding);
+                        double padding = Double.parseDouble(edgeConnectionPadding.getText());
+                        model.setEdgePadding(padding);
                     } catch (NumberFormatException ee) {
                         // ignore
                     }
@@ -387,6 +390,22 @@ public class CSVImportWizardPage extends WizardPage {
                 validatePageComplete();
             }
         });
+
+        altElevationValueSelector = new DynamicComboFieldEditor("altElevation", "Alternative Elevation", parent);
+        altElevationValueSelector.addComboListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                widgetDefaultSelected(e);
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                model.setAltElevationIndex(Integer.parseInt(altElevationValueSelector.getValue()));
+                validatePageComplete();
+            }
+        });
+        
         supplyTempValueSelector = new DynamicComboFieldEditor("tempValue", "Supply Temperature value", parent);
         supplyTempValueSelector.addComboListener(new SelectionListener() {
 
@@ -485,6 +504,20 @@ public class CSVImportWizardPage extends WizardPage {
                 validatePageComplete();
             }
         });
+        peakPowerSelector = new DynamicComboFieldEditor("peakPowerValue", "Peak Power", parent);
+        peakPowerSelector.addComboListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                widgetDefaultSelected(e);
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                model.setPeakPowerIndex(Integer.parseInt(peakPowerSelector.getValue()));
+                validatePageComplete();
+            }
+        });
         nominalHeadMSelector = new DynamicComboFieldEditor("nominalHeadMValue", "nominalHeadM", parent);
         nominalHeadMSelector.addComboListener(new SelectionListener() {
 
@@ -750,6 +783,20 @@ public class CSVImportWizardPage extends WizardPage {
                 validatePageComplete();
             }
         });
+        detailedGeometrySelector = new DynamicComboFieldEditor("detailedGeometryValue", "Geometry", parent);
+        detailedGeometrySelector.addComboListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                widgetDefaultSelected(e);
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                model.detailedGeometryIndex(Integer.parseInt(detailedGeometrySelector.getValue()));
+                validatePageComplete();
+            }
+        });
         diameterSelector = new DynamicComboFieldEditor("diameterValue", "Diameter value", parent);
         diameterSelector.addComboListener(new SelectionListener() {
 
@@ -895,6 +942,7 @@ public class CSVImportWizardPage extends WizardPage {
         endYCoordSelector.updateCombo(namesAndValues);
         startZValueSelector.updateCombo(namesAndValues);
         endZValueSelector.updateCombo(namesAndValues);
+        detailedGeometrySelector.updateCombo(namesAndValues);
         diameterSelector.updateCombo(namesAndValues);
         outerDiameterSelector.updateCombo(namesAndValues);
         nominalMassFlowSelector.updateCombo(namesAndValues);
@@ -909,6 +957,7 @@ public class CSVImportWizardPage extends WizardPage {
         xCoordSelector.updateCombo(namesAndValues);
         yCoordSelector.updateCombo(namesAndValues);
         zValueSelector.updateCombo(namesAndValues);
+        altElevationValueSelector.updateCombo(namesAndValues);
         supplyTempValueSelector.updateCombo(namesAndValues);       
         returnTempValueSelector.updateCombo(namesAndValues);       
         supplyPressureValueSelector.updateCombo(namesAndValues);   
@@ -951,7 +1000,7 @@ public class CSVImportWizardPage extends WizardPage {
         headerIndexAndValues.clear();
 
         try {
-            List<CSVRecord> rows = model.getRows(5);
+            List<CSVRecord> rows = model.getRows(5, false);
 
             for (int k = 0; k < rows.size(); k++) {
                 CSVRecord row = rows.get(k);
@@ -990,7 +1039,7 @@ public class CSVImportWizardPage extends WizardPage {
         if (model.isVertexImport())
             setPageComplete(model.getXCoordIndex() != -1 && model.getYCoordIndex() != -1 && model.getComponentMappingIndex() != -1);
         else
-            setPageComplete(model.getStartXCoordIndex() != 1 && model.getStartYCoordIndex() != -1 && model.getEndXCoordIndex() != -1 && model.getEndYCoordIndex() != -1 && model.getComponentMappingIndex() != -1);
+            setPageComplete(model.getStartXCoordIndex() != -1 && model.getStartYCoordIndex() != -1 && model.getEndXCoordIndex() != -1 && model.getEndYCoordIndex() != -1 && model.getComponentMappingIndex() != -1);
     }
 
 }