kamil_adc support added

python_app/gui/controllers/app_window_plot/gpr_plot_mixin.py

@@ -254,7 +254,15 @@ class AppWindowGprPlotMixin:
 
             points_payload = self._collection_payload_by_name(collection, "gpr_points", kind=4)
             if points_payload is not None and np.asarray(points_payload.table).size > 0:
-                points = np.asarray(points_payload.table, dtype=np.float32)
+                points = (
+                    self._filtered_gpr_object_rows(collection)
+                    if self._processing_mode.currentText() == "gpr"
+                    else np.asarray(points_payload.table, dtype=np.float32)
+                )
+            else:
+                points = np.zeros((0, 3), dtype=np.float32)
+
+            if points.size > 0:
                 self._gpr_points_item.setData(
                     x=points[:, 0],
                     y=points[:, 1],
@@ -368,6 +376,26 @@ class AppWindowGprPlotMixin:
             return float(self._legacy_gpr_min_visible_pair_count.value())
         return float(self._gpr_min_visible_score.value())
 
+    def _gpr_draw_limits(self) -> tuple[int, int] | None:
+        """Return GPR object draw limits, or None for legacy GPR."""
+        if self._processing_mode.currentText() == "legacy_gpr":
+            return None
+        return (
+            int(self._gpr_max_detected_objects_to_draw.value()),
+            int(self._gpr_draw_top_m_objects.value()),
+        )
+
+    @staticmethod
+    def _apply_object_draw_limits(rows: np.ndarray, limits: tuple[int, int] | None) -> np.ndarray:
+        """Apply object count/top-M drawing rules to already-filtered rows."""
+        if limits is None or rows.size == 0:
+            return rows
+
+        max_detected_objects, draw_top_objects = limits
+        if rows.shape[0] > int(max_detected_objects):
+            return np.zeros((0, rows.shape[1]), dtype=rows.dtype)
+        return rows[: max(0, int(draw_top_objects))]
+
     @staticmethod
     def _gpr_display_y_min(z_min: float, z_max: float) -> float:
         """Return lower display bound, preserving surface markers only when surface is visible."""
@@ -483,7 +511,7 @@ class AppWindowGprPlotMixin:
         return extract_gpr_object_rows(collection)
 
     def _filtered_gpr_object_rows(self, collection: ResultCollection) -> np.ndarray:
-        """Return object rows filtered by minimum pair count and visible X/Z bounds."""
+        """Return object rows filtered by threshold, visible X/Z bounds, and active GPR draw limits."""
         rows = self._gpr_object_rows(collection)
         if rows.size == 0:
             return rows
@@ -499,7 +527,7 @@ class AppWindowGprPlotMixin:
             & (rows[:, 1] >= z_min)
             & (rows[:, 1] <= z_max)
         )
-        return rows[visible_mask]
+        return self._apply_object_draw_limits(rows[visible_mask], self._gpr_draw_limits())
 
     def _draw_gpr_objects_only(self, collection: ResultCollection) -> bool:
         """Draw only detected GPR objects inside configured X/Z bounds."""