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
This commit is contained in:
wp_xxyyzz
2020-09-27 18:07:50 +00:00
parent 4867231421
commit 6fc99eddbc
18 changed files with 360 additions and 361 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
inherited BoxPlotFrm: TBoxPlotFrm object BoxPlotFrm: TBoxPlotFrm
Left = 449 Left = 449
Height = 500 Height = 500
Top = 211 Top = 211

View File

@ -10,7 +10,7 @@ uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
StdCtrls, ExtCtrls, Printers, ComCtrls, Buttons, StdCtrls, ExtCtrls, Printers, ComCtrls, Buttons,
MainUnit, Globals, DataProcs, ContextHelpUnit, MainUnit, Globals, DataProcs, ContextHelpUnit,
BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit; BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit;
type type

View File

@ -1,4 +1,4 @@
inherited DescriptiveFrm: TDescriptiveFrm object DescriptiveFrm: TDescriptiveFrm
Left = 526 Left = 526
Height = 384 Height = 384
Top = 202 Top = 202

View File

@ -8,7 +8,7 @@ uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
StdCtrls, ExtCtrls, Buttons, StdCtrls, ExtCtrls, Buttons,
MainUnit, Globals, FunctionsLib, BasicStatsFormUnit, MainUnit, Globals, FunctionsLib, BasicStatsFormUnit,
ReportFrameUnit, DataProcs, DictionaryUnit, ContextHelpUnit; ReportFrameUnit, DataProcs, DictionaryUnit, ContextHelpUnit;
type type

View File

@ -1,4 +1,4 @@
inherited FreqFrm: TFreqFrm object FreqFrm: TFreqFrm
Left = 490 Left = 490
Height = 376 Height = 376
Top = 228 Top = 228

View File

@ -9,7 +9,8 @@ interface
uses uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
StdCtrls, Buttons, ExtCtrls, ComCtrls, Spin, StdCtrls, Buttons, ExtCtrls, ComCtrls, Spin,
Globals, MainUnit, GraphLib, DataProcs, BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit; Globals, MainUnit, GraphLib, DataProcs,
BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit;
type type

View File

@ -1,4 +1,4 @@
inherited MultXvsYFrm: TMultXvsYFrm object MultXvsYFrm: TMultXvsYFrm
Left = 814 Left = 814
Height = 416 Height = 416
Top = 216 Top = 216

View File

@ -11,7 +11,7 @@ uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
StdCtrls, ExtCtrls, Buttons, Clipbrd, StdCtrls, ExtCtrls, Buttons, Clipbrd,
MainUnit, Globals, OutputUnit, DataProcs, DictionaryUnit, ContextHelpUnit, MainUnit, Globals, OutputUnit, DataProcs, DictionaryUnit, ContextHelpUnit,
BasicStatsFormUnit; BasicStatsFormUnit;
type type

View File

@ -1,4 +1,4 @@
inherited PlotXYFrm: TPlotXYFrm object PlotXYFrm: TPlotXYFrm
Left = 427 Left = 427
Height = 500 Height = 500
Top = 175 Top = 175

View File

@ -10,7 +10,7 @@ uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
StdCtrls, ExtCtrls, Buttons, ComCtrls, StdCtrls, ExtCtrls, Buttons, ComCtrls,
MainUnit, Globals, FunctionsLib, DataProcs, BasicStatsFormUnit, MainUnit, Globals, FunctionsLib, DataProcs, BasicStatsFormUnit,
ReportFrameUnit, ChartFrameUnit; ReportFrameUnit, ChartFrameUnit;
type type

View File

@ -1,4 +1,4 @@
inherited XvsMultYForm: TXvsMultYForm object XvsMultYForm: TXvsMultYForm
Left = 288 Left = 288
Height = 500 Height = 500
Top = 117 Top = 117
@ -356,7 +356,7 @@ inherited XvsMultYForm: TXvsMultYForm
Height = 484 Height = 484
Top = 8 Top = 8
Width = 675 Width = 675
ActivePage = ReportPage ActivePage = ChartPage
Align = alClient Align = alClient
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Top = 8 BorderSpacing.Top = 8
@ -364,9 +364,6 @@ inherited XvsMultYForm: TXvsMultYForm
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 8
TabIndex = 0 TabIndex = 0
TabOrder = 2 TabOrder = 2
object ReportPage: TTabSheet
Caption = 'Report'
end
object ChartPage: TTabSheet object ChartPage: TTabSheet
Caption = 'Chart' Caption = 'Chart'
end end

View File

@ -6,14 +6,15 @@ interface
uses uses
Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls,
StdCtrls, ComCtrls, Buttons, PrintersDlgs, StdCtrls, ComCtrls, Buttons,
Globals, MainUnit, ContextHelpUnit, ReportFrameUnit, ChartFrameUnit; Globals, MainUnit, ContextHelpUnit,
BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit;
type type
{ TBasicSPCForm } { TBasicSPCForm }
TBasicSPCForm = class(TForm) TBasicSPCForm = class(TBasicStatsForm)
Bevel1: TBevel; Bevel1: TBevel;
Bevel2: TBevel; Bevel2: TBevel;
GroupEdit: TEdit; GroupEdit: TEdit;
@ -61,13 +62,13 @@ type
procedure PlotMeans(ATitle, AXTitle, AYTitle, ADataTitle, AGrandMeanTitle: String; procedure PlotMeans(ATitle, AXTitle, AYTitle, ADataTitle, AGrandMeanTitle: String;
const Groups: StrDyneVec; const Means: DblDyneVec; const Groups: StrDyneVec; const Means: DblDyneVec;
UCL, LCL, GrandMean, TargetSpec, LowerSpec, UpperSpec: double); virtual; UCL, LCL, GrandMean, TargetSpec, LowerSpec, UpperSpec: double); virtual;
procedure Reset; virtual;
procedure UpdateBtnStates; virtual; procedure UpdateBtnStates; virtual;
function Validate(out AMsg: String; out AControl: TWinControl): Boolean; virtual; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; virtual;
public public
FReportFrame: TReportFrame; FReportFrame: TReportFrame;
FChartFrame: TChartFrame; FChartFrame: TChartFrame;
procedure Reset; override;
property GroupsNeeded: Boolean read FgroupsNeeded write FGroupsNeeded; property GroupsNeeded: Boolean read FgroupsNeeded write FGroupsNeeded;
end; end;

View File

@ -18,9 +18,10 @@ type
procedure FormActivate(Sender: TObject); procedure FormActivate(Sender: TObject);
protected protected
procedure Compute; override; procedure Compute; override;
procedure Reset; override;
function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override;
public
procedure Reset; override;
end; end;
var var

View File

@ -6,7 +6,7 @@ interface
uses uses
Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls,
StdCtrls, Buttons, PrintersDlgs, Globals, BasicSPCUnit; StdCtrls, Buttons, Globals, BasicSPCUnit;
type type
@ -49,8 +49,10 @@ type
procedure PlotMeans(ATitle, AXTitle, AYTitle, ADataTitle, AGrandMeanTitle: String; procedure PlotMeans(ATitle, AXTitle, AYTitle, ADataTitle, AGrandMeanTitle: String;
const Groups: StrDyneVec; const {%H-}Means: DblDyneVec; const Groups: StrDyneVec; const {%H-}Means: DblDyneVec;
UCL, LCL, GrandMean, TargetSpec, LowerSpec, UpperSpec: double); override; UCL, LCL, GrandMean, TargetSpec, LowerSpec, UpperSpec: double); override;
procedure Reset; override;
function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override;
public
procedure Reset; override;
end; end;
var var

View File

@ -22,8 +22,10 @@ type
procedure FormActivate(Sender: TObject); procedure FormActivate(Sender: TObject);
protected protected
procedure Compute; override; procedure Compute; override;
procedure Reset; override;
function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override;
public
procedure Reset; override;
end; end;
var var

View File

@ -20,8 +20,10 @@ type
procedure FormActivate(Sender: TObject); procedure FormActivate(Sender: TObject);
protected protected
procedure Compute; override; procedure Compute; override;
procedure Reset; override;
function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override;
public
procedure Reset; override;
end; end;
var var

View File

@ -49,8 +49,9 @@ type
procedure PlotMeans(ATitle, AXTitle, AYTitle, ADataTitle, AGrandMeanTitle: String; procedure PlotMeans(ATitle, AXTitle, AYTitle, ADataTitle, AGrandMeanTitle: String;
const Groups: StrDyneVec; const Means: DblDyneVec; const Groups: StrDyneVec; const Means: DblDyneVec;
UCL, LCL, GrandMean, TargetSpec, LowerSpec, UpperSpec: double); override; UCL, LCL, GrandMean, TargetSpec, LowerSpec, UpperSpec: double); override;
procedure Reset; override;
function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override; function Validate(out AMsg: String; out AControl: TWinControl): Boolean; override;
public
procedure Reset; override;
end; end;
var var