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;
// Common for vertex and edge
private DynamicComboFieldEditor componentMappingSelector;
private DynamicComboFieldEditor idSelector;
- private DynamicComboFieldEditor labelSelector;
// For vertex import
private DynamicComboFieldEditor xCoordSelector;
private DynamicComboFieldEditor nominalPressureLossSelector;
private DynamicComboFieldEditor valvePositionSelector;
private DynamicComboFieldEditor addressSelector;
+ private DynamicComboFieldEditor lengthSelector;
// For edge import
private DynamicComboFieldEditor startXCoordSelector;
private DynamicComboFieldEditor endXCoordSelector;
private DynamicComboFieldEditor endYCoordSelector;
private DynamicComboFieldEditor endZValueSelector;
+ private DynamicComboFieldEditor detailedGeometrySelector;
private Text edgeConnectionPadding;
@Override
public void modifyText(ModifyEvent e) {
try {
- double padding = Double.parseDouble("");
+ double padding = Double.parseDouble(edgeConnectionPadding.getText());
model.setEdgePapping(padding);
} catch (NumberFormatException ee) {
// ignore
validatePageComplete();
}
});
+
+
}
private void createEdgeIndexMappingField(Group parent) {
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() {
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() {
endYCoordSelector.updateCombo(namesAndValues);
startZValueSelector.updateCombo(namesAndValues);
endZValueSelector.updateCombo(namesAndValues);
+ detailedGeometrySelector.updateCombo(namesAndValues);
diameterSelector.updateCombo(namesAndValues);
outerDiameterSelector.updateCombo(namesAndValues);
nominalMassFlowSelector.updateCombo(namesAndValues);
kReturnSelector.updateCombo(namesAndValues);
kSupplySelector.updateCombo(namesAndValues);
tGroundSelector.updateCombo(namesAndValues);
+ lengthSelector.updateCombo(namesAndValues);
}
private void updateVertexCombos(String[][] namesAndValues) {
velocitySelector.updateCombo(namesAndValues);
flowAreaSelector.updateCombo(namesAndValues);
nominalPressureLossSelector.updateCombo(namesAndValues);
- addressSelector.updateCombo(namesAndValues);
+ addressSelector.updateCombo(namesAndValues);
}
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);