M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

browser: fixes/string style

This commit is contained in:
Robert Jördens 2016-05-08 23:43:33 +02:00
parent 02b54930a9
commit 4fee2055a5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artiq/browser/experiments.py
View File

@ -105,7 +105,7 @@ class _ArgumentEditor(QtWidgets.QTreeWidget):
return group return group
def _recompute_arguments_clicked(self): def _recompute_arguments_clicked(self):
asyncio.ensure_future(self._dock.recompute_arguments()) asyncio.ensure_future(self._dock._recompute_arguments())
def _recompute_argument_clicked(self, name): def _recompute_argument_clicked(self, name):
asyncio.ensure_future(self._recompute_argument(name)) asyncio.ensure_future(self._recompute_argument(name))
@ -195,20 +195,20 @@ class _ExperimentDock(QtWidgets.QMdiSubWindow):
log_level.currentIndexChanged.connect(update_log_level) log_level.currentIndexChanged.connect(update_log_level)
self.log_level = log_level self.log_level = log_level
submit = QtWidgets.QPushButton("Submit") submit = QtWidgets.QPushButton("Analyze")
submit.setIcon(QtWidgets.QApplication.style().standardIcon( submit.setIcon(QtWidgets.QApplication.style().standardIcon(
QtWidgets.QStyle.SP_DialogOkButton)) QtWidgets.QStyle.SP_DialogOkButton))
submit.setToolTip("Schedule the experiment (Ctrl+Return)") submit.setToolTip("Run analysis stage (Ctrl+Return)")
submit.setShortcut("CTRL+RETURN") submit.setShortcut("CTRL+RETURN")
submit.setSizePolicy(QtWidgets.QSizePolicy.Expanding, submit.setSizePolicy(QtWidgets.QSizePolicy.Expanding,
QtWidgets.QSizePolicy.Expanding) QtWidgets.QSizePolicy.Expanding)
self.layout.addWidget(submit, 1, 4, 2, 1) self.layout.addWidget(submit, 1, 4, 2, 1)
submit.clicked.connect(self.submit_clicked) submit.clicked.connect(self.submit_clicked)
reqterm = QtWidgets.QPushButton("Terminate instances") reqterm = QtWidgets.QPushButton("Terminate")
reqterm.setIcon(QtWidgets.QApplication.style().standardIcon( reqterm.setIcon(QtWidgets.QApplication.style().standardIcon(
QtWidgets.QStyle.SP_DialogCancelButton)) QtWidgets.QStyle.SP_DialogCancelButton))
reqterm.setToolTip("Request termination of instances (Ctrl+Backspace)") reqterm.setToolTip("Terminate analysis (Ctrl+Backspace)")
reqterm.setShortcut("CTRL+BACKSPACE") reqterm.setShortcut("CTRL+BACKSPACE")
reqterm.setSizePolicy(QtWidgets.QSizePolicy.Expanding, reqterm.setSizePolicy(QtWidgets.QSizePolicy.Expanding,
QtWidgets.QSizePolicy.Expanding) QtWidgets.QSizePolicy.Expanding)
@ -222,7 +222,7 @@ class _ExperimentDock(QtWidgets.QMdiSubWindow):
def dropEvent(self, ev): def dropEvent(self, ev):
for uri in ev.mimeData().urls(): for uri in ev.mimeData().urls():
if uri.scheme() == "file": if uri.scheme() == "file":
logger.info("loading HDF5 arguments from %s", uri.path()) logger.info("Loading HDF5 arguments from %s", uri.path())
asyncio.ensure_future(self._load_hdf5_task(uri.path())) asyncio.ensure_future(self._load_hdf5_task(uri.path()))
ev.acceptProposedAction() ev.acceptProposedAction()
@ -352,7 +352,7 @@ class ExperimentsArea(QtWidgets.QMdiArea):
except asyncio.CancelledError: except asyncio.CancelledError:
return return
self.current_dir = os.path.dirname(file) self.current_dir = os.path.dirname(file)
logger.info("opening experiment %s", file) logger.info("Opening experiment %s", file)
try: try:
description = await self.examine(file) description = await self.examine(file)
except: except: