bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- in CNCJob UI Autolevelling - added handlers for: jogging, reset, sending commands

Browse Source
This commit is contained in:
Marius Stanciu
2020-08-19 02:26:35 +03:00
parent bdb0e71425
commit 56ac489466
4 changed files with 80 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app_Main.py
View File

@@ -10394,7 +10394,7 @@ class App(QtCore.QObject):
self.preferencesUiManager.defaults_read_form()
self.options.update(self.defaults)
def shell_message(self, msg, show=False, error=False, warning=False, success=False, selected=False):
def shell_message(self, msg, show=False, error=False, warning=False, success=False, selected=False, new_line=True):
"""
Shows a message on the FlatCAM Shell
@@ -10406,19 +10406,21 @@ class App(QtCore.QObject):
:param selected: Indicate that something was selected on canvas
:return: None
"""
end = '\n' if new_line is True else ''
if show:
self.ui.shell_dock.show()
try:
if error:
self.shell.append_error(msg + "\n")
self.shell.append_error(msg + end)
elif warning:
self.shell.append_warning(msg + "\n")
self.shell.append_warning(msg + end)
elif success:
self.shell.append_success(msg + "\n")
self.shell.append_success(msg + end)
elif selected:
self.shell.append_selected(msg + "\n")
self.shell.append_selected(msg + end)
else:
self.shell.append_output(msg + "\n")
self.shell.append_output(msg + end)
except AttributeError:
log.debug("shell_message() is called before Shell Class is instantiated. The message is: %s", str(msg))