From fb602d6f9bac8419adf396f29cce878915fb5ac4 Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Fri, 5 Jun 2020 04:09:29 +0300
Subject: [PATCH] - fixed a small issue in the Panelization Tool that blocked
 the usage of a Geometry object as panelization reference

---
 CHANGELOG.md                | 1 +
 appTools/ToolCalculators.py | 8 ++++----
 app_Main.py                 | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c63972ca..401626ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -122,6 +122,7 @@ CHANGELOG for FlatCAM beta
 27.05.2020
 
 - working on Isolation Tool: made to work the Isolation with multiple tools without rest machining
+- in Tool Calculators fixed an application crash if the user typed letters instead of numbers in the boxes. Now the boxes accept only numbers, dots, comma, spaces and arithmetic operators
 
 26.05.2020
 
diff --git a/appTools/ToolCalculators.py b/appTools/ToolCalculators.py
index b26ae9fb..39018e20 100644
--- a/appTools/ToolCalculators.py
+++ b/appTools/ToolCalculators.py
@@ -7,7 +7,7 @@
 
 from PyQt5 import QtWidgets
 from appTool import AppTool
-from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCEntry
+from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, NumericalEvalEntry
 import math
 
 import gettext
@@ -63,13 +63,13 @@ class ToolCalculator(AppTool):
         grid_units_layout.addWidget(mm_label, 0, 0)
         grid_units_layout.addWidget(inch_label, 0, 1)
 
-        self.inch_entry = FCEntry()
+        self.inch_entry = NumericalEvalEntry(border_color='#0069A9')
 
         # self.inch_entry.setFixedWidth(70)
         # self.inch_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.inch_entry.setToolTip(_("Here you enter the value to be converted from INCH to MM"))
 
-        self.mm_entry = FCEntry()
+        self.mm_entry = NumericalEvalEntry(border_color='#0069A9')
         # self.mm_entry.setFixedWidth(130)
         # self.mm_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.mm_entry.setToolTip(_("Here you enter the value to be converted from MM to INCH"))
@@ -104,7 +104,7 @@ class ToolCalculator(AppTool):
         )
         self.tipAngle_label = QtWidgets.QLabel('%s:' % _("Tip Angle"))
         self.tipAngle_entry = FCSpinner(callback=self.confirmation_message_int)
-        self.tipAngle_entry.set_range(0,180)
+        self.tipAngle_entry.set_range(0, 180)
         self.tipAngle_entry.set_step(5)
 
         # self.tipAngle_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
diff --git a/app_Main.py b/app_Main.py
index 9ab48a23..26246c87 100644
--- a/app_Main.py
+++ b/app_Main.py
@@ -162,7 +162,8 @@ class App(QtCore.QObject):
     # ###############################################################################################################
     # ################################### Version and VERSION DATE ##################################################
     # ###############################################################################################################
-    version = 8.993
+    version = "Unstable Version"
+    # version = 8.993
     version_date = "2020/06/05"
     beta = True