2
0
mirror of https://github.com/m-labs/artiq.git synced 2024-12-25 03:08:27 +08:00

gui,environment: default step to 1.0

This commit is contained in:
Sebastien Bourdeauducq 2015-08-26 20:43:00 +08:00
parent 2c893ba0a2
commit 79ca0d50fa
4 changed files with 4 additions and 6 deletions

View File

@ -75,8 +75,7 @@ class _NumberEntry(QtGui.QDoubleSpinBox):
def __init__(self, procdesc):
QtGui.QDoubleSpinBox.__init__(self)
self.setDecimals(procdesc["ndecimals"])
if procdesc["step"] is not None:
self.setSingleStep(procdesc["step"])
self.setSingleStep(procdesc["step"])
if procdesc["min"] is not None:
self.setMinimum(procdesc["min"])
else:

View File

@ -76,8 +76,7 @@ class ScanController(LayoutWidget):
self.v_noscan.setMaximum(gmax)
else:
self.v_noscan.setMaximum(float("inf"))
if gstep is not None:
self.v_noscan.setSingleStep(gstep)
self.v_noscan.setSingleStep(gstep)
if unit:
self.v_noscan.setSuffix(" " + unit)
self.v_noscan_gr = LayoutWidget()

View File

@ -79,7 +79,7 @@ class NumberValue(_SimpleArgProcessor):
:param max: The maximum value of the argument.
:param ndecimals: The number of decimals a UI should use.
"""
def __init__(self, default=NoDefault, unit="", step=None,
def __init__(self, default=NoDefault, unit="", step=1.0,
min=None, max=None, ndecimals=2):
_SimpleArgProcessor.__init__(self, default)
self.unit = unit

View File

@ -121,7 +121,7 @@ class Scannable:
:param ndecimals: The number of decimals a UI should use.
"""
def __init__(self, default=NoDefault, unit="",
global_step=None, global_min=None, global_max=None,
global_step=1.0, global_min=None, global_max=None,
ndecimals=2):
if default is not NoDefault:
self.default_value = default