gitlab #5
Change-Id: I0bb9bcefa9a7da2cf858e7ee5e3873f62d5cacc5
private int idIndex = -1;
private double edgePadding = 0.0001; // default
private int valvePositionIndx = -1;
private int idIndex = -1;
private double edgePadding = 0.0001; // default
private int valvePositionIndx = -1;
+ private int addressIndex;
public int getValvePositionIndx() {
return valvePositionIndx;
}
public int getValvePositionIndx() {
return valvePositionIndx;
}
+
+ public void setAddressIndex(int parseInt) {
+ this.addressIndex = parseInt;
+ }
+
+ public int getAddressIndex() {
+ return addressIndex;
+ }
int velocityIndex = model.getVelocityIndex();
int flowAreaIndex = model.getFlowAreaIndex();
int nominalPressureLossIndex = model.getNominalPressureLossIndex();
int velocityIndex = model.getVelocityIndex();
int flowAreaIndex = model.getFlowAreaIndex();
int nominalPressureLossIndex = model.getNominalPressureLossIndex();
+ int addressIndex = model.getAddressIndex();
int startXCoordColumnIndex = model.getStartXCoordIndex();
int startYCoordColumnIndex = model.getStartYCoordIndex();
int startXCoordColumnIndex = model.getStartXCoordIndex();
int startYCoordColumnIndex = model.getStartYCoordIndex();
writeValue(graph, row, velocityIndex, vertex, DN.Vertex_HasVelocity);
writeValue(graph, row, flowAreaIndex, vertex, DN.Vertex_HasFlowArea);
writeValue(graph, row, nominalPressureLossIndex, vertex, DN.Vertex_HasNominalPressureLoss);
writeValue(graph, row, velocityIndex, vertex, DN.Vertex_HasVelocity);
writeValue(graph, row, flowAreaIndex, vertex, DN.Vertex_HasFlowArea);
writeValue(graph, row, nominalPressureLossIndex, vertex, DN.Vertex_HasNominalPressureLoss);
+ writeStringValue(graph, row, addressIndex, vertex, DN.Vertex_HasAddress);
} else {
String startXCoords = row.get(startXCoordColumnIndex);
} else {
String startXCoords = row.get(startXCoordColumnIndex);
private DynamicComboFieldEditor flowAreaSelector;
private DynamicComboFieldEditor nominalPressureLossSelector;
private DynamicComboFieldEditor valvePositionSelector;
private DynamicComboFieldEditor flowAreaSelector;
private DynamicComboFieldEditor nominalPressureLossSelector;
private DynamicComboFieldEditor valvePositionSelector;
+ private DynamicComboFieldEditor addressSelector;
// For edge import
private DynamicComboFieldEditor startXCoordSelector;
// For edge import
private DynamicComboFieldEditor startXCoordSelector;
validatePageComplete();
}
});
validatePageComplete();
}
});
+ addressSelector = new DynamicComboFieldEditor("addressValue", "addressSelector", parent);
+ addressSelector.addComboListener(new SelectionListener() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ widgetDefaultSelected(e);
+ }
+
+ @Override
+ public void widgetDefaultSelected(SelectionEvent e) {
+ model.setAddressIndex(Integer.parseInt(addressSelector.getValue()));
+ validatePageComplete();
+ }
+ });
}
private void createEdgeIndexMappingField(Group parent) {
}
private void createEdgeIndexMappingField(Group parent) {
velocitySelector.updateCombo(namesAndValues);
flowAreaSelector.updateCombo(namesAndValues);
nominalPressureLossSelector.updateCombo(namesAndValues);
velocitySelector.updateCombo(namesAndValues);
flowAreaSelector.updateCombo(namesAndValues);
nominalPressureLossSelector.updateCombo(namesAndValues);
+ addressSelector.updateCombo(namesAndValues);
L0.HasLabel "Elevation"
L0.HasRange L0.Double
L0.readOnly false
L0.HasLabel "Elevation"
L0.HasRange L0.Double
L0.readOnly false
+
+DN.Vertex.HasAddress <R L0.HasProperty : SEL.GenericParameterType
+ L0.HasLabel "Address"
+ L0.HasRange L0.String
+ L0.readOnly false
DN.Vertex.HasSupplyTemperature <R L0.HasProperty : SEL.GenericParameterType
L0.HasLabel "Supply Temperature"
DN.Vertex.HasSupplyTemperature <R L0.HasProperty : SEL.GenericParameterType
L0.HasLabel "Supply Temperature"
>-- DN.Mapping.VertexMapping.MaximumHeadMAttribute --> L0.String <R L0.HasProperty
// Consumers
>-- DN.Mapping.VertexMapping.HeatLoadDsAttribute --> L0.String <R L0.HasProperty
>-- DN.Mapping.VertexMapping.MaximumHeadMAttribute --> L0.String <R L0.HasProperty
// Consumers
>-- DN.Mapping.VertexMapping.HeatLoadDsAttribute --> L0.String <R L0.HasProperty
+ >-- DN.Mapping.VertexMapping.AddressAttribute --> L0.String <R L0.HasProperty
>-- DN.Mapping.VertexMapping.MassFlowAttribute --> L0.String <R L0.HasProperty
>-- DN.Mapping.VertexMapping.VolFlowAttribute --> L0.String <R L0.HasProperty
>-- DN.Mapping.VertexMapping.VelocityAttribute --> L0.String <R L0.HasProperty
>-- DN.Mapping.VertexMapping.MassFlowAttribute --> L0.String <R L0.HasProperty
>-- DN.Mapping.VertexMapping.VolFlowAttribute --> L0.String <R L0.HasProperty
>-- DN.Mapping.VertexMapping.VelocityAttribute --> L0.String <R L0.HasProperty
public final Resource Mapping_Terminals;
public final Resource Mapping_Terminals_Inverse;
public final Resource Mapping_VertexMapping;
public final Resource Mapping_Terminals;
public final Resource Mapping_Terminals_Inverse;
public final Resource Mapping_VertexMapping;
+ public final Resource Mapping_VertexMapping_AddressAttribute;
+ public final Resource Mapping_VertexMapping_AddressAttribute_Inverse;
public final Resource Mapping_VertexMapping_DeltaPressureAttribute;
public final Resource Mapping_VertexMapping_DeltaPressureAttribute_Inverse;
public final Resource Mapping_VertexMapping_DeltaTemperatureAttribute;
public final Resource Mapping_VertexMapping_DeltaPressureAttribute;
public final Resource Mapping_VertexMapping_DeltaPressureAttribute_Inverse;
public final Resource Mapping_VertexMapping_DeltaTemperatureAttribute;
public final Resource VertexDefaultMapping;
public final Resource VertexDefaultMapping_Inverse;
public final Resource VertexMappingParameterType;
public final Resource VertexDefaultMapping;
public final Resource VertexDefaultMapping_Inverse;
public final Resource VertexMappingParameterType;
+ public final Resource Vertex_HasAddress;
+ public final Resource Vertex_HasAddress_Inverse;
public final Resource Vertex_HasDeltaPressure;
public final Resource Vertex_HasDeltaPressure_Inverse;
public final Resource Vertex_HasDeltaTemperature;
public final Resource Vertex_HasDeltaPressure;
public final Resource Vertex_HasDeltaPressure_Inverse;
public final Resource Vertex_HasDeltaTemperature;
public static final String Mapping_Terminals = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/Terminals";
public static final String Mapping_Terminals_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/Terminals/Inverse";
public static final String Mapping_VertexMapping = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping";
public static final String Mapping_Terminals = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/Terminals";
public static final String Mapping_Terminals_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/Terminals/Inverse";
public static final String Mapping_VertexMapping = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping";
+ public static final String Mapping_VertexMapping_AddressAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/AddressAttribute";
+ public static final String Mapping_VertexMapping_AddressAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/AddressAttribute/Inverse";
public static final String Mapping_VertexMapping_DeltaPressureAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/DeltaPressureAttribute";
public static final String Mapping_VertexMapping_DeltaPressureAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/DeltaPressureAttribute/Inverse";
public static final String Mapping_VertexMapping_DeltaTemperatureAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/DeltaTemperatureAttribute";
public static final String Mapping_VertexMapping_DeltaPressureAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/DeltaPressureAttribute";
public static final String Mapping_VertexMapping_DeltaPressureAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/DeltaPressureAttribute/Inverse";
public static final String Mapping_VertexMapping_DeltaTemperatureAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/DeltaTemperatureAttribute";
public static final String VertexDefaultMapping = "http://www.simantics.org/DistrictNetwork-1.0/VertexDefaultMapping";
public static final String VertexDefaultMapping_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/VertexDefaultMapping/Inverse";
public static final String VertexMappingParameterType = "http://www.simantics.org/DistrictNetwork-1.0/VertexMappingParameterType";
public static final String VertexDefaultMapping = "http://www.simantics.org/DistrictNetwork-1.0/VertexDefaultMapping";
public static final String VertexDefaultMapping_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/VertexDefaultMapping/Inverse";
public static final String VertexMappingParameterType = "http://www.simantics.org/DistrictNetwork-1.0/VertexMappingParameterType";
+ public static final String Vertex_HasAddress = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasAddress";
+ public static final String Vertex_HasAddress_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasAddress/Inverse";
public static final String Vertex_HasDeltaPressure = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasDeltaPressure";
public static final String Vertex_HasDeltaPressure_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasDeltaPressure/Inverse";
public static final String Vertex_HasDeltaTemperature = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasDeltaTemperature";
public static final String Vertex_HasDeltaPressure = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasDeltaPressure";
public static final String Vertex_HasDeltaPressure_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasDeltaPressure/Inverse";
public static final String Vertex_HasDeltaTemperature = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasDeltaTemperature";
Mapping_Terminals = getResourceOrNull(graph, URIs.Mapping_Terminals);
Mapping_Terminals_Inverse = getResourceOrNull(graph, URIs.Mapping_Terminals_Inverse);
Mapping_VertexMapping = getResourceOrNull(graph, URIs.Mapping_VertexMapping);
Mapping_Terminals = getResourceOrNull(graph, URIs.Mapping_Terminals);
Mapping_Terminals_Inverse = getResourceOrNull(graph, URIs.Mapping_Terminals_Inverse);
Mapping_VertexMapping = getResourceOrNull(graph, URIs.Mapping_VertexMapping);
+ Mapping_VertexMapping_AddressAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_AddressAttribute);
+ Mapping_VertexMapping_AddressAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_AddressAttribute_Inverse);
Mapping_VertexMapping_DeltaPressureAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_DeltaPressureAttribute);
Mapping_VertexMapping_DeltaPressureAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_DeltaPressureAttribute_Inverse);
Mapping_VertexMapping_DeltaTemperatureAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_DeltaTemperatureAttribute);
Mapping_VertexMapping_DeltaPressureAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_DeltaPressureAttribute);
Mapping_VertexMapping_DeltaPressureAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_DeltaPressureAttribute_Inverse);
Mapping_VertexMapping_DeltaTemperatureAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_DeltaTemperatureAttribute);
VertexDefaultMapping = getResourceOrNull(graph, URIs.VertexDefaultMapping);
VertexDefaultMapping_Inverse = getResourceOrNull(graph, URIs.VertexDefaultMapping_Inverse);
VertexMappingParameterType = getResourceOrNull(graph, URIs.VertexMappingParameterType);
VertexDefaultMapping = getResourceOrNull(graph, URIs.VertexDefaultMapping);
VertexDefaultMapping_Inverse = getResourceOrNull(graph, URIs.VertexDefaultMapping_Inverse);
VertexMappingParameterType = getResourceOrNull(graph, URIs.VertexMappingParameterType);
+ Vertex_HasAddress = getResourceOrNull(graph, URIs.Vertex_HasAddress);
+ Vertex_HasAddress_Inverse = getResourceOrNull(graph, URIs.Vertex_HasAddress_Inverse);
Vertex_HasDeltaPressure = getResourceOrNull(graph, URIs.Vertex_HasDeltaPressure);
Vertex_HasDeltaPressure_Inverse = getResourceOrNull(graph, URIs.Vertex_HasDeltaPressure_Inverse);
Vertex_HasDeltaTemperature = getResourceOrNull(graph, URIs.Vertex_HasDeltaTemperature);
Vertex_HasDeltaPressure = getResourceOrNull(graph, URIs.Vertex_HasDeltaPressure);
Vertex_HasDeltaPressure_Inverse = getResourceOrNull(graph, URIs.Vertex_HasDeltaPressure_Inverse);
Vertex_HasDeltaTemperature = getResourceOrNull(graph, URIs.Vertex_HasDeltaTemperature);
<this />
</type>
</target>
<this />
</type>
</target>
- <target interface="org.simantics.scenegraph.profile.Group">
+ <!-- <target interface="org.simantics.scenegraph.profile.Group">
<resource uri="http://www.simantics.org/DistrictNetwork-1.0/EdgeNodeGroup"
class="org.simantics.district.network.profile.EdgeNodeGroup">
<graph/>
</resource>
<resource uri="http://www.simantics.org/DistrictNetwork-1.0/EdgeNodeGroup"
class="org.simantics.district.network.profile.EdgeNodeGroup">
<graph/>
</resource>
<target interface="org.simantics.scenegraph.profile.Style">
<resource uri="http://www.simantics.org/DistrictNetwork-1.0/EdgeNodeStyle"
class="org.simantics.district.network.profile.EdgeNodeStyle">
<target interface="org.simantics.scenegraph.profile.Style">
<resource uri="http://www.simantics.org/DistrictNetwork-1.0/EdgeNodeStyle"
class="org.simantics.district.network.profile.EdgeNodeStyle">