sprint-2: rule engine + auto-assigner + equipment editor + biblioteca
Wizard pasos 5-7 ahora funcionales (1-4 ya estaban en Sprint 1).
vmssailor/studio/designer/rule_engine.py
- RuleContext, RuleEngine, EquipmentProposal
- Lee library/rules/*.yaml y aplica reglas heuristicas
- Filtra por vessel_type, vessel_subtype, length_overall_m range
- Selecciona candidato segun condiciones 'when' (loa min/max)
- Genera tag_prefix con sustitucion {side}/{idx}
vmssailor/studio/designer/port_auto_assigner.py
- auto_assign() greedy: 1 bus Modbus RTU + tarjetas dedicadas para motores/gensets
- Tarjeta auxiliar compartida para resto de equipos
- Mapea SignalType -> ChannelType (AI/DI/DO/RPM)
- Genera TagBindings con scaling apropiado por tipo de senal
- Respeta capacidades 10/5/4/1 de AR-NMEA-IO-v1.0
- AssignmentReport con cards + tags + warnings
vmssailor/studio/wizard/step_05_equipment.py
- Tabla con propuestas del rule engine
- Checkboxes accept/reject + edicion inline de columnas
- Boton 'Regenerar' para re-aplicar reglas
vmssailor/studio/wizard/step_06_refinement.py
- Vista resumen de equipos aceptados
vmssailor/studio/wizard/step_07_topology.py
- Llama auto_assign sobre los equipos materializados
- Muestra tabla de tarjetas con uso por canal (DO/DI/AI/RPM)
- Lista warnings de capacidad
vmssailor/studio/editors/equipment_editor.py
- CRUD de Equipment del proyecto activo
- Tabla editable inline (tag_prefix, name, model_ref, system_id, coords, deck)
- Dialog modal para agregar equipos
- Senal projectMutated para refrescar canvas + sidebar
vmssailor/studio/main_window.py
- Layout actualizado: splitter vertical en panel derecho
(canvas arriba + equipment editor abajo)
- _on_project_mutated() re-distribuye al sidebar y canvas
Biblioteca expandida (Sprint 2 brief: 5-7 yates, 10+ motores, gensets, bombas):
- vessels: + azimut_grande_32m, princess_y85, trawler_32m_offshore, patrol_coastal_30m (total: 6)
- engines: + cat_c32_acert, mtu_16v_2000_m96, yanmar_8lv_370 (total: 5)
- gensets: + kohler_28efkozd, onan_qd13500 (total: 3)
- pumps: + jabsco_36800, grundfos_cm10 (NUEVO categoria pumps)
Tests (tests/studio/test_designer.py, 10 nuevos, total 120/120):
- Rule engine: load default, propose engines, candidate picking por LOA
- auto_assign builds topology compatible with Project (Pydantic validation)
- Equipment editor smoke
VesselWizard.build_project() ahora materializa equipment + topology + tags
desde las propuestas y la asignacion automatica del paso 7.
Criterios Sprint 2:
- uv run vms-studio crea proyecto completo desde wizard con equipos + tags + topologia
- vms-validate-library: OK 6 vessels, 10 equipment, 1 rules
- 120/120 pytest verde, ruff clean
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -28,7 +28,9 @@ from PySide6.QtWidgets import (
|
||||
|
||||
from vmssailor.core.persistence import load_project, save_project
|
||||
from vmssailor.core.project import Project
|
||||
from vmssailor.studio.editors.equipment_editor import EquipmentEditor
|
||||
from vmssailor.studio.theme import (
|
||||
C_CYAN,
|
||||
C_FOAM,
|
||||
C_FOG,
|
||||
mono_font,
|
||||
@@ -123,10 +125,19 @@ class MainWindow(QMainWindow):
|
||||
self._sidebar.setMinimumWidth(260)
|
||||
self._sidebar.setMaximumWidth(380)
|
||||
|
||||
# Right pane: vertical splitter with canvas on top + equipment editor below
|
||||
self._canvas = VesselCanvas()
|
||||
self._equipment_editor = EquipmentEditor()
|
||||
|
||||
right_splitter = QSplitter(Qt.Vertical)
|
||||
right_splitter.setChildrenCollapsible(False)
|
||||
right_splitter.addWidget(self._canvas)
|
||||
right_splitter.addWidget(self._equipment_editor)
|
||||
right_splitter.setSizes([520, 380])
|
||||
self._right_splitter = right_splitter
|
||||
|
||||
self._splitter.addWidget(self._sidebar)
|
||||
self._splitter.addWidget(self._canvas)
|
||||
self._splitter.addWidget(right_splitter)
|
||||
self._splitter.setSizes([280, 1160])
|
||||
|
||||
# Compose central widget: topbar (top) + splitter (rest)
|
||||
@@ -223,6 +234,8 @@ class MainWindow(QMainWindow):
|
||||
|
||||
self.projectChanged.connect(self._sidebar.set_project)
|
||||
self.projectChanged.connect(self._canvas.set_project)
|
||||
self.projectChanged.connect(self._equipment_editor.set_project)
|
||||
self._equipment_editor.projectMutated.connect(self._on_project_mutated)
|
||||
|
||||
# ----- Slots --------------------------------------------------------
|
||||
|
||||
@@ -366,3 +379,13 @@ class MainWindow(QMainWindow):
|
||||
|
||||
def current_project(self) -> Project | None:
|
||||
return self._project
|
||||
|
||||
def _on_project_mutated(self, project: Project) -> None:
|
||||
"""El editor reemplazó el Project. Re-emit a sidebar + canvas."""
|
||||
self._project = project
|
||||
self._update_stats()
|
||||
# Re-emit a sidebar + canvas (que ignoran al editor para evitar loop)
|
||||
self._sidebar.set_project(project)
|
||||
self._canvas.set_project(project)
|
||||
self._dirty_badge.setText("● Cambios pendientes — guarda con Ctrl+S")
|
||||
self._dirty_badge.setStyleSheet(f"color: {C_CYAN};")
|
||||
|
||||
Reference in New Issue
Block a user