Merge pull request #9244 from N-thony/fixing_column_summary

Minor correction in the Prepare > Data Reshape > Column Summary Dialogue
IDEMSInternational · Nov 13, 2024 · 1ae23dc · 1ae23dc
2 parents dedb6c6 + 0b2b2f9
commit 1ae23dc
Showing 1 changed file with 22 additions and 9 deletions.
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