From: jsimomaa <jani.simomaa@gmail.com>
Date: Wed, 29 Mar 2017 16:47:59 +0000 (+0300)
Subject: Some fixes to district stuff 3
X-Git-Tag: v1.31.0~12
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F86%2F386%2F1;p=simantics%2Fdistrict.git

Some fixes to district stuff 3

refs #6958

Change-Id: I58d80b1c6d5b80ff8dd465305f19865c3c9db99f
---

diff --git a/org.simantics.district.network.ontology/graph.tg b/org.simantics.district.network.ontology/graph.tg
index 317d8ce0..6737f9af 100644
Binary files a/org.simantics.district.network.ontology/graph.tg and b/org.simantics.district.network.ontology/graph.tg differ
diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 7719ed48..5e17f658 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -127,13 +127,14 @@ DNAC.newDiagramContribution : L0.Template
 
 DNAC = DN.ActionContext : VP.BrowseContext
     VP.BrowseContext.IsIncludedIn MOD.ModelingActionContext
-    @DNAC.newDiagramContribution "DN Diagram" IMAGES.ConfigurationFolder ACTIONS.NewDNDiagram
+    @DNAC.newDiagramContribution "Network Diagram" IMAGES.MapImage ACTIONS.NewDNDiagram
 
 DNBC = DN.BrowseContext : VP.BrowseContext
     VP.BrowseContext.IsIncludedIn MOD.ModelingBrowseContext
     VP.BrowseContext.Includes SEL_UI.StandardPropertiesBase.BrowseContext
     
     @VP.customModifierRule    DN.Edge    VP.ResourceLabelModifierRule
+    @VP.constantImageRule     DN.Composite   IMAGES.MapImage
 
 
 ACTIONS = DN.Actions : L0.Library
@@ -144,8 +145,8 @@ ACTIONS.NewDNDiagram : MOD.NewComposite
 
 IMAGES = DN.Images : L0.Library
 
-IMAGES.ConfigurationFolder : IMAGE.PngImage
-    @L0.loadBytes "images/Configuration.png"
+IMAGES.MapImage : IMAGE.PngImage
+    @L0.loadBytes "images/map.png"
 
 // Component MAPPING
 DN.Mapping <T L0.Library
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 cdf31212..678f344b 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
@@ -51,7 +51,7 @@ public class DistrictNetworkResource {
     public final Resource HasStartVertex;
     public final Resource HasStartVertex_Inverse;
     public final Resource Images;
-    public final Resource Images_ConfigurationFolder;
+    public final Resource Images_MapImage;
     public final Resource InLayer;
     public final Resource Layer;
     public final Resource MappedComponent;
@@ -126,7 +126,7 @@ public class DistrictNetworkResource {
         public static final String HasStartVertex = "http://www.simantics.org/DistrictNetwork-1.0/HasStartVertex";
         public static final String HasStartVertex_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasStartVertex_Inverse";
         public static final String Images = "http://www.simantics.org/DistrictNetwork-1.0/Images";
-        public static final String Images_ConfigurationFolder = "http://www.simantics.org/DistrictNetwork-1.0/Images/ConfigurationFolder";
+        public static final String Images_MapImage = "http://www.simantics.org/DistrictNetwork-1.0/Images/MapImage";
         public static final String InLayer = "http://www.simantics.org/DistrictNetwork-1.0/InLayer";
         public static final String Layer = "http://www.simantics.org/DistrictNetwork-1.0/Layer";
         public static final String MappedComponent = "http://www.simantics.org/DistrictNetwork-1.0/MappedComponent";
@@ -211,7 +211,7 @@ public class DistrictNetworkResource {
         HasStartVertex = getResourceOrNull(graph, URIs.HasStartVertex);
         HasStartVertex_Inverse = getResourceOrNull(graph, URIs.HasStartVertex_Inverse);
         Images = getResourceOrNull(graph, URIs.Images);
-        Images_ConfigurationFolder = getResourceOrNull(graph, URIs.Images_ConfigurationFolder);
+        Images_MapImage = getResourceOrNull(graph, URIs.Images_MapImage);
         InLayer = getResourceOrNull(graph, URIs.InLayer);
         Layer = getResourceOrNull(graph, URIs.Layer);
         MappedComponent = getResourceOrNull(graph, URIs.MappedComponent);