Fixed "empty field" error

Application was crashing if user clicked "Calculate" while drawing field was empty. Added necessary additional if-statements.
kamil-matula · Jun 17, 2021 · e88336a · e88336a
1 parent 23725fd
commit e88336a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1 deletion.
diff --git a/Digit Recognizer - Main App/Calculation.cs b/Digit Recognizer - Main App/Calculation.cs
@@ -7,6 +7,7 @@ class Calculation // To calculate RPN: string result = toRPN(dzialanie); Stack<s
     {
         public static string Calculate(string equation)
         {
+            if (equation.Length == 0) return "DRAWING FIELD IS EMPTY!";
             if (equation.EndsWith(" - ") || equation.EndsWith(" + ") || equation.EndsWith(" * ") || equation.EndsWith(" / ") || equation.Contains("  "))
                 return "INCORRECT EXPRESSION!";
             if (equation.StartsWith(" - ") || equation.StartsWith(" + ") || equation.StartsWith(" * ") || equation.StartsWith(" / "))

diff --git a/Digit Recognizer - Main App/MainWindow.xaml.cs b/Digit Recognizer - Main App/MainWindow.xaml.cs
@@ -88,7 +88,7 @@ private void CalculateButtonClick(object sender, RoutedEventArgs e)
             string tmp = DigitDetection.RecognizeDigits(digits, network);
             if (tmp != "") MathTextBox.Text = tmp;
             string result = Calculation.Calculate(tmp).ToString();
-            if (result == "INCORRECT EXPRESSION!" || result == "YOU CAN'T DIVIDE BY ZERO!") MathTextBox.Text = result;
+            if (result == "INCORRECT EXPRESSION!" || result == "YOU CAN'T DIVIDE BY ZERO!" || result == "DRAWING FIELD IS EMPTY!") MathTextBox.Text = result;
             else MathTextBox.Text += result;
         }
         #endregion

diff --git a/Digit Recognizer - Main App/bin/Debug/DigitRecognizer.exe b/Digit Recognizer - Main App/bin/Debug/DigitRecognizer.exe
diff --git a/Digit Recognizer - Main App/bin/Debug/DigitRecognizer.pdb b/Digit Recognizer - Main App/bin/Debug/DigitRecognizer.pdb