From d0c603d8819451b37ded79d95a7f5d81cb7f85c7 Mon Sep 17 00:00:00 2001
From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 25 Mar 2014 14:04:03 +0000
Subject: [PATCH] Added toggle button for Sysdyn Synthesis Simulation
 (=Synthesim in Vensim) (refs #4653).

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29201 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 org.simantics.sysdyn.ui/icons/equalizer.png   | Bin 0 -> 540 bytes
 org.simantics.sysdyn.ui/plugin.xml            |  36 ++++++++
 .../ui/handlers/SynthesisSimulation.java      |  87 ++++++++++++++++++
 .../sysdyn/ui/handlers/ToggleSimulation.java  |   7 +-
 .../listeners/SysdynExperimentListener.java   |  17 +++-
 5 files changed, 141 insertions(+), 6 deletions(-)
 create mode 100644 org.simantics.sysdyn.ui/icons/equalizer.png
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/SynthesisSimulation.java

diff --git a/org.simantics.sysdyn.ui/icons/equalizer.png b/org.simantics.sysdyn.ui/icons/equalizer.png
new file mode 100644
index 0000000000000000000000000000000000000000..e496cf4a134e609809867882b6dc5aa30ae2a6ce
GIT binary patch
literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UAs76f$8l%8LL10jWtu
zK~y-)m6N}U8c`I+e<Oo}xQtp%CkPU(tdey50;#u5lRAG2U&2?|Zr@<jq}kpg-GY@O
zq7xMaB@$sBFV4N^rpVq|XEcPI=5o)!?|k36*R$4gYW;qnBuP+8p_C$yW8yewzu(jC
zcFCKccO*$dxm>1LEK;ddI2;Zfk4FZB0hi31&1UHc&1Tb!qR5H}0ORr4YqeVGz1?nm
z!{N}12qHqK)A4+OAPCs)b^wS7)oPXPc8f6v5usMAvDs_@_<3^!z(^@N(<udq?odPo
zYc1AVq9{u5E<RF<ky1>P<c|jVgzImw04PlY-UlDg8oa*0Ck#VYs}%r+Q$$x-ngk>Z
zORv{EYv5>UtzWiqn(*-XJN0^<^?D6})*2DP7?Yvs@(ae8jKeAH5b_0Q4P1e9Xst5|
zj^5wm{?+X}65!X92X`~_nm7ul6P;4>e>`~rtm4ZeefqEmCd9`_hSTd5AbrZ^FJB46
zkka#7@*LyiBLM38%v19JCDQHPTN;f9^ZA>Lao-rja=A=L(ps}vEHWa_=kp9e6h$we
eDgT}S*M0-gn5nsU{?X?E0000<MNUMnLSTXki|;J}

literal 0
HcmV?d00001

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index 87cc1693..d14ae8ba 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -458,6 +458,33 @@
                   </with>
                </visibleWhen>
             </command>
+            <command
+                  commandId="org.simantics.sysdyn.ui.synthesisSimulation"
+                  hoverIcon="icons/equalizer.png"
+                  icon="icons/equalizer.png"
+                  label="Sliders and Trends"
+                  style="toggle"
+                  tooltip="Sliders and Trends">
+               <visibleWhen>
+                  <with
+                        variable="activeContexts">
+                     <iterate
+                           ifEmpty="false"
+                           operator="or">
+                        <equals
+                              value="org.simantics.sysdyn.ui.basicExperiment">
+                        </equals>
+                     </iterate>
+                     <and>
+                        <not>
+                           <count
+                                 value="0">
+                           </count>
+                        </not>
+                     </and>
+                  </with>
+               </visibleWhen>
+            </command>
          </toolbar>
          <toolbar
                id="org.simantics.sysdyn.ui.playbackControlToolbar">
@@ -1477,6 +1504,15 @@
                id="org.simantics.sysdyn.ui.toggleSimulation.state">
          </state>
       </command>
+      <command
+            defaultHandler="org.simantics.sysdyn.ui.handlers.SynthesisSimulation"
+            id="org.simantics.sysdyn.ui.synthesisSimulation"
+            name="Slider and Trends">
+         <state
+               class="org.eclipse.jface.commands.ToggleState"
+               id="org.simantics.sysdyn.ui.synthesisSimulation.state">
+         </state>
+      </command>
       <command
             defaultHandler="org.simantics.sysdyn.ui.handlers.newComponents.NewModuleNodeHandler"
             id="org.simantics.sysdyn.ui.newModuleNode"
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/SynthesisSimulation.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/SynthesisSimulation.java
new file mode 100644
index 00000000..00f12bb6
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/SynthesisSimulation.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.handlers;
+
+
+import java.util.Map;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.State;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.commands.IElementUpdater;
+import org.eclipse.ui.menus.UIElement;
+import org.simantics.simulation.experiment.IExperiment;
+import org.simantics.simulation.project.IExperimentManager;
+import org.simantics.sysdyn.manager.SysdynExperiment;
+import org.simantics.sysdyn.ui.utils.HandlerUtils;
+import org.simantics.ui.SimanticsUI;
+
+/**
+ * @author Tuomas Miettinen
+ */
+public class SynthesisSimulation extends AbstractHandler implements IElementUpdater {
+
+	public static final String COMMAND = "org.simantics.sysdyn.ui.synthesisSimulation";
+    public static final String STATE = "org.simantics.sysdyn.ui.synthesisSimulation.state";
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        ICommandService service = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
+        Command command = service.getCommand(COMMAND);
+        State state = command.getState(STATE);
+        Boolean value = (Boolean) state.getValue();
+        value = !value;
+        state.setValue(value);
+        service.refreshElements(RunBasicExperiment.COMMAND, null);
+        
+        Command toggleCommand = service.getCommand(ToggleSimulation.COMMAND);
+        State toggleState = toggleCommand.getState(ToggleSimulation.STATE);
+        toggleState.setValue(value);
+        service.refreshElements(RunBasicExperiment.COMMAND, null);
+        
+        IExperimentManager manager = 
+            SimanticsUI.getProject().getHint(IExperimentManager.KEY_EXPERIMENT_MANAGER);
+        IExperiment experiment = manager.getActiveExperiment();
+        if(experiment instanceof SysdynExperiment) {
+            if(getState()) {
+                ((SysdynExperiment)experiment).toggleSimulation(true);
+            } else {
+                ((SysdynExperiment)experiment).toggleSimulation(false);
+            }
+        }
+            
+        HandlerUtils.saveBeforeExperimentRun(event);
+
+        return null;
+    }
+
+    public static Boolean getState() {
+        ICommandService service = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
+        Command command = service.getCommand(COMMAND);
+        State state = command.getState(STATE);
+        return (Boolean)state.getValue();
+    }
+
+    @SuppressWarnings("rawtypes")
+	@Override
+    public void updateElement(UIElement element, Map parameters) {
+        ICommandService commandService =
+            (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
+        Command command = commandService.getCommand(COMMAND);
+        boolean checked = (Boolean) command.getState(STATE).getValue();
+        element.setChecked(checked);
+    }
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ToggleSimulation.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ToggleSimulation.java
index 79fa0ffd..351f9c4f 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ToggleSimulation.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ToggleSimulation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Association for Decentralized Information Management in
+ * Copyright (c) 2010, 2014 Association for Decentralized Information Management in
  * Industry THTH ry.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -44,6 +44,11 @@ public class ToggleSimulation extends AbstractHandler implements IElementUpdater
         state.setValue(value);
         service.refreshElements(RunBasicExperiment.COMMAND, null);
         
+        Command synthesisCommand = service.getCommand(SynthesisSimulation.COMMAND);
+        State synthesisState = synthesisCommand.getState(SynthesisSimulation.STATE);
+        synthesisState.setValue(false);
+        service.refreshElements(RunBasicExperiment.COMMAND, null);
+        
         IExperimentManager manager = 
             SimanticsUI.getProject().getHint(IExperimentManager.KEY_EXPERIMENT_MANAGER);
         IExperiment experiment = manager.getActiveExperiment();
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/listeners/SysdynExperimentListener.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/listeners/SysdynExperimentListener.java
index 87bccb75..caea744a 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/listeners/SysdynExperimentListener.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/listeners/SysdynExperimentListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 Association for Decentralized Information Management in
+ * Copyright (c) 2010, 2012, 2014 Association for Decentralized Information Management in
  * Industry THTH ry.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -19,6 +19,7 @@ import org.eclipse.ui.contexts.IContextActivation;
 import org.simantics.simulation.experiment.ExperimentState;
 import org.simantics.simulation.experiment.IExperimentListener;
 import org.simantics.sysdyn.ui.handlers.RunBasicExperiment;
+import org.simantics.sysdyn.ui.handlers.SynthesisSimulation;
 import org.simantics.sysdyn.ui.handlers.ToggleSimulation;
 import org.simantics.sysdyn.ui.handlers.game.ReloadGameExperimentHandler;
 import org.simantics.sysdyn.ui.handlers.game.StepHandler;
@@ -37,15 +38,21 @@ public class SysdynExperimentListener  implements IExperimentListener {
             public void run() {
                 ICommandService commandService =
                     (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
-                Command command = commandService.getCommand(ToggleSimulation.COMMAND);
-                State buttonState = command.getState(ToggleSimulation.STATE);
+                Command toggleCommand = commandService.getCommand(ToggleSimulation.COMMAND);
+                State toggleButtonState = toggleCommand.getState(ToggleSimulation.STATE);
+                Command synhesisCommand = commandService.getCommand(SynthesisSimulation.COMMAND);
+                State synthesisButtonState = synhesisCommand.getState(SynthesisSimulation.STATE);
                                 
                 switch(state) {
                 case DISPOSED:
-                    buttonState.setValue(false); 
+                	toggleButtonState.setValue(false); 
+                	synthesisButtonState.setValue(false); 
                     break;
+				default:
+					break;
                 }
-                commandService.refreshElements(command.getId(), null); 
+                commandService.refreshElements(toggleCommand.getId(), null); 
+                commandService.refreshElements(synhesisCommand.getId(), null); 
                 commandService.refreshElements(RunBasicExperiment.COMMAND, null);
                 commandService.refreshElements(PlaybackExperimentHandler.COMMAND, null);
                 commandService.refreshElements(PlaybackResetHandler.COMMAND, null);
-- 
2.47.1