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=beb56be19a2ab31f25246ad16d8438fdda8cbc36;hb=refs%2Fchanges%2F64%2F3964%2F2;hp=e5cb3a6afba8f8ed2df8cab2e53214124f80a759;hpb=6d8edd63acbd9122ce1da5a39bf42528ec5b71e3;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 e5cb3a6a..beb56be1 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 @@ -12,7 +12,6 @@ import org.eclipse.jface.dialogs.IPageChangeProvider; import org.eclipse.jface.dialogs.IPageChangedListener; import org.eclipse.jface.dialogs.PageChangedEvent; import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.wizard.IWizardContainer; @@ -34,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 { @@ -53,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; @@ -67,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; @@ -79,6 +81,7 @@ public class CSVImportWizardPage extends WizardPage { private DynamicComboFieldEditor nominalPressureLossSelector; private DynamicComboFieldEditor valvePositionSelector; private DynamicComboFieldEditor addressSelector; + private DynamicComboFieldEditor lengthSelector; // For edge import private DynamicComboFieldEditor startXCoordSelector; @@ -87,6 +90,7 @@ public class CSVImportWizardPage extends WizardPage { private DynamicComboFieldEditor endXCoordSelector; private DynamicComboFieldEditor endYCoordSelector; private DynamicComboFieldEditor endZValueSelector; + private DynamicComboFieldEditor detailedGeometrySelector; private Text edgeConnectionPadding; @@ -299,8 +303,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 } @@ -340,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) { @@ -387,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() { @@ -485,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() { @@ -654,6 +702,8 @@ public class CSVImportWizardPage extends WizardPage { validatePageComplete(); } }); + + } private void createEdgeIndexMappingField(Group parent) { @@ -748,6 +798,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() { @@ -846,6 +910,20 @@ public class CSVImportWizardPage extends WizardPage { validatePageComplete(); } }); + lengthSelector = new DynamicComboFieldEditor("lengthValue", "lengthSelector", parent); + lengthSelector.addComboListener(new SelectionListener() { + + @Override + public void widgetSelected(SelectionEvent e) { + widgetDefaultSelected(e); + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + model.setLengthIndex(Integer.parseInt(lengthSelector.getValue())); + validatePageComplete(); + } + }); } private void updateCombos() { @@ -879,6 +957,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); @@ -886,12 +965,14 @@ public class CSVImportWizardPage extends WizardPage { kReturnSelector.updateCombo(namesAndValues); kSupplySelector.updateCombo(namesAndValues); tGroundSelector.updateCombo(namesAndValues); + lengthSelector.updateCombo(namesAndValues); } private void updateVertexCombos(String[][] namesAndValues) { xCoordSelector.updateCombo(namesAndValues); yCoordSelector.updateCombo(namesAndValues); zValueSelector.updateCombo(namesAndValues); + altElevationValueSelector.updateCombo(namesAndValues); supplyTempValueSelector.updateCombo(namesAndValues); returnTempValueSelector.updateCombo(namesAndValues); supplyPressureValueSelector.updateCombo(namesAndValues); @@ -910,7 +991,7 @@ public class CSVImportWizardPage extends WizardPage { velocitySelector.updateCombo(namesAndValues); flowAreaSelector.updateCombo(namesAndValues); nominalPressureLossSelector.updateCombo(namesAndValues); - addressSelector.updateCombo(namesAndValues); + addressSelector.updateCombo(namesAndValues); } @@ -934,7 +1015,7 @@ public class CSVImportWizardPage extends WizardPage { headerIndexAndValues.clear(); try { - List rows = model.getRows(5); + List rows = model.getRows(5, false); for (int k = 0; k < rows.size(); k++) { CSVRecord row = rows.get(k); @@ -973,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); } }