Merge pull request #9258 from Vitalis95/summary_tablesdialog

Improving Summary Tables dialog
IDEMSInternational · Nov 15, 2024 · a8d5cc0 · a8d5cc0
2 parents 1131867 + 0a1ad32
commit a8d5cc0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/instat/dlgSummaryTables.Designer.vb b/instat/dlgSummaryTables.Designer.vb
diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb
@@ -313,8 +313,18 @@ Public Class dlgSummaryTables
         End If
 
     End Sub
+
     Private Sub btnMoreOptions_Click(sender As Object, e As EventArgs) Handles btnMoreOptions.Click
-        sdgTableOptions.Setup(ucrSelectorSummaryTables.strCurrentDataFrame, clsJoiningPipeOperator)
+        Dim clsROperator As ROperator
+        If rdoFrequencyTable.Checked Then
+            clsROperator = clsFrequencyOperator
+        ElseIf rdoSummaryTable.Checked Then
+            clsROperator = clsSummaryOperator
+        Else
+            Exit Sub
+        End If
+
+        sdgTableOptions.Setup(ucrSelectorSummaryTables.strCurrentDataFrame, clsROperator)
         sdgTableOptions.ShowDialog(Me)
 
     End Sub
@@ -338,7 +348,7 @@ Public Class dlgSummaryTables
         TestOKEnabled()
     End Sub
 
-    Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click
+    Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs)
 
         Dim clsROperator As ROperator
         If rdoFrequencyTable.Checked Then
@@ -385,7 +395,6 @@ Public Class dlgSummaryTables
 
     Private Sub ucrPnlSummaryFrequencyTables_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSummaryFrequencyTables.ControlValueChanged
         cmdSummaries.Visible = rdoSummaryTable.Checked
-        cmdFormatTable.Location = New Point(286, If(rdoSummaryTable.Checked, 464, 273))
 
         DialogueSize()
         SettingParameters()