Sfoglia il codice sorgente

- fixed an issue regarding the statusbar pixmap selection

Marius 5 anni fa
parent
commit
3b8b4254b9
3 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 1 0
      CHANGELOG.md
  2. 1 1
      FlatCAMApp.py
  3. 2 2
      tclCommands/TclCommand.py

+ 1 - 0
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 
 

+ 1 - 1
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)

+ 2 - 2
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 <miliseconds>'.")
 
         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: