Fixed conflict with PyQt5. Cleanup. Log level back to debug.
This commit is contained in:
parent
35754aa2b5
commit
aa951e277b
|
@ -51,8 +51,8 @@ class App(QtCore.QObject):
|
||||||
|
|
||||||
## Logging ##
|
## Logging ##
|
||||||
log = logging.getLogger('base')
|
log = logging.getLogger('base')
|
||||||
#log.setLevel(logging.DEBUG)
|
log.setLevel(logging.DEBUG)
|
||||||
log.setLevel(logging.WARNING)
|
#log.setLevel(logging.WARNING)
|
||||||
formatter = logging.Formatter('[%(levelname)s][%(threadName)s] %(message)s')
|
formatter = logging.Formatter('[%(levelname)s][%(threadName)s] %(message)s')
|
||||||
handler = logging.StreamHandler()
|
handler = logging.StreamHandler()
|
||||||
handler.setFormatter(formatter)
|
handler.setFormatter(formatter)
|
||||||
|
@ -690,7 +690,6 @@ class App(QtCore.QObject):
|
||||||
self.defaults["def_win_w"] = width
|
self.defaults["def_win_w"] = width
|
||||||
self.defaults["def_win_h"] = height
|
self.defaults["def_win_h"] = height
|
||||||
self.save_defaults()
|
self.save_defaults()
|
||||||
print self.defaults
|
|
||||||
|
|
||||||
def message_dialog(self, title, message, kind="info"):
|
def message_dialog(self, title, message, kind="info"):
|
||||||
icon = {"info": QtGui.QMessageBox.Information,
|
icon = {"info": QtGui.QMessageBox.Information,
|
||||||
|
|
|
@ -7,6 +7,11 @@
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
from PyQt4 import QtGui, QtCore
|
from PyQt4 import QtGui, QtCore
|
||||||
|
|
||||||
|
# Prevent conflict with Qt5 and above.
|
||||||
|
from matplotlib import use as mpl_use
|
||||||
|
mpl_use("Qt4Agg")
|
||||||
|
|
||||||
from matplotlib.figure import Figure
|
from matplotlib.figure import Figure
|
||||||
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
|
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
|
||||||
import FlatCAMApp
|
import FlatCAMApp
|
||||||
|
|
|
@ -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()
|
||||||
|
|
Loading…
Reference in New Issue