Merge pull request #9024 from N-thony/convert_fix

Corrected regression in the right-click Convert to numeric option
IDEMSInternational · Jun 19, 2024 · eeb2181 · eeb2181
2 parents b89a310 + f4b5373
commit eeb2181
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb
@@ -661,24 +661,20 @@ Public Class ucrDataView
                 GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True)
             Else
                 Dim bCheckLabels As Boolean = GetCurrentDataFrameFocus().clsPrepareFunctions.CheckHasLabels(strColumn)
-                If bCheckLabels Then
-                    frmConvertToNumeric.SetDataFrameName(GetCurrentDataFrameFocus().strName)
-                    frmConvertToNumeric.SetColumnName(strColumn)
-                    frmConvertToNumeric.CheckLabels(bCheckLabels)
-                    frmConvertToNumeric.SetNonNumeric(iNonNumericValues)
-                    frmConvertToNumeric.ShowDialog()
-                    ' Yes for "normal" convert and No for "ordinal" convert
-                    Select Case frmConvertToNumeric.DialogResult
-                        Case DialogResult.Yes
-                            GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True)
-                        Case DialogResult.No
-                            GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False)
-                        Case DialogResult.Cancel
-                            Continue For
-                    End Select
-                Else
-                    GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False)
-                End If
+                frmConvertToNumeric.SetDataFrameName(GetCurrentDataFrameFocus().strName)
+                frmConvertToNumeric.SetColumnName(strColumn)
+                frmConvertToNumeric.CheckLabels(bCheckLabels)
+                frmConvertToNumeric.SetNonNumeric(iNonNumericValues)
+                frmConvertToNumeric.ShowDialog()
+                ' Yes for "normal" convert and No for "ordinal" convert
+                Select Case frmConvertToNumeric.DialogResult
+                    Case DialogResult.Yes
+                        GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True)
+                    Case DialogResult.No
+                        GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False)
+                    Case DialogResult.Cancel
+                        Continue For
+                End Select
                 frmConvertToNumeric.Close()
             End If
         Next