New sewage system modelling features for the mapping tool.

[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 e1b81e0f10df3b6fad4729d26e77754c0460dd06..df04cb3258443391cbf38298185d8d84f845291c 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
@@ -64,6 +64,7 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor endZValueSelector;
     private DynamicComboFieldEditor tempValueSelector;
     private DynamicComboFieldEditor pressureValueSelector;
+    private DynamicComboFieldEditor sewageProductionValueSelector;
     
     private DynamicComboFieldEditor outerDiameterSelector;
     private DynamicComboFieldEditor diameterSelector;
@@ -318,6 +319,21 @@ public class CSVImportWizardPage extends WizardPage {
                 validatePageComplete();
             }
         });
+        
+        sewageProductionValueSelector = new DynamicComboFieldEditor("sewageProductionValue", "Sewage production value", parent);
+        sewageProductionValueSelector.addComboListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                widgetDefaultSelected(e);
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                model.setSewageProductionIndex(Integer.parseInt(sewageProductionValueSelector.getValue()));
+                validatePageComplete();
+            }
+        });
     }
 
     private void createEdgeIndexMappingField(Group parent) {
@@ -492,6 +508,7 @@ public class CSVImportWizardPage extends WizardPage {
         zValueSelector.updateCombo(namesAndValues);
         pressureValueSelector.updateCombo(namesAndValues);
         tempValueSelector.updateCombo(namesAndValues);
+        sewageProductionValueSelector.updateCombo(namesAndValues);
     }
 
     private void updateHeaders() {
@@ -552,7 +569,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);
     }
 
 }