srenblad/artiq
1
0
Fork 0
forked from M-Labs/artiq
Code Pull Requests Activity

waveform: simplify AddChannelDialog

Browse Source
This commit is contained in:
Simon Renblad 2024-02-19 16:58:00 +08:00 committed by Sébastien Bourdeauducq
parent 779b7704ed
commit bd9e8b3977
1 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
artiq/dashboard/waveform.py
View File

@ -670,15 +670,13 @@ class Model(DictSyncTreeSepModel):
class _AddChannelDialog(QtWidgets.QDialog): class _AddChannelDialog(QtWidgets.QDialog):
accepted = QtCore.pyqtSignal(list)
def __init__(self, parent, model): def __init__(self, parent, model):
QtWidgets.QDialog.__init__(self, parent=parent) QtWidgets.QDialog.__init__(self, parent=parent)
self.setContextMenuPolicy(Qt.ActionsContextMenu) self.setContextMenuPolicy(Qt.ActionsContextMenu)
self.setWindowTitle("Add channels") self.setWindowTitle("Add channels")
grid = QtWidgets.QGridLayout() layout = QtWidgets.QVBoxLayout()
self.setLayout(grid) self.setLayout(layout)
self._model = model self._model = model
self._tree_view = QtWidgets.QTreeView() self._tree_view = QtWidgets.QTreeView()
@ -688,19 +686,15 @@ class _AddChannelDialog(QtWidgets.QDialog):
self._tree_view.setSelectionMode( self._tree_view.setSelectionMode(
QtWidgets.QAbstractItemView.ExtendedSelection) QtWidgets.QAbstractItemView.ExtendedSelection)
self._tree_view.setModel(self._model) self._tree_view.setModel(self._model)
grid.addWidget(self._tree_view, 0, 0, 1, 2) layout.addWidget(self._tree_view)
cancel_btn = QtWidgets.QPushButton("Cancel")
cancel_btn.clicked.connect(self.close) self._button_box = QtWidgets.QDialogButtonBox(
cancel_btn.setIcon( QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Cancel
QtWidgets.QApplication.style().standardIcon( )
QtWidgets.QStyle.SP_DialogCancelButton)) self._button_box.setCenterButtons(True)
grid.addWidget(cancel_btn, 1, 0) self._button_box.accepted.connect(self.add_channels)
confirm_btn = QtWidgets.QPushButton("Confirm") self._button_box.rejected.connect(self.reject)
confirm_btn.clicked.connect(self.add_channels) layout.addWidget(self._button_box)
confirm_btn.setIcon(
QtWidgets.QApplication.style().standardIcon(
QtWidgets.QStyle.SP_DialogApplyButton))
grid.addWidget(confirm_btn, 1, 1)
def add_channels(self): def add_channels(self):
selection = self._tree_view.selectedIndexes() selection = self._tree_view.selectedIndexes()
@ -709,8 +703,8 @@ class _AddChannelDialog(QtWidgets.QDialog):
key = self._model.index_to_key(select) key = self._model.index_to_key(select)
if key is not None: if key is not None:
channels.append([key, *self._model[key].ref, []]) channels.append([key, *self._model[key].ref, []])
self.accepted.emit(channels) self.channels = channels
self.close() self.accept()
class WaveformDock(QtWidgets.QDockWidget): class WaveformDock(QtWidgets.QDockWidget):
@ -759,12 +753,15 @@ class WaveformDock(QtWidgets.QDockWidget):
lambda: asyncio.ensure_future(exc_to_warning(self.rpc_client.trigger_proxy_task()))) lambda: asyncio.ensure_future(exc_to_warning(self.rpc_client.trigger_proxy_task())))
grid.addWidget(self._request_dump_btn, 0, 1) grid.addWidget(self._request_dump_btn, 0, 1)
self._add_channel_dialog = _AddChannelDialog(self, self._channel_model)
self._add_channel_dialog.accepted.connect(self._add_channels)
self._add_btn = QtWidgets.QToolButton() self._add_btn = QtWidgets.QToolButton()
self._add_btn.setToolTip("Add channels...") self._add_btn.setToolTip("Add channels...")
self._add_btn.setIcon( self._add_btn.setIcon(
QtWidgets.QApplication.style().standardIcon( QtWidgets.QApplication.style().standardIcon(
QtWidgets.QStyle.SP_FileDialogListView)) QtWidgets.QStyle.SP_FileDialogListView))
self._add_btn.clicked.connect(self.on_add_channel_click) self._add_btn.clicked.connect(self._add_channel_dialog.open)
grid.addWidget(self._add_btn, 0, 2) grid.addWidget(self._add_btn, 0, 2)
self._file_menu = QtWidgets.QMenu() self._file_menu = QtWidgets.QMenu()
@ -790,24 +787,14 @@ class WaveformDock(QtWidgets.QDockWidget):
lambda: asyncio.ensure_future(exc_to_warning(coro()))) lambda: asyncio.ensure_future(exc_to_warning(coro())))
self._file_menu.addAction(action) self._file_menu.addAction(action)
async def _add_channel_task(self): def _add_channels(self):
dialog = _AddChannelDialog(self, self._channel_model) channels = self._add_channel_dialog.channels
fut = asyncio.Future()
def on_accept(s):
fut.set_result(s)
dialog.accepted.connect(on_accept)
dialog.open()
channels = await fut
count = self._waveform_model.rowCount() count = self._waveform_model.rowCount()
self._waveform_model.extend(channels) self._waveform_model.extend(channels)
self._waveform_model.update_data(self._waveform_data['data'], self._waveform_model.update_data(self._waveform_data['data'],
count, count,
count + len(channels)) count + len(channels))
def on_add_channel_click(self):
asyncio.ensure_future(self._add_channel_task())
def on_dump_receive(self, dump): def on_dump_receive(self, dump):
self._dump = dump self._dump = dump
decoded_dump = comm_analyzer.decode_dump(dump) decoded_dump = comm_analyzer.decode_dump(dump)