✨ Add support for Regions object for add_overlay

cds-astro · May 16, 2024 · 3d66a68 · 3d66a68
1 parent b85d55a
commit 3d66a68
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/js/models/message_handler.js b/js/models/message_handler.js
@@ -35,8 +35,10 @@ export default class MessageHandler {
       msg["graphic_options"] || {},
     );
     if (!graphic_options["color"]) graphic_options["color"] = "red";
+    console.log(graphic_options);
     const overlay = A.graphicOverlay(graphic_options);
     this.aladin.addOverlay(overlay);
+    console.log(regions);
     for (const region of regions) {
       const infos = region["infos"];
       switch (region["region_type"]) {
@@ -52,8 +54,14 @@ export default class MessageHandler {
           break;
         case "ellipse":
           overlay.add(
-            A.ellipse(infos.ra, infos.dec, infos.a, infos.b, infos.theta),
-            region.options,
+            A.ellipse(
+              infos.ra,
+              infos.dec,
+              infos.a,
+              infos.b,
+              infos.theta,
+              region.options,
+            ),
           );
           break;
         case "line":
@@ -63,6 +71,7 @@ export default class MessageHandler {
               infos.dec1,
               infos.ra2,
               infos.dec2,
+              "ICRS",
               region.options,
             ),
           );

diff --git a/src/ipyaladin/aladin.py b/src/ipyaladin/aladin.py
@@ -24,6 +24,7 @@
         PolygonSkyRegion,
         RectangleSkyRegion,
         Region,
+        Regions,
     )
 except ImportError:
     CircleSkyRegion = None
@@ -32,6 +33,7 @@
     PolygonSkyRegion = None
     RectangleSkyRegion = None
     Region = None
+    Regions = None
 from traitlets import (
     Float,
     Int,
@@ -372,6 +374,7 @@ def add_overlay(
             LineSkyRegion,
             PolygonSkyRegion,
             RectangleSkyRegion,
+            Regions,
         ],
         **graphic_options: any,
     ) -> None:
@@ -387,11 +390,15 @@ def add_overlay(
             The options for the graphic overlay. Use Region visual for region options.
 
         """
-        if not isinstance(region, list):
-            region = [region]
+        if isinstance(region, Regions):
+            region_list = region.regions
+        elif not isinstance(region, list):
+            region_list = [region]
+        else:
+            region_list = region
 
         regions_infos = []
-        for region_element in region:
+        for region_element in region_list:
             # Check if the regions library is installed and raise an error if not
             if (
                 not isinstance(region_element, str) and Region is None