Changeset 10358 for branches/HLScript/HeuristicLab.HLScript.Views

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.Designer.cs (modified) (17 diffs)
• HeuristicLab.HLScript.Views/3.3/HLScriptView.cs (modified) (8 diffs)
• HeuristicLab.HLScript.Views/3.3/HeuristicLab.HLScript.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.HLScript.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.HLScript.Views/3.3/VariableStoreView.Designer.cs (modified) (1 diff)
• HeuristicLab.HLScript.Views/3.3/VariableStoreView.cs (modified) (12 diffs)

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
       this.compilationLabel = new System.Windows.Forms.Label();
       this.showCodeButton = new System.Windows.Forms.Button();
       this.startStopButton = new System.Windows.Forms.Button();
-      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.errorListView = new System.Windows.Forms.ListView();
       this.categoryColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -63 +61 @@
       this.outputTabPage = new System.Windows.Forms.TabPage();
       this.outputTextBox = new System.Windows.Forms.TextBox();
+      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.variableStoreView = new HeuristicLab.HLScript.Views.VariableStoreView();
-      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
       this.splitContainer1.Panel1.SuspendLayout();
@@ -78 +77 @@
       this.SuspendLayout();
       // 
+      // nameTextBox
+      // 
+      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
+      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
+      this.nameTextBox.Location = new System.Drawing.Point(60, 0);
+      this.nameTextBox.Size = new System.Drawing.Size(750, 20);
+      // 
+      // infoLabel
+      // 
+      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(63, 9);
+      this.compilationLabel.Location = new System.Drawing.Point(63, 32);
       this.compilationLabel.Name = "compilationLabel";
       this.compilationLabel.Size = new System.Drawing.Size(69, 13);
@@ -91 +101 @@
       // 
       this.showCodeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PrintPreview;
-      this.showCodeButton.Location = new System.Drawing.Point(33, 3);
+      this.showCodeButton.Location = new System.Drawing.Point(33, 26);
       this.showCodeButton.Name = "showCodeButton";
       this.showCodeButton.Size = new System.Drawing.Size(24, 24);
@@ -103 +113 @@
       // 
       this.startStopButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Play;
-      this.startStopButton.Location = new System.Drawing.Point(3, 3);
+      this.startStopButton.Location = new System.Drawing.Point(3, 26);
       this.startStopButton.Name = "startStopButton";
       this.startStopButton.Size = new System.Drawing.Size(24, 24);
@@ -126 +136 @@
       this.errorListView.Location = new System.Drawing.Point(3, 3);
       this.errorListView.Name = "errorListView";
-      this.errorListView.Size = new System.Drawing.Size(623, 83);
+      this.errorListView.Size = new System.Drawing.Size(623, 79);
       this.errorListView.TabIndex = 0;
       this.errorListView.UseCompatibleStateImageBehavior = false;
@@ -161 +171 @@
       this.codeEditor.Name = "codeEditor";
       this.codeEditor.Prefix = "";
-      this.codeEditor.Size = new System.Drawing.Size(637, 447);
+      this.codeEditor.Size = new System.Drawing.Size(637, 428);
       this.codeEditor.Suffix = "";
       this.codeEditor.TabIndex = 0;
@@ -169 +179 @@
       // splitContainer1
       // 
-      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.splitContainer1.Location = new System.Drawing.Point(3, 33);
+      this.splitContainer1.Location = new System.Drawing.Point(3, 56);
       this.splitContainer1.Name = "splitContainer1";
       // 
@@ -183 +193 @@
       this.splitContainer1.Panel2.Controls.Add(this.variableStoreView);
       this.splitContainer1.Panel2.Controls.Add(this.viewHost);
-      this.splitContainer1.Size = new System.Drawing.Size(829, 566);
+      this.splitContainer1.Size = new System.Drawing.Size(829, 543);
       this.splitContainer1.SplitterDistance = 637;
       this.splitContainer1.TabIndex = 7;
@@ -201 +211 @@
       // 
       this.splitContainer2.Panel2.Controls.Add(this.tabControl1);
-      this.splitContainer2.Size = new System.Drawing.Size(637, 566);
-      this.splitContainer2.SplitterDistance = 447;
+      this.splitContainer2.Size = new System.Drawing.Size(637, 543);
+      this.splitContainer2.SplitterDistance = 428;
       this.splitContainer2.TabIndex = 5;
       // 
@@ -213 +223 @@
       this.tabControl1.Name = "tabControl1";
       this.tabControl1.SelectedIndex = 0;
-      this.tabControl1.Size = new System.Drawing.Size(637, 115);
+      this.tabControl1.Size = new System.Drawing.Size(637, 111);
       this.tabControl1.TabIndex = 1;
       // 
@@ -222 +232 @@
       this.errorListTabPage.Name = "errorListTabPage";
       this.errorListTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.errorListTabPage.Size = new System.Drawing.Size(629, 89);
+      this.errorListTabPage.Size = new System.Drawing.Size(629, 85);
       this.errorListTabPage.TabIndex = 0;
       this.errorListTabPage.Text = "Error List";
@@ -233 +243 @@
       this.outputTabPage.Name = "outputTabPage";
       this.outputTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.outputTabPage.Size = new System.Drawing.Size(629, 89);
+      this.outputTabPage.Size = new System.Drawing.Size(629, 85);
       this.outputTabPage.TabIndex = 1;
       this.outputTabPage.Text = "Output";
@@ -247 +257 @@
       this.outputTextBox.ReadOnly = true;
       this.outputTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-      this.outputTextBox.Size = new System.Drawing.Size(623, 83);
+      this.outputTextBox.Size = new System.Drawing.Size(623, 79);
       this.outputTextBox.TabIndex = 0;
       this.outputTextBox.WordWrap = false;
-      // 
-      // variableStoreView
-      // 
-      this.variableStoreView.Caption = "ItemCollection View";
-      this.variableStoreView.Content = null;
-      this.variableStoreView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.variableStoreView.Location = new System.Drawing.Point(0, 0);
-      this.variableStoreView.Name = "variableStoreView";
-      this.variableStoreView.ReadOnly = false;
-      this.variableStoreView.Size = new System.Drawing.Size(188, 566);
-      this.variableStoreView.TabIndex = 0;
       // 
       // viewHost
@@ -271 +270 @@
       this.viewHost.Name = "viewHost";
       this.viewHost.ReadOnly = false;
-      this.viewHost.Size = new System.Drawing.Size(188, 566);
+      this.viewHost.Size = new System.Drawing.Size(188, 543);
       this.viewHost.TabIndex = 0;
       this.viewHost.ViewsLabelVisible = true;
       this.viewHost.ViewType = null;
+      // 
+      // variableStoreView
+      // 
+      this.variableStoreView.Caption = "ItemCollection View";
+      this.variableStoreView.Content = null;
+      this.variableStoreView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.variableStoreView.Location = new System.Drawing.Point(0, 0);
+      this.variableStoreView.Name = "variableStoreView";
+      this.variableStoreView.ReadOnly = false;
+      this.variableStoreView.Size = new System.Drawing.Size(188, 543);
+      this.variableStoreView.TabIndex = 0;
       // 
       // HLScriptView
@@ -285 +295 @@
       this.Name = "HLScriptView";
       this.Size = new System.Drawing.Size(835, 602);
+      this.Controls.SetChildIndex(this.showCodeButton, 0);
+      this.Controls.SetChildIndex(this.compilationLabel, 0);
+      this.Controls.SetChildIndex(this.startStopButton, 0);
+      this.Controls.SetChildIndex(this.splitContainer1, 0);
+      this.Controls.SetChildIndex(this.nameLabel, 0);
+      this.Controls.SetChildIndex(this.nameTextBox, 0);
+      this.Controls.SetChildIndex(this.infoLabel, 0);
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.splitContainer1.Panel1.ResumeLayout(false);
       this.splitContainer1.Panel2.ResumeLayout(false);
@@ -307 +325 @@
     private System.Windows.Forms.Label compilationLabel;
     private System.Windows.Forms.Button startStopButton;
-    private System.Windows.Forms.ToolTip toolTip;
     private System.Windows.Forms.ListView errorListView;
     private System.Windows.Forms.ColumnHeader descriptionColumnHeader;

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;
       }
     }

branches/HLScript/HeuristicLab.HLScript.Views/3.3/HeuristicLab.HLScript.Views-3.3.csproj

@@ -115 +115 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
+      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
+      <Name>HeuristicLab.Persistence-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>

branches/HLScript/HeuristicLab.HLScript.Views/3.3/Plugin.cs.frame

@@ -34 +34 @@
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Persistence", "3.3")]
   public class HeuristicLabHLScriptViewsPlugin : PluginBase {
   }

branches/HLScript/HeuristicLab.HLScript.Views/3.3/VariableStoreView.Designer.cs

@@ -61 +61 @@
             this.valueColumnHeader,
             this.typeColumnHeader});
+      this.variableListView.FullRowSelect = true;
       this.variableListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
       this.variableListView.HideSelection = false;

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

@@ -23 +23 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
@@ -31 +32 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Persistence.Core;
+using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.PluginInfrastructure;
 
@@ -53 +56 @@
       InitializeComponent();
       itemListViewItemMapping = new Dictionary<string, ListViewItem>();
+      variableListView.SmallImageList.Images.AddRange(new Image[] {
+        HeuristicLab.Common.Resources.VSImageLibrary.Error,
+        HeuristicLab.Common.Resources.VSImageLibrary.Object,
+        HeuristicLab.Common.Resources.VSImageLibrary.Nothing
+      });
     }
 
@@ -101 +109 @@
         variableListView.Enabled = false;
       } else {
-        addButton.Enabled = /*!Content.IsReadOnly &&*/ !ReadOnly;
+        addButton.Enabled = !Locked && !ReadOnly;
         sortAscendingButton.Enabled = variableListView.Items.Count > 1;
         sortDescendingButton.Enabled = variableListView.Items.Count > 1;
-        removeButton.Enabled = /*!Content.IsReadOnly &&*/ !ReadOnly && variableListView.SelectedItems.Count > 0;
+        removeButton.Enabled = !Locked && !ReadOnly && variableListView.SelectedItems.Count > 0;
         variableListView.Enabled = true;
       }
@@ -130 +138 @@
       string value = (variable.Value ?? "null").ToString();
       string type = variable.Value == null ? "null" : variable.Value.GetType().ToString();
-      var listViewItem = new ListViewItem(new[] { variable.Key, value, type }) { ToolTipText = GetToolTipText(variable), Tag = variable };
-      variableListView.SmallImageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Object);
-      listViewItem.ImageIndex = variableListView.SmallImageList.Images.Count - 1;
+      bool serializable = IsSerializable(variable);
+      var listViewItem = new ListViewItem(new[] { variable.Key, value, type }) { ToolTipText = GetToolTipText(variable, serializable), Tag = variable };
+      if (serializable) {
+        listViewItem.ImageIndex = variable.Value == null ? 2 : 1;
+      } else listViewItem.ImageIndex = 0;
       variableListView.Items.Add(listViewItem);
       itemListViewItemMapping[variable.Key] = listViewItem;
@@ -160 +170 @@
         string value = (variable.Value ?? "null").ToString();
         string type = variable.Value == null ? "null" : variable.Value.GetType().ToString();
+        bool serializable = IsSerializable(variable);
+        if (serializable) {
+          listViewItem.ImageIndex = variable.Value == null ? 2 : 1;
+        } else listViewItem.ImageIndex = 0;
         listViewItem.SubItems[1].Text = value;
         listViewItem.SubItems[2].Text = type;
-        listViewItem.ToolTipText = GetToolTipText(variable);
+        listViewItem.ToolTipText = GetToolTipText(variable, serializable);
         listViewItem.Tag = variable;
       } else throw new ArgumentException("A variable with the specified name does not exist.", "variable");
@@ -169 +183 @@
     #region ListView Events
     protected virtual void variableListView_SelectedIndexChanged(object sender, EventArgs e) {
-      removeButton.Enabled = (Content != null) /*&& !Content.IsReadOnly*/ && !ReadOnly && variableListView.SelectedItems.Count > 0;
+      removeButton.Enabled = (Content != null) && !Locked && !ReadOnly && variableListView.SelectedItems.Count > 0;
       AdjustListViewColumnSizes();
     }
     protected virtual void variableListView_KeyDown(object sender, KeyEventArgs e) {
       if (e.KeyCode == Keys.Delete) {
-        if ((variableListView.SelectedItems.Count > 0) /*&& !Content.IsReadOnly*/ && !ReadOnly) {
+        if ((variableListView.SelectedItems.Count > 0) && !Locked && !ReadOnly) {
           foreach (ListViewItem item in variableListView.SelectedItems)
             Content.Remove(item.Text);
@@ -207 +221 @@
           if (items.Count == 1) data.SetData(HeuristicLab.Common.Constants.DragDropDataFormat, items[0]);
           else data.SetData(HeuristicLab.Common.Constants.DragDropDataFormat, items);
-          if (/*Content.IsReadOnly ||*/ ReadOnly) {
+          if (ReadOnly) {
             DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);
           } else {
@@ -220 +234 @@
     protected virtual void variableListView_DragEnter(object sender, DragEventArgs e) {
       validDragOperation = false;
-      if (/*!Content.IsReadOnly &&*/ !ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is object)) {
+      if (!Locked && !ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is object)) {
         validDragOperation = true;
-      } else if (/*!Content.IsReadOnly &&*/ !ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable)) {
+      } else if (!Locked && !ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable)) {
         validDragOperation = true;
         IEnumerable items = (IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
@@ -361 +375 @@
           item.SubItems[1].Text = value;
           item.SubItems[2].Text = variable.Value.Value.GetType().ToString();
-          item.ToolTipText = GetToolTipText(variable.Value);
+          item.ToolTipText = GetToolTipText(variable.Value, item.ImageIndex == 0);
           return;
         }
@@ -382 +396 @@
     protected virtual void RebuildImageList() {
       variableListView.SmallImageList.Images.Clear();
+      variableListView.SmallImageList.Images.AddRange(new Image[] {
+        HeuristicLab.Common.Resources.VSImageLibrary.Error,
+        HeuristicLab.Common.Resources.VSImageLibrary.Object,
+        HeuristicLab.Common.Resources.VSImageLibrary.Nothing
+      });
       foreach (ListViewItem listViewItem in variableListView.Items) {
-        object item = listViewItem.Tag as object;
-        variableListView.SmallImageList.Images.Add(item == null ? HeuristicLab.Common.Resources.VSImageLibrary.Nothing : HeuristicLab.Common.Resources.VSImageLibrary.Object);//item.ItemImage);
-        listViewItem.ImageIndex = variableListView.SmallImageList.Images.Count - 1;
-      }
-    }
-
-    private string GetToolTipText(KeyValuePair<string, object> variable) {
+        var variable = (KeyValuePair<string, object>)listViewItem.Tag;
+        bool serializable = IsSerializable(variable);
+        if (serializable) {
+          listViewItem.ImageIndex = variable.Value == null ? 2 : 1;
+        } else listViewItem.ImageIndex = 0;
+      }
+    }
+
+    private string GetToolTipText(KeyValuePair<string, object> variable, bool serializable) {
       if (string.IsNullOrEmpty(variable.Key)) throw new ArgumentException("The variable must have a name.", "variable");
       string value = (variable.Value ?? "null").ToString();
+      string type = variable.Value == null ? "null" : variable.Value.GetType().ToString();
       string[] lines = {
         "Name: " + variable.Key,
         "Value: " + value,
-        "Type: " + variable.Value.GetType()
+        "Type: " + type
       };
-      return string.Join(Environment.NewLine, lines);
+      string toolTipText = string.Join(Environment.NewLine, lines);
+      if (!serializable)
+        toolTipText += Environment.NewLine + "CAUTION: Type is not serializable!";
+      return toolTipText;
     }
 
@@ -411 +436 @@
       return defaultName;
     }
+
+    private bool IsSerializable(KeyValuePair<string, object> variable) {
+      var ser = new Serializer(variable, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()), "ROOT", true);
+      try {
+        return ser.Count() > 0;
+      } catch (PersistenceException) {
+        return false;
+      }
+    }
     #endregion
   }