Skip to content

Commit e1306a5

Browse files
committed
added unused background field hiding
1 parent 7d2b81b commit e1306a5

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

RATapi/classlist.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ def __str__(self):
8282
for field in table_fields[1:]:
8383
value = getattr(model, field, "")
8484
if isinstance(value, np.ndarray):
85-
value = f"{'Data array: ['+' x '.join(str(i) for i in value.shape) if value.size > 0 else '['}]"
85+
value = (
86+
f"{'Data array: [' + ' x '.join(str(i) for i in value.shape) if value.size > 0 else '['}]"
87+
)
8688
elif field == "model":
8789
value = "\n".join(str(element) for element in value)
8890
else:

RATapi/models.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ def __setattr__(self, name, value):
7272

7373
super().__setattr__(name, value)
7474

75+
@property
76+
def display_fields(self) -> dict:
77+
visible_fields = ["name", "type", "source"]
78+
if self.type != TypeOptions.Constant:
79+
visible_fields.append("value_1")
80+
if self.type == TypeOptions.Function:
81+
visible_fields.extend(["value_2", "value_3", "value_4", "value_5"])
82+
83+
return {f: getattr(self, f) for f in visible_fields}
84+
7585

7686
class Background(Signal):
7787
"""A background signal.

tests/test_project.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,23 +110,23 @@ def default_project_str():
110110
"| 0 | Background Param 1 | 1e-07 | 1e-06 | 1e-05 | False |\n"
111111
"+-------+--------------------+-------+-------+-------+-------+\n\n"
112112
"Backgrounds: ---------------------------------------------------------------------------------------\n\n"
113-
"+-------+--------------+----------+--------------------+---------+---------+---------+---------+---------+\n"
114-
"| index | name | type | source | value 1 | value 2 | value 3 | value 4 | value 5 |\n"
115-
"+-------+--------------+----------+--------------------+---------+---------+---------+---------+---------+\n"
116-
"| 0 | Background 1 | constant | Background Param 1 | | | | | |\n"
117-
"+-------+--------------+----------+--------------------+---------+---------+---------+---------+---------+\n\n"
113+
"+-------+--------------+----------+--------------------+\n"
114+
"| index | name | type | source |\n"
115+
"+-------+--------------+----------+--------------------+\n"
116+
"| 0 | Background 1 | constant | Background Param 1 |\n"
117+
"+-------+--------------+----------+--------------------+\n\n"
118118
"Resolution Parameters: -----------------------------------------------------------------------------\n\n"
119119
"+-------+--------------------+------+-------+------+-------+\n"
120120
"| index | name | min | value | max | fit |\n"
121121
"+-------+--------------------+------+-------+------+-------+\n"
122122
"| 0 | Resolution Param 1 | 0.01 | 0.03 | 0.05 | False |\n"
123123
"+-------+--------------------+------+-------+------+-------+\n\n"
124124
"Resolutions: ---------------------------------------------------------------------------------------\n\n"
125-
"+-------+--------------+----------+--------------------+---------+---------+---------+---------+---------+\n"
126-
"| index | name | type | source | value 1 | value 2 | value 3 | value 4 | value 5 |\n"
127-
"+-------+--------------+----------+--------------------+---------+---------+---------+---------+---------+\n"
128-
"| 0 | Resolution 1 | constant | Resolution Param 1 | | | | | |\n"
129-
"+-------+--------------+----------+--------------------+---------+---------+---------+---------+---------+\n\n"
125+
"+-------+--------------+----------+--------------------+\n"
126+
"| index | name | type | source |\n"
127+
"+-------+--------------+----------+--------------------+\n"
128+
"| 0 | Resolution 1 | constant | Resolution Param 1 |\n"
129+
"+-------+--------------+----------+--------------------+\n\n"
130130
"Data: ----------------------------------------------------------------------------------------------\n\n"
131131
"+-------+------------+------+------------+------------------+\n"
132132
"| index | name | data | data range | simulation range |\n"

0 commit comments

Comments
 (0)