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: 8a6873cab25f
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: a142d403ea01
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 15, 2016

  1. Copy the full SHA
    e13d424 View commit details
  2. logo: use Unix EOLs

    sbourdeauducq committed Mar 15, 2016
    Copy the full SHA
    a172d8b View commit details
  3. Copy the full SHA
    a142d40 View commit details
Showing with 112 additions and 105 deletions.
  1. +8 −2 artiq/coredevice/analyzer.py
  2. +1 −0 artiq/frontend/artiq_gui.py
  3. +103 −103 artiq/gui/logo.svg
10 changes: 8 additions & 2 deletions artiq/coredevice/analyzer.py
Original file line number Diff line number Diff line change
@@ -377,13 +377,19 @@ def decoded_dump_to_vcd(fileobj, devices, dump):
logger.warning("unable to determine DDS sysclk")
dds_sysclk = 3e9 # guess

messages = sorted(dump.messages, key=get_message_time)
if isinstance(dump.messages[-1], StoppedMessage):
messages = dump.messages[:-1]
else:
logger.warning("StoppedMessage missing")
messages = dump.messages
messages = sorted(messages, key=get_message_time)

channel_handlers = create_channel_handlers(
vcd_manager, devices, ref_period,
dds_sysclk, dump.dds_onehot_sel)
vcd_log_channels = get_vcd_log_channels(dump.log_channel, messages)
channel_handlers[dump.log_channel] = LogHandler(vcd_manager, vcd_log_channels)
channel_handlers[dump.log_channel] = LogHandler(
vcd_manager, vcd_log_channels)
slack = vcd_manager.get_channel("rtio_slack", 64)

vcd_manager.set_time(0)
1 change: 1 addition & 0 deletions artiq/frontend/artiq_gui.py
Original file line number Diff line number Diff line change
@@ -66,6 +66,7 @@ def paintEvent(self, event):
painter = QtGui.QPainter(self.viewport())
x = (self.width() - self.pixmap.width())//2
y = (self.height() - self.pixmap.height())//2
painter.setOpacity(0.5)
painter.drawPixmap(x, y, self.pixmap)


206 changes: 103 additions & 103 deletions artiq/gui/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.