Skip to content

Commit eea79e2

Browse files
committed
Fix for fridge program names
1 parent ecbf438 commit eea79e2

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

pyhon/commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def settings(self) -> Dict[str, HonParameter]:
7171
def parameter_groups(self) -> Dict[str, Dict[str, Union[str, float]]]:
7272
result: Dict[str, Dict[str, Union[str, float]]] = {}
7373
for name, parameter in self._parameters.items():
74-
result.setdefault(parameter.group, {})[name] = parameter.value
74+
result.setdefault(parameter.group, {})[name] = parameter.intern_value
7575
return result
7676

7777
@property

pyhon/parameter/base.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ def key(self) -> str:
2222
def value(self) -> str | float:
2323
return self._value if self._value is not None else "0"
2424

25+
@property
26+
def intern_value(self) -> str | float:
27+
return str(self._value) if self._value is not None else ""
28+
2529
@property
2630
def values(self) -> List[str]:
2731
return [str(self.value)]

pyhon/parameter/enum.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,33 @@
33
from pyhon.parameter.base import HonParameter
44

55

6+
def clean_value(value):
7+
return str(value).strip("[]").replace("|", "_").lower()
8+
9+
610
class HonParameterEnum(HonParameter):
711
def __init__(self, key: str, attributes: Dict[str, Any], group: str) -> None:
812
super().__init__(key, attributes, group)
913
self._default = attributes.get("defaultValue")
1014
self._value = self._default or "0"
1115
self._values: List[str] = attributes.get("enumValues", [])
12-
if self._default and str(self._default.strip("[]")) not in self.values:
16+
if self._default and clean_value(self._default.strip("[]")) not in self.values:
1317
self._values.append(self._default)
1418

1519
def __repr__(self) -> str:
1620
return f"{self.__class__} (<{self.key}> {self.values})"
1721

1822
@property
1923
def values(self) -> List[str]:
20-
return [str(value) for value in self._values]
24+
return [clean_value(value) for value in self._values]
2125

2226
@values.setter
2327
def values(self, values) -> None:
2428
self._values = values
2529

2630
@property
2731
def value(self) -> str | float:
28-
return self._value if self._value is not None else self.values[0]
32+
return clean_value(self._value) if self._value is not None else self.values[0]
2933

3034
@value.setter
3135
def value(self, value: str) -> None:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
setup(
99
name="pyhOn",
10-
version="0.11.0",
10+
version="0.11.1",
1111
author="Andre Basche",
1212
description="Control hOn devices with python",
1313
long_description=long_description,

0 commit comments

Comments
 (0)