Changeset 3 for trunk

Timestamp:

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

Author:

chronos

Message:

• Added: Third selectable EAN on chart tab.

Location:

trunk

Files:

• Ean.pas (modified) (2 diffs)
• FormMain.lfm (modified) (8 diffs)
• FormMain.lrj (modified) (1 diff)
• FormMain.pas (modified) (9 diffs)
• Languages/EdcStats.cs.po (modified) (2 diffs)
• Languages/EdcStats.pot (modified) (2 diffs)

trunk/Ean.pas

@@ -44 +44 @@
   TEans = class(TObjectList<TEan>)
     function SearchByNumber(Number: string): TEan;
-    procedure LoadToStrings(Strings: TStrings);
+    procedure LoadToStrings(Strings: TStrings; AllowNone: Boolean = False);
   end;
 
@@ -142 +142 @@
 end;
 
-procedure TEans.LoadToStrings(Strings: TStrings);
+procedure TEans.LoadToStrings(Strings: TStrings; AllowNone: Boolean = False);
 var
   I: Integer;
+  Shift: Integer;
 begin
+  if AllowNone then Shift := 1 else Shift := 0;
   Strings.BeginUpdate;
   try
-    while Strings.Count > Count do Strings.Delete(Strings.Count - 1);
-    while Strings.Count < Count do Strings.Add('');
+    while Strings.Count > Count + Shift do Strings.Delete(Strings.Count - 1);
+    while Strings.Count < Count + Shift do Strings.Add('');
     for I := 0 to Count - 1 do begin
-      Strings[I] := Items[I].Number + ' (' + Items[I].Owner + ')';
-      Strings.Objects[I] := Items[I];
+      Strings[I + Shift] := Items[I].Number + ' (' + Items[I].Owner + ')';
+      Strings.Objects[I + Shift] := Items[I];
     end;
   finally

trunk/FormMain.lfm

@@ -27 +27 @@
     Top = 64
     Width = 1176
-    ActivePage = TabSheetOverview
+    ActivePage = TabSheetChart
     Anchors = [akTop, akLeft, akRight, akBottom]
-    TabIndex = 0
+    TabIndex = 2
     TabOrder = 1
     object TabSheetOverview: TTabSheet
@@ -95 +95 @@
       OnShow = TabSheetChartShow
       object ComboBoxEan: TComboBox
-        Left = 120
+        Left = 88
         Height = 42
         Top = 24
@@ -108 +108 @@
         Height = 26
         Top = 32
-        Width = 41
-        Caption = 'EAN:'
+        Width = 56
+        Caption = 'EAN 1:'
       end
       object Chart1: TChart
@@ -135 +135 @@
         object Chart1LineSeries1: TLineSeries
           LinePen.Color = clYellow
-          LinePen.Width = 2
+          LinePen.Width = 3
         end
         object Chart1LineSeries2: TLineSeries
           LinePen.Color = clFuchsia
-          LinePen.Width = 2
+          LinePen.Width = 3
         end
+        object Chart1LineSeries3: TLineSeries
+          LinePen.Color = clAqua
+          LinePen.Width = 3
+        end
       end
       object Label3: TLabel
-        Left = 600
+        Left = 544
         Height = 26
         Top = 32
@@ -150 +154 @@
       end
       object ComboBoxEan2: TComboBox
-        Left = 680
+        Left = 608
         Height = 42
         Top = 24
@@ -157 +161 @@
         Style = csDropDownList
         TabOrder = 2
+        OnSelect = ComboBoxEanSelect
+      end
+      object Label6: TLabel
+        Left = 1048
+        Height = 26
+        Top = 32
+        Width = 56
+        Caption = 'EAN 3:'
+      end
+      object ComboBoxEan3: TComboBox
+        Left = 1112
+        Height = 42
+        Top = 24
+        Width = 432
+        ItemHeight = 0
+        Style = csDropDownList
+        TabOrder = 3
         OnSelect = ComboBoxEanSelect
       end
@@ -303 +324 @@
     POFilesFolder = 'Languages'
     OnTranslate = Translator1Translate
-    Left = 901
-    Top = 130
+    Left = 776
+    Top = 408
   end
   object ApplicationInfo1: TApplicationInfo
@@ -318 +339 @@
     RegistryRoot = rrKeyCurrentUser
     License = 'CC0'
-    Left = 1037
-    Top = 125
+    Left = 936
+    Top = 408
   end
   object PersistentForm1: TPersistentForm
     MinVisiblePart = 50
     EntireVisible = False
-    Left = 776
-    Top = 136
+    Left = 584
+    Top = 416
   end
   object ThemeManager1: TThemeManager
-    Left = 657
-    Top = 140
+    Left = 408
+    Top = 416
   end
 end

trunk/FormMain.lrj

@@ -11 +11 @@
 {"hash":21335,"name":"tformmain.tabsheetlog.caption","sourcebytes":[76,111,103],"value":"Log"},
 {"hash":4843668,"name":"tformmain.tabsheetchart.caption","sourcebytes":[67,104,97,114,116],"value":"Chart"},
-{"hash":300570,"name":"tformmain.label1.caption","sourcebytes":[69,65,78,58],"value":"EAN:"},
+{"hash":76940106,"name":"tformmain.label1.caption","sourcebytes":[69,65,78,32,49,58],"value":"EAN 1:"},
 {"hash":76940122,"name":"tformmain.label3.caption","sourcebytes":[69,65,78,32,50,58],"value":"EAN 2:"},
+{"hash":76940138,"name":"tformmain.label6.caption","sourcebytes":[69,65,78,32,51,58],"value":"EAN 3:"},
 {"hash":305313,"name":"tformmain.tabsheetdata.caption","sourcebytes":[68,97,116,97],"value":"Data"},
 {"hash":372789,"name":"tformmain.listview2.columns[0].caption","sourcebytes":[84,105,109,101],"value":"Time"},

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;

trunk/Languages/EdcStats.cs.po

@@ -74 +74 @@
 #: tformmain.label1.caption
 msgctxt "tformmain.label1.caption"
-msgid "EAN:"
-msgstr "EAN:"
+msgid "EAN 1:"
+msgstr "EAN 1:"
 
 #: tformmain.label2.caption
@@ -93 +93 @@
 msgid "Unit:"
 msgstr "Jednotky:"
+
+#: tformmain.label6.caption
+msgid "EAN 3:"
+msgstr "EAN 3:"
 
 #: tformmain.listview1.columns[0].caption

trunk/Languages/EdcStats.pot

@@ -64 +64 @@
 #: tformmain.label1.caption
 msgctxt "tformmain.label1.caption"
-msgid "EAN:"
+msgid "EAN 1:"
 msgstr ""
 
@@ -82 +82 @@
 #: tformmain.label5.caption
 msgid "Unit:"
+msgstr ""
+
+#: tformmain.label6.caption
+msgid "EAN 3:"
 msgstr ""