From 476f1e5858cf1991f559ce2a09c0bdd309c04dbe Mon Sep 17 00:00:00 2001
From: Juan Pablo Caram <jpcaram@gmail.com>
Date: Sun, 22 Feb 2015 17:34:57 -0500
Subject: [PATCH] Version 8.3 for Windows.

---
 FlatCAMApp.py     |  7 ++++++-
 FlatCAMProcess.py | 35 ++++++++++++++++++++---------------
 camlib.py         |  4 ++--
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 82892cc8..e63ad30c 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -59,7 +59,7 @@ class App(QtCore.QObject):
     log.addHandler(handler)
 
     ## Version
-    version = 8.2
+    version = 8.3
     version_date = "2015/02"
 
     ## URL for update checks and statistics
@@ -436,7 +436,9 @@ class App(QtCore.QObject):
         ####################
         ### Other setups ###
         ####################
+        # Sets up FlatCAMObj, FCProcess and FCProcessContainer.
         self.setup_obj_classes()
+
         self.setup_recent_items()
         self.setup_component_editor()
 
@@ -2589,6 +2591,9 @@ class App(QtCore.QObject):
         """
         FlatCAMObj.app = self
 
+        FCProcess.app = self
+        FCProcessContainer.app = self
+
     def version_check(self):
         """
         Checks for the latest version of the program. Alerts the
diff --git a/FlatCAMProcess.py b/FlatCAMProcess.py
index a04d2817..afbec102 100644
--- a/FlatCAMProcess.py
+++ b/FlatCAMProcess.py
@@ -2,20 +2,23 @@ from FlatCAMGUI import FlatCAMActivityView
 from PyQt4 import QtCore
 import weakref
 
-import logging
 
-log = logging.getLogger('base2')
-#log.setLevel(logging.DEBUG)
-log.setLevel(logging.WARNING)
-#log.setLevel(logging.INFO)
-formatter = logging.Formatter('[%(levelname)s] %(message)s')
-handler = logging.StreamHandler()
-handler.setFormatter(formatter)
-log.addHandler(handler)
+# import logging
+
+# log = logging.getLogger('base2')
+# #log.setLevel(logging.DEBUG)
+# log.setLevel(logging.WARNING)
+# #log.setLevel(logging.INFO)
+# formatter = logging.Formatter('[%(levelname)s] %(message)s')
+# handler = logging.StreamHandler()
+# handler.setFormatter(formatter)
+# log.addHandler(handler)
 
 
 class FCProcess(object):
 
+    app = None
+
     def __init__(self, descr):
         self.callbacks = {
             "done": []
@@ -31,10 +34,10 @@ class FCProcess(object):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_type is not None:
-            log.error("Abnormal termination of process!")
-            log.error(exc_type)
-            log.error(exc_val)
-            log.error(exc_tb)
+            self.app.log.error("Abnormal termination of process!")
+            self.app.log.error(exc_type)
+            self.app.log.error(exc_val)
+            self.app.log.error(exc_tb)
 
         self.done()
 
@@ -69,6 +72,8 @@ class FCProcessContainer(object):
     looses track of their reference.
     """
 
+    app = None
+
     def __init__(self):
 
         self.procs = []
@@ -120,13 +125,13 @@ class FCVisibleProcessContainer(QtCore.QObject, FCProcessContainer):
         self.something_changed.connect(self.update_view)
 
     def on_done(self, proc):
-        log.debug("FCVisibleProcessContainer.on_done()")
+        self.app.log.debug("FCVisibleProcessContainer.on_done()")
         super(FCVisibleProcessContainer, self).on_done(proc)
 
         self.something_changed.emit()
 
     def on_change(self, proc):
-        log.debug("FCVisibleProcessContainer.on_change()")
+        self.app.log.debug("FCVisibleProcessContainer.on_change()")
         super(FCVisibleProcessContainer, self).on_change(proc)
 
         self.something_changed.emit()
diff --git a/camlib.py b/camlib.py
index cd65d388..5e32eff5 100644
--- a/camlib.py
+++ b/camlib.py
@@ -43,8 +43,8 @@ import simplejson as json
 import logging
 
 log = logging.getLogger('base2')
-log.setLevel(logging.DEBUG)
-#log.setLevel(logging.WARNING)
+#log.setLevel(logging.DEBUG)
+log.setLevel(logging.WARNING)
 #log.setLevel(logging.INFO)
 formatter = logging.Formatter('[%(levelname)s] %(message)s')
 handler = logging.StreamHandler()