vidavis 0.0.13__py3-none-any.whl → 0.0.15__py3-none-any.whl

vidavis/plot/ms_plot/_raster_plot.py

@@ -2,8 +2,6 @@
 Class to create a raster plot of visibility/spectrum data using plot parameters.
 '''
 
-import holoviews as hv
-
 # hvPlot extensions used to plot xarray DataArray and pandas DataFrame
 # pylint: disable=unused-import
 import hvplot.xarray
@@ -120,10 +118,8 @@ class RasterPlot:
         if is_gui: # update data range for colorbar
             self._plot_params['data']['data_range'] = (xda.min().values.item(), xda.max().values.item())
 
-        # Make Overlay plot with hover tools
-        return (flagged_plot * unflagged_plot).opts(
-            hv.opts.QuadMesh(tools=['hover'])
-        )
+        # Make Overlay plot
+        return flagged_plot * unflagged_plot
 
     def _get_plot_title(self, data, plot_inputs, ms_name):
         ''' Form string containing ms name and selected values using data (xArray Dataset) '''

vidavis/plot/ms_plot/_raster_plot_gui.py

@@ -2,28 +2,31 @@
     Create interactive GUI for ms raster plotting
 '''
 
-import holoviews as hv
 import panel as pn
 from vidavis.plot.ms_plot._ms_plot_selectors import (file_selector, title_selector, style_selector,
     axis_selector, aggregation_selector, iteration_selector, selection_selector, plot_starter)
 
-def create_raster_gui(callbacks, data_dims, x_axis, y_axis):
-    ''' Use Holoviz Panel to create a dashboard for plot inputs and raster plot display. '''
+def create_raster_gui(callbacks, plot_info, empty_plot):
+    ''' Use Holoviz Panel to create a dashboard for plot inputs and raster plot display.
+        ms (str): path to MS, if set
+        plot_info (dict): with keys 'ms', 'data_dims', 'x_axis', 'y_axis'
+        empty_plot (hv.Overlay): QuadMesh overlay plot with no data
+    '''
     # Accordion of widgets for plot inputs
-    selectors = get_plot_input_selectors(callbacks, data_dims, x_axis, y_axis)
+    selectors = get_plot_input_selectors(callbacks, plot_info)
 
     # Plot button and spinner while plotting
-    init_plot = plot_starter(callbacks['plot_updating'])
+    init_plot = plot_starter(callbacks['update_plot'])
 
     # Dynamic map for plot, with callback when inputs change or location needed
-    dmap, points = get_plot_dmap(callbacks, selectors, init_plot)
+    #dmap, points = get_plot_dmap(callbacks, selectors, init_plot)
 
     return pn.Row(
         pn.Tabs(             # Row [0]
             ('Plot',                                 # Tabs[0]
                 pn.Column(
-                    dmap * points,  # [0] plot with hv.Points overlay for point_draw
-                    pn.WidgetBox(), # [1] cursor location
+                    pn.pane.HoloViews(empty_plot), # [0] plot
+                    pn.WidgetBox(),                # [1] cursor location
                 )
             ),
             ('Plot Inputs', pn.Column()),            # Tabs[1]
@@ -43,21 +46,22 @@ def create_raster_gui(callbacks, data_dims, x_axis, y_axis):
         sizing_mode='stretch_height',
     )
 
-def get_plot_input_selectors(callbacks, data_dims, x_axis, y_axis):
+def get_plot_input_selectors(callbacks, plot_info):
     ''' Create accordion of widgets for plot inputs selection '''
     # Select MS
-    file_selectors = file_selector('Path to MeasurementSet (ms or zarr) for plot', '~' , callbacks['filename'])
+    file_selectors = file_selector(callbacks, plot_info['ms'])
 
     # Select style - colormaps, colorbar, color limits
     style_selectors = style_selector(callbacks['style'], callbacks['color'])
 
     # Select x, y, and vis axis
-    axis_selectors = axis_selector(x_axis, y_axis, data_dims, True, callbacks['axes'])
+    axis_selectors = axis_selector(plot_info, True, callbacks['axes'])
 
     # Select from ProcessingSet and MeasurementSet
     selection_selectors = selection_selector(callbacks['select_ps'], callbacks['select_ms'])
 
     # Generic axis options, updated when ms is set
+    data_dims = plot_info['data_dims'] if 'data_dims' in plot_info else None
     axis_options = data_dims if data_dims else []
 
     # Select aggregator and axes to aggregate
@@ -81,25 +85,3 @@ def get_plot_input_selectors(callbacks, data_dims, x_axis, y_axis):
     )
     selectors.toggle = True
     return selectors
-
-def get_plot_dmap(callbacks, selectors, init_plot):
-    ''' Dynamic map for updating plot from callback function '''
-    # Connect plot to filename and plot button; add streams for cursor position, drawn points, and selected box
-    # 'update_plot' callback must have parameters (ms, do_plot, x, y, data, bounds)
-    points = hv.Points([]).opts(
-        size=5,
-        fill_color='white'
-    )
-    dmap = hv.DynamicMap(
-        pn.bind(
-            callbacks['update_plot'],
-            ms=selectors[0][0][0],
-            do_plot=init_plot[0],
-        ),
-        streams=[
-            hv.streams.PointerXY(),              # cursor location (x, y)
-            hv.streams.PointDraw(source=points), # fixed cursor location (data)
-            hv.streams.BoundsXY()                # box location (bounds)
-        ]
-    )
-    return dmap, points

vidavis/plot/ms_plot/_raster_plot_inputs.py

@@ -0,0 +1,113 @@
+'''
+Class to check and hold inputs for raster plot.
+'''
+
+from vidavis.plot.ms_plot._check_raster_inputs import check_inputs
+
+class RasterPlotInputs:
+    '''
+        Class to set inputs for raster plots from MsRaster functions or GUI.
+    '''
+
+    def __init__(self):
+        self._plot_inputs = {'selection': {}}
+
+    def get_inputs(self):
+        ''' Getter for stored plot inputs '''
+        return self._plot_inputs
+
+    def get_input(self, name):
+        ''' Getter for stored plot input by name '''
+        try:
+            return self._plot_inputs[name]
+        except KeyError:
+            return None
+
+    def set_input(self, name, value):
+        ''' Set plot input by name and value '''
+        self._plot_inputs[name] = value
+        if name == 'selection' and 'data_group_name' in value:
+            self._plot_inputs['data_group'] = value['data_group_name']
+
+    def set_selection(self, selection):
+        ''' Add selection dict to existing selection in plot inputs '''
+        self._plot_inputs['selection'] |= selection
+        if 'data_group_name' in selection:
+            self._plot_inputs['data_group'] = selection['data_group_name']
+
+    def get_selection(self, key):
+        ''' Return value for selection key '''
+        try:
+            return self.get_input('selection')[key]
+        except KeyError:
+            return None
+
+    def set_inputs(self, plot_inputs):
+        ''' Setter for storing plot inputs from MsRaster.plot() '''
+        check_inputs(plot_inputs)
+        for key, val in plot_inputs.items():
+            self._plot_inputs[key] = val
+
+    def remove_input(self, name):
+        ''' Remove plot input with name, if it exists '''
+        if name == 'selection':
+            self._plot_inputs['selection'] = {}
+        else:
+            try:
+                del self._plot_inputs[name]
+            except KeyError:
+                pass
+
+    def check_inputs(self):
+        ''' Check input values are valid, adjust for data dims '''
+        check_inputs(self._plot_inputs)
+
+    def is_layout(self):
+        ''' Determine if plot is a layout using plot inputs '''
+        # Check if subplots is a layout
+        subplots = self.get_input('subplots')
+        if subplots is None or subplots == (1, 1):
+            return False
+
+        # Subplots is a layout, check if multi plot
+        if not self.get_input('clear_plots'):
+            return True
+
+        # Check if iteration set and iter_range more than one plot
+        iter_length = 0
+        if self.get_input('iter_axis') is not None:
+            iter_range = self.get_input('iter_range')
+            if iter_range is None or iter_range[1] == -1:
+                iter_range = self.get_input('auto_iter_range')
+            iter_length = len(range(iter_range[0], iter_range[1] + 1))
+        return iter_length > 1
+
+    #--------------
+    # GUI CALLBACKS
+    #--------------
+
+    def set_color_inputs(self, color_mode, color_range):
+        ''' Set style params from gui '''
+        color_mode = color_mode.split()[0]
+        color_mode = None if color_mode == 'No' else color_mode
+        self.set_input('color_mode', color_mode)
+        self.set_input('color_range', color_range)
+
+    def set_axis_inputs(self, x_axis, y_axis, vis_axis):
+        ''' Set plot axis inputs from gui '''
+        self.set_input('x_axis', x_axis)
+        self.set_input('y_axis', y_axis)
+        self.set_input('vis_axis', vis_axis)
+
+    def set_aggregation_inputs(self, aggregator, agg_axes):
+        ''' Set aggregation inputs from gui '''
+        aggregator = None if aggregator== 'None' else aggregator
+        self.set_input('aggregator', aggregator)
+        self.set_input('agg_axis', agg_axes) # ignored if aggregator not set
+
+    def set_iteration_inputs(self, iter_axis, iter_range, subplot_rows, subplot_columns):
+        ''' Set iteration inputs from gui '''
+        iter_axis = None if iter_axis == 'None' else iter_axis
+        self.set_input('iter_axis', iter_axis)
+        self.set_input('iter_range', iter_range)
+        self.set_input('subplots', (subplot_rows, subplot_columns))

{vidavis-0.0.13.dist-info → vidavis-0.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vidavis
-Version: 0.0.13
+Version: 0.0.15
 Summary: Radio astronomy visibility data visualization
 License: LGPL
 Author-email: Darrell Schiebel <darrell@schiebel.us>,Pam Harris <pharris@nrao.edu>

{vidavis-0.0.13.dist-info → vidavis-0.0.15.dist-info}/RECORD

@@ -1,7 +1,7 @@
 vidavis/LICENSE.rst,sha256=qzGpkvhDzf_MgF1PIn6rCmYPrcEhkfrBUchosLJj-U4,26371
 vidavis/__init__.py,sha256=FVM92yTXUplR7tVHiGao0Y3Hd80pRTrwVIYDLjzICws,1709
 vidavis/apps/__init__.py,sha256=ZQ5v1VFtjn3ztmuOHLOk5WbC1uLNIgL9rbHQ4v0zJwY,87
-vidavis/apps/_ms_raster.py,sha256=bWe7N7lbwNYzPl1n-_Y_qBErDddxVe8jnPRYqOxylSI,48397
+vidavis/apps/_ms_raster.py,sha256=wyY7WS9L4zPXtGMYt_v8dze4HP7xEUQrHUS7phMYTss,40972
 vidavis/bokeh/__init__.py,sha256=gdPPxBCe0enCSjvPFxkgMlhpVnAMFXKcw9GN28tVdXM,95
 vidavis/bokeh/_palette.py,sha256=gzfJHuUgqxd8hJpZe-gQPFTCPq9f5I8uLEkHAK5FNDM,2480
 vidavis/data/__init__.py,sha256=-RDRe0PYK6vPlhdRV2Dy1vGbnDGoXWDATmfxaR-gXcE,48
@@ -9,31 +9,32 @@ vidavis/data/measurement_set/__init__.py,sha256=7pnjaRYgQ88pydsMw1Z9sUiuO2udunRV
 vidavis/data/measurement_set/_ms_data.py,sha256=7ATsPbGFAv8WtWk_PRxlfoLdqapd6eMvnpYTgtdEDjE,7726
 vidavis/data/measurement_set/processing_set/__init__.py,sha256=TVQe5Nl4APCB2E1T1giAkOvSxg7OBNcOm9-BeZelY2Q,95
 vidavis/data/measurement_set/processing_set/_ps_concat.py,sha256=uTuxE7krTu6SS7lwV9ITMsAxJ4BJhKOU9dLlQ9L1oNY,3513
-vidavis/data/measurement_set/processing_set/_ps_coords.py,sha256=pdmojL-_55x3CjFcMIMuIqsI4ADG-TlLxc-RTgBQZC8,3640
+vidavis/data/measurement_set/processing_set/_ps_coords.py,sha256=SDp-0ebd94QjO_jPv00weiYmp-OD1XqsCzWvNc0D-94,3747
 vidavis/data/measurement_set/processing_set/_ps_data.py,sha256=2Ss3iUdyIgtMuMTpl9mAGt4K89zgDmRsoTjbjurpDmc,11353
 vidavis/data/measurement_set/processing_set/_ps_io.py,sha256=VeNi-s1hozgCAGAGHs4NUXtlVFwUh-mkqrY9iYWOfW4,1717
-vidavis/data/measurement_set/processing_set/_ps_raster_data.py,sha256=6mU_V68lvJvIktEuyE5tWlyj7GaRmOnkCWSjHXc5lWs,7249
-vidavis/data/measurement_set/processing_set/_ps_select.py,sha256=GhAPxZ5mwvmUhCqKETVkhecjbwfrtDAG7-ibM19GDg0,10831
+vidavis/data/measurement_set/processing_set/_ps_raster_data.py,sha256=m7d0qe5bS-XjGD_1mrpRn9dTobwG8WDidCmAaLP2TWQ,7378
+vidavis/data/measurement_set/processing_set/_ps_select.py,sha256=AtEsLy3bSHEyFUFKM-OO6_-YwUdWOWcGkXkEgFxMaEE,10859
 vidavis/data/measurement_set/processing_set/_ps_stats.py,sha256=4uLImKCANXLUM8jO8nFbBFMwfusS-JjsZ0ttbDFPrSE,8166
 vidavis/data/measurement_set/processing_set/_xds_data.py,sha256=qLO2VkLINkSAQ7CGRFmpWQYpHrP4XoJJkwA4pp9DO8M,5253
 vidavis/plot/__init__.py,sha256=thxe5vAGdpEiqoKPHLJoWUqKMVrUVx0ajpsGf5pVP98,95
 vidavis/plot/ms_plot/__init__.py,sha256=wY0_7gY9M6K1D6tKQsr89L_uSs3seJlD-uicx7dx5Mo,74
 vidavis/plot/ms_plot/_check_raster_inputs.py,sha256=a7u5wlDKTxWYW36-Xp3xd4c756SbYURdFkGHbUaX440,4786
-vidavis/plot/ms_plot/_locate_points.py,sha256=GvuS5kDhIYancc314ofLoYtoRhT_jagG8HpzchhdPds,7474
-vidavis/plot/ms_plot/_ms_plot.py,sha256=RShzvWzHq7iA9awuaWO8GiB1NkWuYkcNOMdToLWPnes,13246
+vidavis/plot/ms_plot/_locate_points.py,sha256=mWXGeUoXPLFdyxR2hCCAZkNtEhtPmZ39mm1-C92TPmE,10898
+vidavis/plot/ms_plot/_ms_plot.py,sha256=tpUWFto-tuSehj-aXHuvGJpdc9yq2m4bmt1EsSWkVjI,18865
 vidavis/plot/ms_plot/_ms_plot_constants.py,sha256=cX_TQhKJ3hJzPuRYmuRJxue1sjq82yl_ZN2_w6TshmI,930
-vidavis/plot/ms_plot/_ms_plot_selectors.py,sha256=BZQwARvMPdk78n6Rh2tOaSc8GenZBrxHZb14oFD9gJM,10785
-vidavis/plot/ms_plot/_plot_inputs.py,sha256=pZL63n9FHSoo9cntf7lppQj44nkpiwnCz6VH-9Oh6ho,671
-vidavis/plot/ms_plot/_raster_plot.py,sha256=lNa9i_eJ8F8Fc2zcHLRcaxKKOELk3x_QmXT__T76pg8,10999
-vidavis/plot/ms_plot/_raster_plot_gui.py,sha256=Kb0BLmkwtYHCqlVaSipbTTStst8RYggqwf1Wf5v8F4Q,4261
+vidavis/plot/ms_plot/_ms_plot_selectors.py,sha256=jBjthBjfXDf6W19HG8j8Pzxxzmnte5apeVDjsMy-dDg,11146
+vidavis/plot/ms_plot/_plot_inputs.py,sha256=GeErBB3pYz6ecJiMTGQMNXkPeMLbWbYGmqL5dr8A46Q,687
+vidavis/plot/ms_plot/_raster_plot.py,sha256=Uv0D-P7PyvcMBqFHqmbNxnDkUMekVok511WIvaA-JB0,10894
+vidavis/plot/ms_plot/_raster_plot_gui.py,sha256=3oEfZqOI3sgxfCQx9t3i679TffV2466-KBUrJ-m8uik,3546
+vidavis/plot/ms_plot/_raster_plot_inputs.py,sha256=kxR6-1Qn4IyQ4FjgpVZ9HEZ7EnPHxJZWomb0n_zaRwo,4071
 vidavis/plot/ms_plot/_time_ticks.py,sha256=j-DcPh7RfGE8iX2bPjLQDQPIbiAbmjiEWQnKmdMWA3I,1773
 vidavis/plot/ms_plot/_xds_plot_axes.py,sha256=EeWvAbiKV33nEWdI8V3M0uwLTnycq4bFYBOyVWkxCu0,4429
 vidavis/toolbox/__init__.py,sha256=jqFa-eziVz_frNnXxwjJFK36qNpz1H38s-VlpBcq-R8,1402
 vidavis/toolbox/_app_context.py,sha256=H7gtF8RrAH46FqDcMobv3KM1Osbnapgu6aTG-m3VCWA,3049
 vidavis/toolbox/_logging.py,sha256=OEisrd8FM8VTNBMc7neLh9ekelf29ZILYB5pScebly0,2739
 vidavis/toolbox/_static.py,sha256=HJLMtClppgOJXWAtV6Umn5EqN80u0oZiIouQ1JsB9PM,2346
-vidavis/__version__.py,sha256=6iFz7cldtJZlw_FSwnt97X1e8jfQ-fdVhcVMqnAiWh8,22
-vidavis-0.0.13.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-vidavis-0.0.13.dist-info/METADATA,sha256=7fBkDctO-V9veQD-m1BbnimzfHgH-PXvEvmhNE_7z3I,2238
-vidavis-0.0.13.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-vidavis-0.0.13.dist-info/RECORD,,
+vidavis/__version__.py,sha256=YtkQ0xJuRN_ZjjhJ2kXBIkzEenORzuw78h9h_vJ-MGY,22
+vidavis-0.0.15.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+vidavis-0.0.15.dist-info/METADATA,sha256=TmHASCjUzIjDPZzY8Mgce0h6p7Jg569JPfvXjfdpabA,2238
+vidavis-0.0.15.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+vidavis-0.0.15.dist-info/RECORD,,