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

gui: use scanwidget

This commit is contained in:
Robert Jördens 2016-02-25 20:34:18 +01:00
parent 3ed8288601
commit 485fc3bd27
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
artiq/gui/entries.py
View File

@ -4,6 +4,8 @@ from collections import OrderedDict
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
from artiq.gui.tools import LayoutWidget, disable_scroll_wheel from artiq.gui.tools import LayoutWidget, disable_scroll_wheel
from artiq.gui.scanwidget import ScanWidget
from artiq.gui.scientific_spinbox import ScientificSpinBox
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -136,6 +138,7 @@ class _RangeScan(LayoutWidget):
LayoutWidget.__init__(self) LayoutWidget.__init__(self)
scale = procdesc["scale"] scale = procdesc["scale"]
def apply_properties(spinbox): def apply_properties(spinbox):
spinbox.setDecimals(procdesc["ndecimals"]) spinbox.setDecimals(procdesc["ndecimals"])
if procdesc["global_min"] is not None: if procdesc["global_min"] is not None:
@ -151,37 +154,53 @@ class _RangeScan(LayoutWidget):
if procdesc["unit"]: if procdesc["unit"]:
spinbox.setSuffix(" " + procdesc["unit"]) spinbox.setSuffix(" " + procdesc["unit"])
self.addWidget(QtWidgets.QLabel("Min:"), 0, 0) self.scanner = scanner = ScanWidget()
self.min = QtWidgets.QDoubleSpinBox() scanner.setSizePolicy(QtWidgets.QSizePolicy(
QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed))
self.addWidget(scanner, 0, 0, -1, 1)
self.min = ScientificSpinBox()
self.min.setStyleSheet("QDoubleSpinBox {color:blue}")
self.min.setMinimumSize(110, 0)
self.min.setSizePolicy(QtWidgets.QSizePolicy(
QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed))
self.min.setValue(state["min"]/scale)
disable_scroll_wheel(self.min) disable_scroll_wheel(self.min)
apply_properties(self.min) apply_properties(self.min)
self.addWidget(self.min, 0, 1) self.addWidget(self.min, 0, 1)
self.addWidget(QtWidgets.QLabel("Max:"), 1, 0) self.npoints = QtWidgets.QSpinBox()
self.max = QtWidgets.QDoubleSpinBox() self.npoints.setMinimum(1)
self.npoints.setValue(state["npoints"])
disable_scroll_wheel(self.npoints)
self.addWidget(self.npoints, 1, 1)
self.max = ScientificSpinBox()
self.max.setStyleSheet("QDoubleSpinBox {color:red}")
self.max.setMinimumSize(110, 0)
self.max.setValue(state["max"]/scale)
disable_scroll_wheel(self.max) disable_scroll_wheel(self.max)
apply_properties(self.max) apply_properties(self.max)
self.addWidget(self.max, 1, 1) self.addWidget(self.max, 2, 1)
self.addWidget(QtWidgets.QLabel("#Points:"), 2, 0)
self.npoints = QtWidgets.QSpinBox()
disable_scroll_wheel(self.npoints)
self.npoints.setMinimum(2)
self.npoints.setValue(10)
self.addWidget(self.npoints, 2, 1)
self.min.setValue(state["min"]/scale)
self.max.setValue(state["max"]/scale)
self.npoints.setValue(state["npoints"])
def update_min(value): def update_min(value):
state["min"] = value*scale state["min"] = value*scale
def update_max(value): def update_max(value):
state["min"] = value*scale state["min"] = value*scale
def update_npoints(value): def update_npoints(value):
state["npoints"] = value state["npoints"] = value
scanner.sigMinMoved.connect(self.min.setValue)
# scanner.sigNumChanged.connect(self.npoints.setValue)
scanner.sigMaxMoved.connect(self.max.setValue)
self.min.valueChanged.connect(update_min) self.min.valueChanged.connect(update_min)
self.max.valueChanged.connect(update_max) self.min.valueChanged.connect(scanner.setMin)
# self.npoints.valueChanged.connect(scanner.setNumPoints)
self.npoints.valueChanged.connect(update_npoints) self.npoints.valueChanged.connect(update_npoints)
self.max.valueChanged.connect(scanner.setMax)
self.max.valueChanged.connect(update_max)
class _ExplicitScan(LayoutWidget): class _ExplicitScan(LayoutWidget):