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

- small changes

This commit is contained in:
Marius Stanciu 2019-12-03 00:17:53 +02:00 committed by Marius
parent 3bbe2843ef
commit 3812de6439
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FlatCAMApp.py
View File

@ -414,7 +414,7 @@ class App(QtCore.QObject):
"global_project_autohide": True,
"global_toggle_tooltips": True,
"global_worker_number": 2,
"global_tolerance": 0.0002,
"global_tolerance": 0.005,
"global_open_style": True,
"global_delete_confirmation": True,
"global_compression_level": 3,

9
FlatCAMObj.py
View File

@ -4237,8 +4237,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
self.ser_attrs.append('tools')
self.build_ui()
self.app.inform.emit('[success] %s' %
_("Tool was copied in Tool Table."))
self.app.inform.emit('[success] %s' % _("Tool was copied in Tool Table."))
def on_tool_edit(self, current_item):
@ -4252,8 +4251,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
try:
d = float(self.ui.geo_tools_table.item(current_row, 1).text().replace(',', '.'))
except ValueError:
self.app.inform.emit('[ERROR_NOTCL] %s' %
_("Wrong value format entered, use a number."))
self.app.inform.emit('[ERROR_NOTCL] %s' % _("Wrong value format entered, use a number."))
return
tool_dia = float('%.*f' % (self.decimals, d))
@ -4267,8 +4265,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
except (TypeError, ValueError):
pass
self.app.inform.emit('[success] %s' %
_("Tool was edited in Tool Table."))
self.app.inform.emit('[success] %s' % _("Tool was edited in Tool Table."))
self.build_ui()
def on_tool_delete(self, all=None):

15
flatcamEditors/FlatCAMGrbEditor.py
View File

@ -2925,10 +2925,8 @@ class FlatCAMGrbEditor(QtCore.QObject):
# this will flag if the Editor "tools" are launched from key shortcuts (True) or from menu toolbar (False)
self.launched_from_shortcuts = False
if self.units == 'MM':
self.tolerance = float(self.app.defaults["global_tolerance"])
else:
self.tolerance = float(self.app.defaults["global_tolerance"]) / 20
def_tol_val = float(self.app.defaults["global_tolerance"])
self.tolerance = def_tol_val if self.units == 'MM'else def_tol_val / 20
def make_callback(the_tool):
def f():
@ -4808,13 +4806,12 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.storage_dict[apid]['geometry'] = []
self.storage_dict[apid]['geometry'] = temp_storage
except Exception as e:
log.debug("FlatCAMGrbEditor.buffer() --> %s\n%s" % str(e))
self.app.inform.emit('[ERROR_NOTCL] %s\n%s' %
(_("Failed."), str(traceback.print_exc())))
log.debug("FlatCAMGrbEditor.buffer() --> %s" % str(e))
self.app.inform.emit('[ERROR_NOTCL] %s\n%s' % (_("Failed."), str(traceback.print_exc())))
return
self.plot_all()
self.app.inform.emit('[success] %s' %
_("Done. Buffer Tool completed."))
self.app.inform.emit('[success] %s' % _("Done. Buffer Tool completed."))
def on_scale(self):
scale_factor = 1.0

2
flatcamGUI/FlatCAMGUI.py
View File

@ -2028,7 +2028,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.restoreState(saved_gui_state)
log.debug("FlatCAMGUI.__init__() --> UI state restored.")
settings = QSettings("Open Source", "FlatCAM")
if settings.contains("layout"):
layout = settings.value('layout', type=str)
if layout == 'standard':
@ -2072,7 +2071,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.lock_action.setText(_("Lock Toolbars"))
self.lock_action.setCheckable(True)
settings = QSettings("Open Source", "FlatCAM")
if settings.contains("toolbar_lock"):
lock_val = settings.value('toolbar_lock')
if lock_val == 'true':