Changeset 4 for trunk/FormMain.pas

Timestamp:

Apr 7, 2026, 10:51:20 PM (3 weeks ago)

Author:

chronos

Message:

• Added: Show result values in charts.
• Fixed: Charts redrawing.

File:

• trunk/FormMain.pas (modified) (11 diffs)

trunk/FormMain.pas

@@ -25 +25 @@
     Chart1LineSeries2: TLineSeries;
     Chart1LineSeries3: TLineSeries;
+    Chart1LineSeries4: TLineSeries;
+    Chart1LineSeries5: TLineSeries;
+    Chart1LineSeries6: TLineSeries;
+    CheckBoxShowResult: TCheckBox;
     ComboBoxEan: TComboBox;
     ComboBoxEan3: TComboBox;
@@ -53 +57 @@
     procedure ButtonIntervalRightClick(Sender: TObject);
     procedure ButtonLoadClick(Sender: TObject);
+    procedure CheckBoxShowResultChange(Sender: TObject);
     procedure ComboBoxEanSelect(Sender: TObject);
     procedure ComboBoxPeriodSelect(Sender: TObject);
@@ -74 +79 @@
     ReportsDir: string;
     OwnersFileName: string;
+    ShowResult: Boolean;
     function FileNameFilter(FileName: string): Boolean;
     function MeasureToFloat(Value: Double; Interval: Double): Double;
@@ -114 +120 @@
   SMeasured = 'Measured';
   SResult = 'Result';
+  SDay = 'Day';
+  SWeek = 'Week';
+  SMonth = 'Month';
+  SYear = 'Year';
 
 { TFormMain }
@@ -143 +153 @@
   IntervalTo := Eans[0].Values.Last.Time + 15 * OneMinute;
   UpdateInterval;
-  ShowActiveTab;
   UpdateInterface;
+end;
+
+procedure TFormMain.CheckBoxShowResultChange(Sender: TObject);
+begin
+  if CheckBoxShowResult.Checked <> ShowResult then begin
+    ShowResult := CheckBoxShowResult.Checked;
+    ReloadChart;
+  end;
 end;
 
@@ -177 +194 @@
 
 procedure TFormMain.DateEdit1Change(Sender: TObject);
-begin
-  IntervalTo := DateEdit1.Date + TimeOf(IntervalTo);
-  UpdateInterval;
+var
+  NewIntervalTo: TDateTime;
+begin
+  NewIntervalTo := DateEdit1.Date + TimeOf(IntervalTo);
+  if NewIntervalTo <> IntervalTo then begin
+    IntervalTo := NewIntervalTo;
+    UpdateInterval;
+  end;
 end;
 
@@ -228 +250 @@
 
 procedure TFormMain.TimeEdit1Change(Sender: TObject);
-begin
-  IntervalTo := DateOf(IntervalTo) + TimeEdit1.Time;
-  UpdateInterval;
+var
+  NewIntervalTo: TDateTime;
+begin
+  NEwIntervalTo := DateOf(IntervalTo) + TimeEdit1.Time;
+  if NewIntervalTo <> IntervalTo then begin
+    IntervalTo := NewIntervalTo;
+    UpdateInterval;
+  end;
 end;
 
 procedure TFormMain.Translator1Translate(Sender: TObject);
 begin
+  ComboBoxPeriod.Items[Integer(prDay)] := SDay;
+  ComboBoxPeriod.Items[Integer(prWeek)] := SWeek;
+  ComboBoxPeriod.Items[Integer(prMonth)] := SMonth;
+  ComboBoxPeriod.Items[Integer(prYear)] := SYear;
   Ean.Translate;
 end;
@@ -447 +478 @@
   Ean: TEan;
 begin
+  Chart1LineSeries1.BeginUpdate;
+  Chart1LineSeries4.BeginUpdate;
   Chart1LineSeries1.Clear;
-  if ComboBoxEan.ItemIndex = -1 then Exit;
-  Ean := TEan(ComboBoxEan.Items.Objects[ComboBoxEan.ItemIndex]);
-  if not Assigned(Ean) then Exit;
-  with Ean do begin
-    for I := 0 to Values.Count - 1 do
-      if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then
-      Chart1LineSeries1.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
-  end;
-
+  Chart1LineSeries4.Clear;
+  if ComboBoxEan.ItemIndex <> -1 then begin
+    Ean := TEan(ComboBoxEan.Items.Objects[ComboBoxEan.ItemIndex]);
+    if Assigned(Ean) then
+    with Ean do begin
+      for I := 0 to Values.Count - 1 do
+        if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then begin
+          Chart1LineSeries1.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
+          if ShowResult then Chart1LineSeries4.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueOut, 1 / 4));
+        end;
+    end;
+  end;
+  Chart1LineSeries1.EndUpdate;
+  Chart1LineSeries4.EndUpdate;
+
+  Chart1LineSeries2.BeginUpdate;
+  Chart1LineSeries5.BeginUpdate;
   Chart1LineSeries2.Clear;
+  Chart1LineSeries5.Clear;
   if ComboBoxEan2.ItemIndex <> -1 then begin
     Ean := TEan(ComboBoxEan2.Items.Objects[ComboBoxEan2.ItemIndex]);
-    if not Assigned(Ean) then Exit;
+    if Assigned(Ean) then
     with Ean do begin
       for I := 0 to Values.Count - 1 do
-        if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then
-        Chart1LineSeries2.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
-    end;
-  end;
-
+        if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then begin
+          Chart1LineSeries2.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
+          if ShowResult then Chart1LineSeries5.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueOut, 1 / 4));
+        end;
+    end;
+  end;
+  Chart1LineSeries2.EndUpdate;
+  Chart1LineSeries5.EndUpdate;
+
+  Chart1LineSeries3.BeginUpdate;
+  Chart1LineSeries6.BeginUpdate;
   Chart1LineSeries3.Clear;
+  Chart1LineSeries6.Clear;
   if ComboBoxEan3.ItemIndex <> -1 then begin
     Ean := TEan(ComboBoxEan3.Items.Objects[ComboBoxEan3.ItemIndex]);
-    if not Assigned(Ean) then Exit;
+    if Assigned(Ean) then
     with Ean do begin
       for I := 0 to Values.Count - 1 do
-        if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then
-        Chart1LineSeries3.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
-    end;
-  end;
+        if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then begin
+          Chart1LineSeries3.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
+          if ShowResult then Chart1LineSeries6.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueOut, 1 / 4));
+        end;
+    end;
+  end;
+  Chart1LineSeries3.EndUpdate;
+  Chart1LineSeries6.EndUpdate;
 end;
 
@@ -504 +557 @@
   ComboBoxUnit.ItemIndex := Integer(ValueUnit);
   ComboBoxPeriod.ItemIndex := Integer(Period);
+  CheckBoxShowResult.Checked := ShowResult;
 end;
 
@@ -538 +592 @@
     OwnersFileName := ReadStringWithDefault('OwnersFileName', OwnersFileName);
     PageControl1.TabIndex := ReadIntegerWithDefault('ActiveTab', PageControl1.TabIndex);
+    ShowResult := ReadBoolWithDefault('ShowResult', ShowResult);
   finally
     Free;
@@ -559 +614 @@
     WriteString('OwnersFileName', OwnersFileName);
     WriteInteger('ActiveTab', PageControl1.TabIndex);
+    WriteBool('ShowResult', ShowResult);
   finally
     Free;