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=910ae428da266f2a5dde41a3d9f5171bf177852d;hb=1a9e7423c31c56955bcf7d051d1c8e756d2d4cb7;hp=c6e1b516dbcde3c97927acdeac21a9a73d25557e;hpb=426a4ef58cf0b7e755a9111881800806f1374d59;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 c6e1b516..910ae428 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
@@ -58,6 +58,7 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor xCoordSelector;
     private DynamicComboFieldEditor yCoordSelector;
     private DynamicComboFieldEditor zValueSelector;
+    private DynamicComboFieldEditor altElevationValueSelector;
 
     private DynamicComboFieldEditor supplyTempValueSelector;
     private DynamicComboFieldEditor returnTempValueSelector;
@@ -66,6 +67,8 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor dpSelector;
     private DynamicComboFieldEditor dtSelector;
     private DynamicComboFieldEditor heatPowerSelector;
+    private DynamicComboFieldEditor peakPowerSelector;
+    private DynamicComboFieldEditor regionSelector;
     private DynamicComboFieldEditor nominalHeadMSelector;
     private DynamicComboFieldEditor nominalHeadBSelector;
     private DynamicComboFieldEditor nominalFlowSelector;
@@ -341,7 +344,20 @@ public class CSVImportWizardPage extends WizardPage {
                 validatePageComplete();
             }
         });
-        
+        regionSelector = new DynamicComboFieldEditor("regionValue", "Region", parent);
+        regionSelector.addComboListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                widgetDefaultSelected(e);
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                model.setRegionIndex(Integer.parseInt(regionSelector.getValue()));
+                validatePageComplete();
+            }
+        });
     }
 
     private void createVertexIndexMappingField(Group parent) {
@@ -388,6 +404,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() {
 
@@ -486,6 +518,21 @@ 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() {
 
@@ -925,6 +972,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);   
@@ -1006,7 +1054,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);
     }
 
 }