Merged trunk@30214 to branches/sysdyn-1.8 on 2014-10-16 for 1.8.2 release.

refs #5267

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@30416 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index cde7423cbcea2477c7c58042b99fff81ce0618bd..4b49d0567142e800684ab25ebaf09725e0982e9e 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 63dd7f0f54bac36d7dcd78967adcdbead358d173..eda75ae22e18c07ad70ff1d21df19898cb3c65b2 100644 (file)
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -48,12 +48,14 @@ SYSDYN.SysdynModel <T MOD.StructuralModel
     >-- SYSDYN.SysdynModel.timeUnit --> L0.String <R L0.HasProperty : L0.FunctionalRelation
     >-- SYSDYN.SysdynModel.lastExportFileName --> L0.String <R L0.HasProperty : L0.FunctionalRelation
     >-- SYSDYN.SysdynModel.lastExportFilePath --> L0.String <R L0.HasProperty : L0.FunctionalRelation
+    >-- SYSDYN.SysdynModel.useModelicaLibraries --> SYSDYN.SysdynModel <R L0.IsRelatedTo : L0.Tag
+        @L0.symmetric
 //    >-- SYSDYN.SysdynModel.exeFile --> L0.ByteArray <R L0.HasProperty
     @L0.assert SYSDYN.SysdynModel.startTime 0.0
     @L0.assert SYSDYN.SysdynModel.stopTime 10.0
     @L0.assert SYSDYN.SysdynModel.solver "euler"
     @L0.assert SYSDYN.SysdynModel.timeUnit "month"    
-    
+
 //#####################################################################
 // Configuration
 //#####################################################################

diff --git a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
index ef6f571d94792258c8b7b34465ba1d4a0ca87ebc..3a3cc77e1d3c884a81848b468dbcb113bf653be5 100644 (file)
--- a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
+++ b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
@@ -655,6 +655,7 @@ public class SysdynResource {
     public final Resource SysdynModel_timeUnit_Inverse;\r
     public final Resource SysdynModel_tolerance;\r
     public final Resource SysdynModel_tolerance_Inverse;\r
+    public final Resource SysdynModel_useModelicaLibraries;\r
     public final Resource SysdynModel_variableFilter;\r
     public final Resource SysdynModel_variableFilter_Inverse;\r
     public final Resource SysdynModelicaFunction;\r
@@ -1439,6 +1440,7 @@ public class SysdynResource {
         public static final String SysdynModel_timeUnit_Inverse = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/timeUnit/Inverse";\r
         public static final String SysdynModel_tolerance = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/tolerance";\r
         public static final String SysdynModel_tolerance_Inverse = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/tolerance/Inverse";\r
+        public static final String SysdynModel_useModelicaLibraries = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/useModelicaLibraries";\r
         public static final String SysdynModel_variableFilter = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/variableFilter";\r
         public static final String SysdynModel_variableFilter_Inverse = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/variableFilter/Inverse";\r
         public static final String SysdynModelicaFunction = "http://www.simantics.org/Sysdyn-1.1/SysdynModelicaFunction";\r
@@ -2233,6 +2235,7 @@ public class SysdynResource {
         SysdynModel_timeUnit_Inverse = getResourceOrNull(graph, URIs.SysdynModel_timeUnit_Inverse);\r
         SysdynModel_tolerance = getResourceOrNull(graph, URIs.SysdynModel_tolerance);\r
         SysdynModel_tolerance_Inverse = getResourceOrNull(graph, URIs.SysdynModel_tolerance_Inverse);\r
+        SysdynModel_useModelicaLibraries = getResourceOrNull(graph, URIs.SysdynModel_useModelicaLibraries);\r
         SysdynModel_variableFilter = getResourceOrNull(graph, URIs.SysdynModel_variableFilter);\r
         SysdynModel_variableFilter_Inverse = getResourceOrNull(graph, URIs.SysdynModel_variableFilter_Inverse);\r
         SysdynModelicaFunction = getResourceOrNull(graph, URIs.SysdynModelicaFunction);\r