X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.imports.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fimports%2Fui%2FCSVImportWizardPage.java;h=6c852dab33a3fa88cb9e2c86bcf8ef85c676d47b;hb=bbe939348eedaeeee3b1031059e2aca42e6137c3;hp=b7e46475dcec4f00c2b4069476de5084364b8b4e;hpb=46e2c804156e3bd2072ec91a801954c18cd15580;p=simantics%2Fdistrict.git

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 b7e46475..6c852dab 100644
--- 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
@@ -87,6 +87,7 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor endXCoordSelector;
     private DynamicComboFieldEditor endYCoordSelector;
     private DynamicComboFieldEditor endZValueSelector;
+    private DynamicComboFieldEditor detailedGeometrySelector;
 
     private Text edgeConnectionPadding;
     
@@ -299,7 +300,7 @@ public class CSVImportWizardPage extends WizardPage {
                 @Override
                 public void modifyText(ModifyEvent e) {
                     try {
-                        double padding = Double.parseDouble("");
+                        double padding = Double.parseDouble(edgeConnectionPadding.getText());
                         model.setEdgePapping(padding);
                     } catch (NumberFormatException ee) {
                         // ignore
@@ -750,6 +751,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 +910,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);
@@ -951,7 +967,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);