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

gui/moninj: sort by channel. Closes #413

This commit is contained in:
Sebastien Bourdeauducq 2016-04-30 10:46:56 +08:00
parent dbbd11d798
commit de73bd1998
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/dashboard/moninj.py
View File

@ -3,7 +3,6 @@ import threading
import logging import logging
import socket import socket
import struct import struct
from operator import itemgetter
from PyQt5 import QtCore, QtWidgets, QtGui from PyQt5 import QtCore, QtWidgets, QtGui
@ -141,6 +140,9 @@ class _TTLWidget(_MoninjWidget):
finally: finally:
self.programmatic_change = False self.programmatic_change = False
def sort_key(self):
return self.channel
class _DDSWidget(_MoninjWidget): class _DDSWidget(_MoninjWidget):
def __init__(self, bus_channel, channel, sysclk, title): def __init__(self, bus_channel, channel, sysclk, title):
@ -173,6 +175,9 @@ class _DDSWidget(_MoninjWidget):
self.value.setText("<font size=\"5\">{:.7f} MHz</font>" self.value.setText("<font size=\"5\">{:.7f} MHz</font>"
.format(frequency/1e6)) .format(frequency/1e6))
def sort_key(self):
return (self.bus_channel, self.channel)
class _DeviceManager: class _DeviceManager:
def __init__(self, send_to_device, init): def __init__(self, send_to_device, init):
@ -260,7 +265,7 @@ class _MonInjDock(QtWidgets.QDockWidget):
grid_widget = QtWidgets.QWidget() grid_widget = QtWidgets.QWidget()
grid_widget.setLayout(grid) grid_widget.setLayout(grid)
for _, w in sorted(widgets, key=itemgetter(0)): for _, w in sorted(widgets, key=lambda i: i[1].sort_key()):
grid.addWidget(w) grid.addWidget(w)
scroll_area.setWidgetResizable(True) scroll_area.setWidgetResizable(True)