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: ea13d00087c6
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: 6ee0f65b120a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 1, 2016

  1. dashboard: kill the Qt built-in main window closing mechanism 

    When the main window is closed, Qt makes QApplication.exec() return, which conflicts with Quamash's implementation of loop.run_until_complete(). The conflict causes Quamash's run_forever() to return earlier than it should, and cause "RuntimeError('Event loop stopped before Future completed.')".

Closes #475
    @sbourdeauducq
    sbourdeauducq committed Jul 1, 2016
    Copy the full SHA
    1193022 View commit details

  2. browser: ditto 1193022

    @sbourdeauducq
    sbourdeauducq committed Jul 1, 2016
    Copy the full SHA
    6ee0f65 View commit details
Showing with 4 additions and 2 deletions.
  1. +2 −1 artiq/frontend/artiq_browser.py
  2. +2 −1 artiq/frontend/artiq_dashboard.py
3 changes: 2 additions & 1 deletion artiq/frontend/artiq_browser.py
View file
Original file line number Diff line number Diff line change
@@ -99,7 +99,8 @@ def __init__(self, datasets_sub, browse_root, select):
a.triggered.connect(self.experiments.tileSubWindows)
g.addAction(a)

def closeEvent(self, *args):
def closeEvent(self, event):
event.ignore()
self.exit_request.set()

def save_state(self):
3 changes: 2 additions & 1 deletion artiq/frontend/artiq_dashboard.py
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,8 @@ def __init__(self, server):

self.exit_request = asyncio.Event()

def closeEvent(self, *args):
def closeEvent(self, event):
event.ignore()
self.exit_request.set()

def save_state(self):