Merge branch 'master' into Changes_Column_Summaries

Vitalis95 · Nov 14, 2024 · 5014510 · 5014510
2 parents e3cf805 + 301b507
commit 5014510
Show file tree

Hide file tree

Showing 15 changed files with 1,162 additions and 946 deletions.
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)

diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb
@@ -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/dlgDistances.vb b/instat/dlgDistances.vb
@@ -37,6 +37,7 @@ Public Class dlgDistances
         autoTranslate(Me)
     End Sub
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 145
 
         ucrSelectorDistance.SetParameter(New RParameter("df", 0))
         ucrSelectorDistance.SetParameterIsrfunction()

diff --git a/instat/dlgSummaryTables.Designer.vb b/instat/dlgSummaryTables.Designer.vb
diff --git a/instat/dlgSummaryTables.resx b/instat/dlgSummaryTables.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>52</value>
+    <value>25</value>
   </metadata>
   <metadata name="ttMultipleResponse.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>

diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb
diff --git a/instat/dlgUseTable.Designer.vb b/instat/dlgUseTable.Designer.vb
diff --git a/instat/dlgUseTable.resx b/instat/dlgUseTable.resx
@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ucrFilePath.FilePathDialogFilter" xml:space="preserve">
+    <value>Comma separated file (*.csv)|*.csv|Excel files (*.xlsx)|*.xlsx|TAB-separated data (*.tsv)|*.tsv|Pipe-separated data (*.psv)|*.psv|Feather r / Python interchange format (*.feather)|*.feather|Fixed-Width format data (*.fwf)|*.fwf|Serialized r objects (*.rds)|*.rds|Saved r objects (*.RData)|*.RData|JSON(*.json)|*.json|YAML(*.yml)|*.yml|Stata(*.dta)|*.dta|SPSS(*.sav)|*.sav|XBASE database files (*.dbf)|*.dbf| Weka Attribute - Relation File Format (*.arff)|*.arff|r syntax object (*.R)|*.R|Xml(*.xml)|*.xml|HTML(*.html)|*.html</value>
+  </data>
 </root>