فهرست منبع

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

Conflicts:
	FlatCAMApp.py
	FlatCAMWorker.py
	termwidget.py
Kamil Sopko 9 سال پیش
والد
کامیت
f4ef7baedb
5فایلهای تغییر یافته به همراه5 افزوده شده و 6 حذف شده
  1. 3 0
      FlatCAMApp.py
  2. 2 6
      FlatCAMWorker.py
  3. BIN
      camlib.pyc
  4. BIN
      descartes/__init__.pyc
  5. BIN
      descartes/patch.pyc

+ 3 - 0
FlatCAMApp.py

@@ -1079,6 +1079,7 @@ class App(QtCore.QObject):
         toggle shell if is  visible close it if  closed open it
         :return:
         """
+
         if self.ui.shell_dock.isVisible():
             self.ui.shell_dock.hide()
         else:
@@ -1091,6 +1092,7 @@ class App(QtCore.QObject):
 
         :return: None
         """
+
         objs = self.collection.get_selected()
 
         def initialize(obj, app):
@@ -1802,6 +1804,7 @@ class App(QtCore.QObject):
         :param outname:
         :return:
         """
+
         self.log.debug("export_svg()")
 
         try:

+ 2 - 6
FlatCAMWorker.py

@@ -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.")

BIN
camlib.pyc


BIN
descartes/__init__.pyc


BIN
descartes/patch.pyc