Skip to content

Refactor: move mass properties and inertia tensor to core model and UI #27

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
karakayahuseyin merged 2 commits into from
Sep 16, 2026
Merged

Refactor: move mass properties and inertia tensor to core model and UI #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a842fc
refactor(core): move mass properties and inertia tensor to core model…
karakayahuseyin Sep 16, 2026
5d10fba
fix(ci): resolve quality check failures for ruff and pyright
karakayahuseyin Sep 16, 2026
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
2 changes: 2 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ include = [
"src/setuav_studio/ui/editor/component.py",
"src/setuav_studio/ui/editor/envelope.py",
"src/setuav_studio/ui/editor/instance.py",
"src/setuav_studio/ui/editor/mass.py",
"src/setuav_studio/ui/editor/transform.py",
"src/setuav_studio/api/__init__.py",
"src/setuav_studio/api/api.py",
Expand All @@ -162,6 +163,7 @@ include = [
"src/setuav_studio/model/data.py",
"src/setuav_studio/model/environment.py",
"src/setuav_studio/model/expression.py",
"src/setuav_studio/model/mass.py",
"src/setuav_studio/model/parameter.py",
"src/setuav_studio/model/state.py",
"src/setuav_studio/model/symbol.py",
Expand Down
18 changes: 14 additions & 4 deletions src/plugins/weight_balance/engine/solver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ def _component_properties(
)

mass_g = root_mass if root_mass is not None else parameter_mass
requested_source = str(wb_extension.get("mass_source") or "")
requested_source = str(
component.get("mass_source") or wb_extension.get("mass_source") or ""
)
source = requested_source or ("declared" if mass_g is not None else "missing")
if mass_g is None or mass_g <= 0.0:
return None
Expand All @@ -179,15 +181,21 @@ def _component_properties(

geometry = parameters.get("geometry")
geometry = geometry if isinstance(geometry, dict) else {}
symmetry_mode = str(wb_extension.get("symmetry_mode") or "pair")
symmetry_mode = str(
component.get("symmetry_mode") or wb_extension.get("symmetry_mode") or "pair"
)
if symmetry_mode == "pair" and (geometry.get("mirror") is True or mirrored_frame):
# A mirrored lifting surface, and its attached control surfaces,
# represent the complete left/right pair. Their aggregate CG is
# therefore on the aircraft centre plane even when the parent
# component has a local attachment offset on Y.
cg_body = (cg_body[0], 0.0, cg_body[2])

inertia_value = wb_extension.get("inertia_kg_m2")
inertia_value = (
component.get("inertia_kg_m2")
or component.get("inertia")
or wb_extension.get("inertia_kg_m2")
)
if inertia_value is None:
inertia_value = parameters.get("inertia")
inertia, has_declared_inertia = _inertia(inertia_value)
Expand Down Expand Up @@ -235,7 +243,9 @@ def _component_cg_value(
wb_extension: dict[str, Any],
envelope: dict[str, Any] | None,
) -> tuple[object, bool]:
value = wb_extension.get("local_cg_mm")
value = (
component.get("local_cg_mm") or component.get("local_cg") or wb_extension.get("local_cg_mm")
)
declared = isinstance(value, dict)
if not declared and envelope is not None:
offset = envelope.get("offset_mm")
Expand Down
Loading