From 2f8b4480c5dee8f54c250bfdb5e705f1c9bd4d3b Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Mon, 12 Oct 2020 12:18:49 +0200 Subject: [PATCH] added __str__ (returns f"{value} {unit}") to Adjustable --- slic/core/adjustable/adjustable.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/slic/core/adjustable/adjustable.py b/slic/core/adjustable/adjustable.py index c9573b23..452e3e98 100644 --- a/slic/core/adjustable/adjustable.py +++ b/slic/core/adjustable/adjustable.py @@ -43,15 +43,22 @@ class Adjustable(BaseAdjustable, SpecConvenience): def __repr__(self): + name = self._printable_name() + value = self._printable_value() + return f"{name} at {value}" + + def __str__(self): + return self._printable_value() + + def _printable_name(self): tname = typename(self) name = self.name - units = self.units + return f"{tname} \"{name}\"" if name is not None else tname + + def _printable_value(self): value = self.get_current_value() - - name = f"{tname} \"{name}\"" if name is not None else tname - value = f"{value} {units}" if units is not None else value - - return f"{name} at {value}" + units = self.units + return f"{value} {units}" if units is not None else str(value)