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 3863b84b4a9f1d2979d965ee940157ce643d8136..b22cae4f6f2dc12b5a50332e9d9df1b02da83b8c 100644 (file)
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 35980897d5d91fadd66a3fbe4e84f85a64c89fb7..a00b29db32edc91d91de3c004c9da0d84ff85591 100644 (file)
--- 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 8a714c78c73a0bd379f1daae5b51cc19793da30a..e5de087321ad7988f1b10e70422854c470d28f78 100644 (file)
--- 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>\r
-VP = <http://www.simantics.org/Viewpoint-1.0>\r
+VP = <http://www.simantics.org/Viewpoint-1.1>\r
 SIMU = <http://www.simantics.org/Simulation-1.0>\r
-PROJECT = <http://www.simantics.org/Project-1.0>\r
-IMAGE = <http://www.simantics.org/Image2-1.0>\r
+PROJECT = <http://www.simantics.org/Project-1.1>\r
+IMAGE = <http://www.simantics.org/Image2-1.1>\r
 ACT = <http://www.simantics.org/Action-1.0>\r
 MOD = <http://www.simantics.org/Modeling-1.1>\r
 STR = <http://www.simantics.org/Structural-1.0>\r
 SYSDYN = <http://www.simantics.org/Sysdyn-1.1>\r
+SILK = <http://www.simantics.org/Silk-1.0>\r
 \r
 SBC = SYSDYN.ProjectBrowseContext : VP.BrowseContext\r
 SAC = SYSDYN.ProjectActionContext : VP.BrowseContext\r
@@ -62,12 +63,12 @@ MBC
     \r
 // Images\r
 MBC\r
-    @VP.constantImageRule           SBC.FunctionsFolder             MBC.Images.Folder    \r
-    @VP.constantImageRule           SBC.SharedFunctionsFolder       MBC.Images.Folder    \r
-    @VP.constantImageRule           SYSDYN.SysdynModelicaFunction   MBC.Images.Component\r
-    @VP.constantImageRule           SBC.ModulesFolder               MBC.Images.Folder   \r
-    @VP.constantImageRule           SBC.ModuleSymbol                MBC.Images.Composite\r
-    @VP.constantImageRule           SBC.BuiltinFunctions            MBC.Images.Folder\r
+    @VP.constantImageRule           SBC.FunctionsFolder             SILK.folder\r
+    @VP.constantImageRule           SBC.SharedFunctionsFolder       SILK.folder    \r
+    @VP.constantImageRule           SYSDYN.SysdynModelicaFunction   SILK.brick\r
+    @VP.constantImageRule           SBC.ModulesFolder               SILK.folder   \r
+    @VP.constantImageRule           SBC.ModuleSymbol                SILK.bricks\r
+    @VP.constantImageRule           SBC.BuiltinFunctions            SILK.folder\r
     \r
 // Modifiers\r
 MBC\r
@@ -87,20 +88,20 @@ ACTIONS.OpenWorkbook : ACT.Action
 \r
     \r
 MAC\r
-    @VP.actionContribution "Module" SBC.ModulesFolder MBC.Images.Composite VP.NewActionCategory ACTIONS.NewModuleType\r
+    @VP.actionContribution "Module" SBC.ModulesFolder SILK.bricks VP.NewActionCategory ACTIONS.NewModuleType\r
     VP.BrowseContext.HasActionContribution _ : VP.ActionContribution\r
       L0.HasLabel "Open Workbook"\r
-      VP.ActionContribution.HasImage MBC.Images.Component\r
+      VP.ActionContribution.HasImage SILK.brick\r
       VP.ActionContribution.HasNodeType MBC.Configuration\r
       VP.ActionContribution.HasAction ACTIONS.OpenWorkbook\r
     \r
-    @VP.actionContribution "Enumeration" MBC.Configuration MBC.Images.Component VP.NewActionCategory ACTIONS.NewEnumeration\r
-    //@VP.actionContribution "Open Workbook" MBC.Configuration MBC.Images.Component VP.NewActionCategory ACTIONS.OpenWorkbook\r
-    @VP.actionContribution "Enumeration" SBC.ModuleSymbol MBC.Images.Component VP.NewActionCategory ACTIONS.NewEnumeration\r
-    @VP.actionContribution "Function" SBC.FunctionsFolder MBC.Images.Component VP.NewActionCategory ACTIONS.NewFunction\r
-    @VP.actionContribution "Function" SYSDYN.SysdynModelicaFunctionLibrary MBC.Images.Component VP.NewActionCategory ACTIONS.NewFunction\r
-    @VP.actionContribution "Function" SYSDYN.SharedFunctionOntology MBC.Images.Component VP.NewActionCategory ACTIONS.NewFunction\r
-    @VP.actionContribution "Function Library" SBC.FunctionsFolder MBC.Images.Folder VP.NewActionCategory ACTIONS.NewFunctionLibrary\r
-    @VP.actionContribution "Function Library" SYSDYN.SysdynModelicaFunctionLibrary MBC.Images.Folder VP.NewActionCategory ACTIONS.NewFunctionLibrary\r
-    @VP.actionContribution "Function Library" SYSDYN.SharedFunctionOntology MBC.Images.Folder VP.NewActionCategory ACTIONS.NewFunctionLibrary    \r
-    @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\r
+    //@VP.actionContribution "Open Workbook" MBC.Configuration SILK.brick VP.NewActionCategory ACTIONS.OpenWorkbook\r
+    @VP.actionContribution "Enumeration" SBC.ModuleSymbol SILK.brick VP.NewActionCategory ACTIONS.NewEnumeration\r
+    @VP.actionContribution "Function" SBC.FunctionsFolder SILK.brick VP.NewActionCategory ACTIONS.NewFunction\r
+    @VP.actionContribution "Function" SYSDYN.SysdynModelicaFunctionLibrary SILK.brick VP.NewActionCategory ACTIONS.NewFunction\r
+    @VP.actionContribution "Function" SYSDYN.SharedFunctionOntology SILK.brick VP.NewActionCategory ACTIONS.NewFunction\r
+    @VP.actionContribution "Function Library" SBC.FunctionsFolder SILK.folder VP.NewActionCategory ACTIONS.NewFunctionLibrary\r
+    @VP.actionContribution "Function Library" SYSDYN.SysdynModelicaFunctionLibrary SILK.folder VP.NewActionCategory ACTIONS.NewFunctionLibrary\r
+    @VP.actionContribution "Function Library" SYSDYN.SharedFunctionOntology SILK.folder VP.NewActionCategory ACTIONS.NewFunctionLibrary    \r
+    @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 042f12d05c591a136f6460a981ebae5cc6d890bf..e74c5e93a5267b35bd49c232b6bfead33cc758ba 100644 (file)
--- 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>\r
 MOD = <http://www.simantics.org/Modeling-1.1>\r
 SYSDYN = <http://www.simantics.org/Sysdyn-1.1>\r
-PROJ = <http://www.simantics.org/Project-1.0>\r
+PROJ = <http://www.simantics.org/Project-1.1>\r
 \r
 //######################################################################\r
 //# Example work model with two modules\r

diff --git a/org.simantics.sysdyn.ontology/mdl2pgraph.pl b/org.simantics.sysdyn.ontology/mdl2pgraph.pl
index 2e49e3ec51030b103196e91c7ba7ea4c8fd2f715..b8e1a1cf2b56823bbab4ea9e48638dc8a90e12e0 100755 (executable)
--- 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 d99f7b6e9433df35f5c275dad951159548ef22df..42efd7936cbb7e7850a40d1419ae2b9f12b825bf 100644 (file)
--- 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