Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e45c089428f3
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: deb51eaaa175
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Sep 5, 2016

  1. Copy the full SHA
    71eb65c View commit details
  2. Copy the full SHA
    524ba80 View commit details
  3. Copy the full SHA
    deb51ea View commit details
Showing with 37 additions and 50 deletions.
  1. +1 −1 artiq/browser/experiments.py
  2. +17 −25 artiq/frontend/artiq_client.py
  3. +1 −1 artiq/frontend/artiq_dashboard.py
  4. +18 −23 artiq/gui/{logo20.svg → logo_ver.svg}
2 changes: 1 addition & 1 deletion artiq/browser/experiments.py
Original file line number Diff line number Diff line change
@@ -392,7 +392,7 @@ class ExperimentsArea(QtWidgets.QMdiArea):
def __init__(self, root, datasets_sub):
QtWidgets.QMdiArea.__init__(self)
self.pixmap = QtGui.QPixmap(os.path.join(
artiq_dir, "gui", "logo20.svg"))
artiq_dir, "gui", "logo_ver.svg"))
self.current_dir = root
self.dataset = None

42 changes: 17 additions & 25 deletions artiq/frontend/artiq_client.py
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@

from artiq.protocols.pc_rpc import Client
from artiq.protocols.sync_struct import Subscriber
from artiq.protocols.broadcast import Receiver
from artiq.protocols import pyon
from artiq.tools import short_format

@@ -236,8 +237,6 @@ def _show_datasets(datasets):


def _run_subscriber(host, port, subscriber):
if port is None:
port = 3250
loop = asyncio.get_event_loop()
try:
loop.run_until_complete(subscriber.connect(host, port))
@@ -259,7 +258,8 @@ def init_d(x):
return d
subscriber = Subscriber(notifier_name, init_d,
lambda mod: display_fun(d))
_run_subscriber(args.server, args.port, subscriber)
port = 3250 if args.port is None else args.port
_run_subscriber(args.server, port, subscriber)


def _print_log_record(record):
@@ -268,30 +268,20 @@ def _print_log_record(record):
print(level, source, t, message)


class _LogPrinter:
def __init__(self, init):
for record in init:
_print_log_record(record)

def append(self, record):
_print_log_record(record)

def insert(self, i, record):
_print_log_record(record)

def pop(self, i=-1):
pass

def __delitem__(self, x):
pass

def __setitem__(self, k, v):
pass
def _show_log(args):
subscriber = Receiver("log", [_print_log_record])
port = 1067 if args.port is None else args.port
_run_subscriber(args.server, port, subscriber)


def _show_log(args):
subscriber = Subscriber("log", _LogPrinter)
_run_subscriber(args.server, args.port, subscriber)
def _show_ccb(args):
subscriber = Receiver("ccb", [
lambda d: print(d["service"],
"args:", d["args"],
"kwargs:", d["kwargs"])
])
port = 1067 if args.port is None else args.port
_run_subscriber(args.server, port, subscriber)


def main():
@@ -302,6 +292,8 @@ def main():
_show_dict(args, "schedule", _show_schedule)
elif args.what == "log":
_show_log(args)
elif args.what == "ccb":
_show_ccb(args)
elif args.what == "devices":
_show_dict(args, "devices", _show_devices)
elif args.what == "datasets":
2 changes: 1 addition & 1 deletion artiq/frontend/artiq_dashboard.py
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ class MdiArea(QtWidgets.QMdiArea):
def __init__(self):
QtWidgets.QMdiArea.__init__(self)
self.pixmap = QtGui.QPixmap(os.path.join(
artiq_dir, "gui", "logo20.svg"))
artiq_dir, "gui", "logo_ver.svg"))

def paintEvent(self, event):
QtWidgets.QMdiArea.paintEvent(self, event)
41 changes: 18 additions & 23 deletions artiq/gui/logo20.svg → artiq/gui/logo_ver.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.