Changeset 13720 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools

Timestamp:

03/19/16 22:35:39 (9 years ago)

Author:

abeham

Message:

#2457: worked on expert-system

Location:

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools

Files:

• 900_CSharpScriptMenuItem.cs (copied) (copied from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools/910_NewCSharpScriptMenuItem.cs) (1 diff)
• 910_NewCSharpScriptMenuItem.cs (modified) (3 diffs)
• 920_OpenCSharpScriptMenuItem.cs (modified) (2 diffs)
• 930_SaveCSharpScriptMenuItem.cs (added)
• 990_ShowAllInOneViewMenuItem.cs (copied) (copied from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools/930_SaveCSharpScriptMenuItem.cs) (1 diff)

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools/900_CSharpScriptMenuItem.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Scripting;
+using HeuristicLab.Common.Resources;
 using System.Collections.Generic;
+using System.Drawing;
 
 namespace HeuristicLab.OptimizationExpertSystem.Menu {
-  internal class NewCSharpScriptMenuItem : MenuItemBase {
-    #region CodeTemplate
-    private static readonly string CodeTemplate = @"
-// 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 QueryClient = HeuristicLab.Clients.OKB.Query.QueryClient;
-using RunCreationClient = HeuristicLab.Clients.OKB.RunCreation.RunCreationClient;
-using AdministrationClient = HeuristicLab.Clients.OKB.Administration.AdministrationClient;
-using HeuristicLab.Core;
-using HeuristicLab.Common;
-using HeuristicLab.Collections;
-using HeuristicLab.Data;
-using HeuristicLab.Optimization;
-using HeuristicLab.OptimizationExpertSystem;
-using HeuristicLab.OptimizationExpertSystem.Common;
-using HeuristicLab.Random;
-
-public class MyScript : HeuristicLab.Scripting.CSharpScriptBase {
-  public ExpertSystem Instance { get { return ((OptimizationExpertSystem)HeuristicLab.MainForm.MainFormManager.MainForm).ExpertSystem; } }
-
-  public override void Main() {
-    // type your code here
-  }
-
-  // implement further classes and methods
-
-}";
-    #endregion
-
-    public override void Execute() {
-      MainForm.ShowContent(new CSharpScript(CodeTemplate));
+  internal class CSharpScriptMenuItem : MenuItemBase {
+    public override Image Image { get { return VSImageLibrary.Script; } }
+    
+    public override string Name {
+      get { return "C# Script"; }
     }
 
     public override IEnumerable<string> Structure {
-      get { return new[] { "Tools", "C# Script" }; }
-    }
-
-    public override string Name {
-      get { return "New"; }
+      get { return new[] { "Tools" }; }
     }
 
     public override int Position {
-      get { return 910; }
+      get { return 900; }
     }
+
+    public override void Execute() { }
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools/910_NewCSharpScriptMenuItem.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Scripting;
 using System.Collections.Generic;
+using System.Drawing;
 
 namespace HeuristicLab.OptimizationExpertSystem.Menu {
   internal class NewCSharpScriptMenuItem : MenuItemBase {
+    public override Image Image { get { return VSImageLibrary.NewDocument; } }
+
     #region CodeTemplate
     private static readonly string CodeTemplate = @"
@@ -62 +66 @@
     #endregion
 
-    public override void Execute() {
-      MainForm.ShowContent(new CSharpScript(CodeTemplate));
+    public override string Name {
+      get { return "New"; }
     }
 
@@ -70 +74 @@
     }
 
-    public override string Name {
-      get { return "New"; }
-    }
-
     public override int Position {
       get { return 910; }
     }
+
+    public override string ToolTipText { get { return "Create a new C# Script"; } }
+
+    public override void Execute() {
+      MainForm.ShowContent(new CSharpScript(CodeTemplate));
+    }
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools/920_OpenCSharpScriptMenuItem.cs

@@ -21 +21 @@
 
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Scripting;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Windows.Forms;
 
 namespace HeuristicLab.OptimizationExpertSystem.Menu {
   internal class OpenCSharpScriptMenuItem : MenuItemBase {
+    public override Image Image { get { return VSImageLibrary.Open; } }
+
+    public override string Name {
+      get { return "Open"; }
+    }
+
+    public override IEnumerable<string> Structure {
+      get { return new[] { "Tools", "C# Script" }; }
+    }
+
+    public override int Position {
+      get { return 920; }
+    }
+
+    public override string ToolTipText { get { return "Open an existing C# Script."; } }
+
     public override void Execute() {
       using (var dialog = new OpenFileDialog()) {
@@ -36 +54 @@
       }
     }
-
-    public override IEnumerable<string> Structure {
-      get { return new[] { "Tools", "C# Script" }; }
-    }
-
-    public override string Name {
-      get { return "Open"; }
-    }
-
-    public override int Position {
-      get { return 920; }
-    }
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/900_Tools/990_ShowAllInOneViewMenuItem.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
-using HeuristicLab.MainForm;
-using HeuristicLab.Scripting;
-using System;
 using System.Collections.Generic;
-using System.Windows.Forms;
 
 namespace HeuristicLab.OptimizationExpertSystem.Menu {
-  internal class SaveCSharpScriptMenuItem : MenuItemBase {
-    protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      base.OnActiveViewChanged(sender, e);
-      var contentView = MainForm.ActiveView as IContentView;
-      ToolStripItem.Enabled = (contentView != null && contentView.Content is CSharpScript);
-    }
-
+  internal class ShowAllInOneViewMenuItem : MenuItemBase {
     public override void Execute() {
-      using (var dialog = new SaveFileDialog()) {
-        dialog.Filter = "HL Files|*.hl";
-        if (dialog.ShowDialog(MainForm) != DialogResult.OK) return;
-        ContentManager.Save((CSharpScript)((IContentView)MainForm.ActiveView).Content, dialog.FileName, true);
-      }
+      MainForm.ShowContent(MainForm.ExpertSystem, typeof(ExpertSystemView));
     }
 
     public override IEnumerable<string> Structure {
-      get { return new[] { "Tools", "C# Script" }; }
+      get { return new[] { "Tools" }; }
     }
 
     public override string Name {
-      get { return "Save"; }
+      get { return "All-In-One View"; }
     }
 
     public override int Position {
-      get { return 930; }
+      get { return 990; }
     }
   }