Changeset 1515 for trunk/eraser6/Eraser/ProgressForm.cs

Timestamp:

1/13/2010 4:29:25 AM (2 years ago)

Author:

lowjoel

Message:

Merged the SpeedMeter? branch to trunk. Fixes #90: Generic speed meter

Location:

trunk/eraser6

Files:

• . (modified) (1 prop)
• Eraser/ProgressForm.cs (modified) (6 diffs)

trunk/eraser6/Eraser/ProgressForm.cs

@@ -31 +31 @@
 using Eraser.Util;
 using System.Globalization;
+using ProgressChangedEventArgs = Eraser.Manager.ProgressChangedEventArgs;
 
 namespace Eraser
@@ -51 +52 @@
             task.ProgressChanged += task_ProgressChanged;
             task.TaskFinished += task_TaskFinished;
+
+            //Set the current progress
+            if (task.Progress.CurrentStep != null)
+                UpdateProgress((SteppedProgressManager)task.Progress.CurrentStep.Progress,
+                    new ProgressChangedEventArgs(task.Progress.CurrentStep.Progress, null));
         }
 
@@ -59 +65 @@
         }
 
-        private void task_ProgressChanged(object sender, TaskProgressEventArgs e)
+        private void task_ProgressChanged(object sender, ProgressChangedEventArgs e)
         {
             if (InvokeRequired)
@@ -68 +74 @@
 
                 lastUpdate = DateTime.Now;
-                Invoke(new EventHandler<TaskProgressEventArgs>(task_ProgressChanged), sender, e);
-                return;
-            }
-
-            status.Text = e.CurrentTargetStatus;
-            item.Text = WrapItemName(e.CurrentItemName);
-            pass.Text = e.CurrentTargetTotalPasses != 0 ?
-                S._("{0} out of {1}", e.CurrentItemPass, e.CurrentTargetTotalPasses) :
-                e.CurrentItemPass.ToString(CultureInfo.CurrentCulture);
-
-            if (e.TimeLeft >= TimeSpan.Zero)
-                timeLeft.Text = S._("About {0:T} left", e.TimeLeft);
-            else
-                timeLeft.Text = S._("Unknown");
-
-            if (e.CurrentItemProgress >= 0.0f)
-            {
-                itemProgress.Style = ProgressBarStyle.Continuous;
-                itemProgress.Value = (int)(e.CurrentItemProgress * 1000);
-                itemProgressLbl.Text = e.CurrentItemProgress.ToString("#0%",
-                    CultureInfo.CurrentCulture);
-            }
-            else
-            {
-                itemProgress.Style = ProgressBarStyle.Marquee;
-                itemProgressLbl.Text = string.Empty;
-            }
-
-            overallProgress.Value = (int)(e.OverallProgress * 1000);
-            overallProgressLbl.Text = S._("Total: {0,2:#0.00%}", e.OverallProgress);
+                Invoke((EventHandler<ProgressChangedEventArgs>)task_ProgressChanged, sender, e);
+                return;
+            }
+
+            ErasureTarget target = sender as ErasureTarget;
+            if (target == null)
+                return;
+
+            SteppedProgressManager progress = target.Progress as SteppedProgressManager;
+            if (progress == null)
+                return;
+
+            UpdateProgress(progress, e);
         }
 
@@ -155 +144 @@
                 task.Cancel();
             Close();
+        }
+
+        private void UpdateProgress(SteppedProgressManager targetProgress, ProgressChangedEventArgs e)
+        {
+            TaskProgressChangedEventArgs e2 = (TaskProgressChangedEventArgs)e.UserState;
+
+            status.Text = targetProgress.CurrentStep.Name;
+            if (e2 != null)
+            {
+                item.Text = WrapItemName(e2.ItemName);
+                pass.Text = e2.ItemTotalPasses != 0 ?
+                    S._("{0} out of {1}", e2.ItemPass, e2.ItemTotalPasses) :
+                    e2.ItemPass.ToString(CultureInfo.CurrentCulture);
+            }
+
+            if (targetProgress.TimeLeft >= TimeSpan.Zero)
+                timeLeft.Text = S._("About {0} left", RoundToSeconds(targetProgress.TimeLeft));
+            else
+                timeLeft.Text = S._("Unknown");
+
+            if (targetProgress.Progress >= 0.0f)
+            {
+                itemProgress.Style = ProgressBarStyle.Continuous;
+                itemProgress.Value = (int)(targetProgress.Progress * 1000);
+                itemProgressLbl.Text = targetProgress.Progress.ToString("#0%",
+                    CultureInfo.CurrentCulture);
+            }
+            else
+            {
+                itemProgress.Style = ProgressBarStyle.Marquee;
+                itemProgressLbl.Text = string.Empty;
+            }
+
+            overallProgress.Value = (int)(task.Progress.Progress * 1000);
+            overallProgressLbl.Text = S._("Total: {0,2:#0.00%}", task.Progress.Progress);
         }
 
@@ -185 +209 @@
             return result.ToString();
         }
+
+        private TimeSpan RoundToSeconds(TimeSpan span)
+        {
+            return new TimeSpan(span.Ticks - span.Ticks % TimeSpan.TicksPerSecond);
+        }
     }
 }