Changeset 9893 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms

Timestamp:

08/21/13 23:08:47 (11 years ago)

Author:

ascheibe

Message:

#1042

• applied mkommends progress view patch
• adapted Hive views accordingly
• made some minor improvements (more to come...)

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -30 +30 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   public partial class MainForm : Form, IMainForm {
-    private readonly Dictionary<IContent, IProgress> contentProgressLookup;
-    private readonly Dictionary<IView, IProgress> viewProgressLookup;
     private bool initialized;
     private int appStartingCursors;
@@ -41 +39 @@
       this.views = new Dictionary<IView, Form>();
       this.userInterfaceItems = new List<IUserInterfaceItem>();
-      this.contentProgressLookup = new Dictionary<IContent, IProgress>();
-      this.viewProgressLookup = new Dictionary<IView, IProgress>();
       this.initialized = false;
       this.showContentInViewHost = false;
@@ -347 +343 @@
         CloseView(view, closeReason);
     }
+    #endregion
+
+    #region progress views
+    private readonly Dictionary<IContent, IProgress> contentProgressLookup = new Dictionary<IContent, IProgress>();
+    private readonly Dictionary<IView, IProgress> viewProgressLookup = new Dictionary<IView, IProgress>();
+    private readonly List<ProgressView> progressViews = new List<ProgressView>();
 
     /// <summary>
@@ -355 +357 @@
         throw new ArgumentException("A progress is already registered for the specified content.", "content");
 
-      var contentViews = Enumerable.Empty<IContentView>();
+      var contentViews = views.Keys.OfType<ContentView>();
+      if (!contentViews.Any(v => v.Content == content))
+        throw new ArgumentException("The content is not displayed in a top-level view", "content");
+
       if (addToObjectGraphObjects) {
         var containedObjects = content.GetObjectGraphObjects();
-        contentViews = views.Keys.OfType<IContentView>().Where(v => containedObjects.Contains(v.Content));
+        contentViews = contentViews.Where(v => containedObjects.Contains(v.Content));
       } else
-        contentViews = views.Keys.OfType<IContentView>().Where(v => v.Content == content);
-
-      var progress = new Progress(progressMessage);
-      foreach (var contentView in contentViews)
-        ProgressView.Attach(contentView, progress, true);
+        contentViews = contentViews.Where(v => v.Content == content);
+
+      var progress = new Progress(progressMessage, ProgressState.Started);
+      foreach (var contentView in contentViews) {
+        progressViews.Add(new ProgressView((Control)contentView, progress));
+      }
 
       contentProgressLookup[content] = progress;
@@ -376 +382 @@
         throw new ArgumentException("A progress is already registered for the specified view.", "view");
 
-      var progress = new Progress(progressMessage);
-      ProgressView.Attach(view, progress, true);
+      var control = view as Control;
+      if (control == null) throw new ArgumentException("The passed view must be a control.", "view");
+
+      var progress = new Progress(progressMessage, ProgressState.Started);
+      progressViews.Add(new ProgressView(control, progress));
       viewProgressLookup[view] = progress;
     }
@@ -390 +399 @@
 
       progress.Finish();
+      foreach (var progressView in progressViews.Where(v => v.Content == progress).ToList()) {
+        progressView.Dispose();
+        progressViews.Remove(progressView);
+      }
       contentProgressLookup.Remove(content);
     }
@@ -402 +415 @@
 
       progress.Finish();
+      foreach (var progressView in progressViews.Where(v => v.Content == progress).ToList()) {
+        progressView.Dispose();
+        progressViews.Remove(progressView);
+      }
       viewProgressLookup.Remove(view);
     }