Merge changes I78c3a258,I7bf72f04

[simantics/platform.git] / bundles / org.simantics.modeling / scl / Simantics / Simulation.scl

diff --git a/bundles/org.simantics.modeling/scl/Simantics/Simulation.scl b/bundles/org.simantics.modeling/scl/Simantics/Simulation.scl
index 7114653295e694ec43f2f53794c2b32a649a20d8..e61b161ad18b2b54186a17498379228d2a274b38 100644 (file)
--- a/bundles/org.simantics.modeling/scl/Simantics/Simulation.scl
+++ b/bundles/org.simantics.modeling/scl/Simantics/Simulation.scl
@@ -1,15 +1,30 @@
-import "Simantics/Variables"\r
-\r
-importJava "org.simantics.simulation.experiment.ExperimentUtil" where\r
-    @JavaName simulate\r
-    simulate :: Boolean -> <Proc> ()\r
-    stepExperiment :: IExperiment -> Double -> <Proc> ()\r
-    simulateExperiment :: IExperiment -> Boolean -> <Proc> ()\r
-    disposeExperiment :: IExperiment -> <Proc> ()\r
-    possibleActiveRunVariable ::Resource -> <ReadGraph> Variable\r
-    \r
-importJava "org.simantics.simulation.experiment.IExperiment" where\r
-    data IExperiment\r
-    \r
-experimentFromRun :: Variable -> <ReadGraph> IExperiment\r
+import "Simantics/Variables"
+
+importJava "org.simantics.simulation.experiment.ExperimentUtil" where
+    @JavaName simulate
+    simulate :: Boolean -> <Proc> ()
+    stepExperiment :: IExperiment -> Double -> <Proc> ()
+    simulateExperiment :: IExperiment -> Boolean -> <Proc> ()
+    disposeExperiment :: IExperiment -> <Proc> ()
+    refreshExperiment :: IExperiment -> <ReadGraph> ()
+    getExperimentState :: IExperiment -> <ReadGraph> ExperimentState
+    possibleActiveRunVariable ::Resource -> <ReadGraph> Maybe Variable
+    activateExperiment :: Resource -> <WriteGraph> Resource
+    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
+
+importJava "org.simantics.simulation.experiment.ExperimentState" where
+    data ExperimentState
+    INITIALIZING, RUNNING, STOPPED, DISPOSED :: ExperimentState
+    
+experimentFromRun :: Variable -> <ReadGraph> IExperiment
 experimentFromRun run = (run#iExperiment) :: IExperiment
\ No newline at end of file