Changeset 4 for trunk


Ignore:
Timestamp:
Apr 7, 2026, 10:51:20 PM (3 weeks ago)
Author:
chronos
Message:
  • Added: Show result values in charts.
  • Fixed: Charts redrawing.
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/FormMain.lfm

    r3 r4  
    11object FormMain: TFormMain
    2   Left = 387
     2  Left = 377
    33  Height = 884
    4   Top = 381
     4  Top = 371
    55  Width = 1203
    66  Caption = 'EDC Stats'
    … …  
    113113      object Chart1: TChart
    114114        Left = 16
    115         Height = 683
    116         Top = 72
     115        Height = 651
     116        Top = 104
    117117        Width = 1138
    118118        AxisList = <       
    … …  
    145145          LinePen.Width = 3
    146146        end
     147        object Chart1LineSeries4: TLineSeries
     148          LinePen.Color = clYellow
     149          LinePen.Style = psDot
     150          LinePen.Width = 3
     151        end
     152        object Chart1LineSeries5: TLineSeries
     153          LinePen.Color = clFuchsia
     154          LinePen.Style = psDot
     155          LinePen.Width = 3
     156        end
     157        object Chart1LineSeries6: TLineSeries
     158          LinePen.Color = clAqua
     159          LinePen.Style = psDot
     160          LinePen.Width = 3
     161        end
    147162      end
    148163      object Label3: TLabel
    … …  
    179194        TabOrder = 3
    180195        OnSelect = ComboBoxEanSelect
     196      end
     197      object CheckBoxShowResult: TCheckBox
     198        Left = 16
     199        Height = 30
     200        Top = 72
     201        Width = 134
     202        Caption = 'Show results'
     203        TabOrder = 4
     204        OnChange = CheckBoxShowResultChange
    181205      end
    182206    end
    … …  
    299323  end
    300324  object ComboBoxUnit: TComboBox
    301     Left = 976
     325    Left = 1016
    302326    Height = 38
    303327    Top = 16

  • trunk/FormMain.lrj

    r3 r4  
    1414{"hash":76940122,"name":"tformmain.label3.caption","sourcebytes":[69,65,78,32,50,58],"value":"EAN 2:"},
    1515{"hash":76940138,"name":"tformmain.label6.caption","sourcebytes":[69,65,78,32,51,58],"value":"EAN 3:"},
     16{"hash":223734467,"name":"tformmain.checkboxshowresult.caption","sourcebytes":[83,104,111,119,32,114,101,115,117,108,116,115],"value":"Show results"},
    1617{"hash":305313,"name":"tformmain.tabsheetdata.caption","sourcebytes":[68,97,116,97],"value":"Data"},
    1718{"hash":372789,"name":"tformmain.listview2.columns[0].caption","sourcebytes":[84,105,109,101],"value":"Time"},

  • trunk/FormMain.pas

    r3 r4  
    2525    Chart1LineSeries2: TLineSeries;
    2626    Chart1LineSeries3: TLineSeries;
     27    Chart1LineSeries4: TLineSeries;
     28    Chart1LineSeries5: TLineSeries;
     29    Chart1LineSeries6: TLineSeries;
     30    CheckBoxShowResult: TCheckBox;
    2731    ComboBoxEan: TComboBox;
    2832    ComboBoxEan3: TComboBox;
    … …  
    5357    procedure ButtonIntervalRightClick(Sender: TObject);
    5458    procedure ButtonLoadClick(Sender: TObject);
     59    procedure CheckBoxShowResultChange(Sender: TObject);
    5560    procedure ComboBoxEanSelect(Sender: TObject);
    5661    procedure ComboBoxPeriodSelect(Sender: TObject);
    … …  
    7479    ReportsDir: string;
    7580    OwnersFileName: string;
     81    ShowResult: Boolean;
    7682    function FileNameFilter(FileName: string): Boolean;
    7783    function MeasureToFloat(Value: Double; Interval: Double): Double;
    … …  
    114120  SMeasured = 'Measured';
    115121  SResult = 'Result';
     122  SDay = 'Day';
     123  SWeek = 'Week';
     124  SMonth = 'Month';
     125  SYear = 'Year';
    116126
    117127{ TFormMain }
    … …  
    143153  IntervalTo := Eans[0].Values.Last.Time + 15 * OneMinute;
    144154  UpdateInterval;
    145   ShowActiveTab;
    146155  UpdateInterface;
     156end;
     157
     158procedure TFormMain.CheckBoxShowResultChange(Sender: TObject);
     159begin
     160  if CheckBoxShowResult.Checked <> ShowResult then begin
     161    ShowResult := CheckBoxShowResult.Checked;
     162    ReloadChart;
     163  end;
    147164end;
    148165
    … …  
    177194
    178195procedure TFormMain.DateEdit1Change(Sender: TObject);
    179 begin
    180   IntervalTo := DateEdit1.Date + TimeOf(IntervalTo);
    181   UpdateInterval;
     196var
     197  NewIntervalTo: TDateTime;
     198begin
     199  NewIntervalTo := DateEdit1.Date + TimeOf(IntervalTo);
     200  if NewIntervalTo <> IntervalTo then begin
     201    IntervalTo := NewIntervalTo;
     202    UpdateInterval;
     203  end;
    182204end;
    183205
    … …  
    228250
    229251procedure TFormMain.TimeEdit1Change(Sender: TObject);
    230 begin
    231   IntervalTo := DateOf(IntervalTo) + TimeEdit1.Time;
    232   UpdateInterval;
     252var
     253  NewIntervalTo: TDateTime;
     254begin
     255  NEwIntervalTo := DateOf(IntervalTo) + TimeEdit1.Time;
     256  if NewIntervalTo <> IntervalTo then begin
     257    IntervalTo := NewIntervalTo;
     258    UpdateInterval;
     259  end;
    233260end;
    234261
    235262procedure TFormMain.Translator1Translate(Sender: TObject);
    236263begin
     264  ComboBoxPeriod.Items[Integer(prDay)] := SDay;
     265  ComboBoxPeriod.Items[Integer(prWeek)] := SWeek;
     266  ComboBoxPeriod.Items[Integer(prMonth)] := SMonth;
     267  ComboBoxPeriod.Items[Integer(prYear)] := SYear;
    237268  Ean.Translate;
    238269end;
    … …  
    447478  Ean: TEan;
    448479begin
     480  Chart1LineSeries1.BeginUpdate;
     481  Chart1LineSeries4.BeginUpdate;
    449482  Chart1LineSeries1.Clear;
    450   if ComboBoxEan.ItemIndex = -1 then Exit;
    451   Ean := TEan(ComboBoxEan.Items.Objects[ComboBoxEan.ItemIndex]);
    452   if not Assigned(Ean) then Exit;
    453   with Ean do begin
    454     for I := 0 to Values.Count - 1 do
    455       if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then
    456       Chart1LineSeries1.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
    457   end;
    458 
     483  Chart1LineSeries4.Clear;
     484  if ComboBoxEan.ItemIndex <> -1 then begin
     485    Ean := TEan(ComboBoxEan.Items.Objects[ComboBoxEan.ItemIndex]);
     486    if Assigned(Ean) then
     487    with Ean do begin
     488      for I := 0 to Values.Count - 1 do
     489        if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then begin
     490          Chart1LineSeries1.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
     491          if ShowResult then Chart1LineSeries4.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueOut, 1 / 4));
     492        end;
     493    end;
     494  end;
     495  Chart1LineSeries1.EndUpdate;
     496  Chart1LineSeries4.EndUpdate;
     497
     498  Chart1LineSeries2.BeginUpdate;
     499  Chart1LineSeries5.BeginUpdate;
    459500  Chart1LineSeries2.Clear;
     501  Chart1LineSeries5.Clear;
    460502  if ComboBoxEan2.ItemIndex <> -1 then begin
    461503    Ean := TEan(ComboBoxEan2.Items.Objects[ComboBoxEan2.ItemIndex]);
    462     if not Assigned(Ean) then Exit;
     504    if Assigned(Ean) then
    463505    with Ean do begin
    464506      for I := 0 to Values.Count - 1 do
    465         if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then
    466         Chart1LineSeries2.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
    467     end;
    468   end;
    469 
     507        if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then begin
     508          Chart1LineSeries2.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
     509          if ShowResult then Chart1LineSeries5.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueOut, 1 / 4));
     510        end;
     511    end;
     512  end;
     513  Chart1LineSeries2.EndUpdate;
     514  Chart1LineSeries5.EndUpdate;
     515
     516  Chart1LineSeries3.BeginUpdate;
     517  Chart1LineSeries6.BeginUpdate;
    470518  Chart1LineSeries3.Clear;
     519  Chart1LineSeries6.Clear;
    471520  if ComboBoxEan3.ItemIndex <> -1 then begin
    472521    Ean := TEan(ComboBoxEan3.Items.Objects[ComboBoxEan3.ItemIndex]);
    473     if not Assigned(Ean) then Exit;
     522    if Assigned(Ean) then
    474523    with Ean do begin
    475524      for I := 0 to Values.Count - 1 do
    476         if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then
    477         Chart1LineSeries3.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
    478     end;
    479   end;
     525        if (Values[I].Time >= IntervalFrom) and (Values[I].Time < IntervalTo) then begin
     526          Chart1LineSeries3.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueIn, 1 / 4));
     527          if ShowResult then Chart1LineSeries6.AddXY(Values[I].Time, MeasureToFloat(Values[I].ValueOut, 1 / 4));
     528        end;
     529    end;
     530  end;
     531  Chart1LineSeries3.EndUpdate;
     532  Chart1LineSeries6.EndUpdate;
    480533end;
    481534
    … …  
    504557  ComboBoxUnit.ItemIndex := Integer(ValueUnit);
    505558  ComboBoxPeriod.ItemIndex := Integer(Period);
     559  CheckBoxShowResult.Checked := ShowResult;
    506560end;
    507561
    … …  
    538592    OwnersFileName := ReadStringWithDefault('OwnersFileName', OwnersFileName);
    539593    PageControl1.TabIndex := ReadIntegerWithDefault('ActiveTab', PageControl1.TabIndex);
     594    ShowResult := ReadBoolWithDefault('ShowResult', ShowResult);
    540595  finally
    541596    Free;
    … …  
    559614    WriteString('OwnersFileName', OwnersFileName);
    560615    WriteInteger('ActiveTab', PageControl1.TabIndex);
     616    WriteBool('ShowResult', ShowResult);
    561617  finally
    562618    Free;

  • trunk/Languages/EdcStats.cs.po

    r3 r4  
    2020msgstr "Výrobní"
    2121
     22#: formmain.sday
     23msgctxt "formmain.sday"
     24msgid "Day"
     25msgstr "Den"
     26
    2227#: formmain.sean
    2328msgctxt "formmain.sean"
    … …  
    2934msgid "Measured"
    3035msgstr "Měřeno"
     36
     37#: formmain.smonth
     38msgid "Month"
     39msgstr "Měsíc"
    3140
    3241#: formmain.sowner
    … …  
    5261msgstr "Celková výroba"
    5362
     63#: formmain.sweek
     64msgid "Week"
     65msgstr "Týden"
     66
     67#: formmain.syear
     68msgid "Year"
     69msgstr "Rok"
     70
    5471#: tformmain.buttonintervalleft.caption
    5572msgid "<"
    … …  
    6885msgstr "EDC Stats"
    6986
     87#: tformmain.checkboxshowresult.caption
     88msgid "Show results"
     89msgstr "Ukázat výsledky"
     90
    7091#: tformmain.comboboxperiod.text
     92msgctxt "tformmain.comboboxperiod.text"
    7193msgid "Day"
    7294msgstr "Den"

  • trunk/Languages/EdcStats.pot

    r3 r4  
    1010msgstr ""
    1111
     12#: formmain.sday
     13msgctxt "formmain.sday"
     14msgid "Day"
     15msgstr ""
     16
    1217#: formmain.sean
    1318msgctxt "formmain.sean"
    … …  
    1823msgctxt "formmain.smeasured"
    1924msgid "Measured"
     25msgstr ""
     26
     27#: formmain.smonth
     28msgid "Month"
    2029msgstr ""
    2130
    … …  
    4251msgstr ""
    4352
     53#: formmain.sweek
     54msgid "Week"
     55msgstr ""
     56
     57#: formmain.syear
     58msgid "Year"
     59msgstr ""
     60
    4461#: tformmain.buttonintervalleft.caption
    4562msgid "<"
    … …  
    5875msgstr ""
    5976
     77#: tformmain.checkboxshowresult.caption
     78msgid "Show results"
     79msgstr ""
     80
    6081#: tformmain.comboboxperiod.text
     82msgctxt "tformmain.comboboxperiod.text"
    6183msgid "Day"
    6284msgstr ""
Note: See TracChangeset for help on using the changeset viewer.