Merge pull request #509 from IDEMSInternational/master

updated my branch
Patowhiz · Dec 2, 2024 · ebe5593 · ebe5593
2 parents a1c51eb + 9391ca3
commit ebe5593
Show file tree

Hide file tree

Showing 23 changed files with 515 additions and 254 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
@@ -76,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")

diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb