From 6fc99eddbc10ff815cbfafb08ba9f7b6e6af49f4 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sun, 27 Sep 2020 18:07:50 +0000 Subject: [PATCH] LazStats: Inherit the SPC forms from TBasicStatsForm. Fix some formatting issues in the descriptive forms. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7702 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- applications/lazstats/source/LazStats.lpi | 664 +++++++++--------- .../analysis/descriptive/boxplotunit.lfm | 2 +- .../analysis/descriptive/boxplotunit.pas | 2 +- .../analysis/descriptive/descriptiveunit.lfm | 2 +- .../analysis/descriptive/descriptiveunit.pas | 2 +- .../forms/analysis/descriptive/frequnit.lfm | 2 +- .../forms/analysis/descriptive/frequnit.pas | 3 +- .../analysis/descriptive/multxvsyunit.lfm | 2 +- .../analysis/descriptive/multxvsyunit.pas | 2 +- .../forms/analysis/descriptive/plotxyunit.lfm | 2 +- .../forms/analysis/descriptive/plotxyunit.pas | 2 +- .../analysis/descriptive/xvsmultyunit.lfm | 7 +- .../basicspcunit.pas | 9 +- .../cchartunit.pas | 3 +- .../statistical_process_control/cusumunit.pas | 6 +- .../pchartunit.pas | 4 +- .../uchartunit.pas | 4 +- .../xbarchartunit.pas | 3 +- 18 files changed, 360 insertions(+), 361 deletions(-) diff --git a/applications/lazstats/source/LazStats.lpi b/applications/lazstats/source/LazStats.lpi index 4ecc7a7ab..d5498e658 100644 --- a/applications/lazstats/source/LazStats.lpi +++ b/applications/lazstats/source/LazStats.lpi @@ -49,7 +49,7 @@ - + @@ -134,1308 +134,1300 @@ - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm index 1411600ec..2ee365917 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm @@ -1,4 +1,4 @@ -inherited BoxPlotFrm: TBoxPlotFrm +object BoxPlotFrm: TBoxPlotFrm Left = 449 Height = 500 Top = 211 diff --git a/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.pas b/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.pas index f945d638b..5377a9ec8 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.pas @@ -10,7 +10,7 @@ uses Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls, Printers, ComCtrls, Buttons, MainUnit, Globals, DataProcs, ContextHelpUnit, - BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit; + BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit; type diff --git a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm index 69b624ea1..8b02408e8 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm @@ -1,4 +1,4 @@ -inherited DescriptiveFrm: TDescriptiveFrm +object DescriptiveFrm: TDescriptiveFrm Left = 526 Height = 384 Top = 202 diff --git a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas index 69b087ee0..1c06c4137 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas @@ -8,7 +8,7 @@ uses Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls, Buttons, MainUnit, Globals, FunctionsLib, BasicStatsFormUnit, - ReportFrameUnit, DataProcs, DictionaryUnit, ContextHelpUnit; + ReportFrameUnit, DataProcs, DictionaryUnit, ContextHelpUnit; type diff --git a/applications/lazstats/source/forms/analysis/descriptive/frequnit.lfm b/applications/lazstats/source/forms/analysis/descriptive/frequnit.lfm index 8c1b9362a..28f5dc866 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/frequnit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/frequnit.lfm @@ -1,4 +1,4 @@ -inherited FreqFrm: TFreqFrm +object FreqFrm: TFreqFrm Left = 490 Height = 376 Top = 228 diff --git a/applications/lazstats/source/forms/analysis/descriptive/frequnit.pas b/applications/lazstats/source/forms/analysis/descriptive/frequnit.pas index 9d2a15ebd..d69c06d24 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/frequnit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/frequnit.pas @@ -9,7 +9,8 @@ interface uses Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, Buttons, ExtCtrls, ComCtrls, Spin, - Globals, MainUnit, GraphLib, DataProcs, BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit; + Globals, MainUnit, GraphLib, DataProcs, + BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit; type diff --git a/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.lfm index 0dfe649b0..70dcfb631 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.lfm @@ -1,4 +1,4 @@ -inherited MultXvsYFrm: TMultXvsYFrm +object MultXvsYFrm: TMultXvsYFrm Left = 814 Height = 416 Top = 216 diff --git a/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.pas b/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.pas index e21b83faf..3587f0826 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.pas @@ -11,7 +11,7 @@ uses Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls, Buttons, Clipbrd, MainUnit, Globals, OutputUnit, DataProcs, DictionaryUnit, ContextHelpUnit, - BasicStatsFormUnit; + BasicStatsFormUnit; type diff --git a/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.lfm index c2fd48db6..91f7a6376 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.lfm @@ -1,4 +1,4 @@ -inherited PlotXYFrm: TPlotXYFrm +object PlotXYFrm: TPlotXYFrm Left = 427 Height = 500 Top = 175 diff --git a/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.pas b/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.pas index 050e37582..d2e4a394c 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/plotxyunit.pas @@ -10,7 +10,7 @@ uses Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls, Buttons, ComCtrls, MainUnit, Globals, FunctionsLib, DataProcs, BasicStatsFormUnit, - ReportFrameUnit, ChartFrameUnit; + ReportFrameUnit, ChartFrameUnit; type diff --git a/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm index df1c97178..f10d6456f 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm @@ -1,4 +1,4 @@ -inherited XvsMultYForm: TXvsMultYForm +object XvsMultYForm: TXvsMultYForm Left = 288 Height = 500 Top = 117 @@ -356,7 +356,7 @@ inherited XvsMultYForm: TXvsMultYForm Height = 484 Top = 8 Width = 675 - ActivePage = ReportPage + ActivePage = ChartPage Align = alClient BorderSpacing.Left = 4 BorderSpacing.Top = 8 @@ -364,9 +364,6 @@ inherited XvsMultYForm: TXvsMultYForm BorderSpacing.Bottom = 8 TabIndex = 0 TabOrder = 2 - object ReportPage: TTabSheet - Caption = 'Report' - end object ChartPage: TTabSheet Caption = 'Chart' end diff --git a/applications/lazstats/source/forms/analysis/statistical_process_control/basicspcunit.pas b/applications/lazstats/source/forms/analysis/statistical_process_control/basicspcunit.pas index 63cb8ccc0..ea1ee61d4 100644 --- a/applications/lazstats/source/forms/analysis/statistical_process_control/basicspcunit.pas +++ b/applications/lazstats/source/forms/analysis/statistical_process_control/basicspcunit.pas @@ -6,14 +6,15 @@ interface uses Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, - StdCtrls, ComCtrls, Buttons, PrintersDlgs, - Globals, MainUnit, ContextHelpUnit, ReportFrameUnit, ChartFrameUnit; + StdCtrls, ComCtrls, Buttons, + Globals, MainUnit, ContextHelpUnit, + BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit; type { TBasicSPCForm } - TBasicSPCForm = class(TForm) + TBasicSPCForm = class(TBasicStatsForm) Bevel1: TBevel; Bevel2: TBevel; GroupEdit: TEdit; @@ -61,13 +62,13 @@ type procedure PlotMeans(ATitle, AXTitle, AYTitle, ADataTitle, AGrandMeanTitle: String; const Groups: StrDyneVec; const Means: DblDyneVec; UCL, LCL, GrandMean, TargetSpec, LowerSpec, UpperSpec: double); virtual; - procedure Reset; virtual; procedure UpdateBtnStates; virtual; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; virtual; public FReportFrame: TReportFrame; FChartFrame: TChartFrame; + procedure Reset; override; property GroupsNeeded: Boolean read FgroupsNeeded write FGroupsNeeded; end; diff --git a/applications/lazstats/source/forms/analysis/statistical_process_control/cchartunit.pas b/applications/lazstats/source/forms/analysis/statistical_process_control/cchartunit.pas index 6000755dd..a442a8bed 100644 --- a/applications/lazstats/source/forms/analysis/statistical_process_control/cchartunit.pas +++ b/applications/lazstats/source/forms/analysis/statistical_process_control/cchartunit.pas @@ -18,9 +18,10 @@ type procedure FormActivate(Sender: TObject); protected procedure Compute; override; - procedure Reset; override; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override; + public + procedure Reset; override; end; var diff --git a/applications/lazstats/source/forms/analysis/statistical_process_control/cusumunit.pas b/applications/lazstats/source/forms/analysis/statistical_process_control/cusumunit.pas index 174ba7661..cc7b09063 100644 --- a/applications/lazstats/source/forms/analysis/statistical_process_control/cusumunit.pas +++ b/applications/lazstats/source/forms/analysis/statistical_process_control/cusumunit.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, - StdCtrls, Buttons, PrintersDlgs, Globals, BasicSPCUnit; + StdCtrls, Buttons, Globals, BasicSPCUnit; type @@ -49,8 +49,10 @@ type procedure PlotMeans(ATitle, AXTitle, AYTitle, ADataTitle, AGrandMeanTitle: String; const Groups: StrDyneVec; const {%H-}Means: DblDyneVec; UCL, LCL, GrandMean, TargetSpec, LowerSpec, UpperSpec: double); override; - procedure Reset; override; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override; + + public + procedure Reset; override; end; var diff --git a/applications/lazstats/source/forms/analysis/statistical_process_control/pchartunit.pas b/applications/lazstats/source/forms/analysis/statistical_process_control/pchartunit.pas index eb17d8277..57470db63 100644 --- a/applications/lazstats/source/forms/analysis/statistical_process_control/pchartunit.pas +++ b/applications/lazstats/source/forms/analysis/statistical_process_control/pchartunit.pas @@ -22,8 +22,10 @@ type procedure FormActivate(Sender: TObject); protected procedure Compute; override; - procedure Reset; override; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override; + + public + procedure Reset; override; end; var diff --git a/applications/lazstats/source/forms/analysis/statistical_process_control/uchartunit.pas b/applications/lazstats/source/forms/analysis/statistical_process_control/uchartunit.pas index 7ac759e70..42725169f 100644 --- a/applications/lazstats/source/forms/analysis/statistical_process_control/uchartunit.pas +++ b/applications/lazstats/source/forms/analysis/statistical_process_control/uchartunit.pas @@ -20,8 +20,10 @@ type procedure FormActivate(Sender: TObject); protected procedure Compute; override; - procedure Reset; override; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override; + + public + procedure Reset; override; end; var diff --git a/applications/lazstats/source/forms/analysis/statistical_process_control/xbarchartunit.pas b/applications/lazstats/source/forms/analysis/statistical_process_control/xbarchartunit.pas index 3123d2f67..9b767d6e7 100644 --- a/applications/lazstats/source/forms/analysis/statistical_process_control/xbarchartunit.pas +++ b/applications/lazstats/source/forms/analysis/statistical_process_control/xbarchartunit.pas @@ -49,8 +49,9 @@ type procedure PlotMeans(ATitle, AXTitle, AYTitle, ADataTitle, AGrandMeanTitle: String; const Groups: StrDyneVec; const Means: DblDyneVec; UCL, LCL, GrandMean, TargetSpec, LowerSpec, UpperSpec: double); override; - procedure Reset; override; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override; + public + procedure Reset; override; end; var