Changeset 11721

Timestamp:

12/23/14 13:35:06 (9 years ago)

Author:

jkarder

Message:

#2262:

• fixed SetEnabledStateOfControls in VariableStoreView
• the code template for a CSharpScript is now read from an embedded resource

Location:

trunk/sources

Files:

• HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/CSharpScript.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/CSharpScriptCode.cs (added)
• HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Script.cs (modified) (1 diff)

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

@@ -117 +117 @@
         sortDescendingButton.Enabled = false;
         removeButton.Enabled = false;
-        variableListView.Enabled = false;
+        variableListView.LabelEdit = false;
       } else {
         bool enabled = !Locked && !ReadOnly;
@@ -124 +124 @@
         sortDescendingButton.Enabled = variableListView.Items.Count > 1;
         removeButton.Enabled = enabled && variableListView.SelectedItems.Count > 0;
-        variableListView.Enabled = enabled;
         variableListView.LabelEdit = enabled;
       }

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

@@ -35 +35 @@
     #region Constants
     protected const string ExecuteMethodName = "Execute";
-    protected override string CodeTemplate {
-      get {
-        return @"// use 'vars' to access variables in the script's variable store (e.g. vars.x = 5)
-// use 'vars[string]' to access variables via runtime strings (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
-// use 'variables' to work with IEnumerable<T> extension methods on the script's variable store
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
-
-public class MyScript : HeuristicLab.Scripting.CSharpScriptBase {
-  public override void Main() {
-    // type your code here
-  }
-
-  // implement further classes and methods
-
-}";
-      }
-    }
+    protected override string CodeTemplate { get { return ReadCodeTemplate("HeuristicLab.Scripting.CSharpScriptCode.cs"); } }
     #endregion
 

trunk/sources/HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj

@@ -92 +92 @@
   <ItemGroup>
     <Compile Include="CSharpScript.cs" />
+    <EmbeddedResource Include="CSharpScriptCode.cs" />
     <Compile Include="Variables.cs" />
     <Compile Include="VariableStore.cs" />

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

@@ -157 +157 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+
+    #region Helpers
+    protected virtual string ReadCodeTemplate(string templateName) {
+      using (var stream = Assembly.GetAssembly(this.GetType()).GetManifestResourceStream(templateName))
+      using (var reader = new StreamReader(stream)) {
+        return reader.ReadToEnd();
+      }
+    }
+    #endregion
   }
 }