mirror of
https://github.com/nqrduck/nqrduck-spectrometer.git
synced 2024-11-09 12:30:01 +00:00
Implemented new setting views with sliders and min max descriptions.
This commit is contained in:
parent
843f129e6e
commit
cdbf40c69c
2 changed files with 49 additions and 10 deletions
|
@ -4,7 +4,7 @@ import logging
|
||||||
import ipaddress
|
import ipaddress
|
||||||
from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot
|
from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot
|
||||||
from PyQt6.QtWidgets import QLineEdit, QComboBox, QCheckBox
|
from PyQt6.QtWidgets import QLineEdit, QComboBox, QCheckBox
|
||||||
from nqrduck.helpers.duckwidgets import DuckFloatEdit, DuckIntEdit
|
from nqrduck.helpers.duckwidgets import DuckFloatEdit, DuckIntEdit, DuckSpinBox
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -80,8 +80,34 @@ class Setting(QObject):
|
||||||
)
|
)
|
||||||
return widget
|
return widget
|
||||||
|
|
||||||
|
class NumericalSetting(Setting):
|
||||||
|
""" A setting that is a numerical value.
|
||||||
|
It can additionally have a minimum and maximum value.
|
||||||
|
"""
|
||||||
|
def __init__(self, name: str, description: str, default, min_value = None, max_value = None ) -> None:
|
||||||
|
"""Create a new numerical setting."""
|
||||||
|
super().__init__(name, self.description_limit_info(description, min_value, max_value), default)
|
||||||
|
|
||||||
class FloatSetting(Setting):
|
def description_limit_info(self, description: str, min_value, max_value) -> str:
|
||||||
|
""" Updates the description with the limits of the setting if there are any.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
description (str): The description of the setting.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: The description of the setting with the limits.
|
||||||
|
"""
|
||||||
|
if min_value is not None and max_value is not None:
|
||||||
|
description += (f"\n (min: {min_value}, max: {max_value})")
|
||||||
|
elif min_value is not None:
|
||||||
|
description += (f"\n (min: {min_value})")
|
||||||
|
elif max_value is not None:
|
||||||
|
description += (f"\n (max: {max_value})")
|
||||||
|
|
||||||
|
return description
|
||||||
|
|
||||||
|
|
||||||
|
class FloatSetting(NumericalSetting):
|
||||||
"""A setting that is a Float.
|
"""A setting that is a Float.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
|
@ -90,6 +116,7 @@ class FloatSetting(Setting):
|
||||||
description (str) : A description of the setting
|
description (str) : A description of the setting
|
||||||
min_value : The minimum value of the setting
|
min_value : The minimum value of the setting
|
||||||
max_value : The maximum value of the setting
|
max_value : The maximum value of the setting
|
||||||
|
spin_box : A tuple with two booleans that determine if a spin box is used if the second value is True, a slider will be created as well.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
DEFAULT_LENGTH = 100
|
DEFAULT_LENGTH = 100
|
||||||
|
@ -101,12 +128,18 @@ class FloatSetting(Setting):
|
||||||
description: str,
|
description: str,
|
||||||
min_value: float = None,
|
min_value: float = None,
|
||||||
max_value: float = None,
|
max_value: float = None,
|
||||||
|
spin_box: tuple = (False, False)
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Create a new float setting."""
|
"""Create a new float setting."""
|
||||||
super().__init__(name, description, default)
|
super().__init__(name, description, default, min_value, max_value)
|
||||||
|
|
||||||
|
if spin_box[0]:
|
||||||
|
self.widget = DuckSpinBox(min_value=min_value, max_value=max_value, slider=spin_box[1], double_box=True)
|
||||||
|
self.widget.spin_box.setValue(default)
|
||||||
|
else:
|
||||||
|
self.widget = DuckFloatEdit(min_value=min_value, max_value=max_value)
|
||||||
|
self.widget.setText(str(default))
|
||||||
|
|
||||||
self.widget = DuckFloatEdit(min_value=min_value, max_value=max_value)
|
|
||||||
self.widget.setText(str(default))
|
|
||||||
self.widget.state_updated.connect(self.on_state_updated)
|
self.widget.state_updated.connect(self.on_state_updated)
|
||||||
|
|
||||||
def on_state_updated(self, state, text):
|
def on_state_updated(self, state, text):
|
||||||
|
@ -130,7 +163,7 @@ class FloatSetting(Setting):
|
||||||
self.settings_changed.emit()
|
self.settings_changed.emit()
|
||||||
|
|
||||||
|
|
||||||
class IntSetting(Setting):
|
class IntSetting(NumericalSetting):
|
||||||
"""A setting that is an Integer.
|
"""A setting that is an Integer.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
|
@ -139,6 +172,7 @@ class IntSetting(Setting):
|
||||||
description (str) : A description of the setting
|
description (str) : A description of the setting
|
||||||
min_value : The minimum value of the setting
|
min_value : The minimum value of the setting
|
||||||
max_value : The maximum value of the setting
|
max_value : The maximum value of the setting
|
||||||
|
spin_box : A tuple with two booleans that determine if a spin box is used if the second value is True, a slider will be created as well.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
|
@ -148,12 +182,17 @@ class IntSetting(Setting):
|
||||||
description: str,
|
description: str,
|
||||||
min_value=None,
|
min_value=None,
|
||||||
max_value=None,
|
max_value=None,
|
||||||
|
spin_box: tuple = (False, False)
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Create a new int setting."""
|
"""Create a new int setting."""
|
||||||
super().__init__(name, description, default)
|
super().__init__(name, description, default, min_value, max_value)
|
||||||
|
|
||||||
self.widget = DuckIntEdit(min_value=min_value, max_value=max_value)
|
if spin_box[0]:
|
||||||
self.widget.setText(str(default))
|
self.widget = DuckSpinBox(min_value=min_value, max_value=max_value, slider=spin_box[1])
|
||||||
|
self.widget.spin_box.setValue(default)
|
||||||
|
else:
|
||||||
|
self.widget = DuckIntEdit(min_value=min_value, max_value=max_value)
|
||||||
|
self.widget.setText(str(default))
|
||||||
|
|
||||||
self.widget.state_updated.connect(self.on_state_updated)
|
self.widget.state_updated.connect(self.on_state_updated)
|
||||||
|
|
||||||
|
|
|
@ -130,7 +130,7 @@ class SpectrometerView(ModuleView):
|
||||||
last_added_action = self._actions[list(self._actions.keys())[-1]]
|
last_added_action = self._actions[list(self._actions.keys())[-1]]
|
||||||
last_added_action.setChecked(True)
|
last_added_action.setChecked(True)
|
||||||
|
|
||||||
self.add_menubar_item.emit("Spectrometer", list(self._actions.values()))
|
self.add_menubar_item.emit("Hardware", list(self._actions.values()))
|
||||||
|
|
||||||
@pyqtSlot(str)
|
@pyqtSlot(str)
|
||||||
def on_menu_button_clicked(self, spectrometer_name):
|
def on_menu_button_clicked(self, spectrometer_name):
|
||||||
|
|
Loading…
Reference in a new issue