Changeset 10727 for trunk/sources

Timestamp:

04/07/14 10:36:52 (11 years ago)

Author:

jkarder

Message:

#2136:

• fixed tool tips
• added Clear() method to remove all variables present in the VariableStore
• the script cannot be compiled and started with the shortcuts anymore if it is already running

Location:

trunk/sources

Files:

• HeuristicLab.Scripting.Views/3.3/ScriptView.cs (modified) (4 diffs)
• HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/Script.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Variables.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Scripting.Views/3.3/ScriptView.cs

@@ -76 +76 @@
         ReadOnly = true;
         startStopButton.Image = VSImageLibrary.Stop;
+        toolTip.SetToolTip(startStopButton, "Stop (Shift+F5)");
         infoTabControl.SelectedTab = outputTabPage;
       }
@@ -86 +87 @@
         ReadOnly = false;
         startStopButton.Image = VSImageLibrary.Play;
+        toolTip.SetToolTip(startStopButton, "Run (F5)");
         running = false;
         var ex = e.Value;
@@ -156 +158 @@
       switch (keyData) {
         case Keys.F5:
-          if (Content != null && !Locked) {
+          if (Content != null && !Locked && !running) {
             if (Compile()) {
               outputTextBox.Clear();
@@ -168 +170 @@
           break;
         case Keys.F6:
-          Compile();
+          if (!running) Compile();
           break;
       }

trunk/sources/HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
@@ -396 +395 @@
       string toolTipText = string.Join(Environment.NewLine, lines);
       if (!serializable)
-        toolTipText += Environment.NewLine + "CAUTION: Type is not serializable!";
+        toolTipText = "Caution: Type is not serializable!" + Environment.NewLine + toolTipText;
       return toolTipText;
     }

trunk/sources/HeuristicLab.Scripting/3.3/Script.cs

@@ -45 +45 @@
     private const string ExecuteMethodName = "Execute";
     private const string CodeTemplate =
-@"// use 'vars' to access variables in the script's variable store
-// vars has a Contains(string) method to check if a variable exists and implements IEnumerable
+@"// use 'vars' to access variables in the script's variable store (e.g. vars.x = 5)
+// use 'vars.Contains(string)' to check if a variable exists
+// use 'vars.Clear()' to remove all variables
+// use 'foreach (KeyValuePair<string, object> v in vars) { ... }' to iterate over all variables
 
 using System;

trunk/sources/HeuristicLab.Scripting/3.3/Variables.cs

@@ -6 +6 @@
   public class Variables : DynamicObject, IEnumerable<KeyValuePair<string, object>> {
     private readonly VariableStore variableStore;
-
-    public ICollection<string> Keys {
-      get { return variableStore.Keys; }
-    }
-
-    public ICollection<object> Values {
-      get { return variableStore.Values; }
-    }
 
     public Variables(VariableStore variableStore) {
@@ -32 +24 @@
     }
 
+    public void Clear() {
+      variableStore.Clear();
+    }
+
     public IEnumerator<KeyValuePair<string, object>> GetEnumerator() {
       return variableStore.GetEnumerator();