From 2f24a20ebcf3b845ebfd0d2edf7f95fefba30ef3 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyleconroy@gmail.com>
Date: Thu, 12 Oct 2023 13:15:04 -0400
Subject: [PATCH] Plugin plots to viewers (#2498)

* create separate app instance with glue-viewer
* nested toolbar in plugin viewers
* migrate implementation for scatter viewers (radial profile, line profiles) and histogram (stretch in plot options)
* downsampling no longer necessary
* lose logic to ensure vmin/max markers are within viewer range (might be confusing)
* home button on histogram viewer is buggy
* update tests
* temporary workaround to segfault on some machines
* bump glue-jupyter to ensure scatter lines support
---
 CHANGES.rst                                   |   3 +
 jdaviz/app.vue                                |  19 +-
 jdaviz/components/plugin_plot.vue             |  11 +-
 jdaviz/components/toolbar_nested.py           |  11 +-
 jdaviz/components/toolbar_nested.vue          |   6 +-
 .../plugins/plot_options/plot_options.py      |  99 ++++------
 .../plot_options/tests/test_plot_options.py   |  35 ++--
 .../aper_phot_simple/aper_phot_simple.py      |  54 ++++--
 .../line_profile_xy/line_profile_xy.py        |  69 +++----
 .../imviz/tests/test_line_profile_xy.py       |  20 +-
 .../imviz/tests/test_simple_aper_phot.py      |   2 +-
 jdaviz/core/template_mixin.py                 | 176 +++++++++++++++---
 pyproject.toml                                |   2 +-
 13 files changed, 324 insertions(+), 183 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6196f6a6dd..1d7aca0c39 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@
 New Features
 ------------
 
+- Plots in plugins now include basic zoom/pan tools for Plot Options,
+  Imviz Line Profiles, and Imviz's aperture photometry. [#2498]
+
 Cubeviz
 ^^^^^^^
 
diff --git a/jdaviz/app.vue b/jdaviz/app.vue
index 5b08c49f28..1aeadbef48 100644
--- a/jdaviz/app.vue
+++ b/jdaviz/app.vue
@@ -360,7 +360,12 @@ a:active {
   text-decoration: none;
 }
 
-.jdaviz-nested-toolbar {
+.invert, .invert-if-dark.theme--dark {
+    filter: invert(1) saturate(1) brightness(100);
+    color: white;
+}
+
+.jdaviz-nested-toolbar, .plugin-nested-toolbar {
   /* height of nested toolbar to match viewer toolbar height */
   height: 42px;
   margin-right: 4px;
@@ -371,12 +376,7 @@ a:active {
   filter: invert(1) saturate(1) brightness(100);
 }
 
-.invert, .invert-if-dark.theme--dark {
-    filter: invert(1) saturate(1) brightness(100);
-    color: white;
-}
-
-.jdaviz-nested-toolbar .v-btn {
+.jdaviz-nested-toolbar .v-btn, .plugin-nested-toolbar .v-btn {
   height: 42px !important;
   border: none !important;
   min-width: 42px !important;
@@ -394,6 +394,11 @@ a:active {
   background-color: #c75109 !important;
 }
 
+.plugin-nested-toolbar .v-btn--active, .plugin-nested-toolbar .v-btn:focus {
+  /* semi-transparent active color (orange) */
+  background-color: #c7510996 !important;
+}
+
 .v-divider.theme--dark {
   /* make the v-divider standout more */
   border-color: hsla(0,0%,100%,.35) !important;
diff --git a/jdaviz/components/plugin_plot.vue b/jdaviz/components/plugin_plot.vue
index cdc9ac7ec7..f751c03f24 100644
--- a/jdaviz/components/plugin_plot.vue
+++ b/jdaviz/components/plugin_plot.vue
@@ -1,7 +1,9 @@
 <template>
-  <div class="plugin-plot-component">
-    <v-row style="margin: 0px 0px -8px 0px !important" justify="end">
-      <div style="line-height: 64px; width=32px" class="only-show-in-tray">
+  <div class="plugin-plot-component" style="margin-bottom: 40px">
+    <v-row dense style="margin: 0px 0px -8px 0px !important">
+      <jupyter-widget class='plugin-nested-toolbar' :widget="toolbar"></jupyter-widget>
+      <v-spacer></v-spacer>
+      <div style="line-height: 40px; width=32px" class="only-show-in-tray">
         <j-plugin-popout :popout_button="popout_button"></j-plugin-popout>
       </div>
     </v-row>
@@ -9,14 +11,12 @@
     <v-row style="margin: -16px 0px 8px 0px !important">
       <jupyter-widget :widget="figure" style="height: 100%; width: 100%" />
     </v-row>
-
   </div>
 </template>
 
 <script>
 </script>
 
-
 <style scoped>
   .only-show-in-tray {
     display: none;
@@ -33,5 +33,4 @@
     width: 100%;
     height: 480px;
   }
-
 </style>
diff --git a/jdaviz/components/toolbar_nested.py b/jdaviz/components/toolbar_nested.py
index 67bdbec019..60ae60f0ad 100644
--- a/jdaviz/components/toolbar_nested.py
+++ b/jdaviz/components/toolbar_nested.py
@@ -65,10 +65,13 @@ def __init__(self, viewer, tools_nested, default_tool_priority=[]):
         self.default_tool_priority = default_tool_priority
         self._handle_default_tool()
 
-        for msg in (AddDataMessage, RemoveDataMessage, ViewerAddedMessage, ViewerRemovedMessage,
-                    SpectralMarksChangedMessage):
-            self.viewer.hub.subscribe(self, msg,
-                                      handler=lambda _: self._update_tool_visibilities())
+        # toolbars in the main app viewers need to respond to the data-collection, etc,
+        # but those in plugins do not
+        if hasattr(self.viewer, 'hub'):
+            for msg in (AddDataMessage, RemoveDataMessage, ViewerAddedMessage, ViewerRemovedMessage,
+                        SpectralMarksChangedMessage):
+                self.viewer.hub.subscribe(self, msg,
+                                          handler=lambda _: self._update_tool_visibilities())
 
     def _is_visible(self, tool_id):
         # tools can optionally implement self.is_visible(). If not NotImplementedError
diff --git a/jdaviz/components/toolbar_nested.vue b/jdaviz/components/toolbar_nested.vue
index ff06e7979f..d698ef5d84 100644
--- a/jdaviz/components/toolbar_nested.vue
+++ b/jdaviz/components/toolbar_nested.vue
@@ -4,8 +4,8 @@
         <v-tooltip v-for="[id, {tooltip, img, menu_ind, has_suboptions, primary, visible}] of Object.entries(tools_data)" v-if="primary && visible" bottom>
             <template v-slot:activator="{ on }">
                 <v-btn v-on="on" icon :value="id" style="min-width: 40px !important" @contextmenu="(e) => show_submenu(e, has_suboptions, menu_ind)">
-                    <img :src="img" width="20px" @click.ctrl.stop=""/>
-                    <v-icon small v-if="has_suboptions" class="suboptions-carrot" @click.ctrl.stop="">mdi-menu-down</v-icon>
+                    <img class="invert-if-dark" :src="img" width="20px" @click.ctrl.stop=""/>
+                    <v-icon small v-if="has_suboptions" class="suboptions-carrot invert-if-dark" @click.ctrl.stop="">mdi-menu-down</v-icon>
                 </v-btn>
             </template>
             <span>{{ tooltip }}{{has_suboptions ? " [right-click for alt. tools]" : ""}}</span>
@@ -81,7 +81,7 @@
   }
 </script>
 
-<style>
+<style scoped>
 .suboptions-carrot {
   transform: rotate(-45deg);
   bottom: 0px;
diff --git a/jdaviz/configs/default/plugins/plot_options/plot_options.py b/jdaviz/configs/default/plugins/plot_options/plot_options.py
index 804751678f..4a61551c42 100644
--- a/jdaviz/configs/default/plugins/plot_options/plot_options.py
+++ b/jdaviz/configs/default/plugins/plot_options/plot_options.py
@@ -7,7 +7,6 @@
 from traitlets import Any, Dict, Float, Bool, Int, List, Unicode, observe
 
 from glue.core.subset_group import GroupedSubset
-import bqplot
 from glue.config import stretches
 from glue.viewers.scatter.state import ScatterViewerState
 from glue.viewers.profile.state import ProfileViewerState, ProfileLayerState
@@ -403,8 +402,13 @@ def state_attr_for_line_visible(state):
                                                  'stretch_vmax_value', 'stretch_vmax_sync',
                                                  state_filter=is_image)
 
-        self.stretch_histogram = Plot(self)
-        self.stretch_histogram.add_bins('histogram', color='gray')
+        self.stretch_histogram = Plot(self, viewer_type='histogram')
+        # NOTE: this is a current workaround so the histogram viewer doesn't crash when replacing
+        # data.  Note also that passing x=[0] fails on SOME machines, so we'll pass [0, 1] instead
+        self.stretch_histogram._add_data('ref', x=[0, 1])
+        self.stretch_histogram.layers['ref'].state.visible = False
+        self.stretch_histogram._add_data('histogram', x=[0, 1])
+
         self.stretch_histogram.add_line('vmin', x=[0, 0], y=[0, 1], ynorm=True, color='#c75d2c')
         self.stretch_histogram.add_line('vmax', x=[0, 0], y=[0, 1], ynorm=True, color='#c75d2c')
         self.stretch_histogram.figure.axes[0].label = 'pixel value'
@@ -606,16 +610,6 @@ def _update_stretch_histogram(self, msg={}):
                 y_max = y_limits.max()
 
                 arr = comp.data[y_min:y_max, x_min:x_max]
-
-                size = arr.shape[0] * arr.shape[1]
-                if size > 400**2:
-                    xstep = max(1, round(arr.shape[1] / 400))
-                    ystep = max(1, round(arr.shape[0] / 400))
-                    arr = arr[::ystep, ::xstep]
-                    stretch_hist_downsampled = [size, arr.shape[0] * arr.shape[1]]
-                else:
-                    stretch_hist_downsampled = size
-
                 sub_data = arr.ravel()
 
             else:
@@ -635,49 +629,34 @@ def _update_stretch_histogram(self, msg={}):
 
                 sub_data = comp.data[inds].ravel()
 
-                # downsampling not currently implemented for 2d spectrum
-                stretch_hist_downsampled = len(sub_data)
-
         else:
             # include all data, regardless of zoom limits
             arr = comp.data
-            size = arr.shape[0] * arr.shape[1]
-            if size > 400**2:
-                xstep = max(1, round(arr.shape[1] / 400))
-                ystep = max(1, round(arr.shape[0] / 400))
-                arr = arr[::ystep, ::xstep]
-                stretch_hist_downsampled = [size, arr.shape[0] * arr.shape[1]]
-            else:
-                stretch_hist_downsampled = size
-
             sub_data = arr.ravel()
 
         # filter out nans (or else bqplot will fail)
         if np.any(np.isnan(sub_data)):
             sub_data = sub_data[~np.isnan(sub_data)]
 
-        hist_mark = self.stretch_histogram.marks['histogram']
-        with hist_mark.hold_sync():
-            hist_mark.sample = sub_data
+        self.stretch_histogram._update_data('histogram', x=sub_data)
+
+        if len(sub_data) > 0:
             interval = PercentileInterval(95)
-            if len(sub_data) > 0:
-                hist_lims = interval.get_limits(sub_data)
-                hist_mark.min, hist_mark.max = hist_lims
-                # set the stepsize for vmin/vmax to be approximately 1% of the range of the
-                # histogram (within the percentile interval), rounded to 1-2 significant digits
-                # to avoid random step sizes.  This logic is somewhat arbitrary and can be safely
-                # modified or eventually exposed to the user if that would be useful.
-                stretch_vstep = (hist_lims[1] - hist_lims[0]) / 100.
-                self.stretch_vstep = np.round(stretch_vstep, decimals=-int(np.log10(stretch_vstep))+1)  # noqa
-            hist_mark.bins = self.stretch_hist_nbins
-            # in case only the sample has changed but its length has not,
-            # we'll force the traitlet to trigger a change
-            hist_mark.send_state('sample')
-        if isinstance(stretch_hist_downsampled, list):
-            title = f"{stretch_hist_downsampled[1]} of {stretch_hist_downsampled[0]} pixels"
-        else:
-            title = f"{stretch_hist_downsampled} pixels"
-        self.stretch_histogram.figure.title = title
+            hist_lims = interval.get_limits(sub_data)
+            # set the stepsize for vmin/vmax to be approximately 1% of the range of the
+            # histogram (within the percentile interval), rounded to 1-2 significant digits
+            # to avoid random step sizes.  This logic is somewhat arbitrary and can be safely
+            # modified or eventually exposed to the user if that would be useful.
+            stretch_vstep = (hist_lims[1] - hist_lims[0]) / 100.
+            self.stretch_vstep = np.round(stretch_vstep, decimals=-int(np.log10(stretch_vstep))+1)  # noqa
+
+            self.stretch_histogram.viewer.state.hist_x_min = hist_lims[0]
+            self.stretch_histogram.viewer.state.hist_x_max = hist_lims[1]
+
+        self.stretch_histogram.figure.title = f"{len(sub_data)} pixels"
+
+        # update the n_bins since this may be a new layer
+        self._histogram_nbins_changed()
 
     @observe('is_active', 'stretch_vmin_value', 'stretch_vmax_value', 'layer_selected',
              'stretch_hist_nbins', 'image_contrast_value', 'image_bias_value',
@@ -739,13 +718,7 @@ def _update_stretch_curve(self, msg=None):
                     opacities=[0.5],
                 )
 
-            # reorder marks so histogram is on top:
-            figure_marks = self.stretch_histogram.figure.marks
-            for i, fig_mark in enumerate(figure_marks):
-                if isinstance(fig_mark, bqplot.Bins):
-                    hist_mark = figure_marks.pop(i)
-                    break
-            self.stretch_histogram.figure.marks = figure_marks + [hist_mark]
+            self.stretch_histogram._refresh_marks()
 
     @observe('stretch_vmin_value')
     def _stretch_vmin_changed(self, msg=None):
@@ -756,18 +729,20 @@ def _stretch_vmax_changed(self, msg=None):
         self.stretch_histogram.marks['vmax'].x = [self.stretch_vmax_value, self.stretch_vmax_value]
 
     @observe("stretch_hist_nbins")
-    def _histogram_nbins_changed(self, msg):
-        if self.stretch_histogram is None or msg['new'] == '' or msg['new'] < 1:
+    def _histogram_nbins_changed(self, msg={}):
+        if self.stretch_histogram is None:
             return
-        self.stretch_histogram.marks['histogram'].bins = self.stretch_hist_nbins
-
-    def set_histogram_x_limits(self, x_min=None, x_max=None):
-        # NOTE: leaving this out of user API until API is finalized with interactive setting
-        self.stretch_histogram.set_xlims(x_min, x_max)
+        if self.stretch_hist_nbins == '' or self.stretch_hist_nbins < 1:
+            return
+        self.stretch_histogram.viewer.state.hist_n_bin = self.stretch_hist_nbins
+        # for some reason, this resets the internal marks, so we need to ensure the manual
+        # marks are still plotted
+        self.stretch_histogram._refresh_marks()
 
-    def set_histogram_y_limits(self, y_min, y_max):
+    def set_histogram_limits(self, x_min=None, x_max=None, y_min=None, y_max=None):
         # NOTE: leaving this out of user API until API is finalized with interactive setting
-        self.stretch_histogram.set_ylims(y_min, y_max)
+        self.stretch_histogram.set_lims(x_min=x_min, x_max=x_max,
+                                        y_min=y_min, y_max=y_max)
 
     def _viewer_is_image_viewer(self):
         # Import here to prevent circular import (and not at the top of the method so the import
diff --git a/jdaviz/configs/default/plugins/plot_options/tests/test_plot_options.py b/jdaviz/configs/default/plugins/plot_options/tests/test_plot_options.py
index d7198cc870..312fa73ca0 100644
--- a/jdaviz/configs/default/plugins/plot_options/tests/test_plot_options.py
+++ b/jdaviz/configs/default/plugins/plot_options/tests/test_plot_options.py
@@ -72,25 +72,29 @@ def test_stretch_histogram(cubeviz_helper, spectrum1d_cube_with_uncerts):
 
     assert po.stretch_histogram is not None
 
-    hist_mark = po.stretch_histogram.marks['histogram']
-    flux_cube_sample = hist_mark.sample
+    hist_lyr = po.stretch_histogram.layers['histogram']
+    flux_cube_sample = hist_lyr.layer.data['x']
 
     # changing viewer should change results
     po.viewer.selected = 'uncert-viewer'
-    assert not allclose(hist_mark.sample, flux_cube_sample)
+    assert not allclose(hist_lyr.layer.data['x'], flux_cube_sample)
 
     po.viewer.selected = 'flux-viewer'
-    assert_allclose(hist_mark.sample, flux_cube_sample)
+    assert_allclose(hist_lyr.layer.data['x'], flux_cube_sample)
 
     # change viewer limits
     fv = cubeviz_helper.app.get_viewer('flux-viewer')
     fv.state.x_max = 0.5 * fv.state.x_max
     # viewer limits should not be affected by default
-    assert_allclose(hist_mark.sample, flux_cube_sample)
+    # (re-retrieve layer - it should not have changed)
+    hist_lyr = po.stretch_histogram.layers['histogram']
+    assert_allclose(hist_lyr.layer.data['x'], flux_cube_sample)
 
     # set to listen to viewer limits, the length of the samples will change
+    # (in this case the layer itself has been replaced)
     po.stretch_hist_zoom_limits = True
-    assert len(hist_mark.sample) != len(flux_cube_sample)
+    hist_lyr = po.stretch_histogram.layers['histogram']
+    assert len(hist_lyr.layer.data['x']) != len(flux_cube_sample)
 
     po.stretch_vmin.value = 0.5
     po.stretch_vmax.value = 1
@@ -98,20 +102,17 @@ def test_stretch_histogram(cubeviz_helper, spectrum1d_cube_with_uncerts):
     assert po.stretch_histogram.marks['vmin'].x[0] == po.stretch_vmin.value
     assert po.stretch_histogram.marks['vmax'].x[0] == po.stretch_vmax.value
 
-    assert hist_mark.bins == 25
+    assert po.stretch_histogram.viewer.state.hist_n_bin == 25
     po.stretch_hist_nbins = 20
-    assert hist_mark.bins == 20
+    assert po.stretch_histogram.viewer.state.hist_n_bin == 20
 
-    po.set_histogram_x_limits(x_min=0.25, x_max=2)
-    assert po.stretch_histogram.figure.axes[0].scale.min == 0.25
-    assert po.stretch_histogram.figure.axes[0].scale.max == 2
+    po.set_histogram_limits(x_min=0.25, x_max=2)
+    assert po.stretch_histogram.viewer.state.x_min == 0.25
+    assert po.stretch_histogram.viewer.state.x_max == 2
 
-    po.set_histogram_y_limits(y_min=1, y_max=2)
-    assert po.stretch_histogram.figure.axes[1].scale.min == 1
-    assert po.stretch_histogram.figure.axes[1].scale.max == 2
-
-    po.stretch_vmin.value = hist_mark.min - 1
-    po.stretch_vmax.value = hist_mark.max + 1
+    po.set_histogram_limits(y_min=1, y_max=2)
+    assert po.stretch_histogram.viewer.state.y_min == 1
+    assert po.stretch_histogram.viewer.state.y_max == 2
 
     assert po.stretch_histogram.marks['vmin'].x[0] == po.stretch_vmin.value
     assert po.stretch_histogram.marks['vmax'].x[0] == po.stretch_vmax.value
diff --git a/jdaviz/configs/imviz/plugins/aper_phot_simple/aper_phot_simple.py b/jdaviz/configs/imviz/plugins/aper_phot_simple/aper_phot_simple.py
index a516e10bb6..71b15347aa 100644
--- a/jdaviz/configs/imviz/plugins/aper_phot_simple/aper_phot_simple.py
+++ b/jdaviz/configs/imviz/plugins/aper_phot_simple/aper_phot_simple.py
@@ -105,9 +105,10 @@ def __init__(self, *args, **kwargs):
         self.current_plot_type = self.plot_types[0]
         self._fitted_model_name = 'phot_radial_profile'
 
-        self.plot.add_line('line', color='gray', marker_size=32)
-        self.plot.add_scatter('scatter', color='gray', default_size=1)
-        self.plot.add_line('fit_line', color='magenta', line_style='dashed')
+        # override default plot styling
+        self.plot.figure.fig_margin = {'top': 60, 'bottom': 60, 'left': 65, 'right': 15}
+        self.plot.viewer.axis_y.tick_format = '0.2e'
+        self.plot.viewer.axis_y.label_offset = '55px'
 
         self.session.hub.subscribe(self, SubsetUpdateMessage, handler=self._on_subset_update)
         self.session.hub.subscribe(self, LinkUpdatedMessage, handler=self._on_link_update)
@@ -479,17 +480,14 @@ def calculate_photometry(self, dataset=None, aperture=None, background=None,
 
         # Plots.
         if update_plots:
-            line = self.plot.marks['line']
-            sc = self.plot.marks['scatter']
-            fit_line = self.plot.marks['fit_line']
-
             if self.current_plot_type == "Curve of Growth":
                 self.plot.figure.title = 'Curve of growth from aperture center'
                 x_arr, sum_arr, x_label, y_label = _curve_of_growth(
                     comp_data, (xcenter, ycenter), aperture, phot_table['sum'][0],
                     wcs=data.coords, background=bg, pixarea_fac=pixarea_fac)
-                line.x, line.y = x_arr, sum_arr
-                self.plot.clear_marks('scatter', 'fit_line')
+                self.plot._update_data('profile', x=x_arr, y=sum_arr, reset_lims=True)
+                self.plot.update_style('profile', line_visible=True, color='gray', size=32)
+                self.plot.update_style('fit', visible=False)
                 self.plot.figure.axes[0].label = x_label
                 self.plot.figure.axes[1].label = y_label
 
@@ -502,8 +500,8 @@ def calculate_photometry(self, dataset=None, aperture=None, background=None,
                     x_data, y_data = _radial_profile(
                         phot_aperstats.data_cutout, phot_aperstats.bbox, (xcenter, ycenter),
                         raw=False)
-                    line.x, line.y = x_data, y_data
-                    self.plot.clear_marks('scatter')
+                    self.plot._update_data('profile', x=x_data, y=y_data, reset_lims=True)
+                    self.plot.update_style('profile', line_visible=True, color='gray', size=32)
 
                 else:  # Radial Profile (Raw)
                     self.plot.figure.title = 'Raw radial profile from aperture center'
@@ -511,8 +509,8 @@ def calculate_photometry(self, dataset=None, aperture=None, background=None,
                         phot_aperstats.data_cutout, phot_aperstats.bbox, (xcenter, ycenter),
                         raw=True)
 
-                    sc.x, sc.y = x_data, y_data
-                    self.plot.clear_marks('line')
+                    self.plot._update_data('profile', x=x_data, y=y_data, reset_lims=True)
+                    self.plot.update_style('profile', line_visible=False, color='gray', size=10)
 
                 # Fit Gaussian1D to radial profile data.
                 if self.fit_radial_profile:
@@ -538,9 +536,11 @@ def calculate_photometry(self, dataset=None, aperture=None, background=None,
                             f"Radial profile fitting: {msg}", color='warning', sender=self))
                     y_fit = fit_model(x_data)
                     self.app.fitted_models[self._fitted_model_name] = fit_model
-                    fit_line.x, fit_line.y = x_data, y_fit
+                    self.plot._update_data('fit', x=x_data, y=y_fit, reset_lims=True)
+                    self.plot.update_style('fit', color='magenta',
+                                           markers_visible=False, line_visible=True)
                 else:
-                    self.plot.clear_marks('fit_line')
+                    self.plot.update_style('fit', visible=False)
 
         # Parse results for GUI.
         tmp = []
@@ -566,6 +566,30 @@ def calculate_photometry(self, dataset=None, aperture=None, background=None,
             else:
                 tmp.append({'function': key, 'result': str(x)})
 
+            # Parse results for GUI.
+            tmp = []
+            for key in phot_table.colnames:
+                if key in ('id', 'data_label', 'subset_label', 'background', 'pixarea_tot',
+                           'counts_fac', 'aperture_sum_counts_err', 'flux_scaling', 'timestamp'):
+                    continue
+                x = phot_table[key][0]
+                if (isinstance(x, (int, float, u.Quantity)) and
+                        key not in ('xcenter', 'ycenter', 'sky_center', 'sum_aper_area',
+                                    'aperture_sum_counts', 'aperture_sum_mag')):
+                    tmp.append({'function': key, 'result': f'{x:.4e}'})
+                elif key == 'sky_center' and x is not None:
+                    tmp.append({'function': 'RA center', 'result': f'{x.ra.deg:.6f} deg'})
+                    tmp.append({'function': 'Dec center', 'result': f'{x.dec.deg:.6f} deg'})
+                elif key in ('xcenter', 'ycenter', 'sum_aper_area'):
+                    tmp.append({'function': key, 'result': f'{x:.1f}'})
+                elif key == 'aperture_sum_counts' and x is not None:
+                    tmp.append({'function': key, 'result':
+                                f'{x:.4e} ({phot_table["aperture_sum_counts_err"][0]:.4e})'})
+                elif key == 'aperture_sum_mag' and x is not None:
+                    tmp.append({'function': key, 'result': f'{x:.3f}'})
+                else:
+                    tmp.append({'function': key, 'result': str(x)})
+
         if update_plots:
             # Also display fit results
             fit_tmp = []
diff --git a/jdaviz/configs/imviz/plugins/line_profile_xy/line_profile_xy.py b/jdaviz/configs/imviz/plugins/line_profile_xy/line_profile_xy.py
index 26cd2febcc..0d0538aaf0 100644
--- a/jdaviz/configs/imviz/plugins/line_profile_xy/line_profile_xy.py
+++ b/jdaviz/configs/imviz/plugins/line_profile_xy/line_profile_xy.py
@@ -25,19 +25,22 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         self.plot_across_x = Plot(self)
-        self.plot_across_x.add_line('line', color='gray')
-        self.plot_across_x.figure.axes[0].label = 'Y (pix)'
-        self.plot_across_x_widget = 'IPY_MODEL_'+self.plot_across_x.model_id
-
         self.plot_across_y = Plot(self)
-        self.plot_across_y.add_line('line', color='gray')
-        self.plot_across_y.figure.axes[0].label = 'X (pix)'
+        for plot in (self.plot_across_x, self.plot_across_y):
+            # override default styling
+            plot.figure.fig_margin = {'top': 60, 'bottom': 60, 'left': 65, 'right': 15}
+            plot.viewer.axis_x.num_ticks = 5
+            plot.viewer.axis_y.tick_format = '0.2e'
+            plot.viewer.axis_y.label_offset = '55px'
+
+        self.plot_across_x_widget = 'IPY_MODEL_'+self.plot_across_x.model_id
         self.plot_across_y_widget = 'IPY_MODEL_'+self.plot_across_y.model_id
 
         self.hub.subscribe(self, ViewerAddedMessage, handler=self._on_viewer_added)
 
     def reset_results(self):
         self.plot_available = False
+        self.plot_across_x.update_style('line', visible=False)
         self.plot_across_x.clear_all_marks()
         self.plot_across_y.clear_all_marks()
 
@@ -105,44 +108,46 @@ def vue_draw_plot(self, msg={}):
             self.reset_results()
             return
 
-        xy_limits = viewer._get_zoom_limits(data)
-        x_limits = xy_limits[:, 0]
-        y_limits = xy_limits[:, 1]
-        x_min = x_limits.min()
-        x_max = x_limits.max()
-        y_min = y_limits.min()
-        y_max = y_limits.max()
-
         comp = data.get_component(data.main_components[0])
         if comp.units:
             y_label = comp.units
         else:
             y_label = 'Value'
 
-        self.plot_across_x.figure.title = f'X={x}'
-        line_x = self.plot_across_x.marks['line']
-        line_x.x, line_x.y = range(comp.data.shape[0]), comp.data[:, x]
-        line_x.scales['x'].min, line_x.scales['x'].max = y_min, y_max
-        self.plot_across_x.figure.axes[1].label = y_label
+        xy_limits = viewer._get_zoom_limits(data)
+        x_limits = xy_limits[:, 0]
+        y_limits = xy_limits[:, 1]
+        x_min = max(int(x_limits.min()), 0)
+        x_max = min(int(x_limits.max()), nx)
+        y_min = max(int(y_limits.min()), 0)
+        y_max = min(int(y_limits.max()), ny)
 
-        y_min = max(int(y_min), 0)
-        y_max = min(int(y_max), ny)
+        self.plot_across_x.figure.title = f'X={x}'
+        self.plot_across_x._update_data('line', x=range(comp.data.shape[0]), y=comp.data[:, x],
+                                        reset_lims=False)
         zoomed_data_x = comp.data[y_min:y_max, x]
         if zoomed_data_x.size > 0:
-            line_x.scales['y'].min = zoomed_data_x.min() * 0.95
-            line_x.scales['y'].max = zoomed_data_x.max() * 1.05
+            self.plot_across_x.set_lims(x_min=y_min,
+                                        x_max=y_max,
+                                        y_min=zoomed_data_x.min() * 0.95,
+                                        y_max=zoomed_data_x.max() * 1.05)
+        self.plot_across_x.update_style('line', line_visible=True,
+                                        markers_visible=False, color='gray', size=10)
+        self.plot_across_x.viewer.axis_x.label = 'Y (pix)'
+        self.plot_across_x.viewer.axis_y.label = y_label
 
         self.plot_across_y.figure.title = f'Y={y}'
-        line_y = self.plot_across_y.marks['line']
-        line_y.x, line_y.y = range(comp.data.shape[1]), comp.data[y, :]
-        line_y.scales['x'].min, line_y.scales['x'].max = x_min, x_max
-        self.plot_across_y.figure.axes[1].label = y_label
-
-        x_min = max(int(x_min), 0)
-        x_max = min(int(x_max), nx)
+        self.plot_across_y._update_data('line', x=range(comp.data.shape[1]), y=comp.data[y, :],
+                                        reset_lims=False)
         zoomed_data_y = comp.data[y, x_min:x_max]
         if zoomed_data_y.size > 0:
-            line_y.scales['y'].min = zoomed_data_y.min() * 0.95
-            line_y.scales['y'].max = zoomed_data_y.max() * 1.05
+            self.plot_across_y.set_lims(x_min=x_min,
+                                        x_max=x_max,
+                                        y_min=zoomed_data_y.min() * 0.95,
+                                        y_max=zoomed_data_y.max() * 1.05)
+        self.plot_across_y.update_style('line', line_visible=True,
+                                        markers_visible=False, color='gray', size=10)
+        self.plot_across_y.viewer.axis_x.label = 'X (pix)'
+        self.plot_across_y.viewer.axis_y.label = y_label
 
         self.plot_available = True
diff --git a/jdaviz/configs/imviz/tests/test_line_profile_xy.py b/jdaviz/configs/imviz/tests/test_line_profile_xy.py
index 634d61aee8..b8737a337b 100644
--- a/jdaviz/configs/imviz/tests/test_line_profile_xy.py
+++ b/jdaviz/configs/imviz/tests/test_line_profile_xy.py
@@ -16,8 +16,7 @@ def test_plugin_linked_by_pixel(self):
         assert lp_plugin.viewer_selected == 'imviz-0'
 
         # Plot attempt with null X/Y should not crash but also no-op.
-        assert len(lp_plugin.plot_across_x.marks['line'].x) == 0
-        assert len(lp_plugin.plot_across_y.marks['line'].x) == 0
+        assert 'line' not in lp_plugin.plot_across_x.layers
         lp_plugin.vue_draw_plot()
         assert not lp_plugin.plot_available
 
@@ -27,8 +26,8 @@ def test_plugin_linked_by_pixel(self):
                                         'domain': {'x': 5.1, 'y': 5}})
         assert_allclose(lp_plugin.selected_x, 5.1)
         assert_allclose(lp_plugin.selected_y, 5)
-        assert len(lp_plugin.plot_across_x.marks['line'].x) > 0
-        assert len(lp_plugin.plot_across_y.marks['line'].x) > 0
+        assert len(lp_plugin.plot_across_x.layers['line'].layer.data['x']) > 0
+        assert len(lp_plugin.plot_across_y.layers['line'].layer.data['x']) > 0
         assert lp_plugin.plot_available
 
         # Add data with unit
@@ -46,23 +45,24 @@ def test_plugin_linked_by_pixel(self):
         assert lp_plugin.viewer_selected == 'imviz-1'
         assert_allclose(lp_plugin.selected_x, 5.1)
         assert_allclose(lp_plugin.selected_y, 5)
-        assert len(lp_plugin.plot_across_x.marks['line'].x) > 0
-        assert len(lp_plugin.plot_across_y.marks['line'].x) > 0
+        assert lp_plugin.plot_across_x.layers['line'].visible
+        assert len(lp_plugin.plot_across_x.layers['line'].layer.data['x']) > 0
+        assert len(lp_plugin.plot_across_y.layers['line'].layer.data['x']) > 0
         assert lp_plugin.plot_available
 
         # Wrong input resets plots without error.
         lp_plugin.selected_x = -1
         lp_plugin.vue_draw_plot()
-        assert len(lp_plugin.plot_across_x.marks['line'].x) == 0
-        assert len(lp_plugin.plot_across_y.marks['line'].x) == 0
+        assert 'line' not in lp_plugin.plot_across_x.layers
         assert not lp_plugin.plot_available
 
         # Mimic manual GUI inputs.
         lp_plugin.selected_x = '1.1'
         lp_plugin.selected_y = '9'
         lp_plugin.viewer_selected = 'imviz-0'
-        assert len(lp_plugin.plot_across_x.marks['line'].x) > 0
-        assert len(lp_plugin.plot_across_y.marks['line'].x) > 0
+        assert lp_plugin.plot_across_x.layers['line'].visible
+        assert len(lp_plugin.plot_across_x.layers['line'].layer.data['x']) > 0
+        assert len(lp_plugin.plot_across_y.layers['line'].layer.data['x']) > 0
         assert lp_plugin.plot_available
 
         # Nothing should update on "l" when plugin closed.
diff --git a/jdaviz/configs/imviz/tests/test_simple_aper_phot.py b/jdaviz/configs/imviz/tests/test_simple_aper_phot.py
index 024827f74d..c029ad19cf 100644
--- a/jdaviz/configs/imviz/tests/test_simple_aper_phot.py
+++ b/jdaviz/configs/imviz/tests/test_simple_aper_phot.py
@@ -64,7 +64,7 @@ def test_plugin_wcs_dithered(self):
         tbl = self.imviz.get_aperture_photometry_results()
         assert len(tbl) == 2
         assert phot_plugin.plot_available
-        assert len(phot_plugin.plot.marks['scatter'].x) > 0
+        assert len(phot_plugin.plot.layers['profile'].layer.data['x']) > 0
 
         # Check photometry results.
         assert tbl.colnames == [
diff --git a/jdaviz/core/template_mixin.py b/jdaviz/core/template_mixin.py
index 6cfff06037..8d53cb70d9 100644
--- a/jdaviz/core/template_mixin.py
+++ b/jdaviz/core/template_mixin.py
@@ -10,17 +10,22 @@
 import threading
 import time
 
+from echo import delay_callback
 from functools import cached_property
 from ipyvuetify import VuetifyTemplate
 from glue.config import colormaps
-from glue.core import HubListener
+from glue.core import Data, HubListener
+from glue.core.link_helpers import LinkSame
 from glue.core.message import (DataCollectionAddMessage,
                                DataCollectionDeleteMessage,
                                SubsetCreateMessage,
                                SubsetDeleteMessage,
                                SubsetUpdateMessage)
 from glue.core.roi import CircularAnnulusROI
+from glue_jupyter import jglue
+from glue_jupyter.bqplot.histogram import BqplotHistogramView
 from glue_jupyter.bqplot.image import BqplotImageView
+from glue_jupyter.registries import viewer_registry
 from glue_jupyter.widgets.linked_dropdown import get_choices as _get_glue_choices
 from specutils import Spectrum1D
 from traitlets import Any, Bool, HasTraits, List, Unicode, observe
@@ -29,6 +34,7 @@
 from ipypopout import PopoutButton
 
 from jdaviz import __version__
+from jdaviz.components.toolbar_nested import NestedJupyterToolbar
 from jdaviz.core.events import (AddDataMessage, RemoveDataMessage,
                                 ViewerAddedMessage, ViewerRemovedMessage,
                                 ViewerRenamedMessage, SnackbarMessage)
@@ -60,6 +66,14 @@
 SPATIAL_DEFAULT_TEXT = "Entire Cube"
 GLUE_STATES_WITH_HELPERS = ('size_att', 'cmap_att')
 
+# this histogram viewer (along with other viewers) are not in the glue viewer-registry by default
+# but may be added in the future.  If it is not in the registry, we'll add it now.  If/once the
+# min-pin of glue-jupyter includes this in the registry, we can safely remove this block.
+if 'histogram' not in viewer_registry.members.keys():
+    @viewer_registry('histogram')
+    class RegisteredHistogramViewer(BqplotHistogramView):
+        pass
+
 
 def show_widget(widget, loc, title):  # pragma: no cover
     from IPython import get_ipython
@@ -3253,20 +3267,137 @@ class Plot(PluginSubcomponent):
     template_file = __file__, "../components/plugin_plot.vue"
 
     figure = Any().tag(sync=True, **widget_serialization)
-
-    def __init__(self, plugin, *args, **kwargs):
+    toolbar = Any().tag(sync=True, **widget_serialization)
+    tools_nested = [
+                    ['jdaviz:homezoom', 'jdaviz:prevzoom'],
+                    ['jdaviz:boxzoom', 'jdaviz:xrangezoom', 'jdaviz:yrangezoom'],
+                    ['jdaviz:panzoom', 'jdaviz:panzoom_x', 'jdaviz:panzoom_y'],
+                ]
+
+    def __init__(self, plugin, viewer_type='scatter', app=None, *args, **kwargs):
         super().__init__(plugin, 'Plot', *args, **kwargs)
-        self.figure = bqplot.Figure()
+        if app is None:
+            app = jglue()
+
+        self._app = app
+        self.viewer = app.new_data_viewer(viewer_type, show=False)
+        self._viewer_type = viewer_type
+        if viewer_type == 'histogram':
+            self._viewer_components = ('x',)
+        else:
+            self._viewer_components = ('x', 'y')
+        self.figure = self.viewer.figure
         self._marks = {}
 
-        self.figure.axes = [bqplot.Axis(scale=bqplot.LinearScale(), label='x'),
-                            bqplot.Axis(scale=bqplot.LinearScale(),
-                                        orientation='vertical', label='y')]
-
         self.figure.title_style = {'font-size': '12px'}
-        self.figure.fig_margin = {'top': 60, 'bottom': 60, 'left': 40, 'right': 10}
+        self.figure.fig_margin = {'top': 60, 'bottom': 60, 'left': 60, 'right': 10}
+
+        self.toolbar = NestedJupyterToolbar(self.viewer, self.tools_nested, [])
+
+    @property
+    def app(self):
+        return self._app
 
-        plugin.bqplot_figs_resize += [self.figure]
+    @property
+    def layers(self):
+        return {layer.layer.label: layer for layer in self.viewer.layers}
+
+    def _check_valid_components(self, **kwargs):
+        for k, v in kwargs.items():
+            if k not in self._viewer_components:
+                raise ValueError(f"{k} is not one of {self._viewer_components}")
+            if self._viewer_type == 'histogram' and len(v) <= 1:
+                # temporary guardrails for segfault
+                # https://github.com/astrofrog/fast-histogram/issues/60
+                raise ValueError("histogram requires data entries with length > 1")
+
+    def _remove_data(self, label):
+        dc_entry = self.app.data_collection[label]
+        self.viewer.remove_data(dc_entry)
+        self.app.data_collection.remove(dc_entry)
+
+    def _update_data(self, label, reset_lims=False, **kwargs):
+        self._check_valid_components(**kwargs)
+        if label not in self.app.data_collection:
+            self._add_data(label, **kwargs)
+            return
+        data = self.app.data_collection[label]
+
+        # if not provided, fallback on existing data
+        length_mismatch = False
+        for component in self._viewer_components:
+            kwargs.setdefault(component, data[component])
+            if len(kwargs[component]) != len(data[component]):
+                length_mismatch = True
+
+        if not length_mismatch:
+            # then we can update the existing entry
+            components = {c.label: c for c in data.components}
+            data.update_components({components[comp]: kwargs[comp]
+                                    for comp in self._viewer_components})
+        else:
+            # then we need to replace the existing entry, restoring any existing styles,
+            # if they exist
+            if label in self.layers.keys():
+                style_state = self.layers[label].state.as_dict()
+            else:
+                style_state = {}
+            self._remove_data(label)
+            self._add_data(label, **kwargs)
+            self.update_style(label, **style_state)
+        if reset_lims:
+            self.viewer.state.reset_limits()
+
+    def update_style(self, label, **kwargs):
+        kwargs.setdefault('visible', True)
+        if label not in self.layers.keys():
+            if not kwargs['visible']:
+                # then we were only trying to hide anyways
+                # (note: this ignores any other passed styles)
+                return
+        dc_entry = self.app.data_collection[label]
+        if kwargs['visible']:
+            if label not in self.layers.keys():
+                self.viewer.add_data(dc_entry)
+        else:
+            # remove from viewer, leave in app (note: this will clear style options)
+            # NOTE: if we want to keep styles, we could skip this and only toggle visibilities,
+            # but then the zooming logic will need to be updated to account for visibility
+            # states and the if not kwargs['visible'] check above to return should ensure no
+            # style options are passed
+            self.viewer.remove_data(dc_entry)
+            return
+
+        lyr = self.layers[label]
+        with delay_callback(lyr.state, *list(kwargs.keys())):
+            for k, v in kwargs.items():
+                if k == 'layer' or k.endswith('_att'):
+                    continue
+                setattr(lyr.state, k, v)
+
+    def _add_data(self, label, **kwargs):
+        self._check_valid_components(**kwargs)
+        data = Data(label=label, **kwargs)
+        dc = self.app.data_collection
+        dc.append(data)
+        dc_entry = dc[label]
+
+        if len(dc) > 1:
+            # we can assume the same units/components since this only accepts x and y
+            ref_data = dc[0]
+            links = [LinkSame(dc_entry.components[i], ref_data.components[i])
+                     for i in range(1, len(ref_data.components))]
+            dc.add_link(links)
+        self.viewer.add_data(dc_entry)
+
+    def _refresh_marks(self):
+        # ensure all marks are drawn
+        # NOTE: this seems to only be necessary for histogram viewers and may be an upstream bug
+        # if that is fixed upstream, we should test to see if we can safely remove this method
+        # and all calls to it
+        other_marks = list(self.marks.values())
+        layer_marks = [m for m in self.figure.marks if m not in other_marks]
+        self.figure.marks = layer_marks + other_marks
 
     @property
     def marks(self):
@@ -3315,21 +3446,16 @@ def add_bins(self, label, sample=[0], bins=2, density=True, **kwargs):
                               colors=kwargs.pop('color', kwargs.pop('colors', 'gray')),
                               **kwargs)
 
-    def set_xlims(self, x_min=None, x_max=None):
-        ax = self.figure.axes[0]
-        if x_min is None:
-            x_min = ax.scale.min
-        if x_max is None:
-            x_max = ax.scale.max
-        ax.scale.min, ax.scale.max = x_min, x_max
-
-    def set_ylims(self, y_min=None, y_max=None):
-        ax = self.figure.axes[1]
-        if y_min is None:
-            y_min = ax.scale.min
-        if y_max is None:
-            y_max = ax.scale.max
-        ax.scale.min, ax.scale.max = y_min, y_max
+    def set_lims(self, x_min=None, x_max=None, y_min=None, y_max=None):
+        with delay_callback(self.viewer.state, 'x_min', 'x_max', 'y_min', 'y_max'):
+            if x_min is not None:
+                self.viewer.state.x_min = x_min
+            if x_max is not None:
+                self.viewer.state.x_max = x_max
+            if y_min is not None:
+                self.viewer.state.y_min = y_min
+            if y_max is not None:
+                self.viewer.state.y_max = y_max
 
 
 class PlotMixin(VuetifyTemplate, HubListener):
diff --git a/pyproject.toml b/pyproject.toml
index dfc708a4cc..f108e51447 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,7 +13,7 @@ dependencies = [
     "bqplot>=0.12.37",
     "bqplot-image-gl>=1.4.11",
     "glue-core>=1.11",
-    "glue-jupyter>=0.18",
+    "glue-jupyter>=0.19",
     "echo>=0.5.0",
     "ipykernel>=6.19.4",
     "ipyvue>=1.6",