Changeset 10358 for branches/HLScript/HeuristicLab.HLScript.Views/3.3/HLScriptView.cs

Timestamp:

01/20/14 17:33:22 (10 years ago)

Author:

jkarder

Message:

#2136:

• refactored HLScriptGeneration to separate outputs from different running HL scripts.
• added persistence support for HLScripts and fixed cloning
• added code completion for all types in the currently loaded assemblies
• merged trunk changes

Location:

branches/HLScript

Files:

• . (modified) (1 prop)
• HeuristicLab.HLScript.Views/3.3/HLScriptView.cs (modified) (8 diffs)

branches/HLScript/HeuristicLab.HLScript.Views/3.3/HLScriptView.cs

@@ -36 +36 @@
   [View("HLScript View")]
   [Content(typeof(HLScript), true)]
-  public partial class HLScriptView : ItemView {
+  public partial class HLScriptView : NamedItemView {
     private bool running;
 
@@ -69 +69 @@
     }
     private void Content_ScriptExecutionStarted(object sender, EventArgs e) {
-      ReadOnly = true;
+      Locked = true;
       startStopButton.Image = VSImageLibrary.Stop;
     }
     private void Content_ScriptExecutionFinished(object sender, EventArgs e) {
-      ReadOnly = false;
+      Locked = false;
       startStopButton.Image = VSImageLibrary.Play;
       running = false;
@@ -92 +92 @@
       } else {
         codeEditor.UserCode = Content.Code;
+        foreach (var asm in Content.GetAssemblies())
+          codeEditor.AddAssembly(asm);
         variableStoreView.Content = Content.VariableStore;
         if (Content.CompileErrors == null) {
@@ -108 +110 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      startStopButton.Enabled = Content != null;
+      startStopButton.Enabled = Content != null && !Locked;
       showCodeButton.Enabled = Content != null && !string.IsNullOrEmpty(Content.CompilationUnitCode);
-      codeEditor.Enabled = Content != null && !ReadOnly;
+      codeEditor.Enabled = Content != null && !Locked && !ReadOnly;
     }
 
@@ -137 +139 @@
     protected override bool ProcessCmdKey(ref Message msg, Keys keyData) {
       if (keyData == Keys.F5) {
-        if (Content == null || ReadOnly)
+        if (Content == null || Locked)
           return base.ProcessCmdKey(ref msg, keyData);
         outputTextBox.Clear();
@@ -144 +146 @@
           outputTextBox.Clear();
           Content.Execute();
+          running = true;
         }
         return true;
@@ -156 +159 @@
     private bool Compile() {
       ReadOnly = true;
+      Locked = true;
       errorListView.Items.Clear();
       outputTextBox.Clear();
@@ -170 +174 @@
         OnContentChanged();
         ReadOnly = false;
+        Locked = false;
       }
     }