LazStats: Update help and its usage in corsim unit.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8057 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2021-06-24 09:20:37 +00:00
parent 5dc39f028a
commit ef624cb020
4 changed files with 63 additions and 48 deletions

Binary file not shown.

View File

@ -31,8 +31,9 @@ inherited CorSimForm: TCorSimForm
inherited HelpBtn: TButton inherited HelpBtn: TButton
Left = 7 Left = 7
Top = 406 Top = 406
HelpType = htKeyword
HelpKeyword = 'html/BivariateScatterPlot.htm'
TabOrder = 7 TabOrder = 7
Visible = False
end end
inherited ButtonBevel: TBevel inherited ButtonBevel: TBevel
Top = 390 Top = 390
@ -42,18 +43,18 @@ inherited CorSimForm: TCorSimForm
AnchorSideLeft.Control = ParamsPanel AnchorSideLeft.Control = ParamsPanel
AnchorSideTop.Control = MeanXEdit AnchorSideTop.Control = MeanXEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 0 Left = 12
Height = 15 Height = 15
Top = 4 Top = 4
Width = 43 Width = 40
Caption = 'Mean X:' BorderSpacing.Left = 12
ParentColor = False Caption = 'Mean X'
end end
object MeanXEdit: TEdit[6] object MeanXEdit: TEdit[6]
AnchorSideLeft.Control = Label1 AnchorSideLeft.Control = Label1
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = ParamsPanel AnchorSideTop.Control = ParamsPanel
Left = 51 Left = 60
Height = 23 Height = 23
Top = 0 Top = 0
Width = 60 Width = 60
@ -66,12 +67,12 @@ inherited CorSimForm: TCorSimForm
AnchorSideLeft.Control = ParamsPanel AnchorSideLeft.Control = ParamsPanel
AnchorSideTop.Control = MeanYEdit AnchorSideTop.Control = MeanYEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 0 Left = 12
Height = 15 Height = 15
Top = 35 Top = 35
Width = 43 Width = 40
Caption = 'Mean Y:' BorderSpacing.Left = 12
ParentColor = False Caption = 'Mean Y'
end end
object MeanYEdit: TEdit[8] object MeanYEdit: TEdit[8]
AnchorSideLeft.Control = MeanXEdit AnchorSideLeft.Control = MeanXEdit
@ -79,7 +80,7 @@ inherited CorSimForm: TCorSimForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = MeanXEdit AnchorSideRight.Control = MeanXEdit
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 51 Left = 60
Height = 23 Height = 23
Top = 31 Top = 31
Width = 60 Width = 60
@ -90,28 +91,32 @@ inherited CorSimForm: TCorSimForm
Text = 'MeanYEdit' Text = 'MeanYEdit'
end end
object Label3: TLabel[9] object Label3: TLabel[9]
AnchorSideLeft.Control = MeanXEdit
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = StdDevXEdit AnchorSideTop.Control = StdDevXEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 135 AnchorSideRight.Control = StdDevXEdit
Left = 134
Height = 15 Height = 15
Top = 4 Top = 4
Width = 50 Width = 53
Anchors = [akTop, akRight]
BorderSpacing.Left = 24 BorderSpacing.Left = 24
Caption = 'Std.Dev.X' Caption = 'Std.Dev. X'
ParentColor = False
end end
object StdDevXEdit: TEdit[10] object StdDevXEdit: TEdit[10]
AnchorSideLeft.Control = Label3 AnchorSideLeft.Control = Label3
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = ParamsPanel AnchorSideTop.Control = ParamsPanel
Left = 193 AnchorSideRight.Control = ParamsPanel
AnchorSideRight.Side = asrBottom
Left = 195
Height = 23 Height = 23
Top = 0 Top = 0
Width = 60 Width = 60
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 12
TabOrder = 1 TabOrder = 1
Text = 'StdDevXEdit' Text = 'StdDevXEdit'
end end
@ -119,19 +124,18 @@ inherited CorSimForm: TCorSimForm
AnchorSideLeft.Control = Label3 AnchorSideLeft.Control = Label3
AnchorSideTop.Control = StdDevYEdit AnchorSideTop.Control = StdDevYEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 135 Left = 134
Height = 15 Height = 15
Top = 35 Top = 35
Width = 50 Width = 53
Caption = 'Std.Dev.Y' Caption = 'Std.Dev. Y'
ParentColor = False
end end
object StdDevYEdit: TEdit[12] object StdDevYEdit: TEdit[12]
AnchorSideLeft.Control = StdDevXEdit AnchorSideLeft.Control = StdDevXEdit
AnchorSideTop.Control = MeanYEdit AnchorSideTop.Control = MeanYEdit
AnchorSideRight.Control = StdDevXEdit AnchorSideRight.Control = StdDevXEdit
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 193 Left = 195
Height = 23 Height = 23
Top = 31 Top = 31
Width = 60 Width = 60
@ -145,7 +149,7 @@ inherited CorSimForm: TCorSimForm
AnchorSideTop.Control = CorrEdit AnchorSideTop.Control = CorrEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = CorrEdit AnchorSideRight.Control = CorrEdit
Left = 51 Left = 62
Height = 15 Height = 15
Top = 82 Top = 82
Width = 76 Width = 76
@ -153,13 +157,13 @@ inherited CorSimForm: TCorSimForm
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Right = 8 BorderSpacing.Right = 8
Caption = 'Correlation XY' Caption = 'Correlation XY'
ParentColor = False
end end
object CorrEdit: TEdit[14] object CorrEdit: TEdit[14]
AnchorSideLeft.Control = Label3 AnchorSideLeft.Control = Bevel1
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = MeanYEdit AnchorSideTop.Control = MeanYEdit
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 135 Left = 146
Height = 23 Height = 23
Top = 78 Top = 78
Width = 60 Width = 60
@ -173,7 +177,7 @@ inherited CorSimForm: TCorSimForm
AnchorSideTop.Control = NumObsEdit AnchorSideTop.Control = NumObsEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = NumObsEdit AnchorSideRight.Control = NumObsEdit
Left = 92 Left = 103
Height = 15 Height = 15
Top = 113 Top = 113
Width = 35 Width = 35
@ -181,7 +185,6 @@ inherited CorSimForm: TCorSimForm
BorderSpacing.Left = 16 BorderSpacing.Left = 16
BorderSpacing.Right = 8 BorderSpacing.Right = 8
Caption = 'N Size:' Caption = 'N Size:'
ParentColor = False
end end
object NumObsEdit: TEdit[16] object NumObsEdit: TEdit[16]
AnchorSideLeft.Control = CorrEdit AnchorSideLeft.Control = CorrEdit
@ -189,7 +192,7 @@ inherited CorSimForm: TCorSimForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = CorrEdit AnchorSideRight.Control = CorrEdit
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 135 Left = 146
Height = 23 Height = 23
Top = 109 Top = 109
Width = 60 Width = 60
@ -203,32 +206,34 @@ inherited CorSimForm: TCorSimForm
AnchorSideLeft.Control = ParamsPanel AnchorSideLeft.Control = ParamsPanel
AnchorSideTop.Control = NumObsEdit AnchorSideTop.Control = NumObsEdit
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = ParamsPanel
AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 140 Height = 140
Top = 148 Top = 148
Width = 220 Width = 267
Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BorderSpacing.Top = 16 BorderSpacing.Top = 16
Caption = 'Plot options' Caption = 'Plot options'
ClientHeight = 120 ClientHeight = 120
ClientWidth = 216 ClientWidth = 263
TabOrder = 6 TabOrder = 6
object NumBinsEdit: TSpinEdit object NumBinsEdit: TSpinEdit
AnchorSideLeft.Control = Label7 AnchorSideLeft.Control = Label7
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = BinCountChk AnchorSideTop.Control = OptionsBevel
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 107 Left = 107
Height = 23 Height = 23
Top = 85 Top = 62
Width = 55 Width = 55
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Top = 4 BorderSpacing.Top = 8
BorderSpacing.Right = 12 BorderSpacing.Right = 12
BorderSpacing.Bottom = 12
MinValue = 2 MinValue = 2
OnChange = NumBinsEditChange OnChange = NumBinsEditChange
TabOrder = 0 TabOrder = 2
Value = 2 Value = 2
end end
object Label7: TLabel object Label7: TLabel
@ -237,26 +242,25 @@ inherited CorSimForm: TCorSimForm
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 16 Left = 16
Height = 15 Height = 15
Top = 89 Top = 66
Width = 83 Width = 83
BorderSpacing.Left = 16 BorderSpacing.Left = 16
Caption = 'Number of bins' Caption = 'Number of bins'
ParentColor = False
end end
object BinCountChk: TCheckBox object BinCountChk: TCheckBox
AnchorSideLeft.Control = Label7 AnchorSideLeft.Control = Label7
AnchorSideTop.Control = OptionsBevel AnchorSideTop.Control = NumBinsEdit
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 16 Left = 16
Height = 19 Height = 19
Top = 62 Top = 89
Width = 188 Width = 188
BorderSpacing.Top = 8 BorderSpacing.Top = 4
BorderSpacing.Right = 12 BorderSpacing.Right = 12
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 12
Caption = 'Show frequencies in histograms' Caption = 'Show frequencies in histograms'
OnChange = BinCountChkChange OnChange = BinCountChkChange
TabOrder = 1 TabOrder = 3
end end
object RegressionLineChk: TCheckBox object RegressionLineChk: TCheckBox
AnchorSideLeft.Control = PlotOptionsGroup AnchorSideLeft.Control = PlotOptionsGroup
@ -272,7 +276,7 @@ inherited CorSimForm: TCorSimForm
Checked = True Checked = True
OnChange = RegressionLineChkChange OnChange = RegressionLineChkChange
State = cbChecked State = cbChecked
TabOrder = 2 TabOrder = 1
end end
object OptionsBevel: TBevel object OptionsBevel: TBevel
AnchorSideLeft.Control = PlotOptionsGroup AnchorSideLeft.Control = PlotOptionsGroup
@ -283,7 +287,7 @@ inherited CorSimForm: TCorSimForm
Left = 12 Left = 12
Height = 8 Height = 8
Top = 46 Top = 46
Width = 192 Width = 239
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 12 BorderSpacing.Left = 12
BorderSpacing.Right = 12 BorderSpacing.Right = 12
@ -302,9 +306,18 @@ inherited CorSimForm: TCorSimForm
Checked = True Checked = True
OnChange = RegressionResultsChkChange OnChange = RegressionResultsChkChange
State = cbChecked State = cbChecked
TabOrder = 3 TabOrder = 0
end end
end end
object Bevel1: TBevel[18]
AnchorSideLeft.Control = ParamsPanel
AnchorSideLeft.Side = asrCenter
Left = 121
Height = 15
Top = 56
Width = 25
Shape = bsSpacer
end
end end
inherited ParamsSplitter: TSplitter inherited ParamsSplitter: TSplitter
Left = 279 Left = 279
@ -314,6 +327,5 @@ inherited CorSimForm: TCorSimForm
Left = 288 Left = 288
Height = 431 Height = 431
Width = 561 Width = 561
TabOrder = 1
end end
end end

View File

@ -23,6 +23,7 @@ type
{ TCorSimForm } { TCorSimForm }
TCorSimForm = class(TBasicStatsReportAndChartForm) TCorSimForm = class(TBasicStatsReportAndChartForm)
Bevel1: TBevel;
BinCountChk: TCheckBox; BinCountChk: TCheckBox;
RegressionResultsChk: TCheckBox; RegressionResultsChk: TCheckBox;
OptionsBevel: TBevel; OptionsBevel: TBevel;
@ -124,6 +125,7 @@ begin
begin begin
BarBrush.Color := DATA_COLORS[1]; BarBrush.Color := DATA_COLORS[1];
MarkPositions := lmpPositive; MarkPositions := lmpPositive;
Marks.LinkPen.Color := clGrayText;
end; end;
XHistogramChart.AddSeries(XHistogramSeries); XHistogramChart.AddSeries(XHistogramSeries);
@ -155,6 +157,7 @@ begin
AxisIndexY := 1; AxisIndexY := 1;
BarBrush.Color := DATA_COLORS[2]; BarBrush.Color := DATA_COLORS[2];
MarkPositions := lmpPositive; MarkPositions := lmpPositive;
Marks.LinkPen.Color := clGrayText;
end; end;
YHistogramChart.AddSeries(YHistogramSeries); YHistogramChart.AddSeries(YHistogramSeries);
@ -179,7 +182,7 @@ begin
inherited; inherited;
ParamsPanel.Constraints.MinWidth := Max( ParamsPanel.Constraints.MinWidth := Max(
3*CloseBtn.Width + 2*CloseBtn.BorderSpacing.Left, 4*CloseBtn.Width + 4*CloseBtn.BorderSpacing.Left,
StdDevXEdit.Left + StdDevXEdit.Width StdDevXEdit.Left + StdDevXEdit.Width
); );
ParamsPanel.Constraints.MinHeight := ParamsPanel.Constraints.MinHeight :=