Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scripts and sub dialogue for gt Table #8615

Closed
wants to merge 13 commits into from
22 changes: 17 additions & 5 deletions instat/dlgDescribeTwoVariable.vb
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ Public Class dlgDescribeTwoVariable
'FORMAT TABLE FUNCTIONS
Private clsFootnoteCellBodyFunction, clsFootnoteCellFunction,
clsFootnoteSubtitleLocationFunction, clsFootnoteTitleLocationFunction, clsSecondFootnoteCellBodyFunction,
clsSecondFootnoteCellFunction, clsStyleListFunction,
clsSecondFootnoteCellFunction, clsStyleListFunction, clsStubFootnoteFunction,
clsTabFootnoteSubtitleFunction, clsTabFootnoteTitleFunction,
clsTableSourcenoteFunction, clsTableTitleFunction, clsThemesTabOptionFunction,
clsTabStyleCellTextFunction, clsTabStyleCellTitleFunction, clsTabStyleFunction,
clsTabStylePxFunction, clsgtExtrasThemesFuction As New RFunction
clsTabStylePxFunction, clsgtExtrasThemesFuction, clsStubCellsFunction, clsStubFunction As New RFunction

Private clsGroupByPipeOperator, clsSummaryOperator As New ROperator

Expand Down Expand Up @@ -201,6 +201,9 @@ Public Class dlgDescribeTwoVariable
clsPivotWiderFunction = New RFunction
clsgtExtrasThemesFuction = New RFunction
clsMutableOperator = New ROperator
clsStubFunction = New RFunction
clsStubCellsFunction = New RFunction
clsStubFootnoteFunction = New RFunction

ucrSelectorDescribeTwoVar.Reset()
ucrReceiverFirstVars.SetMeAsReceiver()
Expand Down Expand Up @@ -234,6 +237,15 @@ Public Class dlgDescribeTwoVariable

clsgtExtrasThemesFuction.SetPackageName("gtExtras")

clsStubFunction.SetPackageName("gt")
clsStubFunction.SetRCommand("tab_stubhead")

clsStubCellsFunction.SetPackageName("gt")
clsStubCellsFunction.SetRCommand("cells_stubhead")

clsStubFootnoteFunction.SetPackageName("gt")
clsStubFootnoteFunction.SetRCommand("tab_footnote")

clsGroupByFunction.SetPackageName("dplyr")
clsGroupByFunction.SetRCommand("group_by")

Expand Down Expand Up @@ -910,11 +922,11 @@ Public Class dlgDescribeTwoVariable
End Sub

Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click
sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction,
sdgFormatSummaryTables.SetRCode(clsNewStubFunction:=clsStubFunction, clsNewGtFunction:=clsgtFunction, clsNewStubCellsFunction:=clsStubCellsFunction, clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction,
clsNewThemesTabOptionFunction:=clsThemesTabOptionFunction, clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction,
clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction,
clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, clsNewStubFootnoteFunction:=clsStubFootnoteFunction,
clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator,
clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, clsNewgtExtraThemesFunction:=clsgtExtrasThemesFuction, clsNewMutableOperator:=clsMutableOperator,
clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, clsNewgtExtraThemesFunction:=clsgtExtrasThemesFuction, clsNewMutableOPerator:=clsMutableOperator,
clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, bReset:=bReset)
sdgFormatSummaryTables.ShowDialog()
End Sub
Expand Down
18 changes: 15 additions & 3 deletions instat/dlgOneVariableSummarise.vb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Public Class dlgOneVariableSummarise
clsConcFunction, clsSummaryTableFunction, clsDummyFunction,
clsSkimrFunction, clsPivotWiderFunction As New RFunction

Private clsTableTitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsFootnoteTitleLocationFunction,
Private clsTableTitleFunction, clsStubFunction, clsStubFootnoteFunction, clsStubCellsFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsFootnoteTitleLocationFunction,
clsFootnoteSubtitleLocationFunction, clsTabFootnoteSubtitleFunction, clsFootnoteCellFunction, clsFootnoteCellBodyFunction,
clsSecondFootnoteCellFunction, clsSecondFootnoteCellBodyFunction, clsTabStyleFunction, clsTabStyleCellTextFunction,
clsTabStylePxFunction, clsTabStyleCellTitleFunction, clsThemesTabOptionsFunction, clsgtExtraThemesFunction As New RFunction
Expand Down Expand Up @@ -127,6 +127,9 @@ Public Class dlgOneVariableSummarise
clsSkimrFunction = New RFunction
clsSummaryOperator = New ROperator
clsPivotWiderFunction = New RFunction
clsStubFunction = New RFunction
clsStubCellsFunction = New RFunction
clsStubFootnoteFunction = New RFunction

clsTableTitleFunction = New RFunction
clsTabFootnoteTitleFunction = New RFunction
Expand Down Expand Up @@ -162,6 +165,15 @@ Public Class dlgOneVariableSummarise
clsTabStyleFunction.AddParameter("style", clsRFunctionParameter:=clsTabStyleCellTextFunction, iPosition:=0)
clsTabStyleFunction.AddParameter("location", clsRFunctionParameter:=clsTabStyleCellTitleFunction, iPosition:=1)

clsStubFunction.SetPackageName("gt")
clsStubFunction.SetRCommand("tab_stubhead")

clsStubCellsFunction.SetPackageName("gt")
clsStubCellsFunction.SetRCommand("cells_stubhead")

clsStubFootnoteFunction.SetPackageName("gt")
clsStubFootnoteFunction.SetRCommand("tab_footnote")

clsTabStyleCellTitleFunction.SetPackageName("gt")
clsTabStyleCellTitleFunction.SetRCommand("cells_title")
clsTabStyleCellTitleFunction.AddParameter("groups", Chr(34) & "title" & Chr(34), iPosition:=0)
Expand Down Expand Up @@ -414,7 +426,7 @@ Public Class dlgOneVariableSummarise
End Sub

Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click
sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction,
sdgFormatSummaryTables.SetRCode(clsNewStubFunction:=clsStubFunction, clsNewGtFunction:=clsGtFunction, clsNewStubCellsFunction:=clsStubCellsFunction, clsNewStubFootnoteFunction:=clsStubFootnoteFunction, clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction,
clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction,
clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction,
clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator,
Expand Down Expand Up @@ -446,4 +458,4 @@ Public Class dlgOneVariableSummarise
Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverOneVarSummarise.ControlContentsChanged, ucrNudMaxSum.ControlContentsChanged, ucrSaveSummary.ControlContentsChanged
TestOKEnabled()
End Sub
End Class
End Class
25 changes: 18 additions & 7 deletions instat/dlgSummaryTables.vb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Public Class dlgSummaryTables
Private clsStubHeadFunction, clsPivotWiderFunction As New RFunction
Private iUcrBaseXLocation, iDialogueXsize As Integer

Private clsTableTitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsFootnoteTitleLocationFunction, clsFootnoteSubtitleLocationFunction,
Private clsTableTitleFunction, clsStubFunction, clsStubCellsFunction, clsTabFootnoteTitleFunction, clsStubFootnoteFunction, clsTableSourcenoteFunction, clsFootnoteTitleLocationFunction, clsFootnoteSubtitleLocationFunction,
clsTabFootnoteSubtitleFunction, clsFootnoteCellFunction, clsFootnoteCellBodyFunction,
clsSecondFootnoteCellFunction, clsSecondFootnoteCellBodyFunction, clsTabStyleFunction, clsDummyFunction,
clsTabStyleCellTextFunction, clsTabStylePxFunction, clsTabStyleCellTitleFunction, clsThemesTabOptionsFunction,
Expand Down Expand Up @@ -194,7 +194,10 @@ Public Class dlgSummaryTables
clsSummariesList = New RFunction
clsConcFunction = New RFunction
clsTableTitleFunction = New RFunction
clsStubFunction = New RFunction
clsStubCellsFunction = New RFunction
clsTabFootnoteTitleFunction = New RFunction
clsStubFootnoteFunction = New RFunction
clsTableSourcenoteFunction = New RFunction
clsFootnoteTitleLocationFunction = New RFunction
clsFootnoteSubtitleLocationFunction = New RFunction
Expand Down Expand Up @@ -293,9 +296,18 @@ Public Class dlgSummaryTables
clsTableTitleFunction.SetPackageName("gt")
clsTableTitleFunction.SetRCommand("tab_header")

clsStubFunction.SetPackageName("gt")
clsStubFunction.SetRCommand("tab_stubhead")

clsStubCellsFunction.SetPackageName("gt")
clsStubCellsFunction.SetRCommand("cells_stubhead")

clsTabFootnoteTitleFunction.SetPackageName("gt")
clsTabFootnoteTitleFunction.SetRCommand("tab_footnote")

clsStubFootnoteFunction.SetPackageName("gt")
clsStubFootnoteFunction.SetRCommand("tab_footnote")

clsTabFootnoteSubtitleFunction.SetPackageName("gt")
clsTabFootnoteSubtitleFunction.SetRCommand("tab_footnote")

Expand Down Expand Up @@ -397,19 +409,19 @@ Public Class dlgSummaryTables

Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click
If rdoSummaryTable.Checked Then
sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction,
sdgFormatSummaryTables.SetRCode(clsNewStubCellsFunction:=clsStubCellsFunction, clsNewGtFunction:=clsGtFunction, clsNewTableTitleFunction:=clsTableTitleFunction, clsNewStubFunction:=clsStubFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewStubFootnoteFunction:=clsStubFootnoteFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction,
clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction,
clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction,
clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator,
clsNewMutableOperator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction,
clsNewMutableOPerator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction,
clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction,
clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog)
Else
sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction,
sdgFormatSummaryTables.SetRCode(clsNewStubCellsFunction:=clsStubCellsFunction, clsNewGtFunction:=clsGtFunction, clsNewTableTitleFunction:=clsTableTitleFunction, clsNewStubFunction:=clsStubFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewStubFootnoteFunction:=clsStubFootnoteFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction,
clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction,
clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction,
clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator,
clsNewMutableOperator:=clsFrequencyOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction,
clsNewMutableOPerator:=clsFrequencyOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction,
clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction,
clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog)
End If
Expand Down Expand Up @@ -585,5 +597,4 @@ Public Class dlgSummaryTables
End If
End If
End Sub

End Class
End Class
10 changes: 7 additions & 3 deletions instat/dlgUseTable.vb
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ Public Class dlgUseTable
Private bReset As Boolean = True
Private clsRFunctionAsHTML, clsRFunctionAsRTF, clsRFunctionAsWord, clsRFunctionAsLaTex, clsUseTableFunction As New RFunction

Private clsTableTitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsDummyFunction,
Private clsTableTitleFunction, clsStubFunction, clsStubFootnoteFunction, clsStubCellsfunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsDummyFunction,
clsThemesTabOptionsFunction, clsFootnoteCellFunction, clsSecondFootnoteCellBodyFunction,
clsFootnoteTitleLocationFunction, clsFootnoteCellBodyFunction,
clsFootnoteSubtitleLocationFunction, clsTabFootnoteSubtitleFunction,
clsSecondFootnoteCellFunction, clsTabStyleCellTitleFunction,
clsTabStyleCellTextFunction, clsTabStyleFunction, clsTabStylePxFunction,
clsgtExtraThemesFunction As New RFunction
clsgtExtraThemesFunction, clsGtFunction As New RFunction

Private clsPipeOperator, clsSummaryOperator, clsJoiningPipeOperator As ROperator

Expand Down Expand Up @@ -105,6 +105,7 @@ Public Class dlgUseTable
clsSummaryOperator = New ROperator
clsJoiningPipeOperator = New ROperator
clsgtExtraThemesFunction = New RFunction
clsGtFunction = New RFunction

'rdoAsHTML.Checked = True
ucrTablesReceiver.SetMeAsReceiver()
Expand All @@ -120,6 +121,9 @@ Public Class dlgUseTable

clsSummaryOperator.SetOperation("+")

clsGtFunction.SetPackageName("gt")
clsGtFunction.SetRCommand("gt")

clsTabStyleFunction.SetRCommand("tab_style")
clsTabStyleFunction.SetPackageName("gt")
clsTabStyleFunction.AddParameter("style", clsRFunctionParameter:=clsTabStyleCellTextFunction, iPosition:=0)
Expand Down Expand Up @@ -210,7 +214,7 @@ Public Class dlgUseTable
End Sub

Private Sub cmdFormatOptions_Click(sender As Object, e As EventArgs) Handles cmdFormatOptions.Click
sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction,
sdgFormatSummaryTables.SetRCode(clsNewStubFunction:=clsStubFunction, clsNewGtFunction:=clsGtFunction, clsNewStubFootnoteFunction:=clsStubFootnoteFunction, clsNewStubCellsFunction:=clsStubCellsfunction, clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction,
clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction,
clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction,
clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator,
Expand Down
Loading
Loading