Merge branch 'master' into 2_3Varsummaries

Patowhiz · Nov 27, 2024 · 420906c · 420906c
2 parents 1a39a29 + 0d1280d
commit 420906c
Show file tree

Hide file tree

Showing 26 changed files with 1,212 additions and 1,019 deletions.
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -104,7 +104,7 @@ jobs:
     - name: Checkout Instat Data
       uses: actions/checkout@v3
       with:
-        repository: ' africanmathsinitiative/R-Instat-Data'
+        repository: ' IDEMSInternational/R-Instat-Data'
         fetch-depth: 0
         path: 'InstatData'
 

diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb
@@ -41,16 +41,12 @@ Public Class sdgTableOptions
     End Sub
 
     ''' <summary>
-    ''' An R operateor that has a parameter named "gt" set up.
-    ''' The parameter should be an R Function that generates script "gt:gt()" as part of the last script statement.
+    ''' Sets up the sub dialog.
+    ''' Expected to be called before showing the dialog. 
     ''' </summary>
-    ''' <param name="clsNewOperator"></param>
+    ''' <param name="strDataFrameName">Name of the data frame contained in the data book</param>
+    ''' <param name="clsNewOperator">R operator that has a 'gt' parameter that produces a 'gt' object.</param>
     Public Sub Setup(strDataFrameName As String, clsNewOperator As ROperator)
-        If clsTablesUtils.FindRFunctionsParamsWithRCommand({"gt"}, clsNewOperator).Count = 0 Then
-            MsgBox("Developer Error: Parameter with 'gt' as name MUST be set up before using this subdialog")
-            Exit Sub
-        End If
-
         clsOperator = clsNewOperator
 
         ucrHeader.Setup(clsOperator)
@@ -80,25 +76,12 @@ Public Class sdgTableOptions
     ' Themes
 
     Private Sub SetupTheme(clsOperator As ROperator)
-        clsThemeRFunction = New RFunction
-
-        ' Uncheck then the check radio button to forces the panel to raise its ControlValueChanged event
-        rdoSelectTheme.Checked = False
-        rdoSelectTheme.Checked = True
-
-        If Not clsOperator.ContainsParameter("theme_format") Then
-            Exit Sub
-        End If
-
-        clsThemeRFunction = clsOperator.GetParameter("theme_format").clsArgumentCodeStructure
-
-        If clsThemeRFunction.strRCommand = "tab_options" Then
-            rdoManualTheme.Checked = True
+        If clsOperator.ContainsParameter("theme_format") Then
+            clsThemeRFunction = clsOperator.GetParameter("theme_format").clsArgumentCodeStructure
         Else
-            rdoSelectTheme.Checked = True
-            ucrCboSelectThemes.SetName(clsThemeRFunction.strRCommand)
+            clsThemeRFunction = New RFunction
+            clsThemeRFunction.SetPackageName("gtExtras")
         End If
-
     End Sub
 
     Private Sub ucrPnlThemes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlThemesPanel.ControlValueChanged

diff --git a/instat/dlgClimaticSummary.vb b/instat/dlgClimaticSummary.vb
@@ -194,8 +194,7 @@ Public Class dlgClimaticSummary
 
         'TODO: what defaults do we want?
         clsSummariesList.SetRCommand("c")
-        clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
-        clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=3)
+        clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
         clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11)
 
         clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary")

diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb
@@ -109,7 +109,7 @@ Public Class dlgColumnStats
         clsConcFunction.SetRCommand("c")
 
         clsSummariesList.SetRCommand("c")
-        clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
+        clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
         clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11)
 
         clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary")
@@ -220,19 +220,32 @@ Public Class dlgColumnStats
         sdgMissingOptions.ShowDialog()
     End Sub
 
-    Private Sub ucrReceiverByFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverByFactor.ControlValueChanged, ucrChkStoreResults.ControlValueChanged, ucrChkPrintOutput.ControlValueChanged
-        If ucrReceiverByFactor.IsEmpty Then
-            clsDefaultFunction.AddParameter("store_results", "FALSE", iPosition:=3)
-            clsDefaultFunction.AddParameter("return_output", "TRUE", iPosition:=4)
-            ucrBase.clsRsyntax.iCallType = 2
-        Else
-            clsDefaultFunction.RemoveParameterByName("return_output")
-            If ucrChkStoreResults.Checked Then
-                clsDefaultFunction.AddParameter("store_results", "TRUE", iPosition:=3)
+    Private Sub ucrReceiverByFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverByFactor.ControlValueChanged, ucrChkStoreResults.ControlValueChanged, ucrChkPrintOutput.ControlValueChanged, ucrReceiverSelectedVariables.ControlValueChanged, ucrChkOriginalLevel.ControlValueChanged
+        If Not ucrChkOriginalLevel.Checked Then
+            If ucrReceiverByFactor.IsEmpty AndAlso Not ucrReceiverSelectedVariables.IsEmpty Then
+                clsDefaultFunction.AddParameter("store_results", "FALSE", iPosition:=3)
+                clsDefaultFunction.AddParameter("return_output", "TRUE", iPosition:=4)
+                ucrBase.clsRsyntax.iCallType = 2
+            Else
+                clsDefaultFunction.RemoveParameterByName("return_output")
+                If ucrChkStoreResults.Checked Then
+                    clsDefaultFunction.AddParameter("store_results", "TRUE", iPosition:=3)
+                Else
+                    clsDefaultFunction.AddParameter("store_results", "FALSE", iPosition:=3)
+                End If
+                If ucrChkPrintOutput.Checked Then
+                    clsDefaultFunction.AddParameter("return_output", "TRUE", iPosition:=4)
+                Else
+                    clsDefaultFunction.AddParameter("return_output", "FALSE", iPosition:=4)
+                End If
             End If
+        Else
             If ucrChkPrintOutput.Checked Then
                 clsDefaultFunction.AddParameter("return_output", "TRUE", iPosition:=4)
+            Else
+                clsDefaultFunction.RemoveParameterByName("return_output")
             End If
+            clsDefaultFunction.AddParameter("store_results", "TRUE", iPosition:=3)
         End If
     End Sub
 

diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb
diff --git a/instat/dlgDisplayDailyData.vb b/instat/dlgDisplayDailyData.vb
@@ -156,7 +156,7 @@ Public Class dlgDisplayDailyData
         ucrChkIQR.SetParameter(New RParameter("IQR", 5), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "IQR" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34))
         ucrChkIQR.SetText("IQR")
 
-        ucrChkSumMissing.SetParameter(New RParameter("summary_count_missing", 6), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_missing" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34))
+        ucrChkSumMissing.SetParameter(New RParameter("summary_count_miss", 6), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_miss" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34))
         ucrChkSumMissing.SetText("N Missing")
 
         ucrNudNumberOfColumns.SetParameter(New RParameter("ncol", 1))

diff --git a/instat/dlgExtremesClimatic.vb b/instat/dlgExtremesClimatic.vb
@@ -447,7 +447,7 @@ Public Class dlgExtremesClimatic
         clsNSummary.AddParameter("save", "2", iPosition:=4)
         clsNSummary.SetAssignTo("n_dates_summary")
 
-        clsNFunction.SetRCommand("summary_count")
+        clsNFunction.SetRCommand("summary_count_all")
         clsNFunction.bToScriptAsRString = True
 
         clsFilterExtremeCalc.SetRCommand("instat_calculation$new")

diff --git a/instat/dlgLabelsLevels.vb b/instat/dlgLabelsLevels.vb
@@ -80,7 +80,7 @@ Public Class dlgLabelsLevels
         ucrSelectorForLabels.Focus()
 
 
-        clsSumCountMissingFunction.SetRCommand("summary_count_missing")
+        clsSumCountMissingFunction.SetRCommand("summary_count_miss")
 
         clsViewLabelsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$set_factor_levels")
         ucrBase.clsRsyntax.SetBaseRFunction(clsViewLabelsFunction)

diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb
@@ -248,8 +248,8 @@ Public Class dlgOneVariableSummarise
                                                strObjectName:="last_table")
 
         clsSummariesList.SetRCommand("c")
-        clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False)
         clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False)
+        clsSummariesList.AddParameter("summary_count_all", Chr(34) & "summary_count_all" & Chr(34), bIncludeArgumentName:=False)
         clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False)
 
         clsSummaryFunction.SetRCommand("summary")