From 2636fc31c16c23711cf2b06a4ae8537bba9c1d35 Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Wed, 29 Mar 2017 19:47:59 +0300
Subject: [PATCH] Some fixes to district stuff 3

refs #6958

Change-Id: I58d80b1c6d5b80ff8dd465305f19865c3c9db99f
---
 .../graph.tg                                  | Bin 11300 -> 12092 bytes
 .../graph/DistrictNetwork.pgraph              |   7 ++++---
 .../ontology/DistrictNetworkResource.java     |   6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/org.simantics.district.network.ontology/graph.tg b/org.simantics.district.network.ontology/graph.tg
index 317d8ce0641b5e4731d36d472db40508ab67870f..6737f9afa6f4e786bede66c9973c396fddd9bfb8 100644
GIT binary patch
literal 12092
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

literal 11300
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
ICX3Gc9~WC4xc~qF

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);
-- 
2.45.1