Changeset 2961

Timestamp:

03/08/10 00:20:29 (14 years ago)

Author:

swagner

Message:

Refactored enabling and disabling of save buttons and menu items to prevent saving of running algorithms (#685)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/ItemView.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.2/ContentView.cs (modified) (2 diffs)
• HeuristicLab.MainForm/3.2/Interfaces/IContentView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (5 diffs)
• HeuristicLab.Optimizer/3.3/MenuItems/SaveAllMenuItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/MenuItems/SaveAsMenuItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/MenuItems/SaveMenuItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/ToolBarItems/SaveAllToolBarItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/ToolBarItems/SaveToolBarItem.cs (modified) (2 diffs)

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

@@ -36 +36 @@
       set { base.Content = value; }
     }
-    private bool enableFileOperations;
-    public bool EnableFileOperations {
-      get { return enableFileOperations; }
-      protected set {
-        if (value != enableFileOperations) {
-          enableFileOperations = value;
-          OnChanged();
-        }
-      }
-    }
 
     /// <summary>
@@ -53 +43 @@
       InitializeComponent();
       Caption = "View";
-      enableFileOperations = true;
     }
     public ItemView(IItem content)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ContentView.cs

@@ -31 +31 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   public partial class ContentView : View, IContentView {
-    public ContentView()
-      : base() {
-      InitializeComponent();
-    }
-
-    public ContentView(object content)
-      : this() {
-      this.content = content;
-    }
-
     private object content;
     public object Content {
@@ -58 +48 @@
         }
       }
+    }
+    private bool saveEnabled;
+    public bool SaveEnabled {
+      get { return saveEnabled; }
+      protected set {
+        if (value != saveEnabled) {
+          saveEnabled = value;
+          OnChanged();
+        }
+      }
+    }
+
+    public ContentView()
+      : base() {
+      InitializeComponent();
+      saveEnabled = true;
+    }
+    public ContentView(object content)
+      : this() {
+      this.content = content;
     }
 

trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IContentView.cs

@@ -28 +28 @@
   public interface IContentView : IView {
     object Content { get; }
+    bool SaveEnabled { get; }
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

@@ -152 +152 @@
         Invoke(new EventHandler(Content_Started), sender, e);
       else {
-        EnableFileOperations = false;
+        SaveEnabled = false;
         parameterCollectionView.Enabled = false;
         newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
@@ -167 +167 @@
         Invoke(new EventHandler(Content_Stopped), sender, e);
       else {
-        EnableFileOperations = true;
+        SaveEnabled = true;
         parameterCollectionView.Enabled = true;
         newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = true;

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

@@ -26 +26 @@
 using System.Threading;
 using System.Windows.Forms;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -108 +107 @@
     }
     private static void Save(IContentView view) {
-      if ((!files.ContainsKey(view)) || (!File.Exists(files[view].Filename))) {
-        SaveAs(view);
-      } else {
-        if (files[view].Compressed)
-          SaveItemAsync(view, files[view].Filename, 9);
-        else
-          SaveItemAsync(view, files[view].Filename, 0);
+      if (view.SaveEnabled) {
+        if ((!files.ContainsKey(view)) || (!File.Exists(files[view].Filename))) {
+          SaveAs(view);
+        } else {
+          if (files[view].Compressed)
+            SaveItemAsync(view, files[view].Filename, 9);
+          else
+            SaveItemAsync(view, files[view].Filename, 0);
+        }
       }
     }
@@ -125 +126 @@
     }
     public static void SaveAs(IContentView view) {
-      if (saveFileDialog == null) {
-        saveFileDialog = new SaveFileDialog();
-        saveFileDialog.Title = "Save Item";
-        saveFileDialog.DefaultExt = "hl";
-        saveFileDialog.Filter = "Uncompressed HeuristicLab Files|*.hl|HeuristicLab Files|*.hl|All Files|*.*";
-        saveFileDialog.FilterIndex = 2;
-      }
-
-      if (!files.ContainsKey(view)) {
-        files.Add(view, new FileInfo());
-        saveFileDialog.FileName = view.Caption;
-      } else {
-        saveFileDialog.FileName = files[view].Filename;
-      }
-      if (! files[view].Compressed)
-        saveFileDialog.FilterIndex = 1;
-      else
-        saveFileDialog.FilterIndex = 2;
-
-      if (saveFileDialog.ShowDialog() == DialogResult.OK) {
-        if (saveFileDialog.FilterIndex == 1) {
-          SaveItemAsync(view, saveFileDialog.FileName, 0);
+      if (view.SaveEnabled) {
+        if (saveFileDialog == null) {
+          saveFileDialog = new SaveFileDialog();
+          saveFileDialog.Title = "Save Item";
+          saveFileDialog.DefaultExt = "hl";
+          saveFileDialog.Filter = "Uncompressed HeuristicLab Files|*.hl|HeuristicLab Files|*.hl|All Files|*.*";
+          saveFileDialog.FilterIndex = 2;
+        }
+
+        if (!files.ContainsKey(view)) {
+          files.Add(view, new FileInfo());
+          saveFileDialog.FileName = view.Caption;
         } else {
-          SaveItemAsync(view, saveFileDialog.FileName, 9);
+          saveFileDialog.FileName = files[view].Filename;
+        }
+        if (!files[view].Compressed)
+          saveFileDialog.FilterIndex = 1;
+        else
+          saveFileDialog.FilterIndex = 2;
+
+        if (saveFileDialog.ShowDialog() == DialogResult.OK) {
+          if (saveFileDialog.FilterIndex == 1) {
+            SaveItemAsync(view, saveFileDialog.FileName, 0);
+          } else {
+            SaveItemAsync(view, saveFileDialog.FileName, 9);
+          }
         }
       }
@@ -154 +157 @@
 
     public static void SaveAll() {
-      var views = from v in MainFormManager.MainForm.Views
-                  where v is IContentView
-                  select v as IContentView;
-
-      foreach (IContentView view in views) {
-        ItemView itemView = view as ItemView;
-        if ((itemView == null) || (itemView.EnableFileOperations)) {
-          Save(view);
-        }
-      }
+      foreach (IContentView view in MainFormManager.MainForm.Views.OfType<IContentView>())
+        Save(view);
     }
 
@@ -211 +206 @@
             try {
               SetWaitingCursor();
-              IItem item = (IItem)XmlParser.Deserialize(filename);
+              object content = XmlParser.Deserialize(filename);
               Invoke(delegate() {
-                IContentView view = MainFormManager.CreateDefaultView(item) as IContentView;
+                IContentView view = MainFormManager.CreateDefaultView(content) as IContentView;
                 if (view == null) {
                   MessageBox.Show("There is no view for the loaded item. It cannot be displayed. ", "No View Available", MessageBoxButtons.OK, MessageBoxIcon.Error);

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

@@ -25 +25 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
@@ -48 +46 @@
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      var views = from v in MainFormManager.MainForm.Views
-                  where v is IContentView
-                  where ((v is ItemView) && ((ItemView)v).EnableFileOperations) || (!(v is ItemView))
+      var views = from v in MainFormManager.MainForm.Views.OfType<IContentView>()
+                  where v.SaveEnabled
                   select v;
       ToolStripItem.Enabled = views.FirstOrDefault() != null;

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
-using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
@@ -47 +45 @@
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
       IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
-      bool enable = activeView != null;
-      ItemView itemView = MainFormManager.MainForm.ActiveView as ItemView;
-      if ((enable) && (itemView != null)) enable = itemView.EnableFileOperations;
-      ToolStripItem.Enabled = enable;
+      ToolStripItem.Enabled = (activeView != null) && (activeView.SaveEnabled);
     }
 

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

@@ -24 +24 @@
 using System.Drawing;
 using System.Windows.Forms;
-using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
@@ -51 +49 @@
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
       IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
-      bool enable = activeView != null;
-      ItemView itemView = MainFormManager.MainForm.ActiveView as ItemView;
-      if ((enable) && (itemView != null)) enable = itemView.EnableFileOperations;
-      ToolStripItem.Enabled = enable;
+      ToolStripItem.Enabled = (activeView != null) && (activeView.SaveEnabled);
     }
 

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

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
@@ -47 +45 @@
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      var views = from v in MainFormManager.MainForm.Views
-                  where v is IContentView
-                  where ((v is ItemView) && ((ItemView)v).EnableFileOperations) || (!(v is ItemView))
+      var views = from v in MainFormManager.MainForm.Views.OfType<IContentView>()
+                  where v.SaveEnabled
                   select v;
       ToolStripItem.Enabled = views.FirstOrDefault() != null;

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

@@ -23 +23 @@
 using System.Drawing;
 using System.Windows.Forms;
-using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
@@ -47 +45 @@
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
       IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
-      bool enable = activeView != null;
-      ItemView itemView = MainFormManager.MainForm.ActiveView as ItemView;
-      if ((enable) && (itemView != null)) enable = itemView.EnableFileOperations;
-      ToolStripItem.Enabled = enable;
+      ToolStripItem.Enabled = (activeView != null) && (activeView.SaveEnabled);
     }