Changeset 9865

Timestamp:

08/07/13 13:28:48 (11 years ago)

Author:

jkarder

Message:

#1042

• progress management is handled internally
• fixed ProgressView overlays so that they don't get disabled anymore

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (3 diffs)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/ShrinkDataAnalysisRunsMenuItem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -167 +167 @@
         Invoke((Action)LockBackground);
       } else {
-        parentView.Enabled = false;
+        foreach (Control c in Control.Controls)
+          c.Enabled = false;
         Enabled = true;
       }
@@ -175 +176 @@
       if (InvokeRequired) Invoke((Action)UnlockBackground);
       else {
-        parentView.Enabled = true;
+        foreach (Control c in Control.Controls)
+          c.Enabled = true;
         Enabled = false;
       }

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

@@ -351 +351 @@
     /// Adds a <see cref="ProgressView"/> to the <see cref="ContentView"/>s showing the specified content.
     /// </summary>
-    public void AddOperationProgressToContent(IContent content, IProgress progress, bool addToObjectGraphObjects = true) {
+    public void AddOperationProgressToContent(IContent content, string progressMessage, bool addToObjectGraphObjects = true) {
       if (contentProgressLookup.ContainsKey(content))
         throw new ArgumentException("A progress is already registered for the specified content.", "content");
@@ -362 +362 @@
         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);
@@ -371 +372 @@
     /// Adds a <see cref="ProgressView"/> to the specified view.
     /// </summary>
-    public void AddOperationProgressToView(IView view, Progress progress) {
+    public void AddOperationProgressToView(IView view, string progressMessage) {
       if (viewProgressLookup.ContainsKey(view))
         throw new ArgumentException("A progress is already registered for the specified view.", "view");
 
+      var progress = new Progress(progressMessage);
       ProgressView.Attach(view, progress, true);
       viewProgressLookup[view] = progress;

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

@@ -153 +153 @@
       mainForm.Invoke((Action)delegate {
         if (showProgress) {
-          var progress = new Progress(string.Format("Saving file \"{0}\"...", Path.GetFileName(fileName ?? content.Filename)));
-          mainForm.AddOperationProgressToContent(content, progress);
+          mainForm.AddOperationProgressToContent(content, string.Format("Saving file \"{0}\"...", Path.GetFileName(fileName ?? content.Filename)));
         } else
           mainForm.RemoveOperationProgressFromContent(content);

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/ShrinkDataAnalysisRunsMenuItem.cs

@@ -76 +76 @@
     public override void Execute() {
       IContentView activeView = (IContentView)MainFormManager.MainForm.ActiveView;
-      Progress progress = new Progress("Removing duplicate datasets.");
       var mainForm = (MainForm.WindowsForms.MainForm)MainFormManager.MainForm;
-      mainForm.AddOperationProgressToContent(activeView.Content, progress);
+      mainForm.AddOperationProgressToContent(activeView.Content, "Removing duplicate datasets.");
 
       Action<IContentView> action = (view) => {