Changeset 2547

Timestamp:

12/08/09 02:35:40 (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) (4 diffs)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (9 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerApplication.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/OptimizerMainForm.Designer.cs (added)
• HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs (added)
• HeuristicLab.Optimizer/3.3/OptimizerMainForm.resx (added)

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

@@ -56 +56 @@
       }
     }
-    private string myCaption;
-    /// <summary>
-    /// Gets or sets the caption of the current instance.
-    /// </summary>
-    /// <remarks>Call <see cref="OnCaptionChanged"/> in the setter if a new item is set.</remarks>
-    public string Caption {
-      get { return myCaption; }
-      set {
-        if (value != myCaption) {
-          myCaption = value;
-          OnCaptionChanged();
-        }
-      }
-    }
 
     /// <summary>
@@ -97 +83 @@
     public override void Refresh() {
       if (InvokeRequired) {
-        Invoke(new MethodInvoker(Refresh));
+        Invoke(new Action(Refresh));
       } else {
         UpdateControls();
@@ -110 +96 @@
         Caption = "View";
       else
-        Caption = "View (" + Item.GetType().Name + ")";
+        Caption = Item.Name;
       
     }
@@ -125 +111 @@
         ItemChanged(this, new EventArgs());
     }
-    /// <summary>
-    /// Occurs when the current caption was changed.
-    /// </summary>
-    public event EventHandler CaptionChanged;
-    /// <summary>
-    /// Fires a new <c>CaptionChanged</c> event.
-    /// </summary>
-    protected virtual void OnCaptionChanged() {
-      if (CaptionChanged != null)
-        CaptionChanged(this, new EventArgs());
+
+    public event EventHandler Closed;
+    public override void OnClosed(object sender, EventArgs e) {
+      base.OnClosed(sender, e);
+      if (Closed != null)
+        Closed(this, e);
     }
 

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

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using System.Threading;
+using System.IO;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
@@ -12 +14 @@
   internal static class FileManager {
 
+    #region Private Class FileInfo
     private class FileInfo {
       public string Filename { get; set; }
@@ -27 +30 @@
       }
     }
-
-    private static Dictionary<IItem, FileInfo> files = new Dictionary<IItem, FileInfo>();
-    private static NewItemDialog newItemDialog = null;
-    private static OpenFileDialog openFileDialog = null;
-    private static SaveFileDialog saveFileDialog = null;
+    #endregion
+
+    private static Dictionary<IItemView, FileInfo> files;
+    private static NewItemDialog newItemDialog;
+    private static OpenFileDialog openFileDialog;
+    private static SaveFileDialog saveFileDialog;
+    private static int waitingCursors;
+    private static int newDocumentsCounter;
+
+    static FileManager() {
+      files = new Dictionary<IItemView, FileInfo>();
+      newItemDialog = null;
+      openFileDialog = null;
+      saveFileDialog = null;
+      waitingCursors = 0;
+      newDocumentsCounter = 1;
+    }
 
     public static void New() {
       if (newItemDialog == null) newItemDialog = new NewItemDialog();
       if (newItemDialog.ShowDialog() == DialogResult.OK) {
-        MainFormManager.MainForm.ShowView(MainFormManager.CreateDefaultView(newItemDialog.Item));
-        files.Add(newItemDialog.Item, new FileInfo());
+        IItemView view = MainFormManager.CreateDefaultView(newItemDialog.Item) as IItemView;
+        if (view != null) {
+          view.Closed += new EventHandler(ViewClosed);
+          view.Caption = "Item" + newDocumentsCounter.ToString() + ".hl";
+          newDocumentsCounter++;
+          MainFormManager.MainForm.ShowView(view);
+        }
       }
     }
@@ -52 +72 @@
 
       if (openFileDialog.ShowDialog() == DialogResult.OK) {
-        foreach (string file in openFileDialog.FileNames) {
-          IItem item = (IItem)XmlParser.Deserialize(file);
-          MainFormManager.MainForm.ShowView(MainFormManager.CreateDefaultView(item));
-          files.Add(item, new FileInfo(file));
-        }
+        foreach (string filename in openFileDialog.FileNames)
+          LoadItemAsync(filename);
       }
     }
@@ -63 +80 @@
       IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
       if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType()))) {
-        Save(activeView.Item);
-      }
-    }
-    private static void Save(IItem item) {
-      if (files[item].Filename != string.Empty) {
-        if (files[item].Compressed)
-          XmlGenerator.Serialize(item, saveFileDialog.FileName, 9);
+        Save(activeView);
+      }
+    }
+    private static void Save(IItemView view) {
+      if (!files.ContainsKey(view)) {
+        SaveAs(view);
+      } else {
+        if (files[view].Compressed)
+          SaveItemAsync(view, files[view].Filename, 9);
         else
-          XmlGenerator.Serialize(item, saveFileDialog.FileName, 0);
-      } else {
-        SaveAs(item);
+          SaveItemAsync(view, files[view].Filename, 0);
       }
     }
@@ -80 +97 @@
       IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
       if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType()))) {
-        SaveAs(activeView.Item);
-      }
-    }
-    public static void SaveAs(IItem item) {
+        SaveAs(activeView);
+      }
+    }
+    public static void SaveAs(IItemView view) {
       if (saveFileDialog == null) {
         saveFileDialog = new SaveFileDialog();
@@ -92 +109 @@
       }
 
-      saveFileDialog.FileName = files[item].Filename;
-      if (saveFileDialog.FileName == string.Empty) saveFileDialog.FileName = "Item";
-      if (! files[item].Compressed)
+      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
@@ -101 +122 @@
       if (saveFileDialog.ShowDialog() == DialogResult.OK) {
         if (saveFileDialog.FilterIndex == 1) {
-          XmlGenerator.Serialize(item, saveFileDialog.FileName, 0);
+          SaveItemAsync(view, saveFileDialog.FileName, 0);
         } else {
-          XmlGenerator.Serialize(item, saveFileDialog.FileName, 9);
+          SaveItemAsync(view, saveFileDialog.FileName, 9);
         }
-        files[item].Filename = saveFileDialog.FileName;
-        files[item].Compressed = saveFileDialog.FilterIndex != 1;
       }
     }
@@ -117 +136 @@
 
       foreach (IItemView view in views) {
-        Save(view.Item);
-      }
-    }
+        Save(view);
+      }
+    }
+
+    private static void ViewClosed(object sender, EventArgs e) {
+      IItemView view = (IItemView)sender;
+      view.Closed -= new EventHandler(ViewClosed);
+      files.Remove(view);
+    }
+
+    #region Asynchronous Save/Load Operations
+    private static void Invoke(Action a) {
+      Form form = MainFormManager.MainForm as Form;
+      if (form.InvokeRequired)
+        form.Invoke(a);
+      else
+        a.Invoke();
+    }
+
+    private static void SaveItemAsync(IItemView view, string filename, int compression) {
+      ThreadPool.QueueUserWorkItem(
+        new WaitCallback(
+          delegate(object arg) {
+            try {
+              SetWaitingCursor();
+              XmlGenerator.Serialize(view.Item, filename, compression);
+              Invoke(delegate() {
+                view.Caption = Path.GetFileName(filename);
+                files[view].Filename = filename;
+                files[view].Compressed = compression > 0;
+              });
+            }
+            catch (Exception ex) {
+              Auxiliary.ShowErrorMessageBox(ex);
+            } finally {
+              ResetWaitingCursor();
+            }
+          }
+        )
+      );
+    }
+    private static void LoadItemAsync(string filename) {
+      ThreadPool.QueueUserWorkItem(
+        new WaitCallback(
+          delegate(object arg) {
+            try {
+              SetWaitingCursor();
+              IItem item = (IItem)XmlParser.Deserialize(filename);
+              Invoke(delegate() {
+                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));
+                  MainFormManager.MainForm.ShowView(view);
+                }
+              });
+            } catch (Exception ex) {
+              Auxiliary.ShowErrorMessageBox(ex);
+            } finally {
+              ResetWaitingCursor();
+            }
+          }
+        )
+      );
+    }
+
+    private static void SetWaitingCursor() {
+      Invoke(delegate() {
+        waitingCursors++;
+        ((Form)MainFormManager.MainForm).Cursor = Cursors.AppStarting;
+      });
+    }
+    private static void ResetWaitingCursor() {
+      Invoke(delegate() {
+        waitingCursors--;
+        if (waitingCursors == 0) ((Form)MainFormManager.MainForm).Cursor = Cursors.Default;
+      });
+    }
+    #endregion
   }
 }

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -70 +70 @@
       <DependentUpon>NewItemDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="OptimizerMainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="OptimizerMainForm.Designer.cs">
+      <DependentUpon>OptimizerMainForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -119 +125 @@
       <DependentUpon>NewItemDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="OptimizerMainForm.resx">
+      <DependentUpon>OptimizerMainForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

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

@@ -33 +33 @@
   internal class HeuristicLabOptimizerApplication : ApplicationBase {
     public override void Run() {
-      DockingMainForm mainForm = new DockingMainForm(typeof(IOptimizerUserInterfaceItemProvider));
-      mainForm.Title = "HeuristicLab Optimizer " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
-      mainForm.Icon = Resources.HeuristicLabIcon;
-      mainForm.Width = 800;
-      mainForm.Height = 600;
+      OptimizerMainForm mainForm = new OptimizerMainForm(typeof(IOptimizerUserInterfaceItemProvider));
       Application.Run(mainForm);
     }