forked from M-Labs/artiq
1
0
Fork 0

gui: console -> log

This commit is contained in:
Sebastien Bourdeauducq 2015-05-24 00:38:30 +08:00
parent d9c25130e3
commit 2f910921f5
3 changed files with 11 additions and 11 deletions

View File

@ -12,7 +12,7 @@ from pyqtgraph import dockarea
from artiq.protocols.file_db import FlatFileDB from artiq.protocols.file_db import FlatFileDB
from artiq.gui.explorer import ExplorerDock from artiq.gui.explorer import ExplorerDock
from artiq.gui.parameters import ParametersDock from artiq.gui.parameters import ParametersDock
from artiq.gui.console import ConsoleDock from artiq.gui.log import LogDock
from artiq.gui.schedule import ScheduleDock from artiq.gui.schedule import ScheduleDock
@ -61,11 +61,11 @@ def main():
args.server, args.port_notify)) args.server, args.port_notify))
atexit.register(lambda: loop.run_until_complete(d_params.sub_close())) atexit.register(lambda: loop.run_until_complete(d_params.sub_close()))
d_console = ConsoleDock() d_log = LogDock()
area.addDock(d_console, "bottom") area.addDock(d_log, "bottom")
d_schedule = ScheduleDock() 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( loop.run_until_complete(d_schedule.sub_connect(
args.server, args.port_notify)) args.server, args.port_notify))
atexit.register(lambda: loop.run_until_complete(d_schedule.sub_close())) atexit.register(lambda: loop.run_until_complete(d_schedule.sub_close()))

View File

@ -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))

7
artiq/gui/log.py Normal file
View File

@ -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))