giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Version 8.3 for Windows.

This commit is contained in:
Juan Pablo Caram 2015-02-22 17:34:57 -05:00
parent 873db32aad
commit 476f1e5858
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FlatCAMApp.py
View File

@ -59,7 +59,7 @@ class App(QtCore.QObject):
log.addHandler(handler) log.addHandler(handler)
## Version ## Version
version = 8.2 version = 8.3
version_date = "2015/02" version_date = "2015/02"
## URL for update checks and statistics ## URL for update checks and statistics
@ -436,7 +436,9 @@ class App(QtCore.QObject):
#################### ####################
### Other setups ### ### Other setups ###
#################### ####################
# Sets up FlatCAMObj, FCProcess and FCProcessContainer.
self.setup_obj_classes() self.setup_obj_classes()
self.setup_recent_items() self.setup_recent_items()
self.setup_component_editor() self.setup_component_editor()
@ -2589,6 +2591,9 @@ class App(QtCore.QObject):
""" """
FlatCAMObj.app = self FlatCAMObj.app = self
FCProcess.app = self
FCProcessContainer.app = self
def version_check(self): def version_check(self):
""" """
Checks for the latest version of the program. Alerts the Checks for the latest version of the program. Alerts the

35
FlatCAMProcess.py
View File

@ -2,20 +2,23 @@ from FlatCAMGUI import FlatCAMActivityView
from PyQt4 import QtCore from PyQt4 import QtCore
import weakref import weakref
import logging
log = logging.getLogger('base2') # import logging
#log.setLevel(logging.DEBUG)
log.setLevel(logging.WARNING) # log = logging.getLogger('base2')
#log.setLevel(logging.INFO) # #log.setLevel(logging.DEBUG)
formatter = logging.Formatter('[%(levelname)s] %(message)s') # log.setLevel(logging.WARNING)
handler = logging.StreamHandler() # #log.setLevel(logging.INFO)
handler.setFormatter(formatter) # formatter = logging.Formatter('[%(levelname)s] %(message)s')
log.addHandler(handler) # handler = logging.StreamHandler()
# handler.setFormatter(formatter)
# log.addHandler(handler)
class FCProcess(object): class FCProcess(object):
app = None
def __init__(self, descr): def __init__(self, descr):
self.callbacks = { self.callbacks = {
"done": [] "done": []
@ -31,10 +34,10 @@ class FCProcess(object):
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
if exc_type is not None: if exc_type is not None:
log.error("Abnormal termination of process!") self.app.log.error("Abnormal termination of process!")
log.error(exc_type) self.app.log.error(exc_type)
log.error(exc_val) self.app.log.error(exc_val)
log.error(exc_tb) self.app.log.error(exc_tb)
self.done() self.done()
@ -69,6 +72,8 @@ class FCProcessContainer(object):
looses track of their reference. looses track of their reference.
""" """
app = None
def __init__(self): def __init__(self):
self.procs = [] self.procs = []
@ -120,13 +125,13 @@ class FCVisibleProcessContainer(QtCore.QObject, FCProcessContainer):
self.something_changed.connect(self.update_view) self.something_changed.connect(self.update_view)
def on_done(self, proc): def on_done(self, proc):
log.debug("FCVisibleProcessContainer.on_done()") self.app.log.debug("FCVisibleProcessContainer.on_done()")
super(FCVisibleProcessContainer, self).on_done(proc) super(FCVisibleProcessContainer, self).on_done(proc)
self.something_changed.emit() self.something_changed.emit()
def on_change(self, proc): def on_change(self, proc):
log.debug("FCVisibleProcessContainer.on_change()") self.app.log.debug("FCVisibleProcessContainer.on_change()")
super(FCVisibleProcessContainer, self).on_change(proc) super(FCVisibleProcessContainer, self).on_change(proc)
self.something_changed.emit() self.something_changed.emit()

4
camlib.py
View File

@ -43,8 +43,8 @@ import simplejson as json
import logging import logging
log = logging.getLogger('base2') log = logging.getLogger('base2')
log.setLevel(logging.DEBUG) #log.setLevel(logging.DEBUG)
#log.setLevel(logging.WARNING) log.setLevel(logging.WARNING)
#log.setLevel(logging.INFO) #log.setLevel(logging.INFO)
formatter = logging.Formatter('[%(levelname)s] %(message)s') formatter = logging.Formatter('[%(levelname)s] %(message)s')
handler = logging.StreamHandler() handler = logging.StreamHandler()