Skip to content

Commit d3f2ff4

Browse files
committed
Revert changes to result_info.py and available_result.py
1 parent eef62b2 commit d3f2ff4

File tree

2 files changed

+7
-36
lines changed

2 files changed

+7
-36
lines changed

src/ansys/dpf/core/available_result.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,10 @@ def __init__(self, availableresult):
121121
}
122122
self._sub_res = availableresult.sub_res
123123
self._qualifiers = availableresult.qualifiers
124-
self._qualifier_labels = availableresult.qualifier_labels
125124

126125
def __str__(self):
127126
txt = (
128-
"DPF Result\n----------\n"
129-
+ self.name
127+
self.name
130128
+ "\n"
131129
+ 'Operator name: "%s"\n' % self.operator_name
132130
+ "Number of components: %d\n" % self.n_components
@@ -135,13 +133,6 @@ def __str__(self):
135133
)
136134
if self.unit:
137135
txt += "Units: %s\n" % self.unit
138-
if self.qualifiers:
139-
txt += "Available qualifier labels:\n"
140-
for label in self.qualifier_labels:
141-
txt += f" - {label}: {', '.join(map(str, self.qualifier_labels[label]))}\n"
142-
txt += "Available qualifier combinations:\n"
143-
for qualifier in self.qualifiers:
144-
txt += f" {qualifier.__dict__()}\n"
145136
return txt
146137

147138
@property
@@ -240,11 +231,6 @@ def qualifiers(self) -> list:
240231
"""
241232
return self._qualifiers
242233

243-
@property
244-
def qualifier_labels(self) -> dict:
245-
"""Returns a dictionary of available labels for each available qualifier."""
246-
return self._qualifier_labels
247-
248234

249235
_result_properties = {
250236
"S": {"location": "ElementalNodal", "scripting_name": "stress"},
@@ -295,7 +281,6 @@ def available_result_from_name(name) -> AvailableResult:
295281
sub_res={},
296282
properties={"loc_name": item["location"], "scripting_name": name},
297283
qualifiers=[],
298-
qualifier_labels={},
299284
)
300285

301286
return AvailableResult(availableresult)

src/ansys/dpf/core/result_info.py

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,6 @@ def _get_result(self, numres):
369369
sub_res[sub_res_name] = [ssub_res_rec_name, descr]
370370

371371
qualifiers = []
372-
qualifier_labels = {}
373372
if self._server.meet_version("5.0"):
374373
qual_obj = object_handler.ObjHandler(
375374
data_processing_api=self._data_processing_core_api,
@@ -381,25 +380,13 @@ def _get_result(self, numres):
381380
)
382381
num_qual_obj = label_space_api.list_label_spaces_size(qual_obj)
383382
for ires in range(num_qual_obj):
384-
label_space = LabelSpace(
385-
label_space=label_space_api.list_label_spaces_at(qual_obj, ires),
386-
obj=self,
387-
server=self._server,
383+
qualifiers.append(
384+
LabelSpace(
385+
label_space=label_space_api.list_label_spaces_at(qual_obj, ires),
386+
obj=self,
387+
server=self._server,
388+
)
388389
)
389-
qualifiers.append(label_space)
390-
label_space_dict = label_space.__dict__()
391-
for key in label_space_dict:
392-
value = label_space_dict[key]
393-
label_support = self.qualifier_label_support(key)
394-
names_field = label_support.string_field_support_by_property("names")
395-
label_value = names_field.data_as_list[
396-
names_field.scoping.ids.tolist().index(value)
397-
]
398-
label_value = label_value + f" ({value})"
399-
if key in qualifier_labels.keys() and label_value not in qualifier_labels[key]:
400-
qualifier_labels[key].append(label_value)
401-
else:
402-
qualifier_labels[key] = [label_value]
403390

404391
availableresult = SimpleNamespace(
405392
name=name,
@@ -411,7 +398,6 @@ def _get_result(self, numres):
411398
sub_res=sub_res,
412399
properties={"loc_name": loc_name, "scripting_name": scripting_name},
413400
qualifiers=qualifiers,
414-
qualifier_labels=qualifier_labels,
415401
)
416402
return available_result.AvailableResult(availableresult)
417403

0 commit comments

Comments
 (0)