giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed the units calculators crash FlatCAM when using comma as decimal separator

This commit is contained in:
Marius Stanciu 2019-02-05 22:32:48 +02:00 committed by Marius S
parent c6277967a6
commit 2ea2ed0cb0
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FlatCAMApp.py
View File

@ -92,8 +92,8 @@ class App(QtCore.QObject):
log.addHandler(handler)
# Version
version = 8.906
version_date = "2019/02/5"
version = 8.907
version_date = "2019/02/6"
beta = True
# current date now

4
README.md
View File

@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
=================================================
6.02.2019
- fixed the units calculators crash FlatCAM when using comma as decimal separator
5.02.3019
- added a text in the Selected Tab which is showed whenever the Selected Tab is selected but without having an object selected to display it's properties

24
flatcamTools/ToolCalculators.py
View File

@ -293,10 +293,30 @@ class ToolCalculator(FlatCAMTool):
self.effectiveToolDia_entry.set_value("%.4f" % tool_diameter)
def on_calculate_inch_units(self):
self.inch_entry.set_value('%.6f' % (float(self.mm_entry.get_value()) / 25.4))
try:
mm_val = float(self.mm_entry.get_value())
except ValueError:
# try to convert comma to decimal point. if it's still not working error message and return
try:
mm_val = float(self.mm_entry.get_value().replace(',', '.'))
except ValueError:
self.app.inform.emit("[ERROR_NOTCL]Wrong value format entered, "
"use a number.")
return
self.inch_entry.set_value('%.6f' % (mm_val / 25.4))
def on_calculate_mm_units(self):
self.mm_entry.set_value('%.6f' % (float(self.inch_entry.get_value()) * 25.4))
try:
inch_val = float(self.inch_entry.get_value())
except ValueError:
# try to convert comma to decimal point. if it's still not working error message and return
try:
inch_val = float(self.inch_entry.get_value().replace(',', '.'))
except ValueError:
self.app.inform.emit("[ERROR_NOTCL]Wrong value format entered, "
"use a number.")
return
self.mm_entry.set_value('%.6f' % (inch_val * 25.4))
def on_calculate_eplate(self):