From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 10 Sep 2019 12:31:47 +0000 (+0000)
Subject: Merge "An action for experiment activation"
X-Git-Tag: v1.43.0~136^2~74
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=599e0a37bfc3159ed450154c2a613a17def12fcb;hp=2317b4651fb6c51f634074e9644aa056d1338ea1

Merge "An action for experiment activation"
---

diff --git a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
index 98b7aa981..b97753e5f 100644
--- 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 2a721ee21..e61b161ad 100644
--- 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