Changeset 2555 for trunk

Timestamp:

12/14/09 00:23:57 (15 years ago)

Author:

swagner

Message:

Continued work on Optimizer (#770)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/IItemView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemViewBase.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (4 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerApplication.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/MenuItems/SaveAllMenuItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/ToolBarItems/SaveAllToolBarItem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/IItemView.cs

@@ -40 +40 @@
     /// </summary>
     event EventHandler ItemChanged;
-
-    event EventHandler Closed;
   }
 }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemViewBase.cs

@@ -112 +112 @@
     }
 
-    public event EventHandler Closed;
-    public override void OnClosed(object sender, EventArgs e) {
-      base.OnClosed(sender, e);
-      if (Closed != null)
-        Closed(this, e);
-    }
-
     /// <summary>
     /// Asynchron call of GUI updating.

trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -46 +46 @@
       waitingCursors = 0;
       newDocumentsCounter = 1;
+      // NOTE: Events fired by the main form are registered in HeuristicLabOptimizerApplication.
     }
 
@@ -51 +52 @@
       if (newItemDialog == null) newItemDialog = new NewItemDialog();
       if (newItemDialog.ShowDialog() == DialogResult.OK) {
-        IItemView view = MainFormManager.CreateDefaultView(newItemDialog.Item) as IItemView;
-        if (view != null) {
-          view.Closed += new EventHandler(ViewClosed);
+        IView view = MainFormManager.CreateDefaultView(newItemDialog.Item);
+        if (view is IItemView) {
           view.Caption = "Item" + newDocumentsCounter.ToString() + ".hl";
           newDocumentsCounter++;
-          MainFormManager.MainForm.ShowView(view);
         }
+        MainFormManager.MainForm.ShowView(view);
       }
     }
@@ -140 +140 @@
     }
 
-    private static void ViewClosed(object sender, EventArgs e) {
-      IItemView view = (IItemView)sender;
-      view.Closed -= new EventHandler(ViewClosed);
+    // NOTE: This event is fired by the main form. It is registered in HeuristicLabOptimizerApplication.
+    internal static void ViewClosed(object sender, ViewEventArgs e) {
+      IItemView view = e.View as IItemView;
       files.Remove(view);
     }
@@ -187 +187 @@
                 IItemView view = MainFormManager.CreateDefaultView(item) as IItemView;
                 if (view != null) {
-                  view.Closed += new EventHandler(ViewClosed);
                   view.Caption = Path.GetFileName(filename);
                   files.Add(view, new FileInfo(filename));

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerApplication.cs

@@ -27 +27 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Common.Resources;
+using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 
@@ -34 +35 @@
     public override void Run() {
       OptimizerMainForm mainForm = new OptimizerMainForm(typeof(IOptimizerUserInterfaceItemProvider));
+      mainForm.ViewClosed += new EventHandler<ViewEventArgs>(FileManager.ViewClosed);
       Application.Run(mainForm);
     }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAllMenuItem.cs

@@ -8 +8 @@
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Common.Resources;
+using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
 
 namespace HeuristicLab.Optimizer.MenuItems {
@@ -31 +33 @@
     }
     public override void ActiveViewChanged(object sender, EventArgs e) {
-      ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
+      var views = from v in MainFormManager.MainForm.Views
+                  where v is IItemView
+                  where CreatableAttribute.IsCreatable(((IItemView)v).Item.GetType())
+                  select v;
+      ToolStripItem.Enabled = views.FirstOrDefault() != null;
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveAllToolBarItem.cs

@@ -8 +8 @@
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Common.Resources;
+using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
 
 namespace HeuristicLab.Optimizer {
@@ -28 +30 @@
     }
     public override void ActiveViewChanged(object sender, EventArgs e) {
-      ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
+      var views = from v in MainFormManager.MainForm.Views
+                  where v is IItemView
+                  where CreatableAttribute.IsCreatable(((IItemView)v).Item.GetType())
+                  select v;
+      ToolStripItem.Enabled = views.FirstOrDefault() != null;
     }