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

Timestamp:

01/13/10 04:29:25 (3 years ago)

Author:

lowjoel

Message:

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

Location:

trunk/eraser6

Files:

• . (modified) (1 prop)
• Eraser/SchedulerPanel.cs (modified) (4 diffs)

trunk/eraser6/Eraser/SchedulerPanel.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.Drawing;
@@ -35 +34 @@
 using System.IO;
 using System.Runtime.Serialization;
+using System.ComponentModel;
+using ProgressChangedEventArgs = Eraser.Manager.ProgressChangedEventArgs;
 
 namespace Eraser
@@ -207 +208 @@
         /// Handles the progress event by the task.
         /// </summary>
-        void task_ProgressChanged(object sender, TaskProgressEventArgs e)
+        void task_ProgressChanged(object sender, ProgressChangedEventArgs e)
         {
             //Make sure we handle the event in the main thread as this requires
@@ -213 +214 @@
             if (scheduler.InvokeRequired)
             {
-                Invoke(new EventHandler<TaskProgressEventArgs>(task_ProgressChanged), sender, e);
+                Invoke((EventHandler<ProgressChangedEventArgs>)task_ProgressChanged, sender, e);
                 return;
             }
 
             //Update the progress bar
-            schedulerProgress.Value = (int)(e.OverallProgress * 1000.0);
+            ErasureTarget target = (ErasureTarget)sender;
+            schedulerProgress.Value = (int)(target.Task.Progress.Progress * 1000.0);
         }