Merge branch 'merge-tcl-commands' of https://bitbucket.org/sopak/flatcam into tcl-commands

Conflicts:
	FlatCAMApp.py
	FlatCAMWorker.py
	termwidget.py
This commit is contained in:
Kamil Sopko
2016-03-31 18:03:48 +02:00
5 changed files with 5 additions and 6 deletions

View File

@@ -31,18 +31,15 @@ class Worker(QtCore.QObject):
def run(self):
# allow debuging/breakpoints in this threads
#pydevd.settrace(suspend=False, trace_only_current_thread=True)
# FlatCAMApp.App.log.debug("Worker Started!")
self.app.log.debug("Worker Started!")
self.allow_debug()
# Tasks are queued in the event listener.
self.app.worker_task.connect(self.do_worker_task)
def do_worker_task(self, task):
# FlatCAMApp.App.log.debug("Running task: %s" % str(task))
self.app.log.debug("Running task: %s" % str(task))
self.allow_debug()
@@ -58,5 +55,4 @@ class Worker(QtCore.QObject):
return
# FlatCAMApp.App.log.debug("Task ignored.")
self.app.log.debug("Task ignored.")