Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ include = [
"src/setuav_studio/units/quantities.py",
"src/setuav_studio/units/unit.py",
"src/setuav_studio/model/component.py",
"src/setuav_studio/model/configuration.py",
"src/setuav_studio/model/constraint.py",
"src/setuav_studio/model/data.py",
"src/setuav_studio/model/environment.py",
Expand Down
5 changes: 0 additions & 5 deletions src/plugins/geometry/engine/envelope.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ def sync_project_geometry_envelopes(project: Any) -> int:
return 0

all_components = list(components)
for cfg in data.get("configurations", []):
if isinstance(cfg, dict):
for added in cfg.get("added_components", []):
if isinstance(added, dict):
all_components.append(added)

by_id: dict[str, dict[str, Any]] = {
str(c.get("id")): c for c in all_components if isinstance(c, dict) and c.get("id")
Expand Down
8 changes: 5 additions & 3 deletions src/plugins/geometry/viewport/scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,13 @@ def _project_items(project: Any) -> dict[str, dict[str, Any]] | None:
components = project_data.get("components") if isinstance(project_data, dict) else None
if not isinstance(components, list):
return None
from setuav_studio.model.configuration import ConfigurationManager
from setuav_studio.model.parameter import ParameterResolver

cfg_mgr = ConfigurationManager(project_data)
resolver = ParameterResolver()
raw_params = project_data.get("parameters", {}) if isinstance(project_data, dict) else {}
resolved_params = resolver.resolve_all(raw_params) if isinstance(raw_params, dict) else {}
return {
item["id"]: cfg_mgr.get_resolved_component(item)
item["id"]: resolver.evaluate_component_parameters(item, resolved_params)
for item in components
if isinstance(item, dict) and isinstance(item.get("id"), str)
}
Expand Down
6 changes: 0 additions & 6 deletions src/setuav_studio/model/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
Component,
GenericComponent,
)
from setuav_studio.model.configuration import (
ConfigurationError,
ConfigurationManager,
)
from setuav_studio.model.constraint import (
ConstraintChecker,
ConstraintResult,
Expand Down Expand Up @@ -50,8 +46,6 @@
"CircularDependencyError",
"Component",
"ComponentMassProperties",
"ConfigurationError",
"ConfigurationManager",
"ConstraintChecker",
"ConstraintResult",
"Data",
Expand Down
Loading