Skip to content

Commit e2773c0

Browse files
committed
updating to js-based implementation
1 parent 66cbcd0 commit e2773c0

3 files changed

Lines changed: 5 additions & 15 deletions

File tree

js/models/message_handler.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export default class MessageHandler {
2828
);
2929
}
3030
catalog.addSources(markers);
31+
this.messageHandler.handleGetOverlays();
3132
}
3233

3334
handleChangeFoV(msg) {
@@ -75,6 +76,7 @@ export default class MessageHandler {
7576
handleAddCatalogFromURL(msg) {
7677
const options = convertOptionNamesToCamelCase(msg["options"] || {});
7778
this.aladin.addCatalog(A.catalogFromURL(msg["votable_URL"], options));
79+
this.messageHandler.handleGetOverlays();
7880
}
7981

8082
handleAddMOCFromURL(msg) {
@@ -138,6 +140,7 @@ export default class MessageHandler {
138140
break;
139141
}
140142
}
143+
this.messageHandler.handleGetOverlays();
141144
}
142145

143146
handleRemoveOverlay = (msg) => {
@@ -232,6 +235,7 @@ export default class MessageHandler {
232235
options,
233236
(catalog) => {
234237
this.aladin.addCatalog(catalog);
238+
this.messageHandler.handleGetOverlays();
235239
},
236240
false,
237241
);

src/ipyaladin/widget.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,6 @@ def add_markers(
550550
"options": catalog_options,
551551
}
552552
)
553-
self.get_overlays()
554553

555554
def _save_file(self, path: str, buffer: bytes) -> None:
556555
"""Save a file from a buffer.
@@ -674,7 +673,6 @@ def add_catalog_from_URL(
674673
"options": votable_options,
675674
}
676675
)
677-
self.get_overlays()
678676

679677
@widget_should_be_loaded
680678
def add_fits(self, fits: Union[str, Path, HDUList], **image_options: any) -> None:
@@ -880,16 +878,6 @@ def add_table(
880878
{"event_name": "add_table", "options": table_options},
881879
buffers=[table_bytes.getvalue()],
882880
)
883-
if not self._ready:
884-
warnings.warn(
885-
"The table has not yet finished loading into the widget, so the "
886-
"overlays list has not been updated. Please call `get_overlays()` "
887-
"to update the list.",
888-
UserWarning,
889-
stacklevel=2,
890-
)
891-
else:
892-
self.get_overlays()
893881

894882
@widget_should_be_loaded
895883
def add_graphic_overlay_from_region(
@@ -970,7 +958,6 @@ def add_graphic_overlay_from_region(
970958
"graphic_options": graphic_options,
971959
}
972960
)
973-
self.get_overlays()
974961

975962
@widget_should_be_loaded
976963
def add_overlay_from_stcs(
@@ -1036,7 +1023,6 @@ def add_graphic_overlay_from_stcs(
10361023
"graphic_options": overlay_options,
10371024
}
10381025
)
1039-
self.get_overlays()
10401026

10411027
@widget_should_be_loaded
10421028
def remove_overlay(self, overlay_name: Union[Iterable[str], str]) -> None:

src/tests/test_aladin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def test_add_graphic_overlay_from_stcs_iterables(
255255
mock_send = Mock()
256256
monkeypatch.setattr(Aladin, "send", mock_send)
257257
aladin.add_graphic_overlay_from_stcs(stcs_strings)
258-
regions_info = mock_send.call_args_list[0].args[0]["regions_infos"]
258+
regions_info = mock_send.call_args[0][0]["regions_infos"]
259259
assert isinstance(regions_info, list)
260260
assert regions_info[0]["infos"]["stcs"] in stcs_strings
261261

0 commit comments

Comments
 (0)