Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Orange/canvas/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -485,15 +485,20 @@ def main(argv=None):
filename=os.path.join(config.log_dir(), "canvas.log"),
mode="w"
)
file_handler.setFormatter(
logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s")
)
formatter = logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s")
file_handler.setFormatter(formatter)
file_handler.setLevel(level)

stream = TextStream()
stream_handler = logging.StreamHandler(stream)
stream_handler.setFormatter(formatter)
stream_handler.setLevel(level)

for namespace in ["orangecanvas", "orangewidget", "Orange"]:
logger = logging.getLogger(namespace)
logger.setLevel(level)
logger.addHandler(file_handler)
logger.addHandler(stream_handler)

# intercept any QFileOpenEvent requests until the main window is
# fully initialized.
Expand Down Expand Up @@ -562,6 +567,7 @@ def onrequest(url):
canvas_window = MainWindow()
canvas_window.setAttribute(Qt.WA_DeleteOnClose)
canvas_window.setWindowIcon(config.application_icon())
canvas_window.connect_output_stream(stream)

# initialize notification server, set to initial canvas
notif_server = NotificationServer()
Expand Down Expand Up @@ -672,6 +678,7 @@ def show_message(message):
try:
with closing(stdout),\
closing(stderr),\
closing(stream), \
patch('sys.excepthook', excepthook),\
patch('sys.stderr', stderr),\
patch('sys.stdout', stdout):
Expand Down
2 changes: 1 addition & 1 deletion requirements-gui.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
orange-canvas-core>=0.1.12,<0.2a
orange-canvas-core>=0.1.14,<0.2a
orange-widget-base>=4.5.0

# PyQt4/PyQt5 compatibility
Expand Down