pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

LazStats: Add some menu separators. Some clean-up.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7683 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-09-22 08:26:09 +00:00
parent 57b8701628
commit 5cfa3c5c6c
2 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
applications/lazstats/source/forms/mainunit.lfm
View File

@@ -14,7 +14,7 @@ object OS3MainFrm: TOS3MainFrm
Font.Name = 'Courier New' Font.Name = 'Courier New'
Font.Pitch = fpFixed Font.Pitch = fpFixed
Font.Quality = fqDraft Font.Quality = fqDraft
Menu = MainMenu1 Menu = MainMenu
OnCloseQuery = FormCloseQuery OnCloseQuery = FormCloseQuery
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
@@ -237,7 +237,7 @@ object OS3MainFrm: TOS3MainFrm
OnKeyPress = DataGridKeyPress OnKeyPress = DataGridKeyPress
OnPrepareCanvas = DataGridPrepareCanvas OnPrepareCanvas = DataGridPrepareCanvas
end end
object MainMenu1: TMainMenu object MainMenu: TMainMenu
Left = 192 Left = 192
Top = 200 Top = 200
object MenuItem1: TMenuItem object MenuItem1: TMenuItem
@@ -450,6 +450,9 @@ object OS3MainFrm: TOS3MainFrm
Caption = 'Distribution Statistics' Caption = 'Distribution Statistics'
OnClick = mnuAnalysisDescr_DistribStatsClick OnClick = mnuAnalysisDescr_DistribStatsClick
end end
object MenuItem4: TMenuItem
Caption = '-'
end
object mnuAnalysisDescr_Freq: TMenuItem object mnuAnalysisDescr_Freq: TMenuItem
Caption = 'Frequency Analysis' Caption = 'Frequency Analysis'
OnClick = mnuAnalysisDescr_FreqClick OnClick = mnuAnalysisDescr_FreqClick
@@ -458,18 +461,43 @@ object OS3MainFrm: TOS3MainFrm
Caption = 'Plot Group Frequencies' Caption = 'Plot Group Frequencies'
OnClick = mnuAnalysisDescr_GrpFreqClick OnClick = mnuAnalysisDescr_GrpFreqClick
end end
object MenuItem5: TMenuItem
Caption = '-'
end
object mnuAnalysisDescr_PlotXvsY: TMenuItem
Caption = 'Plot X vs Y'
OnClick = mnuAnalysisDescr_PlotXvsYClick
end
object mnuAnalysisDescr_XvsMultY: TMenuItem
Caption = 'X versus Multiple Y Plot'
OnClick = mnuAnalysisDescr_XvsMultYClick
end
object mnuAnalysisDescr_MultXvsY: TMenuItem
Caption = 'Multiple Group X vs Y Plot'
OnClick = mnuAnalysisDescr_MultXvsYClick
end
object MenuItem7: TMenuItem
Caption = '-'
end
object mnuAnalysisDescr_BoxPlot: TMenuItem
Caption = 'Box Plot'
OnClick = mnuAnalysisDescr_BoxPlotClick
end
object mnuAnalysisDescr_BubblePlot: TMenuItem
Caption = 'Repeated Measures Bubble Plot'
OnClick = mnuAnalysisDescr_BubblePlotClick
end
object MenuItem6: TMenuItem
Caption = '-'
end
object mnuAnalysisDescr_CrossTabs: TMenuItem object mnuAnalysisDescr_CrossTabs: TMenuItem
Caption = 'Cross Tabulation' Caption = 'Cross Tabulation'
OnClick = mnuAnalysisDescr_CrossTabsClick OnClick = mnuAnalysisDescr_CrossTabsClick
end end
object mnuAnalysisDescr_Breakdown: TMenuItem object mnuAnalysisDescr_Breakdown: TMenuItem
Caption = 'mnuAnalysisDescr_Breakdown' Caption = 'Breakdown'
OnClick = mnuAnalysisDescr_BreakdownClick OnClick = mnuAnalysisDescr_BreakdownClick
end end
object mnuAnalysisDescr_BoxPlot: TMenuItem
Caption = 'Box Plot'
OnClick = mnuAnalysisDescr_BoxPlotClick
end
object mnuAnalysisDescr_Normality: TMenuItem object mnuAnalysisDescr_Normality: TMenuItem
Caption = 'Normality Tests' Caption = 'Normality Tests'
OnClick = mnuAnalysisDescr_NormalityClick OnClick = mnuAnalysisDescr_NormalityClick
@@ -478,26 +506,10 @@ object OS3MainFrm: TOS3MainFrm
Caption = '3-D Variable Rotation' Caption = '3-D Variable Rotation'
OnClick = mnuAnalysisDescr_ThreeDRotateClick OnClick = mnuAnalysisDescr_ThreeDRotateClick
end end
object mnuAnalysisDescr_PlotXvsY: TMenuItem
Caption = 'Plot X vs Y'
OnClick = mnuAnalysisDescr_PlotXvsYClick
end
object mnuAnalysisDescr_BubblePlot: TMenuItem
Caption = 'Repeated Measures Bubble Plot'
OnClick = mnuAnalysisDescr_BubblePlotClick
end
object mnuAnalysisDescr_StemLeaf: TMenuItem object mnuAnalysisDescr_StemLeaf: TMenuItem
Caption = 'Stem and Leaf Plot' Caption = 'Stem and Leaf Plot'
OnClick = mnuAnalysisDescr_StemLeafClick OnClick = mnuAnalysisDescr_StemLeafClick
end end
object mnuAnalysisDescr_MultXvsY: TMenuItem
Caption = 'Multiple Group X vs Y Plot'
OnClick = mnuAnalysisDescr_MultXvsYClick
end
object mnuAnalysisDescr_XvsMultY: TMenuItem
Caption = 'X versus Multiple Y Plot'
OnClick = mnuAnalysisDescr_XvsMultYClick
end
object mnuAnalysisDescr_CompareDists: TMenuItem object mnuAnalysisDescr_CompareDists: TMenuItem
Caption = 'Compare Distributions' Caption = 'Compare Distributions'
OnClick = mnuAnalysisDescr_CompareDistsClick OnClick = mnuAnalysisDescr_CompareDistsClick
@@ -879,6 +891,9 @@ object OS3MainFrm: TOS3MainFrm
Caption = 'CUSUM Chart' Caption = 'CUSUM Chart'
OnClick = mnuAnalysisSPC_CUSUMClick OnClick = mnuAnalysisSPC_CUSUMClick
end end
object MenuItem3: TMenuItem
Caption = '-'
end
object mnuAnalysisSPC_CChart: TMenuItem object mnuAnalysisSPC_CChart: TMenuItem
Caption = 'Defect (nonconformity) c Chart' Caption = 'Defect (nonconformity) c Chart'
OnClick = mnuAnalysisSPC_CChartClick OnClick = mnuAnalysisSPC_CChartClick
@@ -1069,11 +1084,11 @@ object OS3MainFrm: TOS3MainFrm
OnClick = MenuItem2Click OnClick = MenuItem2Click
end end
end end
object OpenDialog1: TOpenDialog object OpenDialog: TOpenDialog
Left = 312 Left = 312
Top = 200 Top = 200
end end
object SaveDialog1: TSaveDialog object SaveDialog: TSaveDialog
Left = 432 Left = 432
Top = 200 Top = 200
end end

47
applications/lazstats/source/forms/mainunit.pas
View File

@@ -59,6 +59,11 @@ type
MenuItem113: TMenuItem; MenuItem113: TMenuItem;
MenuItem114: TMenuItem; MenuItem114: TMenuItem;
MenuItem115: TMenuItem; MenuItem115: TMenuItem;
MenuItem3: TMenuItem;
MenuItem4: TMenuItem;
MenuItem5: TMenuItem;
MenuItem6: TMenuItem;
MenuItem7: TMenuItem;
mnuAnalysis: TMenuItem; mnuAnalysis: TMenuItem;
mnuAnalysisSPC: TMenuItem; mnuAnalysisSPC: TMenuItem;
@@ -195,8 +200,8 @@ type
TwoSLSReg: TMenuItem; TwoSLSReg: TMenuItem;
RiditAnalysis: TMenuItem; RiditAnalysis: TMenuItem;
MenuItem9: TMenuItem; MenuItem9: TMenuItem;
OpenDialog1: TOpenDialog; OpenDialog: TOpenDialog;
SaveDialog1: TSaveDialog; SaveDialog: TSaveDialog;
MenuItem71: TMenuItem; MenuItem71: TMenuItem;
MenuItem72: TMenuItem; MenuItem72: TMenuItem;
MenuItem73: TMenuItem; MenuItem73: TMenuItem;
@@ -234,7 +239,7 @@ type
Label2: TLabel; Label2: TLabel;
NoCasesEdit: TEdit; NoCasesEdit: TEdit;
Label1: TLabel; Label1: TLabel;
MainMenu1: TMainMenu; MainMenu: TMainMenu;
MenuItem1: TMenuItem; MenuItem1: TMenuItem;
OneSampTests: TMenuItem; OneSampTests: TMenuItem;
MenuItem34: TMenuItem; MenuItem34: TMenuItem;
@@ -1372,11 +1377,11 @@ begin
// move all down 1 and add new one at the top // move all down 1 and add new one at the top
{ for i := 8 downto 1 do { for i := 8 downto 1 do
begin begin
MainMenu1.Items[0].Items[11].Items[i].Caption := MainMenu.Items[0].Items[11].Items[i].Caption :=
MainMenu1.Items[0].Items[11].Items[i-1].Caption; MainMenu.Items[0].Items[11].Items[i-1].Caption;
MainMenu1.Items[0].Items[11].Items[i-1].Caption := ' '; MainMenu.Items[0].Items[11].Items[i-1].Caption := ' ';
end; end;
MainMenu1.Items[0].Items[11].Items[0].Caption := filename;} MainMenu.Items[0].Items[11].Items[0].Caption := filename;}
if OptionsFrm = nil then if OptionsFrm = nil then
Application.CreateForm(TOptionsFrm, OptionsFrm); Application.CreateForm(TOptionsFrm, OptionsFrm);
OptionsFrm.SaveBtnClick(Self); OptionsFrm.SaveBtnClick(Self);
@@ -1398,11 +1403,11 @@ begin
// move all down 1 and add new one at the top // move all down 1 and add new one at the top
{ for i := 8 downto 1 do { for i := 8 downto 1 do
begin begin
MainMenu1.Items[0].Items[11].Items[i].Caption := MainMenu.Items[0].Items[11].Items[i].Caption :=
MainMenu1.Items[0].Items[11].Items[i-1].Caption; MainMenu.Items[0].Items[11].Items[i-1].Caption;
MainMenu1.Items[0].Items[11].Items[i-1].Caption := ' '; MainMenu.Items[0].Items[11].Items[i-1].Caption := ' ';
end; end;
MainMenu1.Items[0].Items[11].Items[0].Caption := filename;} MainMenu.Items[0].Items[11].Items[0].Caption := filename;}
if OptionsFrm = nil then if OptionsFrm = nil then
Application.CreateForm(TOptionsFrm, OptionsFrm); Application.CreateForm(TOptionsFrm, OptionsFrm);
OptionsFrm.SaveBtnClick(Self); OptionsFrm.SaveBtnClick(Self);
@@ -1968,10 +1973,7 @@ end;
procedure TOS3MainFrm.mnuAnalysisDescr_BoxPlotClick(Sender: TObject); procedure TOS3MainFrm.mnuAnalysisDescr_BoxPlotClick(Sender: TObject);
begin begin
if BoxPlotFrm = nil then if BoxPlotFrm = nil then
begin
Application.CreateForm(TBoxPlotFrm, BoxPlotFrm); Application.CreateForm(TBoxPlotFrm, BoxPlotFrm);
BoxPlotFrm.Position := poMainFormCenter;
end;
BoxPlotFrm.Show; BoxPlotFrm.Show;
end; end;
@@ -1980,7 +1982,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_BreakdownClick(Sender: TObject);
begin begin
if BreakDownFrm = nil then if BreakDownFrm = nil then
Application.CreateForm(TBreakDownFrm, BreakDownFrm); Application.CreateForm(TBreakDownFrm, BreakDownFrm);
BreakDownFrm.ShowModal; BreakDownFrm.Show;
end; end;
// Menu "Analysis" > "Descriptive" > "Repeated Measures Bubble Plot" // Menu "Analysis" > "Descriptive" > "Repeated Measures Bubble Plot"
@@ -1996,7 +1998,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_CompareDistsClick(Sender: TObject);
begin begin
if CompareDistFrm = nil then if CompareDistFrm = nil then
Application.CreateForm(TCompareDistFrm, CompareDistFrm); Application.CreateForm(TCompareDistFrm, CompareDistFrm);
CompareDistFrm.ShowModal; CompareDistFrm.Show;
end; end;
// Menu "Analysis" > "Descriptive" > "Cross tabulation" // Menu "Analysis" > "Descriptive" > "Cross tabulation"
@@ -2004,7 +2006,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_CrossTabsClick(Sender: TObject);
begin begin
if CrossTabFrm = nil then if CrossTabFrm = nil then
Application.CreateForm(TCrossTabFrm, CrossTabFrm); Application.CreateForm(TCrossTabFrm, CrossTabFrm);
CrossTabFrm.ShowModal; CrossTabFrm.Show;
end; end;
// Menu "Analysis" > "Descriptive" > "Data Smoothing" // Menu "Analysis" > "Descriptive" > "Data Smoothing"
@@ -2012,7 +2014,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_DataSmoothClick(Sender: TObject);
begin begin
if DataSmoothingForm = nil then if DataSmoothingForm = nil then
Application.CreateForm(TDataSmoothingForm, DataSmoothingForm); Application.CreateForm(TDataSmoothingForm, DataSmoothingForm);
DataSmoothingForm.ShowModal; DataSmoothingForm.Show;
end; end;
// Menu "Analysis" > "Descriptive" > "Distribution Statistics" // Menu "Analysis" > "Descriptive" > "Distribution Statistics"
@@ -2028,7 +2030,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_FreqClick(Sender: TObject);
begin begin
if FreqFrm = nil then if FreqFrm = nil then
Application.CreateForm(TFreqFrm, FreqFrm); Application.CreateForm(TFreqFrm, FreqFrm);
FreqFrm.ShowModal; FreqFrm.Show;
end; end;
// Menu "Analysis" > "Descriptive" > "Plot Group Frequencies" // Menu "Analysis" > "Descriptive" > "Plot Group Frequencies"
@@ -2036,7 +2038,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_GrpFreqClick(Sender: TObject);
begin begin
if GroupFreqForm = nil then if GroupFreqForm = nil then
Application.CreateForm(TGroupFreqForm, GroupFreqForm); Application.CreateForm(TGroupFreqForm, GroupFreqForm);
GroupFreqForm.ShowModal; GroupFreqForm.Show;
end; end;
// Menu "Analyses" > "Brown-Forsythe test for homogeneity of variance" // Menu "Analyses" > "Brown-Forsythe test for homogeneity of variance"
@@ -2082,7 +2084,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_NormalityClick(Sender: TObject);
begin begin
if NormalityFrm = nil then if NormalityFrm = nil then
Application.CreateForm(TNormalityFrm, NormalityFrm); Application.CreateForm(TNormalityFrm, NormalityFrm);
NormalityFrm.ShowModal; NormalityFrm.Show;
end; end;
// Menu "Analysis" > "Descriptive" > "Plot X vs Y" // Menu "Analysis" > "Descriptive" > "Plot X vs Y"
@@ -2108,7 +2110,6 @@ begin
StemLeafFrm.ShowModal; StemLeafFrm.ShowModal;
end; end;
// Menu "Analysis" > "Descriptive" > "3-D Variable Rotation" // Menu "Analysis" > "Descriptive" > "3-D Variable Rotation"
procedure TOS3MainFrm.mnuAnalysisDescr_ThreeDRotateClick(Sender: TObject); procedure TOS3MainFrm.mnuAnalysisDescr_ThreeDRotateClick(Sender: TObject);
begin begin
@@ -2122,7 +2123,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_XvsMultYClick(Sender: TObject);
begin begin
if XvsMultYForm = nil then if XvsMultYForm = nil then
Application.CreateForm(TXvsMultYForm, XvsMultYForm); Application.CreateForm(TXvsMultYForm, XvsMultYForm);
XvsMultYForm.ShowModal; XvsMultYForm.Show;
end; end;