mhu/shimatta-kenkyusho
2
0
Fork 0
Code Issues 14 Pull Requests 1 Releases Wiki Activity

rounded float values in short string, fixed displaying components without proper type

Browse Source
This commit is contained in:
Stefan Strobel 2025-01-31 23:58:58 +01:00
parent 462ed0c101
commit adf152938d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shimatta_kenkyusho/parts/models.py
View File

@ -276,6 +276,10 @@ class Component(models.Model):
@property @property
def dynamic_description(self): def dynamic_description(self):
if not self.component_type or not self.component_type.description_template:
return ''
django_engine = engines["django"] django_engine = engines["django"]
template = django_engine.from_string(self.component_type.description_template) template = django_engine.from_string(self.component_type.description_template)
@ -325,7 +329,7 @@ class AbstractParameter(models.Model):
if my_type == 'E' or my_type == 'I': if my_type == 'E' or my_type == 'I':
# Engineering float number # Engineering float number
(num, prefix) = NumConv.number_to_engineering(self.value, it_unit=(True if my_type=='I' else False)) (num, prefix) = NumConv.number_to_engineering(self.value, it_unit=(True if my_type=='I' else False))
result = f'{num:g}' result = f'{round(num, 3):g}'
interpostfix = (prefix if prefix else self.parameter_type.interfix or '.') interpostfix = (prefix if prefix else self.parameter_type.interfix or '.')
if '.' in result: if '.' in result:
result = result.replace('.', interpostfix) result = result.replace('.', interpostfix)
@ -334,7 +338,7 @@ class AbstractParameter(models.Model):
return result return result
elif my_type == 'N': elif my_type == 'N':
# Standard float number # Standard float number
return f'{self.value:g}{self.parameter_type.unit}' return f'{round(self.value, 3):g}{self.parameter_type.unit}'
else: else:
return self.resolved_value_as_string() return self.resolved_value_as_string()