Ignore:
Timestamp:
1/13/2010 4:29:25 AM (5 years ago)
Author:
lowjoel
Message:

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

Location:
trunk/eraser6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/eraser6

  • trunk/eraser6/Eraser/SchedulerPanel.cs

    r1495 r1515  
    2222using System; 
    2323using System.Collections.Generic; 
    24 using System.ComponentModel; 
    2524using System.Data; 
    2625using System.Drawing; 
     
    3534using System.IO; 
    3635using System.Runtime.Serialization; 
     36using System.ComponentModel; 
     37using ProgressChangedEventArgs = Eraser.Manager.ProgressChangedEventArgs; 
    3738 
    3839namespace Eraser 
     
    207208        /// Handles the progress event by the task. 
    208209        /// </summary> 
    209         void task_ProgressChanged(object sender, TaskProgressEventArgs e) 
     210        void task_ProgressChanged(object sender, ProgressChangedEventArgs e) 
    210211        { 
    211212            //Make sure we handle the event in the main thread as this requires 
     
    213214            if (scheduler.InvokeRequired) 
    214215            { 
    215                 Invoke(new EventHandler<TaskProgressEventArgs>(task_ProgressChanged), sender, e); 
     216                Invoke((EventHandler<ProgressChangedEventArgs>)task_ProgressChanged, sender, e); 
    216217                return; 
    217218            } 
    218219 
    219220            //Update the progress bar 
    220             schedulerProgress.Value = (int)(e.OverallProgress * 1000.0); 
     221            ErasureTarget target = (ErasureTarget)sender; 
     222            schedulerProgress.Value = (int)(target.Task.Progress.Progress * 1000.0); 
    221223        } 
    222224 
Note: See TracChangeset for help on using the changeset viewer.