From 3b8b4254b9104e12be35e13516ac37d4c8127296 Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 24 Apr 2020 08:37:47 +0300 Subject: [PATCH] - fixed an issue regarding the statusbar pixmap selection --- CHANGELOG.md | 1 + FlatCAMApp.py | 2 +- tclCommands/TclCommand.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c2e6796..1b0852b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ CHANGELOG for FlatCAM beta - the status bar messages that are echoed in the Tcl Shell will no longer have all text colored but only the identifier - some message strings cleanup - added possibility to save as text file the content in Tcl Shell browser window when clicking the Save log context menu entry +- fixed an issue regarding the statusbar pixmap selection 23.04.2020 diff --git a/FlatCAMApp.py b/FlatCAMApp.py index fb9b9871..21af0c26 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -3706,7 +3706,7 @@ class App(QtCore.QObject): """ # Type of message in brackets at the beginning of the message. - match = re.search("\[([^\]]+)\](.*)", msg) + match = re.search(r"\[(.*)\](.*)", msg) if match: level = match.group(1) msg_ = match.group(2) diff --git a/tclCommands/TclCommand.py b/tclCommands/TclCommand.py index 72bb48c5..45378180 100644 --- a/tclCommands/TclCommand.py +++ b/tclCommands/TclCommand.py @@ -289,7 +289,7 @@ class TclCommand(object): # self.worker_task.emit({'fcn': self.exec_command_test, 'params': [text, False]}) try: - self.log.debug("TCL command '%s' executed." % str(self.__class__)) + self.log.debug("TCL command '%s' executed." % str(type(self).__name__)) self.original_args = args args, unnamed_args = self.check_args(args) return self.execute(args, unnamed_args) @@ -405,7 +405,7 @@ class TclCommandSignaled(TclCommand): "'set_sys global_background_timeout '.") try: - self.log.debug("TCL command '%s' executed." % str(self.__class__)) + self.log.debug("TCL command '%s' executed." % str(type(self).__name__)) self.original_args = args args, unnamed_args = self.check_args(args) if 'timeout' in args: