- small changes
This commit is contained in:
parent
3bbe2843ef
commit
3812de6439
@ -414,7 +414,7 @@ class App(QtCore.QObject):
|
|||||||
"global_project_autohide": True,
|
"global_project_autohide": True,
|
||||||
"global_toggle_tooltips": True,
|
"global_toggle_tooltips": True,
|
||||||
"global_worker_number": 2,
|
"global_worker_number": 2,
|
||||||
"global_tolerance": 0.0002,
|
"global_tolerance": 0.005,
|
||||||
"global_open_style": True,
|
"global_open_style": True,
|
||||||
"global_delete_confirmation": True,
|
"global_delete_confirmation": True,
|
||||||
"global_compression_level": 3,
|
"global_compression_level": 3,
|
||||||
|
@ -4237,8 +4237,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
|||||||
self.ser_attrs.append('tools')
|
self.ser_attrs.append('tools')
|
||||||
|
|
||||||
self.build_ui()
|
self.build_ui()
|
||||||
self.app.inform.emit('[success] %s' %
|
self.app.inform.emit('[success] %s' % _("Tool was copied in Tool Table."))
|
||||||
_("Tool was copied in Tool Table."))
|
|
||||||
|
|
||||||
def on_tool_edit(self, current_item):
|
def on_tool_edit(self, current_item):
|
||||||
|
|
||||||
@ -4252,8 +4251,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
|||||||
try:
|
try:
|
||||||
d = float(self.ui.geo_tools_table.item(current_row, 1).text().replace(',', '.'))
|
d = float(self.ui.geo_tools_table.item(current_row, 1).text().replace(',', '.'))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
self.app.inform.emit('[ERROR_NOTCL] %s' %
|
self.app.inform.emit('[ERROR_NOTCL] %s' % _("Wrong value format entered, use a number."))
|
||||||
_("Wrong value format entered, use a number."))
|
|
||||||
return
|
return
|
||||||
|
|
||||||
tool_dia = float('%.*f' % (self.decimals, d))
|
tool_dia = float('%.*f' % (self.decimals, d))
|
||||||
@ -4267,8 +4265,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
|||||||
except (TypeError, ValueError):
|
except (TypeError, ValueError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
self.app.inform.emit('[success] %s' %
|
self.app.inform.emit('[success] %s' % _("Tool was edited in Tool Table."))
|
||||||
_("Tool was edited in Tool Table."))
|
|
||||||
self.build_ui()
|
self.build_ui()
|
||||||
|
|
||||||
def on_tool_delete(self, all=None):
|
def on_tool_delete(self, all=None):
|
||||||
|
@ -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)
|
# this will flag if the Editor "tools" are launched from key shortcuts (True) or from menu toolbar (False)
|
||||||
self.launched_from_shortcuts = False
|
self.launched_from_shortcuts = False
|
||||||
|
|
||||||
if self.units == 'MM':
|
def_tol_val = float(self.app.defaults["global_tolerance"])
|
||||||
self.tolerance = float(self.app.defaults["global_tolerance"])
|
self.tolerance = def_tol_val if self.units == 'MM'else def_tol_val / 20
|
||||||
else:
|
|
||||||
self.tolerance = float(self.app.defaults["global_tolerance"]) / 20
|
|
||||||
|
|
||||||
def make_callback(the_tool):
|
def make_callback(the_tool):
|
||||||
def f():
|
def f():
|
||||||
@ -4808,13 +4806,12 @@ class FlatCAMGrbEditor(QtCore.QObject):
|
|||||||
self.storage_dict[apid]['geometry'] = []
|
self.storage_dict[apid]['geometry'] = []
|
||||||
self.storage_dict[apid]['geometry'] = temp_storage
|
self.storage_dict[apid]['geometry'] = temp_storage
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log.debug("FlatCAMGrbEditor.buffer() --> %s\n%s" % str(e))
|
log.debug("FlatCAMGrbEditor.buffer() --> %s" % str(e))
|
||||||
self.app.inform.emit('[ERROR_NOTCL] %s\n%s' %
|
self.app.inform.emit('[ERROR_NOTCL] %s\n%s' % (_("Failed."), str(traceback.print_exc())))
|
||||||
(_("Failed."), str(traceback.print_exc())))
|
|
||||||
return
|
return
|
||||||
|
|
||||||
self.plot_all()
|
self.plot_all()
|
||||||
self.app.inform.emit('[success] %s' %
|
self.app.inform.emit('[success] %s' % _("Done. Buffer Tool completed."))
|
||||||
_("Done. Buffer Tool completed."))
|
|
||||||
|
|
||||||
def on_scale(self):
|
def on_scale(self):
|
||||||
scale_factor = 1.0
|
scale_factor = 1.0
|
||||||
|
@ -2028,7 +2028,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||||||
self.restoreState(saved_gui_state)
|
self.restoreState(saved_gui_state)
|
||||||
log.debug("FlatCAMGUI.__init__() --> UI state restored.")
|
log.debug("FlatCAMGUI.__init__() --> UI state restored.")
|
||||||
|
|
||||||
settings = QSettings("Open Source", "FlatCAM")
|
|
||||||
if settings.contains("layout"):
|
if settings.contains("layout"):
|
||||||
layout = settings.value('layout', type=str)
|
layout = settings.value('layout', type=str)
|
||||||
if layout == 'standard':
|
if layout == 'standard':
|
||||||
@ -2072,7 +2071,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||||||
self.lock_action.setText(_("Lock Toolbars"))
|
self.lock_action.setText(_("Lock Toolbars"))
|
||||||
self.lock_action.setCheckable(True)
|
self.lock_action.setCheckable(True)
|
||||||
|
|
||||||
settings = QSettings("Open Source", "FlatCAM")
|
|
||||||
if settings.contains("toolbar_lock"):
|
if settings.contains("toolbar_lock"):
|
||||||
lock_val = settings.value('toolbar_lock')
|
lock_val = settings.value('toolbar_lock')
|
||||||
if lock_val == 'true':
|
if lock_val == 'true':
|
||||||
|
Loading…
Reference in New Issue
Block a user