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: 7886827b8051
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: e8bd24d53997
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 5, 2015

  1. gui: typos

    @sbourdeauducq
    sbourdeauducq committed Dec 5, 2015
    Copy the full SHA
    2871b5e View commit details

  2. gui/experiments: add argument recompute buttons. Closes #171

    @sbourdeauducq
    sbourdeauducq committed Dec 5, 2015
    Copy the full SHA
    e8bd24d View commit details
Showing with 25 additions and 9 deletions.
  1. +24 −8 artiq/gui/experiments.py
  2. +1 −1 artiq/gui/explorer.py
32 changes: 24 additions & 8 deletions artiq/gui/experiments.py
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

from quamash import QtGui, QtCore

from pyqtgraph import dockarea
from pyqtgraph import dockarea, LayoutWidget

from artiq.gui.tools import log_level_to_name, disable_scroll_wheel
from artiq.gui.scan import ScanController
@@ -121,8 +121,11 @@ def default_state(procdesc):
class _ArgumentEditor(QtGui.QTreeWidget):
def __init__(self, arguments):
QtGui.QTreeWidget.__init__(self)
self.setColumnCount(2)
self.header().setResizeMode(QtGui.QHeaderView.ResizeToContents)
self.setColumnCount(3)
self.header().setStretchLastSection(False)
self.header().setResizeMode(0, QtGui.QHeaderView.ResizeToContents)
self.header().setResizeMode(1, QtGui.QHeaderView.Stretch)
self.header().setResizeMode(2, QtGui.QHeaderView.ResizeToContents)
self.header().setVisible(False)
self.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
self.setHorizontalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
@@ -132,23 +135,33 @@ def __init__(self, arguments):
self._args_to_entries = dict()

if not arguments:
self.addTopLevelItem(QtGui.QTreeWidgetItem(["No arguments", ""]))
self.addTopLevelItem(QtGui.QTreeWidgetItem(["No arguments"]))

for n, (name, argument) in enumerate(arguments.items()):
entry = _argty_to_entry[argument["desc"]["ty"]](argument)
self._args_to_entries[name] = entry

widget_item = QtGui.QTreeWidgetItem([name, ""])
widget_item = QtGui.QTreeWidgetItem([name])
if argument["group"] is None:
self.addTopLevelItem(widget_item)
else:
self._get_group(argument["group"]).addChild(widget_item)
self.setItemWidget(widget_item, 1, entry)
recompute_argument = QtGui.QToolButton()
recompute_argument.setToolTip("Re-run the experiment's build "
"method and take the default value")
recompute_argument.setIcon(QtGui.QApplication.style().standardIcon(
QtGui.QStyle.SP_BrowserReload))
recompute_argument.clicked.connect(
partial(self._recompute_argument, name))
fix_layout = LayoutWidget()
fix_layout.addWidget(recompute_argument)
self.setItemWidget(widget_item, 2, fix_layout)

def _get_group(self, name):
if name in self._groups:
return self._groups[name]
group = QtGui.QTreeWidgetItem([name, ""])
group = QtGui.QTreeWidgetItem([name])
for c in 0, 1:
group.setBackground(c, QtGui.QBrush(QtGui.QColor(100, 100, 100)))
group.setForeground(c, QtGui.QBrush(QtGui.QColor(220, 220, 255)))
@@ -159,6 +172,9 @@ def _get_group(self, name):
self._groups[name] = group
return group

def _recompute_argument(self, argument):
logger.warning("recompute_argument not implemented (%s)", argument)

def save_state(self):
expanded = []
for k, v in self._groups.items():
@@ -304,7 +320,7 @@ def submit_clicked(self):
except:
# May happen when experiment has been removed
# from repository/explist
logger.warning("failed to request termination of instances of %s",
logger.warning("failed to submit '%s'",
self.expname, exc_info=True)

def reqterm_clicked(self):
@@ -313,7 +329,7 @@ def reqterm_clicked(self):
except:
# May happen when experiment has been removed
# from repository/explist
logger.warning("failed to request termination of instances of %s",
logger.warning("failed to request termination of instances of '%s'",
self.expname, exc_info=True)

def save_state(self):
2 changes: 1 addition & 1 deletion artiq/gui/explorer.py
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ def __init__(self, status_bar, exp_manager, d_shortcuts,

submit = QtGui.QPushButton("Submit")
submit.setIcon(QtGui.QApplication.style().standardIcon(
QtGui.QStyle.SP_DialogOkButton))
QtGui.QStyle.SP_DialogOkButton))
submit.setToolTip("Schedule the selected experiment (Ctrl+Return)")
self.addWidget(submit, 1, 1)
submit.clicked.connect(self.submit_clicked)