Skip to content

add support for AggregateArgument in commands #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fqqb merged 1 commit into from
Apr 28, 2025
Merged

add support for AggregateArgument in commands #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 110 additions & 7 deletions src/yamcs/pymdb/xtce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,8 @@ def add_argument_type(
self.add_string_argument_type(parent, system, name, default, data_type)
elif isinstance(data_type, ArrayDataType):
self.add_array_argument_type(parent, system, name, data_type)
elif isinstance(data_type, AggregateDataType):
self.add_aggregate_argument_type(parent, system, name, data_type)
else:
raise ExportError(f"Unexpected data type {data_type.__class__}")

Expand Down Expand Up @@ -902,13 +904,13 @@ def add_array_argument_type(
name=element_type_name,
data_type=el_type,
)
# elif isinstance(el_type, AggregateDataType):
# self.add_aggregate_argument_type(
# parent,
# system,
# name=element_type_name,
# data_type=el_type,
# )
elif isinstance(el_type, AggregateDataType):
self.add_aggregate_argument_type(
parent,
system,
name=element_type_name,
data_type=el_type,
)
elif isinstance(el_type, ArrayDataType):
self.add_array_argument_type(
parent,
Expand Down Expand Up @@ -967,6 +969,107 @@ def add_array_argument_type(
else:
raise ExportError(f"Unexpected data type {el_type.__class__}")

def add_aggregate_argument_type(
self,
parent: ET.Element,
system: System,
name: str,
data_type: AggregateDataType,
):
el = ET.SubElement(parent, "AggregateArgumentType")
el.attrib["name"] = name

members_el = ET.SubElement(el, "MemberList")
for member in data_type.members:
# Always make a new type
member_type_name = f"{name}__{member.name}"

member_el = ET.SubElement(members_el, "Member")
member_el.attrib["name"] = str(member.name)
member_el.attrib["typeRef"] = member_type_name

if member.short_description:
member_el.attrib["shortDescription"] = member.short_description

if member.long_description:
ET.SubElement(member_el, "LongDescription").text = (
member.long_description
)
if member.extra:
self.add_ancillary_data(member_el, member.extra)

if isinstance(member, AbsoluteTimeMember):
self.add_absolute_time_argument_type(
parent,
system,
name=member_type_name,
data_type=member,
)
elif isinstance(member, AggregateMember):
self.add_aggregate_argument_type(
parent,
system,
name=member_type_name,
data_type=member,
)
elif isinstance(member, ArrayMember):
self.add_array_argument_type(
parent,
system,
name=member_type_name,
data_type=member,
)
elif isinstance(member, BinaryMember):
self.add_binary_argument_type(
parent,
system,
name=member_type_name,
default=None,
data_type=member,
)
elif isinstance(member, BooleanMember):
self.add_boolean_argument_type(
parent,
system,
name=member_type_name,
default=None,
data_type=member,
)
elif isinstance(member, EnumeratedMember):
self.add_enumerated_argument_type(
parent,
system,
name=member_type_name,
default=None,
data_type=member,
)
elif isinstance(member, FloatMember):
self.add_float_argument_type(
parent,
system,
name=member_type_name,
default=None,
data_type=member,
)
elif isinstance(member, IntegerMember):
self.add_integer_argument_type(
parent,
system,
name=member_type_name,
default=None,
data_type=member,
)
elif isinstance(member, StringMember):
self.add_string_argument_type(
parent,
system,
name=member_type_name,
default=None,
data_type=member,
)
else:
raise ExportError(f"Unexpected member type {member.__class__}")

def add_aggregate_parameter_type(
self,
parent: ET.Element,
Expand Down