From 6d8edd63acbd9122ce1da5a39bf42528ec5b71e3 Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Wed, 22 Aug 2018 23:51:41 +0300
Subject: [PATCH] Add address information for district import

gitlab #5

Change-Id: I0bb9bcefa9a7da2cf858e7ee5e3873f62d5cacc5
---
 .../district/imports/ui/CSVImportModel.java   |   9 +++++++++
 .../district/imports/ui/CSVImportWizard.java  |   2 ++
 .../imports/ui/CSVImportWizardPage.java       |  16 ++++++++++++++++
 .../graph.tg                                  | Bin 26038 -> 26433 bytes
 .../graph/DistrictNetwork.pgraph              |   6 ++++++
 .../ontology/DistrictNetworkResource.java     |  12 ++++++++++++
 org.simantics.district.network/adapters.xml   |   4 ++--
 7 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java
index e2a6b7ee..9d5bd715 100644
--- a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java
+++ b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java
@@ -69,6 +69,7 @@ public class CSVImportModel {
     private int idIndex = -1;
     private double edgePadding = 0.0001; // default
     private int valvePositionIndx = -1;
+    private int addressIndex;
     
     // Third page
 
@@ -473,4 +474,12 @@ public class CSVImportModel {
     public int getValvePositionIndx() {
         return valvePositionIndx;
     }
+
+    public void setAddressIndex(int parseInt) {
+        this.addressIndex = parseInt;
+    }
+    
+    public int getAddressIndex() {
+        return addressIndex;
+    }
 }
diff --git a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
index 76c30d98..ffed0c3a 100644
--- a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
+++ b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
@@ -92,6 +92,7 @@ public class CSVImportWizard extends Wizard implements IImportWizard {
                         int velocityIndex = model.getVelocityIndex();
                         int flowAreaIndex = model.getFlowAreaIndex();
                         int nominalPressureLossIndex = model.getNominalPressureLossIndex();
+                        int addressIndex = model.getAddressIndex();
                         
                         int startXCoordColumnIndex = model.getStartXCoordIndex();
                         int startYCoordColumnIndex = model.getStartYCoordIndex();
@@ -198,6 +199,7 @@ public class CSVImportWizard extends Wizard implements IImportWizard {
                                             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);
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 0035f6b7..e5cb3a6a 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
@@ -78,6 +78,7 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor flowAreaSelector;
     private DynamicComboFieldEditor nominalPressureLossSelector;
     private DynamicComboFieldEditor valvePositionSelector;
+    private DynamicComboFieldEditor addressSelector;
 
     // For edge import
     private DynamicComboFieldEditor startXCoordSelector;
@@ -639,6 +640,20 @@ public class CSVImportWizardPage extends WizardPage {
                 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) {
@@ -895,6 +910,7 @@ public class CSVImportWizardPage extends WizardPage {
         velocitySelector.updateCombo(namesAndValues);              
         flowAreaSelector.updateCombo(namesAndValues);              
         nominalPressureLossSelector.updateCombo(namesAndValues);   
+        addressSelector.updateCombo(namesAndValues);   
     }
     
     
diff --git a/org.simantics.district.network.ontology/graph.tg b/org.simantics.district.network.ontology/graph.tg
index 534183308172fb8f9284eef9f9b3a99df10272e3..dcc422bf507a0062f0c1c4d99bf6df0f6e480e7a 100644
GIT binary patch
literal 26433
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

literal 26038
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
P-;*O^u+K_9R>uB6#{con

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 5c165085..b7b5d043 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -65,6 +65,11 @@ DN.Vertex.HasElevation <R L0.HasProperty : SEL.GenericParameterType
     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"
@@ -320,6 +325,7 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
     >-- 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
diff --git a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
index accd2264..d23f9d0c 100644
--- a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
+++ b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
@@ -113,6 +113,8 @@ public class DistrictNetworkResource {
     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;
@@ -163,6 +165,8 @@ public class DistrictNetworkResource {
     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;
@@ -306,6 +310,8 @@ public class DistrictNetworkResource {
         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";
@@ -356,6 +362,8 @@ public class DistrictNetworkResource {
         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";
@@ -509,6 +517,8 @@ public class DistrictNetworkResource {
         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);
@@ -559,6 +569,8 @@ public class DistrictNetworkResource {
         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);
diff --git a/org.simantics.district.network/adapters.xml b/org.simantics.district.network/adapters.xml
index adb325ce..03953cf7 100644
--- a/org.simantics.district.network/adapters.xml
+++ b/org.simantics.district.network/adapters.xml
@@ -8,12 +8,12 @@
 			<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>
-    </target>
+    </target> -->
 	<target interface="org.simantics.scenegraph.profile.Style">
 		<resource uri="http://www.simantics.org/DistrictNetwork-1.0/EdgeNodeStyle"
 			class="org.simantics.district.network.profile.EdgeNodeStyle">
-- 
2.45.2