From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 3 Nov 2011 11:21:07 +0000 (+0000)
Subject: Modified image ontology => multiple ontology versions were updated.
X-Git-Tag: simantics-1.6~111
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=1d2697ff0c3af10e3a8c13457e6feee8f96e640a;p=simantics%2Fsysdyn.git

Modified image ontology => multiple ontology versions were updated.

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@23186 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index 3863b84b..b22cae4f 100644
Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ
diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 35980897..a00b29db 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -5,7 +5,7 @@ STR = <http://www.simantics.org/Structural-1.0>
 DIA = <http://www.simantics.org/Diagram-2.1>
 SIMU = <http://www.simantics.org/Simulation-1.0>
 MOD = <http://www.simantics.org/Modeling-1.1>
-PROJ = <http://www.simantics.org/Project-1.0>
+PROJ = <http://www.simantics.org/Project-1.1>
  
 //#####################################################################
 // Defines ontology and attaches it to SimanticsDomain
diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph
index 8a714c78..e5de0873 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph
@@ -1,12 +1,13 @@
 L0 = <http://www.simantics.org/Layer0-1.0>
-VP = <http://www.simantics.org/Viewpoint-1.0>
+VP = <http://www.simantics.org/Viewpoint-1.1>
 SIMU = <http://www.simantics.org/Simulation-1.0>
-PROJECT = <http://www.simantics.org/Project-1.0>
-IMAGE = <http://www.simantics.org/Image2-1.0>
+PROJECT = <http://www.simantics.org/Project-1.1>
+IMAGE = <http://www.simantics.org/Image2-1.1>
 ACT = <http://www.simantics.org/Action-1.0>
 MOD = <http://www.simantics.org/Modeling-1.1>
 STR = <http://www.simantics.org/Structural-1.0>
 SYSDYN = <http://www.simantics.org/Sysdyn-1.1>
+SILK = <http://www.simantics.org/Silk-1.0>
 
 SBC = SYSDYN.ProjectBrowseContext : VP.BrowseContext
 SAC = SYSDYN.ProjectActionContext : VP.BrowseContext
@@ -62,12 +63,12 @@ MBC
     
 // Images
 MBC
-    @VP.constantImageRule           SBC.FunctionsFolder             MBC.Images.Folder    
-    @VP.constantImageRule           SBC.SharedFunctionsFolder       MBC.Images.Folder    
-    @VP.constantImageRule           SYSDYN.SysdynModelicaFunction   MBC.Images.Component
-    @VP.constantImageRule           SBC.ModulesFolder               MBC.Images.Folder   
-    @VP.constantImageRule           SBC.ModuleSymbol                MBC.Images.Composite
-    @VP.constantImageRule           SBC.BuiltinFunctions            MBC.Images.Folder
+    @VP.constantImageRule           SBC.FunctionsFolder             SILK.folder
+    @VP.constantImageRule           SBC.SharedFunctionsFolder       SILK.folder    
+    @VP.constantImageRule           SYSDYN.SysdynModelicaFunction   SILK.brick
+    @VP.constantImageRule           SBC.ModulesFolder               SILK.folder   
+    @VP.constantImageRule           SBC.ModuleSymbol                SILK.bricks
+    @VP.constantImageRule           SBC.BuiltinFunctions            SILK.folder
     
 // Modifiers
 MBC
@@ -87,20 +88,20 @@ ACTIONS.OpenWorkbook : ACT.Action
 
     
 MAC
-    @VP.actionContribution "Module" SBC.ModulesFolder MBC.Images.Composite VP.NewActionCategory ACTIONS.NewModuleType
+    @VP.actionContribution "Module" SBC.ModulesFolder SILK.bricks VP.NewActionCategory ACTIONS.NewModuleType
     VP.BrowseContext.HasActionContribution _ : VP.ActionContribution
       L0.HasLabel "Open Workbook"
-      VP.ActionContribution.HasImage MBC.Images.Component
+      VP.ActionContribution.HasImage SILK.brick
       VP.ActionContribution.HasNodeType MBC.Configuration
       VP.ActionContribution.HasAction ACTIONS.OpenWorkbook
     
-    @VP.actionContribution "Enumeration" MBC.Configuration MBC.Images.Component VP.NewActionCategory ACTIONS.NewEnumeration
-    //@VP.actionContribution "Open Workbook" MBC.Configuration MBC.Images.Component VP.NewActionCategory ACTIONS.OpenWorkbook
-    @VP.actionContribution "Enumeration" SBC.ModuleSymbol MBC.Images.Component VP.NewActionCategory ACTIONS.NewEnumeration
-    @VP.actionContribution "Function" SBC.FunctionsFolder MBC.Images.Component VP.NewActionCategory ACTIONS.NewFunction
-    @VP.actionContribution "Function" SYSDYN.SysdynModelicaFunctionLibrary MBC.Images.Component VP.NewActionCategory ACTIONS.NewFunction
-    @VP.actionContribution "Function" SYSDYN.SharedFunctionOntology MBC.Images.Component VP.NewActionCategory ACTIONS.NewFunction
-    @VP.actionContribution "Function Library" SBC.FunctionsFolder MBC.Images.Folder VP.NewActionCategory ACTIONS.NewFunctionLibrary
-    @VP.actionContribution "Function Library" SYSDYN.SysdynModelicaFunctionLibrary MBC.Images.Folder VP.NewActionCategory ACTIONS.NewFunctionLibrary
-    @VP.actionContribution "Function Library" SYSDYN.SharedFunctionOntology MBC.Images.Folder VP.NewActionCategory ACTIONS.NewFunctionLibrary    
-    @VP.actionContribution "Shared Function Library" SBC.SharedFunctionsFolder MBC.Images.Folder VP.NewActionCategory ACTIONS.NewSharedFunctionLibrary  
\ No newline at end of file
+    @VP.actionContribution "Enumeration" MBC.Configuration SILK.brick VP.NewActionCategory ACTIONS.NewEnumeration
+    //@VP.actionContribution "Open Workbook" MBC.Configuration SILK.brick VP.NewActionCategory ACTIONS.OpenWorkbook
+    @VP.actionContribution "Enumeration" SBC.ModuleSymbol SILK.brick VP.NewActionCategory ACTIONS.NewEnumeration
+    @VP.actionContribution "Function" SBC.FunctionsFolder SILK.brick VP.NewActionCategory ACTIONS.NewFunction
+    @VP.actionContribution "Function" SYSDYN.SysdynModelicaFunctionLibrary SILK.brick VP.NewActionCategory ACTIONS.NewFunction
+    @VP.actionContribution "Function" SYSDYN.SharedFunctionOntology SILK.brick VP.NewActionCategory ACTIONS.NewFunction
+    @VP.actionContribution "Function Library" SBC.FunctionsFolder SILK.folder VP.NewActionCategory ACTIONS.NewFunctionLibrary
+    @VP.actionContribution "Function Library" SYSDYN.SysdynModelicaFunctionLibrary SILK.folder VP.NewActionCategory ACTIONS.NewFunctionLibrary
+    @VP.actionContribution "Function Library" SYSDYN.SharedFunctionOntology SILK.folder VP.NewActionCategory ACTIONS.NewFunctionLibrary    
+    @VP.actionContribution "Shared Function Library" SBC.SharedFunctionsFolder SILK.folder VP.NewActionCategory ACTIONS.NewSharedFunctionLibrary  
\ No newline at end of file
diff --git a/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph b/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph
index 042f12d0..e74c5e93 100644
--- a/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph
@@ -6,7 +6,7 @@ DIA = <http://www.simantics.org/Diagram-2.1>
 SIMU = <http://www.simantics.org/Simulation-1.0>
 MOD = <http://www.simantics.org/Modeling-1.1>
 SYSDYN = <http://www.simantics.org/Sysdyn-1.1>
-PROJ = <http://www.simantics.org/Project-1.0>
+PROJ = <http://www.simantics.org/Project-1.1>
 
 //######################################################################
 //# Example work model with two modules
diff --git a/org.simantics.sysdyn.ontology/mdl2pgraph.pl b/org.simantics.sysdyn.ontology/mdl2pgraph.pl
index 2e49e3ec..b8e1a1cf 100755
--- a/org.simantics.sysdyn.ontology/mdl2pgraph.pl
+++ b/org.simantics.sysdyn.ontology/mdl2pgraph.pl
@@ -585,7 +585,7 @@ DIA = <http://www.simantics.org/Diagram-2.1>
 SIMU = <http://www.simantics.org/Simulation-1.0>
 MOD = <http://www.simantics.org/Modeling-1.1>
 SYSDYN = <http://www.simantics.org/Sysdyn-1.1>
-PROJ = <http://www.simantics.org/Project-1.0>
+PROJ = <http://www.simantics.org/Project-1.1>
 
 //######################################################################
 //# Example work model with two modules
diff --git a/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep b/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep
index d99f7b6e..42efd793 100644
--- a/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep
+++ b/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep
@@ -5,7 +5,7 @@ DIA = <http://www.simantics.org/Diagram-2.1>
 SIMU = <http://www.simantics.org/Simulation-1.0>
 MOD = <http://www.simantics.org/Modeling-1.1>
 SYSDYN = <http://www.simantics.org/Sysdyn-1.1>
-PROJ = <http://www.simantics.org/Project-1.0>
+PROJ = <http://www.simantics.org/Project-1.1>
 
 //######################################################################
 //# Example work model with two modules