vidavis 0.0.12__py3-none-any.whl → 0.0.14__py3-none-any.whl

vidavis/plot/ms_plot/_raster_plot_gui.py

@@ -9,9 +9,42 @@ from vidavis.plot.ms_plot._ms_plot_selectors import (file_selector, title_select
 
 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. '''
-    # ------------------
-    # PLOT INPUTS COLUMN
-    # ------------------
+    # Accordion of widgets for plot inputs
+    selectors = get_plot_input_selectors(callbacks, data_dims, x_axis, y_axis)
+
+    # Plot button and spinner while plotting
+    init_plot = plot_starter(callbacks['plot_updating'])
+
+    # Dynamic map for plot, with callback when inputs change or location needed
+    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
+                )
+            ),
+            ('Plot Inputs', pn.Column()),            # Tabs[1]
+            ('Locate Selected Points', pn.Column()), # Tabs[2]
+            ('Locate Selected Box', pn.Column()),    # Tabs[3]
+            sizing_mode='stretch_width',
+        ),
+        pn.Spacer(width=10), # Row [1]
+        pn.Column(  # Row [2]
+            pn.Spacer(height=25), # Column[0]
+            selectors,            # Column[1]
+            init_plot,            # Column[2]
+            width_policy='min',
+            width=400,
+            sizing_mode='stretch_height',
+        ),
+        sizing_mode='stretch_height',
+    )
+
+def get_plot_input_selectors(callbacks, data_dims, x_axis, y_axis):
+    ''' Create accordion of widgets for plot inputs selection '''
     # Select MS
     file_selectors = file_selector('Path to MeasurementSet (ms or zarr) for plot', '~' , callbacks['filename'])
 
@@ -47,50 +80,26 @@ def create_raster_gui(callbacks, data_dims, x_axis, y_axis):
         ("Plot title", title_input),             # [6]
     )
     selectors.toggle = True
+    return selectors
 
-    # Plot button and spinner while plotting
-    init_plot = plot_starter(callbacks['plot_updating'])
-
-    # ----------------------------------------
-    # PLOT WITH CURSOR POSITION AND BOX SELECT
-    # ----------------------------------------
-    # Connect plot to filename and plot button; add streams for cursor position and selected box
-    # 'update_plot' callback must have parameters (ms, do_plot, x, y, data)
+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=file_selectors[0][0],
+            ms=selectors[0][0][0],
             do_plot=init_plot[0],
         ),
         streams=[
-            hv.streams.PointerXY(), # cursor location (x, y)
-            hv.streams.BoundsXY()   # box location (bounds)
+            hv.streams.PointerXY(),              # cursor location (x, y)
+            hv.streams.PointDraw(source=points), # fixed cursor location (data)
+            hv.streams.BoundsXY()                # box location (bounds)
         ]
     )
-
-    # ----------------------------------------------
-    # GUI LAYOUT OF PLOT TABS AND PLOT INPUTS COLUMN
-    # ----------------------------------------------
-    return pn.Row(
-        pn.Tabs(             # Row [0]
-            ('Plot',
-                pn.Column(                # Tabs [0]
-                    dmap,           # [0]
-                    pn.WidgetBox(), # [1] cursor location
-                )
-            ),
-            ('Plot Inputs', pn.Column()),         # Tabs [1]
-            ('Locate Selected Box', pn.Column()), # Tabs [2]
-            sizing_mode='stretch_width',
-        ),
-        pn.Spacer(width=10), # Row [1]
-        pn.Column(  # Row [2]
-            pn.Spacer(height=25), # Column [0]
-            selectors,            # Column [1]
-            init_plot,            # Column [2]
-            width_policy='min',
-            width=400,
-            sizing_mode='stretch_height',
-        ),
-        sizing_mode='stretch_height',
-    )
+    return dmap, points

vidavis/plot/ms_plot/_raster_plot_inputs.py

@@ -1,107 +1,114 @@
 '''
-Check inputs to MsRaster plot() or its GUI
+Class to check and hold inputs for raster plot.
 '''
 
-from vidavis.plot.ms_plot._ms_plot_constants import VIS_AXIS_OPTIONS, AGGREGATOR_OPTIONS
-
-def check_inputs(inputs):
-    ''' Check plot input types, and axis input values. '''
-    _set_baseline_antenna_axis(inputs)
-    _check_axis_inputs(inputs)
-    _check_agg_inputs(inputs)
-    _check_color_inputs(inputs)
-    _check_other_inputs(inputs)
-
-def _set_baseline_antenna_axis(inputs):
-    ''' Set baseline axis to dimension in data_dims '''
-    if 'data_dims' not in inputs:
-        return
-
-    data_dims = inputs['data_dims']
-    baseline_dim = 'antenna_name' if 'antenna_name' in data_dims else 'baseline'
-
-    # Convert baseline axis to existing baseline dimension
-    baseline_dims = ['baseline', 'antenna_name']
-    for axis in ['x_axis', 'y_axis', 'iter_axis', 'agg_axis']:
-        if inputs[axis] in baseline_dims:
-            inputs[axis] = baseline_dim
-
-def _check_axis_inputs(inputs):
-    ''' Check x_axis, y_axis, vis_axis, and iter_axis inputs. '''
-    x_axis = inputs['x_axis']
-    y_axis = inputs['y_axis']
-    if x_axis == y_axis:
-        raise ValueError(f"Invalid parameter values: x_axis {x_axis} cannot be same as y_axis {y_axis}.")
-
-    iter_axis = inputs['iter_axis']
-    if iter_axis and iter_axis in (x_axis, y_axis):
-        raise ValueError(f"Invalid parameter value: iter_axis {iter_axis} cannot be x_axis ({x_axis}) or y_axis ({y_axis}).")
-
-    data_dims = inputs['data_dims'] if 'data_dims' in inputs else None
-    if data_dims:
-        if x_axis not in data_dims or y_axis not in data_dims:
-            raise ValueError(f"Invalid parameter value: x and y axis must be a data dimension in {data_dims}.")
-        if iter_axis and iter_axis not in data_dims:
-            raise ValueError(f"Invalid parameter value: iter_axis {iter_axis} must be a data dimension in {data_dims}.")
-
-    vis_axis = inputs['vis_axis']
-    if vis_axis not in VIS_AXIS_OPTIONS:
-        raise ValueError(f"Invalid parameter value: vis_axis {vis_axis} must be one of {VIS_AXIS_OPTIONS}")
-
-def _check_agg_inputs(inputs):
-    ''' Check aggregator and agg_axis. Set agg_axis if not set. '''
-    aggregator = inputs['aggregator']
-    agg_axis = inputs['agg_axis']
-
-    x_axis = inputs['x_axis']
-    y_axis = inputs['y_axis']
-    data_dims = inputs['data_dims'] if 'data_dims' in inputs else None
-
-    if aggregator and aggregator not in AGGREGATOR_OPTIONS:
-        raise ValueError(f"Invalid parameter value: aggregator {aggregator} must be None or one of {AGGREGATOR_OPTIONS}.")
-
-    if agg_axis:
-        if not isinstance(agg_axis, str) and not isinstance(agg_axis, list):
-            raise TypeError(f"Invalid parameter type: agg_axis {agg_axis} must be str or list.")
-
-        # Make agg_axis a list
-        if isinstance(agg_axis, str):
-            agg_axis = [agg_axis]
-
-        for axis in agg_axis:
-            if axis in (x_axis, y_axis):
-                raise ValueError(f"Invalid parameter value: agg_axis {agg_axis} cannot be x_axis ({x_axis}) or y_axis ({y_axis}).")
-            if data_dims and axis not in data_dims:
-                raise ValueError(f"Invalid parameter value: agg_axis {axis} must be a data dimension in {data_dims}.")
-    elif aggregator and data_dims:
-        # Set agg_axis to non-plotted dim axes
-        agg_axis = data_dims.copy()
-        agg_axis.remove(x_axis)
-        agg_axis.remove(y_axis)
-        if 'iter_axis' in inputs and inputs['iter_axis']:
-            agg_axis.remove(inputs['iter_axis'])
-    inputs['agg_axis'] = agg_axis
-
-def _check_color_inputs(inputs):
-    if inputs['color_mode']:
-        color_mode = inputs['color_mode'].lower()
-        valid_color_modes = ['auto', 'manual']
-        if color_mode not  in valid_color_modes:
-            raise ValueError(f"Invalid parameter value: color_mode {color_mode} must be None or one of {valid_color_modes}.")
-        inputs['color_mode'] = color_mode
-
-    if inputs['color_range']:
-        if not (isinstance(inputs['color_range'], tuple) and len(inputs['color_range']) == 2):
-            raise ValueError("Invalid parameter type: color_range must be None or a tuple of (min, max).")
-
-def _check_other_inputs(inputs):
-    if inputs['iter_range']:
-        if not (isinstance(inputs['iter_range'], tuple) and len(inputs['iter_range']) == 2):
-            raise ValueError("Invalid parameter type: iter_range must be None or a tuple of (start, end).")
-
-    if inputs['subplots']:
-        if not (isinstance(inputs['subplots'], tuple) and len(inputs['subplots']) == 2):
-            raise ValueError("Invalid parameter type: subplots must be None or a tuple of (rows, columns).")
-
-    if inputs['title'] and not isinstance(inputs['title'], str):
-        raise TypeError("Invalid parameter type: title must be None or a string.")
+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 = {}
+
+    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 '''
+        if 'selection' not in self._plot_inputs:
+            self._plot_inputs['selection'] = {}
+        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 (TypeError, KeyError):
+            # TypeError: get_input returned None for 'selection'
+            # KeyError: key not in selection
+            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 '''
+        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.12.dist-info → vidavis-0.0.14.dist-info}/METADATA

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

{vidavis-0.0.12.dist-info → vidavis-0.0.14.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=lbq9GRGeyIV1a_kyS8nU0XfadMwQbOC7JZj6Zcp2uo8,47260
+vidavis/apps/_ms_raster.py,sha256=MtW55gRm9EYKR-E86-YrfSnNiYg-xa6WJNar-0-Rsac,43139
 vidavis/bokeh/__init__.py,sha256=gdPPxBCe0enCSjvPFxkgMlhpVnAMFXKcw9GN28tVdXM,95
 vidavis/bokeh/_palette.py,sha256=gzfJHuUgqxd8hJpZe-gQPFTCPq9f5I8uLEkHAK5FNDM,2480
 vidavis/data/__init__.py,sha256=-RDRe0PYK6vPlhdRV2Dy1vGbnDGoXWDATmfxaR-gXcE,48
@@ -18,21 +18,23 @@ vidavis/data/measurement_set/processing_set/_ps_stats.py,sha256=4uLImKCANXLUM8jO
 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/_locate_points.py,sha256=TsfklqCB-rab8VKsnSwnFy-hh7JSY7Wp7Lo498ad10M,6161
-vidavis/plot/ms_plot/_ms_plot.py,sha256=AZe4WbW5QCjX5hIir1W4H8Nd69NvxBQUiJhIHPCOTGE,12764
+vidavis/plot/ms_plot/_check_raster_inputs.py,sha256=a7u5wlDKTxWYW36-Xp3xd4c756SbYURdFkGHbUaX440,4786
+vidavis/plot/ms_plot/_locate_points.py,sha256=f2sOeq1Ba6SR7uk7pX2vS2TLPsQsWZti2VJkOcFx6Gw,10899
+vidavis/plot/ms_plot/_ms_plot.py,sha256=B0_81JtBD9k7M8frwlgoJNH6vZzW17aGmytPjD_xQqw,18706
 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=wpVFnnX9jL4G4b9OhCxgGpqrqUq4cvDLy4IIzYRMR18,3738
-vidavis/plot/ms_plot/_raster_plot_inputs.py,sha256=vPjZPDuB26ENxwv4z7dUa_c5TqByXejScY6hqEnLFLU,4768
+vidavis/plot/ms_plot/_raster_plot_gui.py,sha256=Kb0BLmkwtYHCqlVaSipbTTStst8RYggqwf1Wf5v8F4Q,4261
+vidavis/plot/ms_plot/_raster_plot_inputs.py,sha256=AMIvEz2b4QLH03P6EJXOAnkQ-v2uNKEukdaoA6g070Y,4166
 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=28LaL9J1JRdBfN4Edp_03ZUWOZCUdFtygoKFI5dYdXA,22
-vidavis-0.0.12.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-vidavis-0.0.12.dist-info/METADATA,sha256=3ZnkBJhcC1bVNAkVvRIVxRGfvo6_wow4DWPOvFOIqVA,2238
-vidavis-0.0.12.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-vidavis-0.0.12.dist-info/RECORD,,
+vidavis/__version__.py,sha256=DT3lXVWSM0vxCDfBsBbQ4k1SOUtDSFBhl094H35FE2w,22
+vidavis-0.0.14.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+vidavis-0.0.14.dist-info/METADATA,sha256=fZDo9_lUcwhVToPrllG6fE5SJj0XcyDcgbzoOvVf_zY,2238
+vidavis-0.0.14.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+vidavis-0.0.14.dist-info/RECORD,,