- fixed bug in NCC Tool: after trying to add a tool already in the Tool Table when trying to change the Tool Type the GUI does not change
- final fix for app not quiting when running a script as argument, script that has the quit_flatcam Tcl command; fixed issue #360 - fixed issue #363. The Tcl command drillcncjob does not create tool cut, does not allow creation of gcode, it forces the usage of dwell and dwelltime parameters
This commit is contained in:
@@ -1007,7 +1007,8 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
||||
if float('%.*f' % (self.decimals, tool_dia)) in tool_dias:
|
||||
if muted is None:
|
||||
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Adding tool cancelled. Tool already in Tool Table."))
|
||||
self.tools_table.itemChanged.connect(self.on_tool_edit)
|
||||
# self.tools_table.itemChanged.connect(self.on_tool_edit)
|
||||
self.ui_connect()
|
||||
return
|
||||
else:
|
||||
if muted is None:
|
||||
|
||||
@@ -468,7 +468,7 @@ class Properties(FlatCAMTool):
|
||||
_("Depth of Cut"),
|
||||
'%.*f %s' % (
|
||||
self.decimals,
|
||||
(obj.z_cut - obj.tool_offset[tool_dia]),
|
||||
(obj.z_cut - abs(obj.tool_offset[tool_dia])),
|
||||
self.app.defaults['units'].lower()
|
||||
)
|
||||
],
|
||||
|
||||
@@ -56,7 +56,7 @@ class TermWidget(QWidget):
|
||||
self._history = [''] # current empty line
|
||||
self._historyIndex = 0
|
||||
|
||||
def open_proccessing(self, detail=None):
|
||||
def open_processing(self, detail=None):
|
||||
"""
|
||||
Open processing and disable using shell commands again until all commands are finished
|
||||
|
||||
@@ -67,14 +67,14 @@ class TermWidget(QWidget):
|
||||
self._edit.setTextColor(Qt.white)
|
||||
self._edit.setTextBackgroundColor(Qt.darkGreen)
|
||||
if detail is None:
|
||||
self._edit.setPlainText(_("...proccessing..."))
|
||||
self._edit.setPlainText(_("...processing..."))
|
||||
else:
|
||||
self._edit.setPlainText('%s [%s]' % (_("...proccessing..."), detail))
|
||||
self._edit.setPlainText('%s [%s]' % (_("...processing..."), detail))
|
||||
|
||||
self._edit.setDisabled(True)
|
||||
self._edit.setFocus()
|
||||
|
||||
def close_proccessing(self):
|
||||
def close_processing(self):
|
||||
"""
|
||||
Close processing and enable using shell commands again
|
||||
:return:
|
||||
|
||||
Reference in New Issue
Block a user