Changeset 11975 for branches/ALPS/HeuristicLab.Scripting.Views/3.3

Timestamp:

02/10/15 09:57:29 (10 years ago)

Author:

pfleck

Message:

#2269 merged trunk

Location:

branches/ALPS

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs (modified) (6 diffs)
• HeuristicLab.Scripting.Views/3.3/HeuristicLab.Scripting.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Scripting.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Scripting.Views/3.3/ScriptView.cs (modified) (9 diffs)
• HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs (modified) (6 diffs)

branches/ALPS/HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs

@@ -21 +21 @@
 
 using System;
+using System.Drawing;
+using System.Threading;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -31 +33 @@
   [Content(typeof(CSharpScript), true)]
   public partial class CSharpScriptView : ScriptView {
+    private const string ScriptExecutionStartedMessage = "Script execution started";
+    private const string ScriptExecutionCanceledMessage = "Script execution canceled";
+    private const string ScriptExecutionSuccessfulMessage = "Script execution successful";
+    private const string ScriptExecutionFailedMessage = "Script execution failed";
+
     protected bool Running { get; set; }
 
@@ -65 +72 @@
         startStopButton.Image = VSImageLibrary.Stop;
         toolTip.SetToolTip(startStopButton, "Stop (Shift+F5)");
+        UpdateInfoTextLabel(ScriptExecutionStartedMessage, SystemColors.ControlText);
         infoTabControl.SelectedTab = outputTabPage;
       }
@@ -76 +84 @@
         startStopButton.Image = VSImageLibrary.Play;
         toolTip.SetToolTip(startStopButton, "Run (F5)");
+
+        var ex = e.Value;
+        if (ex == null) {
+          UpdateInfoTextLabel(ScriptExecutionSuccessfulMessage, Color.DarkGreen);
+        } else if (ex is ThreadAbortException) {
+          // the execution was canceled by the user
+          UpdateInfoTextLabel(ScriptExecutionCanceledMessage, Color.DarkOrange);
+        } else {
+          UpdateInfoTextLabel(ScriptExecutionFailedMessage, Color.DarkRed);
+          PluginInfrastructure.ErrorHandling.ShowErrorDialog(this, ex);
+        }
+
         Running = false;
-        var ex = e.Value;
-        if (ex != null)
-          PluginInfrastructure.ErrorHandling.ShowErrorDialog(this, ex);
       }
     }
@@ -111 +128 @@
         if (Compile()) {
           outputTextBox.Clear();
-          Content.Execute();
           Running = true;
+          Content.ExecuteAsync();
         }
     }
@@ -123 +140 @@
             if (Compile()) {
               outputTextBox.Clear();
-              Content.Execute();
+              Content.ExecuteAsync();
               Running = true;
             }

branches/ALPS/HeuristicLab.Scripting.Views/3.3/HeuristicLab.Scripting.Views-3.3.csproj

@@ -118 +118 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3.3\HeuristicLab.CodeEditor-3.3.csproj">
-      <Project>{489cfe09-fdf7-4c89-bab5-bd09cadd61ad}</Project>
-      <Name>HeuristicLab.CodeEditor-3.3</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3.4\HeuristicLab.CodeEditor-3.4.csproj">
+      <Project>{c38691ae-ecb4-489a-a05d-b035554e0168}</Project>
+      <Name>HeuristicLab.CodeEditor-3.4</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">

branches/ALPS/HeuristicLab.Scripting.Views/3.3/Plugin.cs.frame

@@ -25 +25 @@
   [Plugin("HeuristicLab.Scripting.Views", "3.3.10.$WCREV$")]
   [PluginFile("HeuristicLab.Scripting.Views-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.CodeEditor", "3.3")]
+  [PluginDependency("HeuristicLab.CodeEditor", "3.4")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/ALPS/HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs

@@ -19 +19 @@
  */
 #endregion
+
+using System.Collections.Generic;
+using System.Reflection;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Scripting.Views {
@@ -46 +50 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScriptView));
-      this.compilationLabel = new System.Windows.Forms.Label();
+      this.infoTextLabel = new System.Windows.Forms.Label();
       this.imageList = new System.Windows.Forms.ImageList(this.components);
       this.compileButton = new System.Windows.Forms.Button();
@@ -84 +87 @@
       this.infoLabel.Location = new System.Drawing.Point(816, 4);
       // 
-      // compilationLabel
-      // 
-      this.compilationLabel.AutoSize = true;
-      this.compilationLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-      this.compilationLabel.Location = new System.Drawing.Point(66, 32);
-      this.compilationLabel.Name = "compilationLabel";
-      this.compilationLabel.Size = new System.Drawing.Size(69, 13);
-      this.compilationLabel.TabIndex = 3;
-      this.compilationLabel.Text = "Not compiled";
+      // infoTextLabel
+      // 
+      this.infoTextLabel.AutoSize = true;
+      this.infoTextLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+      this.infoTextLabel.Location = new System.Drawing.Point(66, 32);
+      this.infoTextLabel.Name = "infoTextLabel";
+      this.infoTextLabel.Size = new System.Drawing.Size(69, 13);
+      this.infoTextLabel.TabIndex = 3;
+      this.infoTextLabel.Text = "Not compiled";
       // 
       // imageList
@@ -215 +218 @@
       this.codeEditor.UserCode = "";
       this.codeEditor.TextEditorTextChanged += new System.EventHandler(this.codeEditor_TextEditorTextChanged);
+      this.codeEditor.AssembliesLoading += new System.EventHandler<HeuristicLab.Common.EventArgs<System.Collections.Generic.IEnumerable<System.Reflection.Assembly>>>(this.codeEditor_AssembliesLoading);
+      this.codeEditor.AssembliesLoaded += new System.EventHandler<HeuristicLab.Common.EventArgs<System.Collections.Generic.IEnumerable<System.Reflection.Assembly>>>(this.codeEditor_AssembliesLoaded);
+      this.codeEditor.AssembliesUnloading += new System.EventHandler<HeuristicLab.Common.EventArgs<System.Collections.Generic.IEnumerable<System.Reflection.Assembly>>>(this.codeEditor_AssembliesUnloading);
+      this.codeEditor.AssembliesUnloaded += new System.EventHandler<HeuristicLab.Common.EventArgs<System.Collections.Generic.IEnumerable<System.Reflection.Assembly>>>(this.codeEditor_AssembliesUnloaded);
       // 
       // splitContainer1
@@ -241 +248 @@
       this.Controls.Add(this.splitContainer1);
       this.Controls.Add(this.compileButton);
-      this.Controls.Add(this.compilationLabel);
+      this.Controls.Add(this.infoTextLabel);
       this.Name = "ScriptView";
       this.Size = new System.Drawing.Size(835, 602);
-      this.Controls.SetChildIndex(this.compilationLabel, 0);
+      this.Controls.SetChildIndex(this.infoTextLabel, 0);
       this.Controls.SetChildIndex(this.compileButton, 0);
       this.Controls.SetChildIndex(this.splitContainer1, 0);
@@ -266 +273 @@
     #endregion
 
-    protected System.Windows.Forms.Label compilationLabel;
+    protected System.Windows.Forms.Label infoTextLabel;
     protected System.Windows.Forms.Button compileButton;
     protected System.Windows.Forms.ImageList imageList;

branches/ALPS/HeuristicLab.Scripting.Views/3.3/ScriptView.cs

@@ -22 +22 @@
 using System;
 using System.CodeDom.Compiler;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Globalization;
 using System.Linq;
+using System.Reflection;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core.Views;
@@ -35 +38 @@
   [Content(typeof(Script), true)]
   public partial class ScriptView : NamedItemView {
+    private const string NotCompiledMessage = "Not compiled";
+    private const string CompilationSucceededMessage = "Compilation succeeded";
+    private const string CompilationFailedMessage = "Compilation failed";
+    private const string AssembliesLoadingMessage = "Loading Assemblies";
+    private const string AssembliesUnloadingMessage = "Unloading Assemblies";
+    private const int SilentAssemblyLoadingOperationLimit = 10;
+
     #region Properties
     public new Script Content {
@@ -73 +83 @@
         codeEditor.UserCode = string.Empty;
       } else {
-        if (codeEditor.UserCode != Content.Code)
-          codeEditor.UserCode = Content.Code;
-        foreach (var asm in Content.GetAssemblies())
-          codeEditor.AddAssembly(asm);
+        codeEditor.UserCode = Content.Code;
+        codeEditor.AddAssembliesAsync(Content.GetAssemblies());
         if (Content.CompileErrors == null) {
-          compilationLabel.ForeColor = SystemColors.ControlDarkDark;
-          compilationLabel.Text = "Not compiled";
-        } else if (Content.CompileErrors.HasErrors) {
-          compilationLabel.ForeColor = Color.DarkRed;
-          compilationLabel.Text = "Compilation failed";
-        } else {
-          compilationLabel.ForeColor = Color.DarkGreen;
-          compilationLabel.Text = "Compilation successful";
+          UpdateInfoTextLabel(NotCompiledMessage, SystemColors.ControlText);
         }
       }
@@ -114 +115 @@
       try {
         Content.Compile();
-        outputTextBox.AppendText("Compilation succeeded.");
+        outputTextBox.AppendText(CompilationSucceededMessage);
+        UpdateInfoTextLabel(CompilationSucceededMessage, Color.DarkGreen);
         return true;
-      } catch (InvalidOperationException) {
+      } catch (CompilationException) {
         if (Content.CompileErrors.HasErrors) {
-          outputTextBox.AppendText("Compilation failed.");
+          outputTextBox.AppendText(CompilationFailedMessage);
+          UpdateInfoTextLabel(CompilationFailedMessage, Color.DarkRed);
           return false;
         } else {
-          outputTextBox.AppendText("Compilation succeeded.");
+          outputTextBox.AppendText(CompilationSucceededMessage);
+          UpdateInfoTextLabel(CompilationSucceededMessage, Color.DarkGreen);
           return true;
         }
@@ -131 +135 @@
         Locked = false;
         codeEditor.Focus();
-        OnContentChanged();
       }
     }
@@ -137 +140 @@
     #region Helpers
     protected virtual void ShowCompilationResults() {
-      if (Content.CompileErrors.Count == 0) return;
-
       var messages = Content.CompileErrors.OfType<CompilerError>()
                                       .OrderBy(x => x.IsWarning)
@@ -157 +158 @@
       }
 
-      codeEditor.ShowCompileErrors(Content.CompileErrors, ".cs");
+      codeEditor.ShowCompileErrors(Content.CompileErrors);
 
       AdjustErrorListViewColumnSizes();
+    }
+
+    protected virtual void UpdateInfoTextLabel(string message, Color color) {
+      infoTextLabel.Text = message;
+      infoTextLabel.ForeColor = color;
     }
 
@@ -167 +173 @@
         ch.Width = -2;
     }
+
+    #region ProgressView
+    private bool progressViewCreated;
+
+    private void AddProgressView(string progressMessage) {
+      var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
+      mainForm.AddOperationProgressToView(this, progressMessage);
+      progressViewCreated = true;
+    }
+
+    private void RemoveProgressView() {
+      if (!progressViewCreated) return;
+      var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
+      mainForm.RemoveOperationProgressFromView(this);
+      progressViewCreated = false;
+    }
+    #endregion
     #endregion
 
     #region Event Handlers
-    private void Content_CodeChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_CodeChanged), sender, e);
+    protected virtual void Content_CodeChanged(object sender, EventArgs e) {
+      if (InvokeRequired) Invoke((Action<object, EventArgs>)Content_CodeChanged, sender, e);
       else {
         codeEditor.UserCode = Content.Code;
@@ -196 +218 @@
     }
     #endregion
+
+    private void codeEditor_AssembliesLoading(object sender, EventArgs<IEnumerable<Assembly>> e) {
+      if (InvokeRequired) Invoke((Action<object, EventArgs<IEnumerable<Assembly>>>)codeEditor_AssembliesLoading, sender, e);
+      else {
+        int nrOfAssemblies = e.Value.Count();
+        if (nrOfAssemblies > SilentAssemblyLoadingOperationLimit)
+          AddProgressView(AssembliesLoadingMessage);
+      }
+    }
+
+    private void codeEditor_AssembliesLoaded(object sender, EventArgs<IEnumerable<Assembly>> e) {
+      if (InvokeRequired) Invoke((Action<object, EventArgs<IEnumerable<Assembly>>>)codeEditor_AssembliesLoaded, sender, e);
+      else {
+        RemoveProgressView();
+      }
+    }
+
+    private void codeEditor_AssembliesUnloading(object sender, EventArgs<IEnumerable<Assembly>> e) {
+      if (InvokeRequired) Invoke((Action<object, EventArgs<IEnumerable<Assembly>>>)codeEditor_AssembliesUnloading, sender, e);
+      else {
+        int nrOfAssemblies = e.Value.Count();
+        if (nrOfAssemblies > SilentAssemblyLoadingOperationLimit)
+          AddProgressView(AssembliesUnloadingMessage);
+      }
+    }
+
+    private void codeEditor_AssembliesUnloaded(object sender, EventArgs<IEnumerable<Assembly>> e) {
+      if (InvokeRequired) Invoke((Action<object, EventArgs<IEnumerable<Assembly>>>)codeEditor_AssembliesUnloaded, sender, e);
+      else {
+        RemoveProgressView();
+      }
+    }
   }
 }

branches/ALPS/HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs

@@ -47 +47 @@
     #endregion
 
+    private readonly Regex SafeVariableNameRegex = new Regex("^[@]?[_a-zA-Z][_a-zA-Z0-9]*$");
+    private const string DefaultVariableName = "enter_name";
     protected readonly Dictionary<string, ListViewItem> itemListViewItemMapping;
     protected readonly Dictionary<Type, bool> serializableLookup;
@@ -117 +119 @@
         sortDescendingButton.Enabled = false;
         removeButton.Enabled = false;
-        variableListView.Enabled = false;
+        variableListView.LabelEdit = false;
       } else {
         bool enabled = !Locked && !ReadOnly;
@@ -124 +126 @@
         sortDescendingButton.Enabled = variableListView.Items.Count > 1;
         removeButton.Enabled = enabled && variableListView.SelectedItems.Count > 0;
-        variableListView.Enabled = enabled;
         variableListView.LabelEdit = enabled;
       }
@@ -242 +243 @@
     }
     protected virtual void variableListView_DragEnter(object sender, DragEventArgs e) {
-      validDragOperation = !Locked && !ReadOnly && e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) != null;
+      validDragOperation = !Locked && !ReadOnly;
+
+      object item = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+      if (item is KeyValuePair<string, object>) {
+        var variable = (KeyValuePair<string, object>)item;
+        validDragOperation &= variable.Value is IDeepCloneable;
+      } else {
+        validDragOperation &= item is IDeepCloneable;
+      }
     }
     protected virtual void variableListView_DragOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       if (validDragOperation) {
-        if (e.AllowedEffect.HasFlag(DragDropEffects.Copy)) e.Effect = DragDropEffects.Copy;
+        if (e.AllowedEffect.HasFlag(DragDropEffects.Copy))
+          e.Effect = DragDropEffects.Copy;
       }
     }
@@ -270 +280 @@
 
       var cloneable = item as IDeepCloneable;
-      if (cloneable != null) item = cloneable.Clone();
-
-      Content.Add(variableName, item);
+      if (cloneable == null) return;
+
+      var clonedItem = cloneable.Clone();
+      Content.Add(variableName, clonedItem);
 
       var listViewItem = variableListView.FindItemWithText(variableName);
@@ -278 +289 @@
       if (editLabel) listViewItem.BeginEdit();
     }
-
-    private readonly Regex SafeVariableNameRegex = new Regex("^[@]?[_a-zA-Z][_a-zA-Z0-9]*$");
-    private const string DefaultVariableName = "enter_name";
 
     private void variableListView_AfterLabelEdit(object sender, LabelEditEventArgs e) {