Changeset 1504 for branches/eraser6/SpeedMeter/Eraser.Manager/ProgressManager.cs

Timestamp:

1/12/2010 5:40:14 AM (3 years ago)

Author:

lowjoel

Message:

Fixed a few behaviours in the ProgressManager? classes:
-for ProgressManager?, if the Total field is zero, always return 0 for progress (prevents division by zero)
-for SteppedProgressManager?, the Speed property is dependent on the CurrentStep? property; if that is null, the speed should be zero.
-for SteppedProgressManager?, the TimeLeft? property is dependent on the StartTime? of the task, if it is invalid, the TimeLeft? property will now return TimeSpan?.MinValue?
-for SteppedProgressManager?, the CurrentStep? property will return the last completed step if all the steps have been completed

File:

• branches/eraser6/SpeedMeter/Eraser.Manager/ProgressManager.cs (modified) (5 diffs)

branches/eraser6/SpeedMeter/Eraser.Manager/ProgressManager.cs

@@ -100 +100 @@
             get
             {
+                if (Total == 0)
+                    return 0.0f;
+
                 return (float)((double)Completed / Total);
             }
@@ -408 +411 @@
             get
             {
-                float totalWeight = (float)Steps.TotalWeights;
                 float result = 0.0f;
-
                 foreach (Step step in Steps)
                     result += step.Progress.Progress * step.Weight;
@@ -422 +423 @@
             get
             {
+                if (CurrentStep == null)
+                    return 0;
+
                 return CurrentStep.Progress.Speed;
             }
@@ -430 +434 @@
             get
             {
+                if (StartTime == DateTime.MinValue)
+                    return TimeSpan.MinValue;
+
                 long ticksElapsed = (DateTime.Now - StartTime).Ticks;
                 float progressRemaining = 1.0f - Progress;
@@ -457 +464 @@
                     return null;
 
+                if (Steps.Count == 0)
+                    return null;
+
                 foreach (Step step in Steps)
                     if (step.Progress.Progress < 1.0f)
                         return step;
 
-                return null;
+                //Return the last step since we don't have any
+                return Steps[Steps.Count - 1];
             }
         }