Beat head on wall of catalog style stuff

Author: mwcraig

src/astro_image_display_api/dummy_viewer.py

@@ -39,7 +39,6 @@ class ImageViewer:
     _cursor: str = ImageViewerInterface.ALLOWED_CURSOR_LOCATIONS[0]
     # marker style will be stored in catalog table metadata
     _catalogs: dict[str, CatalogInfo] = field(default_factory=dict)
-    _default_marker_style: dict[str, Any] = field(default_factory=dict)
     _cuts: str | tuple[float, float] = (0, 1)
     _stretch: str = "linear"
     # viewer: Any
@@ -54,10 +53,9 @@ class ImageViewer:
     def __post_init__(self):
         # This is a dictionary of marker sets. The keys are the names of the
         # marker sets, and the values are the tables containing the markers.
-        self._default_marker_style = dict(shape="circle", color="yellow", size=10)
         self._catalogs = defaultdict(CatalogInfo)
         self._catalogs[None].data = None
-        self._catalogs[None].style = self._default_marker_style.copy()
+        self._catalogs[None].style = self._default_catalog_style.copy()
 
     def _user_catalog_labels(self) -> list[str]:
         """
@@ -89,6 +87,17 @@ def _resolve_catalog_label(self, catalog_label: str | None) -> str:
 
         return catalog_label
 
+    @property
+    def _default_catalog_style(self) -> dict[str, Any]:
+        """
+        The default style for the catalog markers.
+        """
+        return {
+            "shape": "circle",
+            "color": "red",
+            "size": 5,
+        }
+
     @property
     def stretch(self) -> str:
         return self._stretch
@@ -128,7 +137,7 @@ def cursor(self, value: str) -> None:
 
     # The methods, grouped loosely by purpose
 
-    def get_catalog_style(self, catalog_label=None) -> dict[str, dict[str, Any]]:
+    def get_catalog_style(self, catalog_label=None) -> dict[str, Any]:
         """
         Get the style for the catalog.
 
@@ -151,9 +160,9 @@ def get_catalog_style(self, catalog_label=None) -> dict[str, dict[str, Any]]:
     def set_catalog_style(
             self,
             catalog_label: str | None = None,
-            shape: str = "",
-            color: str = "",
-            size: float = 0,
+            shape: str = "circle",
+            color: str = "red",
+            size: float = 5,
             **kwargs
     ) -> None:
         """
@@ -172,9 +181,9 @@ def set_catalog_style(
         **kwargs
             Additional keyword arguments to pass to the marker style.
         """
-        shape = shape if shape else self._default_marker_style["shape"]
-        color = color if color else self._default_marker_style["color"]
-        size = size if size else self._default_marker_style["size"]
+        shape = shape
+        color = color
+        size = size
 
         catalog_label = self._resolve_catalog_label(catalog_label)
 
@@ -305,11 +314,12 @@ def load_catalog(self, table: Table, x_colname: str = 'x', y_colname: str = 'y',
             self._catalogs[catalog_label].data = vstack([old_table, to_add])
         else:
             self._catalogs[catalog_label].data = to_add
-
+        breakpoint()
         if catalog_style is None:
-            catalog_style = self._default_marker_style.copy()
-
-        self._catalogs[catalog_label].style = catalog_style
+            if self._catalogs[catalog_label].style is None:
+                catalog_style = self._default_catalog_style.copy()
+        else:
+            self._catalogs[catalog_label].style = catalog_style
 
     load_catalog.__doc__ = ImageViewerInterface.load_catalog.__doc__