[WIP] Gaia charts

default_config.json

@@ -15,6 +15,11 @@
     "chart_dso": 128,
     "chart_reticle": 128,
     "chart_constellations": 64,
+    "obj_chart_crosshair": "pulse",
+    "obj_chart_crosshair_style": "simple",
+    "obj_chart_crosshair_speed": "2.0",
+    "obj_chart_lm_mode": "auto",
+    "obj_chart_lm_fixed": 14.0,
     "solve_pixel": [256, 256],
     "gps_type": "ublox",
     "gps_baud_rate": 9600,

python/PiFinder/audit_images.py

@@ -1,4 +1,5 @@
 #!/usr/bin/python
+from PiFinder.object_images.poss_provider import POSSImageProvider
 # -*- coding:utf-8 -*-
 # mypy: ignore-errors
 """
@@ -10,7 +11,7 @@
 import sqlite3
 from tqdm import tqdm
 
-from PiFinder import cat_images
+from PiFinder.object_images import get_display_image
 
 
 def get_catalog_objects():
@@ -59,7 +60,7 @@ def check_object_image(catalog_object):
             if aka_sequence:
                 catalog_object = {"catalog": "NGC", "sequence": aka_sequence}
 
-    object_image_path = cat_images.resolve_image_name(catalog_object, "POSS")
+    object_image_path = POSSImageProvider()._resolve_image_name(catalog_object, "POSS")
     # POSS
     image_name = object_image_path.split("/")[-1]
     seq_ones = image_name.split("_")[0][-1]

python/PiFinder/camera_debug.py

@@ -49,7 +49,7 @@ def setup_debug_images(self) -> None:
         self.images = list(zip(range(1, len(images) + 1), images))
         self.image_cycle = cycle(self.images)
         self.last_image_time: float = time.time()
-        self.current_image_num, self.last_image = self.images[0]
+        self.current_image_num, self.last_image = self.images[1]  # Use darker sky image
 
     def initialize(self) -> None:
         self._camera_started = True
@@ -63,13 +63,15 @@ def stop_camera(self) -> None:
     def capture(self) -> Image.Image:
         sleep_time = self.exposure_time / 1000000
         time.sleep(sleep_time)
+        # FOR TESTING: Keep using the same image (first image - solves, brighter sky)
+        # Comment out image cycling to maintain consistent roll/orientation
         # Change images every 10 seconds
-        elapsed = time.time() - self.last_image_time
-        if elapsed > 10:
-            self.current_image_num, self.last_image = next(self.image_cycle)
-            logger.debug(
-                f"Debug camera switched to test image #{self.current_image_num}"
-            )
+        # elapsed = time.time() - self.last_image_time
+        # if elapsed > 10:
+        #     self.current_image_num, self.last_image = next(self.image_cycle)
+        #     logger.debug(
+        #         f"Debug camera switched to test image #{self.current_image_num}"
+        #     )
         return self.last_image
 
     def capture_bias(self):

python/PiFinder/catalog_base.py

@@ -171,7 +171,7 @@ def assign_virtual_object_ids(catalog, low_id: int) -> int:
 class TimerMixin:
     """Provides timer functionality via composition"""
 
-    def __init__(self):
+    def __init__(self) -> None:
         self.timer: Optional[threading.Timer] = None
         self.is_running: bool = False
         self.time_delay_seconds: Union[int, Callable[[], int]] = (

python/PiFinder/catalogs.py

@@ -912,8 +912,18 @@ def _build_composite(
 
         # Start background loader for deferred objects
         if deferred_objects:
+            # Sort deferred objects: load WDS last (it has 131K objects)
+            # This ensures smaller catalogs (C, Col, etc.) are available sooner
+            def sort_key(obj):
+                if obj["catalog_code"] == "WDS":
+                    return 1  # Load last
+                else:
+                    return 0  # Load first
+
+            deferred_objects_sorted = sorted(deferred_objects, key=sort_key)
+
             loader = CatalogBackgroundLoader(
-                deferred_catalog_objects=deferred_objects,
+                deferred_catalog_objects=deferred_objects_sorted,
                 objects=objects,
                 common_names=common_names,
                 obs_db=obs_db,
@@ -929,8 +939,7 @@ def _build_composite(
 
     def _on_loader_progress(self, loaded: int, total: int, catalog: str) -> None:
         """Progress callback - log every 10K objects"""
-        if loaded % 10000 == 0 or loaded == total:
-            logger.info(f"Background loading: {loaded}/{total} ({catalog})")
+        pass  # Muted to reduce log noise
 
     def _on_loader_complete(
         self, loaded_objects: List[CompositeObject], ui_queue

python/PiFinder/displays.py

@@ -70,6 +70,14 @@ class DisplayPygame_128(DisplayBase):
 
     def __init__(self):
         from luma.emulator.device import pygame
+        import pygame as pg
+        from pathlib import Path
+
+        # Set window icon to welcome splash screen before creating display
+        icon_path = Path(__file__).parent.parent.parent / "images" / "welcome.png"
+        if icon_path.exists():
+            icon = pg.image.load(str(icon_path))
+            pg.display.set_icon(icon)
 
         # init display  (SPI hardware)
         pygame = pygame(
@@ -90,6 +98,14 @@ class DisplayPygame_320(DisplayBase):
 
     def __init__(self):
         from luma.emulator.device import pygame
+        import pygame as pg
+        from pathlib import Path
+
+        # Set window icon to welcome splash screen before creating display
+        icon_path = Path(__file__).parent.parent.parent / "images" / "welcome.png"
+        if icon_path.exists():
+            icon = pg.image.load(str(icon_path))
+            pg.display.set_icon(icon)
 
         # init display  (SPI hardware)
         pygame = pygame(

python/PiFinder/get_images.py

@@ -1,3 +1,5 @@
+from PiFinder.object_images.poss_provider import BASE_IMAGE_PATH
+from PiFinder.object_images.poss_provider import create_catalog_image_dirs
 #!/usr/bin/python
 # -*- coding:utf-8 -*-
 """
@@ -11,7 +13,7 @@
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from typing import List, Tuple
 
-from PiFinder import cat_images
+from PiFinder.object_images import get_display_image
 from PiFinder.db.objects_db import ObjectsDatabase
 
 
@@ -35,7 +37,7 @@ def check_missing_images() -> List[str]:
     for image_name in tqdm(image_names, desc="Checking existing images"):
         # Check if POSS image exists (primary check)
         poss_path = (
-            f"{cat_images.BASE_IMAGE_PATH}/{image_name[-1]}/{image_name}_POSS.jpg"
+            f"{BASE_IMAGE_PATH}/{image_name[-1]}/{image_name}_POSS.jpg"
         )
         if not os.path.exists(poss_path):
             missing_images.append(image_name)
@@ -79,7 +81,7 @@ def fetch_images_for_object(
 
     # Download POSS image
     poss_filename = f"{image_name}_POSS.jpg"
-    poss_path = f"{cat_images.BASE_IMAGE_PATH}/{seq_ones}/{poss_filename}"
+    poss_path = f"{BASE_IMAGE_PATH}/{seq_ones}/{poss_filename}"
     poss_url = f"https://ddbeeedxfpnp0.cloudfront.net/catalog_images/{seq_ones}/{poss_filename}"
 
     poss_success, poss_error = download_image_from_url(session, poss_url, poss_path)
@@ -88,7 +90,7 @@ def fetch_images_for_object(
 
     # Download SDSS image
     sdss_filename = f"{image_name}_SDSS.jpg"
-    sdss_path = f"{cat_images.BASE_IMAGE_PATH}/{seq_ones}/{sdss_filename}"
+    sdss_path = f"{BASE_IMAGE_PATH}/{seq_ones}/{sdss_filename}"
     sdss_url = f"https://ddbeeedxfpnp0.cloudfront.net/catalog_images/{seq_ones}/{sdss_filename}"
 
     sdss_success, sdss_error = download_image_from_url(session, sdss_url, sdss_path)
@@ -154,7 +156,7 @@ def main():
     """
     Main function to check for and download missing catalog images.
     """
-    cat_images.create_catalog_image_dirs()
+    create_catalog_image_dirs()
 
     print("Checking for missing images...")
     missing_images = check_missing_images()