Changeset 3 for trunk/FormMain.pas

Timestamp:

Apr 7, 2026, 10:43:55 AM (3 weeks ago)

Author:

chronos

Message:

• Added: Third selectable EAN on chart tab.

File:

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

trunk/FormMain.pas

@@ -24 +24 @@
     Chart1LineSeries1: TLineSeries;
     Chart1LineSeries2: TLineSeries;
+    Chart1LineSeries3: TLineSeries;
     ComboBoxEan: TComboBox;
+    ComboBoxEan3: TComboBox;
     ComboBoxEanData: TComboBox;
     ComboBoxEan2: TComboBox;
@@ -35 +37 @@
     Label4: TLabel;
     Label5: TLabel;
+    Label6: TLabel;
     ListView1: TListView;
     ListView2: TListView;
@@ -138 +141 @@
   CreateEan('', STotalConsumtion, ekConsumption);
 
-  IntervalTo := Eans[0].Values.Last.Time;
+  IntervalTo := Eans[0].Values.Last.Time + 15 * OneMinute;
   UpdateInterval;
   ShowActiveTab;
@@ -181 +184 @@
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
+  PageControl1.TabIndex := 0;
   Eans := TEans.Create;
   LoadConfig;
@@ -193 +197 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  PageControl1.TabIndex := 0;
   ButtonLoadClick(nil);
 end;
@@ -204 +207 @@
 procedure TFormMain.TabSheetChartShow(Sender: TObject);
 begin
-  Eans.LoadToStrings(ComboBoxEan.Items);
-  if (ComboBoxEan.Items.Count > 0) and (ComboBoxEan.ItemIndex = -1) then ComboBoxEan.ItemIndex := 0;
-  Eans.LoadToStrings(ComboBoxEan2.Items);
+  Eans.LoadToStrings(ComboBoxEan.Items, True);
+  if (ComboBoxEan.Items.Count > 1) and (ComboBoxEan.ItemIndex = -1) then ComboBoxEan.ItemIndex := 1;
+  Eans.LoadToStrings(ComboBoxEan2.Items, True);
+  Eans.LoadToStrings(ComboBoxEan3.Items, True);
   ReloadChart;
 end;
@@ -463 +467 @@
     end;
   end;
+
+  Chart1LineSeries3.Clear;
+  if ComboBoxEan3.ItemIndex <> -1 then begin
+    Ean := TEan(ComboBoxEan3.Items.Objects[ComboBoxEan3.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
+        Chart1LineSeries3.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
+    end;
+  end;
 end;
 
@@ -522 +537 @@
     ReportsDir := ReadStringWithDefault('ReportsDir', ReportsDir);
     OwnersFileName := ReadStringWithDefault('OwnersFileName', OwnersFileName);
+    PageControl1.TabIndex := ReadIntegerWithDefault('ActiveTab', PageControl1.TabIndex);
   finally
     Free;
@@ -542 +558 @@
     WriteString('ReportsDir', ReportsDir);
     WriteString('OwnersFileName', OwnersFileName);
+    WriteInteger('ActiveTab', PageControl1.TabIndex);
   finally
     Free;