Changeset 27 for trunk

Timestamp:

Apr 6, 2016, 7:45:46 AM (9 years ago)

Author:

chronos

Message:

• Modified: Improved average value in speed measurement.
• Added: Show Min and Max values with different colors in speed chart.

Location:

trunk

Files:

• Form/UFormMain.lfm (modified) (1 diff)
• Form/UFormMain.pas (modified) (2 diffs)
• UDriveScan.pas (modified) (4 diffs)

trunk/Form/UFormMain.lfm

@@ -397 +397 @@
         Align = alClient
         BorderSpacing.Around = 4
-        object ChartSpeedLineSeries1: TLineSeries
-          LinePen.Color = clWhite
+        object ChartSpeedLineSeriesAvg: TLineSeries
+          LinePen.Color = clGreen
+        end
+        object ChartSpeedLineSeriesMin: TLineSeries
+          LinePen.Color = clBlue
+        end
+        object ChartSpeedLineSeriesMax: TLineSeries
+          LinePen.Color = clRed
         end
       end

trunk/Form/UFormMain.pas

@@ -39 +39 @@
     ButtonScan2: TButton;
     ChartSpeed: TChart;
-    ChartSpeedLineSeries1: TLineSeries;
+    ChartSpeedLineSeriesAvg: TLineSeries;
+    ChartSpeedLineSeriesMin: TLineSeries;
+    ChartSpeedLineSeriesMax: TLineSeries;
     ComboBoxDrive: TComboBox;
     Image1: TImage;
@@ -540 +542 @@
     ChartSpeed.BottomAxis.Range.UseMax := True;
     ChartSpeed.BottomAxis.Range.Max := Length(SpeedSteps);
-    ChartSpeedLineSeries1.Clear;
+    ChartSpeedLineSeriesAvg.Clear;
+    ChartSpeedLineSeriesMin.Clear;
+    ChartSpeedLineSeriesMax.Clear;
     for I := 0 to Length(SpeedSteps) - 1 do
-    if not SpeedSteps[I].Null then
-      ChartSpeedLineSeries1.AddXY(I, SpeedSteps[I].Average / (1024 * 1024));
+    if not SpeedSteps[I].Null then begin
+      ChartSpeedLineSeriesAvg.AddXY(I, SpeedSteps[I].Average / (1024 * 1024));
+      ChartSpeedLineSeriesMin.AddXY(I, SpeedSteps[I].Min / (1024 * 1024));
+      ChartSpeedLineSeriesMax.AddXY(I, SpeedSteps[I].Max / (1024 * 1024));
+    end;
   end;
 end;

trunk/UDriveScan.pas

@@ -50 +50 @@
 
   TSpeedValue = record
+  public
     Null: Boolean;
     Max: Int64;
     Average: Int64;
+    Values: array of Int64;
     Min: Int64;
     procedure Reset;
@@ -132 +134 @@
 
 procedure TSpeedValue.UpdateValue(Value: Int64);
+var
+  Sum: Double;
+  I: Integer;
 begin
   if Null then begin
     Min := High(Int64);
     Max := Low(Int64);
-    Average := 0;
+    SetLength(Values, 0);
   end;
   Null := False;
   if Value > Max then Max := Value;
   // TODO: Computer average
-  Average := Value;
+  SetLength(Values, Length(Values) + 1);
+  Values[Length(Values) - 1] := Value;
+  Sum := 0;
+  for I := 0 to Length(Values) - 1 do
+    Sum := Sum + Values[I];
+  Average := Trunc(Sum / Length(Values));
   if Value < Min then Min := Value;
 end;
@@ -344 +354 @@
   SpeedTimeCurrent: TDateTime;
   Index: Integer;
+  Value: Int64;
 begin
   SpeedTimeCurrent := Now;
   Index := Trunc(SectorCurrent / SectorCount * SpeedStepsCount);
   if Index >= Length(SpeedSteps) then Index := Length(SpeedSteps) - 1;
-  SpeedSteps[Index].UpdateValue(
-    Trunc((SectorCurrent - SectorLast) * SectorSize / ((SpeedTimeCurrent - SpeedTimeLast) / OneSecond)));
+  Value := Trunc((SectorCurrent - SectorLast) * SectorSize / ((SpeedTimeCurrent - SpeedTimeLast) / OneSecond));
+  if Value < 0 then Value := 0;
+  SpeedSteps[Index].UpdateValue(Value);
   SpeedTimeLast := SpeedTimeCurrent;
   SectorLast := SectorCurrent;
@@ -389 +401 @@
   SpeedTimer.Enabled := False;
   SpeedTimer.OnTimer := SpeedTimerExecute;
-  SpeedStepsCount := 1000;
+  SpeedStepsCount := 500;
   SectorSize := 4096;
   Terminated := True;