Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix float slider readout widget for qt #511

Merged
merged 1 commit into from
Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/magicgui/backends/_qtpy/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,9 @@ def _mgui_set_tracking(self, value: bool) -> None:
self._qwidget.setTracking(value)

def _pre_set_hook(self, value):
return self._cast(value)

def _cast(self, value: Any) -> Any:
return int(value)


Expand Down Expand Up @@ -655,17 +658,17 @@ def _mgui_get_native_widget(self) -> QtW.QWidget:
def _mgui_set_min(self, value: float):
"""Set the minimum possible value."""
super()._mgui_set_min(value)
self._readout_widget.setMinimum(self._pre_set_hook(value))
self._readout_widget.setMinimum(self._cast(value))

def _mgui_set_max(self, value: float):
"""Set the maximum possible value."""
super()._mgui_set_max(value)
self._readout_widget.setMaximum(self._pre_set_hook(value))
self._readout_widget.setMaximum(self._cast(value))

def _mgui_set_step(self, value: float):
"""Set the step size."""
super()._mgui_set_step(value)
self._readout_widget.setSingleStep(self._pre_set_hook(value))
self._readout_widget.setSingleStep(self._cast(value))

def _mgui_get_adaptive_step(self) -> bool:
return (
Expand Down Expand Up @@ -716,6 +719,9 @@ def _update_precision(self, minimum=None, maximum=None, step=None):
self._mgui_set_min(self._mgui_get_min() * ratio)
# self._mgui_set_step(self._mgui_get_step() * ratio)

def _cast(self, value: Any) -> Any:
return float(value)

def _post_get_hook(self, value):
return value / self._precision

Expand Down
8 changes: 8 additions & 0 deletions tests/test_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -1176,3 +1176,11 @@ def f(x: Set[Lit]):
sel = f.x
assert type(sel) is widgets.Select
assert sel.choices == get_args(Lit)


def test_float_slider_readout():
sld = widgets.FloatSlider(value=4, min=0.5, max=10.5)
assert sld.value == 4
assert sld._widget._readout_widget.value() == 4
assert sld._widget._readout_widget.minimum() == 0.5
assert sld._widget._readout_widget.maximum() == 10.5