From 2f910921f5953036b687f1bb32bb328adb581530 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 24 May 2015 00:38:30 +0800 Subject: [PATCH] gui: console -> log --- artiq/frontend/artiq_gui.py | 8 ++++---- artiq/gui/console.py | 7 ------- artiq/gui/log.py | 7 +++++++ 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 artiq/gui/console.py create mode 100644 artiq/gui/log.py diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py index 1b4be3be6..b914a7475 100755 --- a/artiq/frontend/artiq_gui.py +++ b/artiq/frontend/artiq_gui.py @@ -12,7 +12,7 @@ from pyqtgraph import dockarea from artiq.protocols.file_db import FlatFileDB from artiq.gui.explorer import ExplorerDock from artiq.gui.parameters import ParametersDock -from artiq.gui.console import ConsoleDock +from artiq.gui.log import LogDock from artiq.gui.schedule import ScheduleDock @@ -61,11 +61,11 @@ def main(): args.server, args.port_notify)) atexit.register(lambda: loop.run_until_complete(d_params.sub_close())) - d_console = ConsoleDock() - area.addDock(d_console, "bottom") + d_log = LogDock() + area.addDock(d_log, "bottom") d_schedule = ScheduleDock() - area.addDock(d_schedule, "above", d_console) + area.addDock(d_schedule, "above", d_log) loop.run_until_complete(d_schedule.sub_connect( args.server, args.port_notify)) atexit.register(lambda: loop.run_until_complete(d_schedule.sub_close())) diff --git a/artiq/gui/console.py b/artiq/gui/console.py deleted file mode 100644 index 60d7352c2..000000000 --- a/artiq/gui/console.py +++ /dev/null @@ -1,7 +0,0 @@ -from quamash import QtGui -from pyqtgraph import dockarea - - -class ConsoleDock(dockarea.Dock): - def __init__(self): - dockarea.Dock.__init__(self, "Console", size=(1000, 300)) diff --git a/artiq/gui/log.py b/artiq/gui/log.py new file mode 100644 index 000000000..ed5c9abb6 --- /dev/null +++ b/artiq/gui/log.py @@ -0,0 +1,7 @@ +from quamash import QtGui +from pyqtgraph import dockarea + + +class LogDock(dockarea.Dock): + def __init__(self): + dockarea.Dock.__init__(self, "Log", size=(1000, 300))