Make background map preference changes apply immediately

[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 6c852dab33a3fa88cb9e2c86bcf8ef85c676d47b..beb56be19a2ab31f25246ad16d8438fdda8cbc36 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,7 +33,8 @@ 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.ui.controls.DynamicComboFieldEditor;
+import org.simantics.district.imports.CSVImportModel;
+import org.simantics.district.network.ui.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,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;
@@ -301,7 +304,7 @@ public class CSVImportWizardPage extends WizardPage {
                 public void modifyText(ModifyEvent e) {
                     try {
                         double padding = Double.parseDouble(edgeConnectionPadding.getText());
-                        model.setEdgePapping(padding);
+                        model.setEdgePadding(padding);
                     } catch (NumberFormatException ee) {
                         // ignore
                     }
@@ -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);
     }
 
 }