Changeset 15171 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/MenuItems

Timestamp:

07/08/17 12:31:54 (7 years ago)

Author:

jkarder

Message:

#1853: worked on ParameterConfigurationEncoding

• updated to .NET 4.5
• replaced CreateExperimentDialogV2 with CreateExperimentView
• improved experiment generation
• fixed plugin dependencies and cleaned project references

Location:

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3

Files:

• . (modified) (1 prop)
• MenuItems/CreateExperimentMenuItemV2.cs (modified) (2 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/MenuItems/CreateExperimentMenuItemV2.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
-using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimizer;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding.Views {
   public class CreateExperimentMenuItemV2 : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
-      get { return "Create Experiment (v2)"; }
+      get { return "Create E&xperiment (v2)"; }
     }
     public override IEnumerable<string> Structure {
@@ -49 +47 @@
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
       IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
-      ToolStripItem.Enabled = (activeView != null) && (activeView.Content != null) && (activeView.Content is IAlgorithm) && !activeView.Locked;
+      ToolStripItem.Enabled = (activeView != null) && (activeView.Content as IAlgorithm != null) && !activeView.Locked;
     }
 
     public override void Execute() {
-      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
-      if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IAlgorithm) && !activeView.Locked) {
-        using (CreateExperimentDialogV2 dialog = new CreateExperimentDialogV2((IAlgorithm)activeView.Content, ApplicationManager.Manager.GetInstances<IEngine>())) {
-          if (dialog.ShowDialog() == DialogResult.OK) MainFormManager.MainForm.ShowContent(dialog.Experiment);
-        }
+      var activeView = MainFormManager.MainForm.ActiveView as IContentView;
+      if (activeView == null) return;
+      var algorithm = activeView.Content as IAlgorithm;
+      if (algorithm == null) return;
+
+      if (!activeView.Locked) {
+        MainFormManager.MainForm.ShowContent(algorithm, typeof(CreateExperimentView));
       }
     }