Merge pull request #233 from IDEMSInternational/master

update
Vitalis95 · Apr 8, 2024 · fa2cd19 · fa2cd19
2 parents 2d97a1b + 2e1e0b2
commit fa2cd19
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb
@@ -661,18 +661,23 @@ Public Class ucrDataView
                 GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True)
             Else
                 Dim bCheckLabels As Boolean = GetCurrentDataFrameFocus().clsPrepareFunctions.CheckHasLabels(strColumn)
-                frmConvertToNumeric.SetDataFrameName(GetCurrentDataFrameFocus().strName)
-                frmConvertToNumeric.SetColumnName(strColumn)
-                frmConvertToNumeric.CheckLabels(bCheckLabels)
-                frmConvertToNumeric.SetNonNumeric(iNonNumericValues)
-                frmConvertToNumeric.ShowDialog()
-                ' Yes for "normal" convert and No for "ordinal" convert
-                If frmConvertToNumeric.DialogResult = DialogResult.Yes Then
-                    GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True)
-                ElseIf frmConvertToNumeric.DialogResult = DialogResult.No Then
+                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)
-                ElseIf frmConvertToNumeric.DialogResult = DialogResult.Cancel Then
-                    Continue For
                 End If
                 frmConvertToNumeric.Close()
             End If