Changeset 15446 for branches/EnhancedProgress/HeuristicLab.MainForm.WindowsForms/3.3/MainForms

Timestamp:

11/03/17 11:14:27 (7 years ago)

Author:

pfleck

Message:

#2845:

• Start progres with initial progress value in several cases to use the progress value update.
• Removed object disposal guard in ProgressView because it can block part of the initialization.

File:

• branches/EnhancedProgress/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (8 diffs)

branches/EnhancedProgress/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -61 +61 @@
       set {
         if (InvokeRequired) {
-          Action<string> action = delegate(string s) { this.Title = s; };
+          Action<string> action = delegate (string s) { this.Title = s; };
           Invoke(action, value);
         } else
@@ -72 +72 @@
       set {
         if (InvokeRequired) {
-          Action<Cursor> action = delegate(Cursor c) { this.Cursor = c; };
+          Action<Cursor> action = delegate (Cursor c) { this.Cursor = c; };
           Invoke(action, value);
         } else
@@ -95 +95 @@
         if (this.activeView != value) {
           if (InvokeRequired) {
-            Action<IView> action = delegate(IView activeView) { this.ActiveView = activeView; };
+            Action<IView> action = delegate (IView activeView) { this.ActiveView = activeView; };
             Invoke(action, value);
           } else {
@@ -230 +230 @@
     }
 
-    public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class,IContent {
+    public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class, IContent {
       if (content == null) throw new ArgumentNullException("Content cannot be null.");
       if (!reuseExistingView) return ShowContent(content);
@@ -350 +350 @@
     private readonly List<ProgressView> progressViews = new List<ProgressView>();
 
+    public IProgress AddOperationProgressToContent(IContent content, string progressMessage, double? initialProgressValue = null, bool addToObjectGraphObjects = true) {
+      var progress = new Progress();
+      if (initialProgressValue.HasValue)
+        progress.Start(progressMessage, initialProgressValue.Value);
+      else
+        progress.Start(progressMessage);
+      AddOperationProgressToContent(content, progress, addToObjectGraphObjects);
+      return progress;
+    }
     /// <summary>
     /// Adds a <see cref="ProgressView"/> to the <see cref="ContentView"/>s showing the specified content.
     /// </summary>
-    [Obsolete]
-    public IProgress AddOperationProgressToContent(IContent content, string progressMessage, bool addToObjectGraphObjects = true) {
+    public void AddOperationProgressToContent(IContent content, IProgress progress, bool addToObjectGraphObjects = true) {
       if (InvokeRequired) {
-        IProgress result = (IProgress)Invoke((Func<IContent, string, bool, IProgress>)AddOperationProgressToContent, content, progressMessage, addToObjectGraphObjects);
-        return result;
+        Invoke((Action<IContent, IProgress, bool>)AddOperationProgressToContent, content, progress, addToObjectGraphObjects);
+        return;
       }
       if (contentProgressLookup.ContainsKey(content))
@@ -372 +380 @@
         contentViews = contentViews.Where(v => v.Content == content);
 
-      var progress = new Progress();
-      progress.Start(progressMessage);
       foreach (var contentView in contentViews) {
         progressViews.Add(new ProgressView(contentView, progress));
@@ -379 +385 @@
 
       contentProgressLookup[content] = progress;
+    }
+
+    public IProgress AddOperationProgressToView(Control control, string progressMessage, double? initialProgressValue = null) {
+      var progress = new Progress();
+      if (initialProgressValue.HasValue)
+        progress.Start(progressMessage, initialProgressValue.Value);
+      else
+        progress.Start(progressMessage);
+      AddOperationProgressToView(control, progress);
       return progress;
     }
-
     /// <summary>
     /// Adds a <see cref="ProgressView"/> to the specified view.
     /// </summary>
-    [Obsolete]
-    public IProgress AddOperationProgressToView(Control control, string progressMessage) {
-      var progress = new Progress();
-      progress.Start(progressMessage);
-      AddOperationProgressToView(control, progress);
-      return progress;
-    }
-
     public void AddOperationProgressToView(Control control, IProgress progress) {
       if (InvokeRequired) {
@@ -564 +570 @@
       try {
         ((IActionUserInterfaceItem)item.Tag).Execute();
-      }
-      catch (Exception ex) {
+      } catch (Exception ex) {
         ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, ex);
       }