remove my dumbness and rushing for window nightmares, vastly simplified

Author: JohnnyMarnell

docs/backends/PixelBlaze.md

@@ -40,7 +40,7 @@ marimapper_upload_mapping_to_pixelblaze --csv_file led_map_3d.csv
 Or with results CLI, plus `pb` CLI:
 ```bash
 ( echo '[' ; marimapper_results \
-    | tail -n+2 | cut -d, -f 5-7 \
+    | tail -n+2 | cut -d, -f 2-4 \
     | awk '{print (NR==1 ? "[" : "],[" ) $0 }' ; \
   echo ']]' ) | pb map
 ```

marimapper/detector.py

@@ -3,18 +3,28 @@
 import cv2
 import time
 from typing import Optional
+from dataclasses import dataclass
 import numpy as np
 from multiprocessing import get_logger
 
 from marimapper.camera import Camera
 from marimapper.timeout_controller import TimeoutController
 from marimapper.led import Point2D, LED2D
-from marimapper.utils import position_window
+from marimapper.utils import window_config
 
 
 logger = get_logger()
 
 
+@dataclass
+class _Window:
+    name: str = "MariMapper - Detector"
+    camera_native_aspect_ratio: float = -1
+    initial_height: int = -1
+
+_win = _Window()
+
+
 def contour_brightness(image: np.ndarray, contour: np.ndarray) -> int:
     """Calculate the sum of all pixels within a contour."""
     mask = np.zeros(image.shape, dtype=np.uint8)
@@ -89,25 +99,34 @@ def draw_led_detections(image: cv2.Mat, led_detection: Optional[Point2D]) -> np.
     return render_image
 
 
-def show_image(image: np.ndarray) -> None:
-    window_name = "MariMapper - Detector"
+# If this is our first render and cv2.imshow(), make sure the window is created
+def _init_win_if_needed(image: np.ndarray) -> None:
+    if _win.initial_height <= 0:
+        cam_h, cam_w = image.shape[:2]
+        cam_aspect_ratio = cam_w / cam_h
 
-    x, y, _, target_height = position_window(window_name, 320, 0, 960, 540)
+        x, y, _, target_win_height = window_config(_win.name, 320, 0, 960, 540)
+        target_win_width = int(target_win_height * cam_aspect_ratio)
+        cv2.namedWindow(_win.name, cv2.WINDOW_NORMAL)
+        cv2.resizeWindow(_win.name, target_win_width, target_win_height)
+        cv2.moveWindow(_win.name, x, y)
+        
+        _win.initial_height = target_win_height
+        _win.camera_native_aspect_ratio = cam_aspect_ratio
 
-    native_h, native_w = image.shape[:2]
-    aspect_ratio = native_w / native_h
 
-    target_width = int(target_height * aspect_ratio)
 
-    if not getattr(show_image, "setup_done", False):
-        cv2.namedWindow(window_name, cv2.WINDOW_NORMAL)
-        cv2.resizeWindow(window_name, target_width, target_height)
-        cv2.moveWindow(window_name, x, y)
-        show_image.setup_done = True
+def show_image(image: np.ndarray) -> None:
+    _init_win_if_needed(image)
 
-    display_image = cv2.resize(image, (target_width, target_height))
+    # Resizing actually seems to perform better than not (more responsive too)
+    # We only need to resize the display image (not window), and can use the initial height,
+    # user movements are still respected
+    image_height = _win.initial_height
+    image_width = int(image_height * _win.camera_native_aspect_ratio)
+    display_image = cv2.resize(image, (image_width, image_height))
 
-    cv2.imshow(window_name, display_image)
+    cv2.imshow(_win.name, display_image)
     key = cv2.waitKey(1)
 
     if key == 27:  # esc

marimapper/utils.py

@@ -54,35 +54,14 @@ def __exit__(self, *_):
         self.errnull_file.close()
 
 
-CONFIG_DIR = Path.home() / ".config" / "marimapper" / "windows"
-_CACHE = {}
-
-
-def position_window(name: str, x: int, y: int, w: int, h: int) -> list[int]:
-    """
-    Returns [x, y, width, height].
-    Checks memory cache first.
-    If not in cache, checks disk.
-    If not on disk, returns defaults immediately.
-    """
-    if name in _CACHE:
-        return _CACHE[name]
-
-    clean_name = re.sub(r"[^\w\-_\. ]", "_", name)
-    file_path = CONFIG_DIR / f"{clean_name}.json"
-
-    defaults = {"x": x, "y": y, "width": w, "height": h}
-    config = defaults.copy()
-
-    if file_path.exists():
-        try:
-            with open(file_path, "r") as f:
+# Look for stored window position and size settings, otherwise return supplied defaults
+def window_config(name: str, x: int, y: int, w: int, h: int) -> list[int]:
+    try:
+        with open(Path.home() / ".config" / "marimapper.json", "r") as f:
                 data = json.load(f)
-                config.update(data)
-        except Exception:
-            pass
-
-    # Return as list [x, y, w, h]
-    result = [config["x"], config["y"], config["width"], config["height"]]
-    _CACHE[name] = result
-    return result
+                window_cfg = data["window"] and data["window"][name]
+                if window_cfg:
+                    return [window_cfg["x"], window_cfg["y"], window_cfg["width"], window_cfg["height"]]
+    except Exception:
+        pass
+    return [x, y, w, h]

marimapper/visualize_process.py

@@ -3,7 +3,7 @@
 from multiprocessing import get_logger, Process, Event
 from marimapper.queues import Queue3D
 from marimapper.led import LED3D, View, get_next, get_distance
-from marimapper.utils import position_window
+from marimapper.utils import window_config
 import time
 
 logger = get_logger()
@@ -70,7 +70,7 @@ def run(self):
     def initialise_visualiser__(self):
         logger.debug("Renderer3D process initialising visualiser")
         window_name = "MariMapper"
-        x, y, w, h = position_window(window_name, 0, 0, 640, 640)
+        x, y, w, h = window_config(window_name, 0, 0, 640, 640)
 
         self._vis = (
             open3d.visualization.Visualizer()