Changeset 12

Timestamp:

Apr 17, 2026, 2:31:42 PM (13 days ago)

Author:

chronos

Message:

• Added: Min/max interval position navigation buttons.
• Modified: Remember last interval position.

Location:

trunk

Files:

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

trunk/Ean.pas

@@ -58 +58 @@
 
   TEans = class(TObjectList<TEan>)
+    function GetMaxTime: TDateTime;
+    function GetMinTime: TDateTime;
     function SearchByNumber(Number: string): TEan;
     function SearchByOwnerKind(Owner: string; Kind: TEanKind): TEan;
@@ -75 +77 @@
   EanValueName = 'EanValue';
   EanValuesName = 'EanValues';
+  FifteenMinute = 15 * OneMinute;
 
 
@@ -180 +183 @@
   TotalIn := GetTotalIn(TimeFrom, TimeTo);
   TotalOut := GetTotalOut(TimeFrom, TimeTo);
-  if TotalIn <> 0 then Result := TotalIn - TotalOut
-    else Result := 0;
+  Result := TotalIn - TotalOut;
 end;
 
@@ -187 +189 @@
 var
   TotalIn: Double;
+  TotalOut: Double;
 begin
   TotalIn := GetTotalIn(TimeFrom, TimeTo);
-  if TotalIn <> 0 then Result := (1 - GetTotalOut(TimeFrom, TimeTo) / TotalIn) * 100
-    else Result := 0;
+  TotalOut := GetTotalOut(TimeFrom, TimeTo);
+  Result := (1 - TotalOut / TotalIn) * 100;
 end;
 
@@ -286 +289 @@
 
 { TEans }
+
+function TEans.GetMaxTime: TDateTime;
+var
+  I: Integer;
+  Found: Boolean;
+begin
+  Found := False;
+  for I := 0 to Count - 1 do
+  with Items[I] do
+    if Values.Count > 0 then begin
+      if not Found then begin
+        Result := Values[Values.Count - 1].Time;
+        Found := True;
+      end
+      else if Values[Values.Count - 1].Time > Result then begin
+        Result := Values[Values.Count - 1].Time;
+      end;
+    end;
+  if not Found then Result := Now;
+end;
+
+function TEans.GetMinTime: TDateTime;
+var
+  I: Integer;
+  Found: Boolean;
+begin
+  Found := False;
+  for I := 0 to Count - 1 do
+  with Items[I] do
+    if Values.Count > 0 then begin
+      if not Found then begin
+        Result := Values[0].Time;
+        Found := True;
+      end
+      else if Values[0].Time < Result then begin
+        Result := Values[0].Time;
+      end;
+    end;
+  if not Found then Result := Now;
+end;
 
 function TEans.SearchByNumber(Number: string): TEan;

trunk/EdcProject.pas

@@ -192 +192 @@
         if TryStrToCurr(CSVDoc.Cells[3 + C * 2 + 1, R], CellValueOut) then begin
           if EanKind = ekConsumption then CellValueOut := -CellValueOut;
-        end;
+        end else CellValueOut := CellValueIn;
 
         Ean.Values.Add(TEanValue.Create(TimeFrom, CellValueIn, CellValueOut));

trunk/FormMain.lfm

@@ -340 +340 @@
   end
   object TimeEdit1: TTimeEdit
-    Left = 520
+    Left = 544
     Height = 43
-    Top = 8
+    Top = 3
     Width = 155
     ButtonWidth = 34
@@ -351 +351 @@
   end
   object DateEdit1: TDateEdit
-    Left = 352
+    Left = 376
     Height = 43
-    Top = 8
+    Top = 3
     Width = 155
     CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
@@ -364 +364 @@
   end
   object ButtonIntervalRight: TButton
-    Left = 680
-    Height = 38
-    Top = 13
+    Left = 704
+    Height = 38
+    Top = 8
     Width = 40
     Caption = '>'
@@ -373 +373 @@
   end
   object ButtonIntervalLeft: TButton
-    Left = 304
-    Height = 38
-    Top = 13
+    Left = 328
+    Height = 38
+    Top = 8
     Width = 40
     Caption = '<'
@@ -382 +382 @@
   end
   object ComboBoxUnit: TComboBox
-    Left = 848
-    Height = 38
-    Top = 8
+    Left = 904
+    Height = 38
+    Top = 3
     Width = 160
     ItemHeight = 0
@@ -398 +398 @@
   end
   object Label5: TLabel
-    Left = 752
+    Left = 808
     Height = 26
-    Top = 16
+    Top = 11
     Width = 40
     Caption = 'Unit:'
+  end
+  object ButtonIntervalRightMax: TButton
+    Left = 752
+    Height = 38
+    Top = 8
+    Width = 40
+    Caption = '>|'
+    TabOrder = 7
+    OnClick = ButtonIntervalRightMaxClick
+  end
+  object ButtonIntervalLeftMin: TButton
+    Left = 280
+    Height = 38
+    Top = 8
+    Width = 40
+    Caption = '|<'
+    TabOrder = 8
+    OnClick = ButtonIntervalLeftMinClick
   end
   object Translator1: TTranslator

trunk/FormMain.lrj

@@ -36 +36 @@
 {"hash":60,"name":"tformmain.buttonintervalleft.caption","sourcebytes":[60],"value":"<"},
 {"hash":6049914,"name":"tformmain.label5.caption","sourcebytes":[85,110,105,116,58],"value":"Unit:"},
+{"hash":1116,"name":"tformmain.buttonintervalrightmax.caption","sourcebytes":[62,124],"value":">|"},
+{"hash":2044,"name":"tformmain.buttonintervalleftmin.caption","sourcebytes":[124,60],"value":"|<"},
 {"hash":315429,"name":"tformmain.menuitemfile.caption","sourcebytes":[70,105,108,101],"value":"File"},
 {"hash":341364,"name":"tformmain.menuitemload.caption","sourcebytes":[76,111,97,100],"value":"Load"},

trunk/FormMain.pas

@@ -20 +20 @@
     ButtonIntervalRight: TButton;
     ButtonIntervalLeft: TButton;
+    ButtonIntervalRightMax: TButton;
+    ButtonIntervalLeftMin: TButton;
     Chart1: TChart;
     Chart1LineSeries1: TLineSeries;
@@ -65 +67 @@
     Translator1: TTranslator;
     procedure ButtonIntervalLeftClick(Sender: TObject);
+    procedure ButtonIntervalLeftMinClick(Sender: TObject);
     procedure ButtonIntervalRightClick(Sender: TObject);
+    procedure ButtonIntervalRightMaxClick(Sender: TObject);
     procedure CheckBoxShowResultChange(Sender: TObject);
     procedure ComboBoxEanDataSelect(Sender: TObject);
@@ -156 +160 @@
 end;
 
+procedure TFormMain.ButtonIntervalRightMaxClick(Sender: TObject);
+begin
+  IntervalTo := EdcProject.Eans.GetMaxTime + FifteenMinute;
+  UpdateInterval;
+end;
+
 procedure TFormMain.ButtonIntervalLeftClick(Sender: TObject);
 begin
   IntervalTo := IntervalTo - GetIntervalLength;
+  UpdateInterval;
+end;
+
+procedure TFormMain.ButtonIntervalLeftMinClick(Sender: TObject);
+begin
+  IntervalTo := EdcProject.Eans.GetMinTime + GetIntervalLength + FifteenMinute;
   UpdateInterval;
 end;
@@ -209 +225 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  MenuItemLoad.Click;
+  EdcProject.LoadFromFile(ProjectFileName);
+
+  UpdateInterval;
+  UpdateInterface;
 end;
 
@@ -217 +236 @@
 
   if (EdcProject.Eans.Count > 0) and (EdcProject.Eans[0].Values.Count > 0) then
-    IntervalTo := EdcProject.Eans[0].Values.Last.Time + 15 * OneMinute;
+    IntervalTo := EdcProject.Eans[0].Values.Last.Time + FifteenMinute;
   UpdateInterval;
   UpdateInterface;
@@ -235 +254 @@
 
   if (EdcProject.Eans.Count > 0) and (EdcProject.Eans[0].Values.Count > 0) then
-    IntervalTo := EdcProject.Eans[0].Values.Last.Time + 15 * OneMinute;
+    IntervalTo := EdcProject.Eans[0].Values.Last.Time + FifteenMinute;
   UpdateInterval;
   UpdateInterface;
@@ -501 +520 @@
 begin
   case Period of
-    prDay: Result := 15 * OneMinute;
+    prDay: Result := FifteenMinute;
     prWeek: Result := 1;
     prMonth: Result := 1;
@@ -549 +568 @@
     PageControl1.TabIndex := ReadIntegerWithDefault('ActiveTab', PageControl1.TabIndex);
     ShowResult := ReadBoolWithDefault('ShowResult', ShowResult);
+    IntervalFrom := ReadDateTimeWithDefault('IntervalFrom', IntervalFrom);
+    IntervalTo := ReadDateTimeWithDefault('IntervalTo', IntervalTo);
   finally
     Free;
@@ -572 +593 @@
     WriteInteger('ActiveTab', PageControl1.TabIndex);
     WriteBool('ShowResult', ShowResult);
+    WriteDateTime('IntervalFrom', IntervalFrom);
+    WriteDateTime('IntervalTo', IntervalTo);
   finally
     Free;

trunk/Languages/EdcStats.cs.po

@@ -75 +75 @@
 msgstr "<"
 
+#: tformmain.buttonintervalleftmin.caption
+msgid "|<"
+msgstr "|<"
+
 #: tformmain.buttonintervalright.caption
 msgid ">"
 msgstr ">"
+
+#: tformmain.buttonintervalrightmax.caption
+msgid ">|"
+msgstr ">|"
 
 #: tformmain.caption

trunk/Languages/EdcStats.pot

@@ -65 +65 @@
 msgstr ""
 
+#: tformmain.buttonintervalleftmin.caption
+msgid "|<"
+msgstr ""
+
 #: tformmain.buttonintervalright.caption
 msgid ">"
+msgstr ""
+
+#: tformmain.buttonintervalrightmax.caption
+msgid ">|"
 msgstr ""