Merge "Try to read queries from cache also in cases where cache is not written"

diff --git a/bundles/org.simantics.desktop.product/splash.svg b/bundles/org.simantics.desktop.product/splash.svg
index ff75c9a67b96167f0f1bf6a0a356698d25b71547..5a0d20984c06a44a2577b8037269a2aa4007c7c5 100644 (file)
--- a/bundles/org.simantics.desktop.product/splash.svg
+++ b/bundles/org.simantics.desktop.product/splash.svg
@@ -401,7 +401,7 @@
          id="tspan6235"
          x="4.0821486"
          y="291.79337"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:'The Real Font';-inkscape-font-specification:'The Real Font';fill:#ffffff;fill-opacity:1;stroke-width:0.26458335px">1.40.0</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:'The Real Font';-inkscape-font-specification:'The Real Font';fill:#ffffff;fill-opacity:1;stroke-width:0.26458335px">1.41.0</tspan></text>
     <circle
        style="opacity:0.92900002;fill:#5d6b91;fill-opacity:1;stroke:none;stroke-width:1.27400005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6809)"
        id="path6231"

diff --git a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
index 98b7aa98120c69217aba16c8a9cf709a98bccbf0..b97753e5fc5c920061de1be78cd1f8b7adde20d9 100644 (file)
--- a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
+++ b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
@@ -457,6 +457,13 @@ MOD.Contributions.ActivateModel : VP.ActionContribution
     VP.ActionContribution.HasNodeType SIMU.Model
     VP.ActionContribution.HasAction ACTIONS.ActivateModel
 
+MOD.Contributions.ActivateExperiment : VP.ActionContribution
+    L0.HasLabel "Activate"
+    VP.ActionContribution.HasImage SILK.bullet_go
+    VP.ActionContribution.HasCategory VP.EditActionCategory
+    VP.ActionContribution.HasNodeType SIMU.Experiment
+    VP.ActionContribution.HasAction ACTIONS.ActivateExperiment
+
 MOD.Contributions.Help : VP.ActionContribution
     L0.HasLabel "Help"
     VP.ActionContribution.HasImage SILK.help
@@ -727,6 +734,8 @@ ACTIONS.NewSheetBook
   @MOD.sclAction "createSpreadsheetBookAction"
 ACTIONS.ActivateModel
   @MOD.sclAction "activateModelAction"
+ACTIONS.ActivateExperiment
+  @MOD.sclAction "activateExperimentAction"
 ACTIONS.MigrateComponentType : ACT.Action
 ACTIONS.CompilePGraphs : ACT.Action
 //ACTIONS.MigrateMasterTypical : ACT.Action

diff --git a/bundles/org.simantics.modeling/scl/Simantics/Simulation.scl b/bundles/org.simantics.modeling/scl/Simantics/Simulation.scl
index 2a721ee21d69f873b024b9506466f262d64490d5..e61b161ad18b2b54186a17498379228d2a274b38 100644 (file)
--- a/bundles/org.simantics.modeling/scl/Simantics/Simulation.scl
+++ b/bundles/org.simantics.modeling/scl/Simantics/Simulation.scl
@@ -13,6 +13,11 @@ importJava "org.simantics.simulation.experiment.ExperimentUtil" where
     createExperimentRun :: Resource -> <WriteGraph> Resource
     createExperimentRunWithType :: Resource -> Resource -> <WriteGraph> Resource
     activateRun :: Resource -> <WriteGraph> ()
+
+activateExperimentAction :: Resource -> <Proc> ()
+activateExperimentAction experiment = do
+  syncWrite (\() -> activateExperiment experiment)
+  ()
     
 importJava "org.simantics.simulation.experiment.IExperiment" where
     data IExperiment

diff --git a/bundles/org.simantics.scl.db/src/org/simantics/scl/db/SCLFunctions.java b/bundles/org.simantics.scl.db/src/org/simantics/scl/db/SCLFunctions.java
index 2fd74b21e3e1c25e7b7b520ba24f559ff0749a06..09022d543c1aba3e9101028c88ed939b72759963 100644 (file)
--- a/bundles/org.simantics.scl.db/src/org/simantics/scl/db/SCLFunctions.java
+++ b/bundles/org.simantics.scl.db/src/org/simantics/scl/db/SCLFunctions.java
@@ -123,7 +123,7 @@ public class SCLFunctions {
     }
 
     private static <T> T evaluate(RuntimeModule rm, String function, Object ... args) throws ValueNotFound {
-        return evaluate(resolveFunction(rm, function));
+        return evaluate(resolveFunction(rm, function), args);
     }
 
     public static <T> T evaluate(String module, String function, Object ... args) throws ValueNotFound {

diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index c0cedff2f92007299a7674007295f346af6c261b..000f176e92059efcd38836fd58a5f946530b9ca8 100644 (file)
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.simantics.sdk"
       label="Simantics SDK"
-      version="1.40.0.qualifier"
+      version="1.41.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description url="http://www.example.com/description">

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index ec1814d1d0cd6d440d4631a8f82745eac5105499..58faa0f92e1cdcbd3a652f9d62a23794c3e5f1f3 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Simantics 1.40.0" sequenceNumber="1560983842">
+<target name="Simantics 1.41.0" sequenceNumber="1560983842">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
index eeb2e54b8a05bc907d33a9c9c453487a4034f285..9c17094145f862c9eb6b27fd4393532a1731eefc 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
@@ -1,4 +1,4 @@
-target "Simantics 1.40.0"
+target "Simantics 1.41.0"
 
 with source allEnvironments
 

diff --git a/releng/org.simantics.sdk.repository/pom.xml b/releng/org.simantics.sdk.repository/pom.xml
index 4902ca06d807458b624546fc7649187fa25bc314..8aa8e170bde33c762b1ef7bc24c40fa7b253f947 100644 (file)
--- a/releng/org.simantics.sdk.repository/pom.xml
+++ b/releng/org.simantics.sdk.repository/pom.xml
@@ -2,7 +2,7 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <artifactId>org.simantics.sdk.repository</artifactId>
-       <version>1.40.0-SNAPSHOT</version>
+       <version>1.41.0-SNAPSHOT</version>
        <packaging>eclipse-repository</packaging>
 
        <parent>