Merge pull request #936 from mprib/feature/presenter-layer-cleanup

refactor(presenter): cleanup naming, domain logic, and indirection

Author: mprib

src/caliscope/core/point_data_bundle.py

@@ -28,6 +28,10 @@
     apply_similarity_transform,
     SimilarityTransform,
 )
+from caliscope.core.scale_accuracy import (
+    compute_scale_accuracy as compute_scale_accuracy_impl,
+    ScaleAccuracyData,
+)
 
 import pandas as pd
 
@@ -512,6 +516,65 @@ def filter_by_percentile_error(
 
         return self._filter_by_reprojection_thresholds(thresholds, min_per_camera)
 
+    def compute_scale_accuracy(self, sync_index: int) -> ScaleAccuracyData:
+        """Compute scale accuracy comparing triangulated points to known object geometry.
+
+        Compares triangulated world points at the given sync_index to their
+        corresponding ground truth object positions (from obj_loc columns) to
+        assess reconstruction accuracy. Uses ALL pairwise distances between
+        detected corners for robust statistical measurement.
+
+        Args:
+            sync_index: Frame index to compute accuracy at
+
+        Returns:
+            ScaleAccuracyData with distance RMSE and relative error
+
+        Raises:
+            ValueError: If insufficient matched points at sync_index (< 2)
+        """
+        # Extract data at sync_index
+        img_df = self.image_points.df
+        world_df = self.world_points.df
+
+        img_subset = img_df[img_df["sync_index"] == sync_index]
+        world_subset = world_df[world_df["sync_index"] == sync_index]
+
+        if img_subset.empty:
+            raise ValueError(f"No image observations at sync_index {sync_index}")
+        if world_subset.empty:
+            raise ValueError(f"No world points at sync_index {sync_index}")
+
+        # Get image points with object locations at reference frame
+        # Use drop_duplicates on img_subset since multiple cameras may see same point_id
+        obj_points_df = img_subset[["point_id", "obj_loc_x", "obj_loc_y", "obj_loc_z"]].drop_duplicates(
+            subset=["point_id"]
+        )
+
+        # Merge world points with object locations by point_id
+        merged = world_subset.merge(obj_points_df, on="point_id", how="inner")
+
+        if len(merged) < 2:
+            raise ValueError(f"Insufficient matched points for scale accuracy: {len(merged)} (need at least 2)")
+
+        # Handle planar objects (z=0 or NaN)
+        if merged["obj_loc_z"].isna().all():
+            merged = merged.copy()
+            merged["obj_loc_z"] = 0.0
+
+        # Filter out any remaining NaN values
+        valid_mask = ~merged[["obj_loc_x", "obj_loc_y", "obj_loc_z"]].isna().any(axis=1)
+        merged = merged[valid_mask]
+
+        if len(merged) < 2:
+            raise ValueError("Insufficient valid points after NaN filtering (need at least 2)")
+
+        # Extract arrays for scale accuracy computation
+        world_points = merged[["x_coord", "y_coord", "z_coord"]].to_numpy()
+        object_points = merged[["obj_loc_x", "obj_loc_y", "obj_loc_z"]].to_numpy()
+
+        return compute_scale_accuracy_impl(world_points, object_points, sync_index)
+
     def align_to_object(self, sync_index: int) -> "PointDataBundle":
         """
         Align the bundle to real-world units using object point correspondences.

src/caliscope/gui/camera_undistort_view.py

@@ -17,7 +17,6 @@
 from caliscope.gui.views.extrinsic_calibration_view import ExtrinsicCalibrationView
 
 if TYPE_CHECKING:
-    from caliscope.core.point_data_bundle import PointDataBundle
     from caliscope.workspace_coordinator import WorkspaceCoordinator
 
 logger = logging.getLogger(__name__)
@@ -66,19 +65,9 @@ def _connect_signals(self) -> None:
         if self._presenter is None:
             return
 
-        # Calibration completion - persist bundle via coordinator
-        self._presenter.calibration_complete.connect(self._on_calibration_complete)
-
         # Charuco changes invalidate the presenter - need to recreate
         self._coordinator.charuco_changed.connect(self._on_charuco_changed)
 
-    def _on_calibration_complete(self, bundle: PointDataBundle) -> None:
-        """Handle calibration completion - persist bundle via coordinator."""
-        logger.info(f"Extrinsic calibration complete: RMSE={bundle.reprojection_report.overall_rmse:.3f}px")
-
-        # Persist via coordinator (handles bundle_updated signal, camera array save, etc.)
-        self._coordinator.update_bundle(bundle)
-
     def _on_charuco_changed(self) -> None:
         """Update charuco reference when config changes.
 

src/caliscope/gui/extrinsic_calibration_tab.py

@@ -17,9 +17,6 @@
 from caliscope.gui.views.multi_camera_processing_widget import MultiCameraProcessingWidget
 
 if TYPE_CHECKING:
-    from caliscope.core.coverage_analysis import ExtrinsicCoverageReport
-    from caliscope.core.point_data import ImagePoints
-    from caliscope.tracker import Tracker
     from caliscope.workspace_coordinator import WorkspaceCoordinator
 
 logger = logging.getLogger(__name__)
@@ -74,24 +71,9 @@ def _connect_signals(self) -> None:
         # Rotation persistence
         self._presenter.rotation_changed.connect(self.coordinator.persist_camera_rotation)
 
-        # Processing completion - persist results and notify coordinator
-        self._presenter.processing_complete.connect(self._on_processing_complete)
-
         # Charuco changes invalidate the tracker - need to recreate presenter
         self.coordinator.charuco_changed.connect(self._on_charuco_changed)
 
-    def _on_processing_complete(
-        self,
-        image_points: ImagePoints,
-        coverage_report: ExtrinsicCoverageReport,
-        tracker: Tracker,
-    ) -> None:
-        """Handle processing completion - persist results and signal coordinator."""
-        logger.info(f"Multi-camera processing complete: {len(image_points.df)} observations")
-
-        # Persist ImagePoints to extrinsic directory (triggers status_changed)
-        self.coordinator.persist_extrinsic_image_points(image_points, tracker.name)
-
     def _on_charuco_changed(self) -> None:
         """Update tracker when charuco config changes.