vidavis 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

vidavis/__version__.py

@@ -1 +1 @@
-__version__ = '0.0.1'
+__version__ = '0.0.3'

vidavis/apps/_ms_raster.py

@@ -24,8 +24,9 @@ class MsRaster(MsPlot):
     Plot MeasurementSet data as raster plot.
 
     Args:
-        ms (str): path to MSv2 (.ms) or MSv4 (.zarr) file. Required when show_gui=False.
+        ms (str, None): path to MSv2 (.ms) or MSv4 (.zarr) file. Default None. Required when show_gui=False.
         log_level (str): logging threshold. Options include 'debug', 'info', 'warning', 'error', 'critical'. Default 'info'.
+        log_to_file (bool): whether to write log messages to log file "msraster-<timestamp>.log". Default True.
         show_gui (bool): whether to launch the interactive GUI in a browser tab. Default False.
 
     Example:
@@ -39,8 +40,8 @@ class MsRaster(MsPlot):
         msr.save() # saves as {ms name}_raster.png
     '''
 
-    def __init__(self, ms=None, log_level="info", show_gui=False):
-        super().__init__(ms, log_level, show_gui, "MsRaster")
+    def __init__(self, ms=None, log_level="info", log_to_file=True, show_gui=False):
+        super().__init__(ms, log_level, log_to_file, show_gui, "MsRaster")
         self._raster_plot = RasterPlot()
 
         # Calculations for color limits
@@ -211,11 +212,7 @@ class MsRaster(MsPlot):
 
         # Get data dimensions if valid MS is set to check input axes
         if 'data_dims' in self._ms_info:
-            data_dims = self._ms_info['data_dims']
-            if 'baseline_id' in data_dims:
-                data_dims.remove('baseline_id')
-                data_dims.append('baseline')
-            inputs['data_dims'] = data_dims
+            inputs['data_dims'] = self._ms_info['data_dims'] if 'data_dims' in self._ms_info else None
 
         # Validate input arguments then set
         check_inputs(inputs)
@@ -279,6 +276,10 @@ class MsRaster(MsPlot):
         ms_name = self._ms_info['basename'] # for title
         self._raster_plot.set_plot_params(raster_data, plot_inputs, ms_name)
 
+        # Show plot inputs in log
+        super()._set_plot_params(plot_inputs | self._raster_plot.get_plot_params()['style'])
+        self._logger.info("MsRaster plot parameters: %s", ", ".join(self._plot_params))
+
         # Make plot. Add data min/max if GUI is shown to update color limits range.
         return self._raster_plot.raster_plot(raster_data, self._logger, self._show_gui)
 
@@ -475,8 +476,9 @@ class MsRaster(MsPlot):
 
         # Layout plot and input widgets in a row
         self._gui_layout = pn.Row(
-            pn.Column(           # [0]
-                dmap,
+            pn.Tabs(             # [0]
+                ('Plot', dmap),               # [0]
+                ('Plot Inputs', pn.Column()), # [1]
                 sizing_mode='stretch_width',
             ),
             pn.Spacer(width=10), # [1]
@@ -544,6 +546,9 @@ class MsRaster(MsPlot):
             # Subparam values changed but not applied to plot
             gui_plot = self._last_gui_plot
 
+        # Update plot inputs for gui
+        self._set_plot_params(self._plot_inputs | style_inputs)
+
         # Save inputs to see if changed
         self._last_plot_inputs = self._plot_inputs.copy()
         self._last_style_inputs = style_inputs.copy()
@@ -556,7 +561,8 @@ class MsRaster(MsPlot):
         # Save plot if no new plot
         self._last_gui_plot = gui_plot
 
-        # Change plot button and stop spinner
+        # Add plot inputs, change plot button to outline, and stop spinner
+        self._update_plot_inputs()
         self._update_plot_status(False)
         self._update_plot_spinner(False)
 
@@ -636,15 +642,16 @@ class MsRaster(MsPlot):
         return self._empty_plot
 
     def _create_empty_plot(self):
-        ''' Create empty Overlay plot for DynamicMap with default color params and hover enabled '''
+        ''' Create empty Overlay plot for DynamicMap with colormap params and hover enabled '''
         plot_params = self._raster_plot.get_plot_params()
         plot = hv.Overlay(
             hv.QuadMesh([]).opts(
-                colorbar=False,
+                colorbar=plot_params['style']['show_flagged_colorbar'],
                 cmap=plot_params['style']['flagged_cmap'],
                 responsive=True,
             ) * hv.QuadMesh([]).opts(
                 colorbar=plot_params['style']['show_colorbar'],
+                colorbar_position='left',
                 cmap=plot_params['style']['unflagged_cmap'],
                 responsive=True,
             )
@@ -708,17 +715,37 @@ class MsRaster(MsPlot):
         ''' Set gui options from ms data '''
         if 'data_dims' in self._ms_info:
             data_dims = self._ms_info['data_dims']
-
-            # Update options for x_axis and y_axis selectors
             axis_selectors = self._get_selector('axes')
-            axis_selectors.objects[0][0].options = data_dims
-            axis_selectors.objects[0][1].options = data_dims
+
+            # Update options for x_axis selector
+            x_axis_selector = axis_selectors.objects[0][0]
+            x_axis_value = x_axis_selector.value
+            x_axis_selector.options = data_dims
+            if x_axis_value in data_dims:
+                x_axis_selector.value = x_axis_value
+            else:
+                x_axis_selector.value = data_dims[1]
+
+            # Update options for y_axis selector
+            y_axis_selector = axis_selectors.objects[0][1]
+            y_axis_value = y_axis_selector.value
+            y_axis_selector.options = data_dims
+            if y_axis_value in data_dims:
+                y_axis_selector.value = y_axis_value
+            else:
+                y_axis_selector.value = data_dims[0]
 
             # Update options for vis_axis selector
+            vis_axis_selector = axis_selectors.objects[2]
+            vis_axis_value = vis_axis_selector.value
             if self._data.get_correlated_data('base') == 'SPECTRUM':
-                axis_selectors.objects[1].options = SPECTRUM_AXIS_OPTIONS
+                vis_axis_selector.options = SPECTRUM_AXIS_OPTIONS
             else:
-                axis_selectors.objects[1].options = VIS_AXIS_OPTIONS
+                vis_axis_selector.options = VIS_AXIS_OPTIONS
+            if vis_axis_value in vis_axis_selector.options:
+                vis_axis_selector.value = vis_axis_value
+            else:
+                vis_axis_selector.value = VIS_AXIS_OPTIONS[0]
 
             # Update options for selection selector
             selection_selectors = self._get_selector('sel')
@@ -841,6 +868,14 @@ class MsRaster(MsPlot):
             button = self._gui_layout[2][2][0]
             button.button_style = 'solid' if inputs_changed else 'outline'
 
+    def _update_plot_inputs(self):
+        ''' Show inputs for raster plot in GUI '''
+        if self._plot_params:
+            inputs_column = self._gui_layout[0][1]
+            inputs_column.clear()
+            for param in self._plot_params:
+                inputs_column.append(pn.pane.Str(param))
+
     ###
     ### Callbacks for widgets which update plot inputs
     ###

vidavis/data/measurement_set/processing_set/_ps_data.py

@@ -105,15 +105,16 @@ class PsData:
         return len(self._get_ps_xdt())
 
     def get_max_dims(self):
-        ''' Returns maximum length of data dimensions in selected ps_xdt (if selected) '''
+        ''' Returns maximum length of dimensions in selected ProcessingSet (if selected) '''
         ps_xdt = self._get_ps_xdt()
         return ps_xdt.xr_ps.get_max_dims()
 
     def get_data_dimensions(self):
-        ''' Return the maximum dimensions in selected ProcessingSet (if selected) '''
+        ''' Return names of the data dimensions. '''
         dims = list(self.get_max_dims().keys())
         if 'uvw_label' in dims:
             dims.remove('uvw_label') # not a VISIBILITY/SPECTRUM data dim
+        dims = ['baseline' if dim=='baseline_id' else dim for dim in dims]
         return dims
 
     def get_dimension_values(self, dimension):

vidavis/plot/ms_plot/_ms_plot.py

@@ -24,13 +24,14 @@ class MsPlot:
 
     ''' Base class for MS plots with common functionality '''
 
-    def __init__(self, ms=None, log_level="info", show_gui=False, app_name="MsPlot"):
+# pylint: disable=too-many-arguments, too-many-positional-arguments
+    def __init__(self, ms=None, log_level="info", log_to_file=False, show_gui=False, app_name="MsPlot"):
         if not ms and not show_gui:
             raise RuntimeError("Must provide ms/zarr path if gui not shown.")
 
         # Set logger: use toolviper logger else casalog else python logger
         if _HAVE_TOOLVIPER:
-            self._logger = setup_logger(app_name, log_to_term=True, log_to_file=False, log_level=log_level.upper())
+            self._logger = setup_logger(app_name, log_to_term=True, log_to_file=log_to_file, log_file=app_name.lower(), log_level=log_level.upper())
         else:
             self._logger = get_logger()
             self._logger.setLevel(log_level.upper())
@@ -49,6 +50,7 @@ class MsPlot:
 
         # Initialize plot inputs and params
         self._plot_inputs = {'selection': {}}
+        self._plot_params = None
 
         # Initialize plots
         self._plot_init = False
@@ -59,6 +61,7 @@ class MsPlot:
         self._data = None
         self._ms_info = {}
         self._set_ms(ms)
+# pylint: enable=too-many-arguments, too-many-positional-arguments
 
     def summary(self, data_group='base', columns=None):
         ''' Print ProcessingSet summary.
@@ -150,7 +153,14 @@ class MsPlot:
             plot = hv.render(layout_plot)
 
         self._plots_locked = False
-        show(plot)
+        if self._plot_params:
+            column = pn.Column()
+            for param in self._plot_params:
+                column.append(pn.pane.Str(param))
+            tabs = pn.Tabs(('Plot', plot), ('Plot Inputs', column))
+            tabs.show(title=self._app_name, threaded=True)
+        else:
+            show(plot)
 
     def save(self, filename='ms_plot.png', fmt='auto', width=900, height=600):
         '''
@@ -262,3 +272,14 @@ class MsPlot:
             self._logger.warning(message)
             if self._show_gui:
                 self._toast = pn.state.notifications.warning(message, duration=duration)
+
+    def _set_plot_params(self, plot_params):
+        ''' Set list of plot parameters as key=value string, for logging or browser display '''
+        plot_inputs = plot_params.copy()
+        for key in ['self', '__class__', 'data_dims']:
+            # Remove keys from using function locals()
+            try:
+                del plot_inputs[key]
+            except KeyError:
+                pass
+        self._plot_params = sorted([f"{key}={value}" for key, value in plot_inputs.items()])

{vidavis-0.0.1.dist-info → vidavis-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vidavis
-Version: 0.0.1
+Version: 0.0.3
 Summary: Radio astronomy visibility data visualization
 License: LGPL
 Author-email: Darrell Schiebel <darrell@schiebel.us>,Pam Harris <pharris@nrao.edu>
@@ -13,8 +13,8 @@ Description-Content-Type: text/x-rst
 vidavis - VIsibility DAta VISualization
 =======================================
 
-This is a **pre-alpha** package. All applications are currently in various
-phases of *prototyping*.
+This is a **pre-alpha** package. All applications are in various phases of
+*prototyping*.
 
 Introduction
 ------------
@@ -30,8 +30,8 @@ The `Bokeh <https://bokeh.org/>`_ plots are created with
 `hvPlot <https://hvplot.holoviz.org/>`_ and optionally shown in a
 `Panel <https://panel.holoviz.org/>`_-based GUI.
 
-The **MsRaster** application creates raster plots of visibility data.  See
-example below.
+The first application added to **vidavis** is **MsRaster**, which creates raster
+plots of visibility data.  See example below.
 
 Installation
 ------------
@@ -54,6 +54,9 @@ Install
 
 - :code:`pip install vidavis`
 
+MSv2 Conversion
+^^^^^^^^^^^^^^^
+
 To enable conversion from MSv2 to MSv4 with **python-casacore** use (this only works for Linux):
 
 - :code:`pip install "xradio[python-casacore]"`
@@ -62,19 +65,22 @@ On macOS it is required to pre-install `python-casacore` using:
 
 - :code:`conda install -c conda-forge python-casacore`
 
+Exporting Plots
+^^^^^^^^^^^^^^^
 
-To enable exporting plots to file using preferred web driver:
+To enable exporting plots to file without showing the plot, using preferred web
+driver:
 
-**Selenium** with **geckodriver** and **Firefox** (to ensure compatible versions)::
+**Selenium** with **geckodriver** and **Firefox** (to ensure compatible versions):
 
 - :code:`conda install -c conda-forge selenium firefox geckodriver`
 
 **Selenium** with **ChromeDriver** (Chrome), with the executable
-**chromedriver** in your PATH::
+**chromedriver** in your PATH:
 
 - :code:`conda install -c conda-forge selenium python-chromedriver-binary`
 
-or::
+or:
 
 - :code:`pip install selenium chromedriver-binary`
 

{vidavis-0.0.1.dist-info → vidavis-0.0.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 vidavis/LICENSE.rst,sha256=qzGpkvhDzf_MgF1PIn6rCmYPrcEhkfrBUchosLJj-U4,26371
 vidavis/__init__.py,sha256=k3gZarCQxuW9qtnnU06ERZrfW08AE6z0GheGQ9far3Y,1696
 vidavis/apps/__init__.py,sha256=Yjm30SyCmoV5E4HgkctsNMZwYAXuumJGYZU7eOjiDbU,1336
-vidavis/apps/_ms_raster.py,sha256=zvz9IUxdSgg5hSV9TUKbAg-XHTs6ML3RGXcNrjDSwNU,43271
+vidavis/apps/_ms_raster.py,sha256=hILrhGrE48JaEZRfMQ3iDCzUU4WSQxpkOuVRr4LXJYk,45002
 vidavis/bokeh/__init__.py,sha256=XvuKcU9-bAv1CPb_O81VJTNLlHQC-zBg_Ig9_q4RkM4,1371
 vidavis/bokeh/state/__init__.py,sha256=TwXVPmEg2FAcBOJh1mdqRRhxjJvEyw6bnz0elEkToSg,1476
 vidavis/bokeh/state/_palette.py,sha256=gzfJHuUgqxd8hJpZe-gQPFTCPq9f5I8uLEkHAK5FNDM,2480
@@ -11,7 +11,7 @@ vidavis/data/measurement_set/_ms_data.py,sha256=7ATsPbGFAv8WtWk_PRxlfoLdqapd6eMv
 vidavis/data/measurement_set/processing_set/__init__.py,sha256=34JvSyeSa1yeQ_WptnzPCvBxgWvWBOOLti6y7k2jvlE,523
 vidavis/data/measurement_set/processing_set/_ps_concat.py,sha256=bCRsYFJQTp65QEAk_wGZQ2rZNkn6E3Gg2gKKFQfV5mw,3499
 vidavis/data/measurement_set/processing_set/_ps_coords.py,sha256=pdmojL-_55x3CjFcMIMuIqsI4ADG-TlLxc-RTgBQZC8,3640
-vidavis/data/measurement_set/processing_set/_ps_data.py,sha256=0m1CoK4PYIjrmh6IaXueTcFq-kzxcnuVXgQnbSStKCE,10723
+vidavis/data/measurement_set/processing_set/_ps_data.py,sha256=4-LXSk9ROnmWG8vZmSuBD7ObRIyNSTTfyjmYlULikpE,10767
 vidavis/data/measurement_set/processing_set/_ps_io.py,sha256=i-YkHEOPpqLLbUv6Gd29EQfJfq_Hgs0055vDwc3Hmbo,1709
 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
@@ -19,7 +19,7 @@ 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=nlvKDuKy4s5nufpoYINzZW5kf1MIcmheAnzo82i-GXo,93
 vidavis/plot/ms_plot/__init__.py,sha256=f2okSBxRB-GgdiJGUE5ZfPgKY2_dzDkGfX91GxRUE94,658
-vidavis/plot/ms_plot/_ms_plot.py,sha256=N85Ldy05y5FffNipcBWNFjJgVYu0r10hDNe9F-ogRFk,10402
+vidavis/plot/ms_plot/_ms_plot.py,sha256=pS-l6-cxmnsIa4Dm-yyPkgimh7sFSl6qBIpXxK9HV_Y,11414
 vidavis/plot/ms_plot/_ms_plot_constants.py,sha256=cX_TQhKJ3hJzPuRYmuRJxue1sjq82yl_ZN2_w6TshmI,930
 vidavis/plot/ms_plot/_ms_plot_selectors.py,sha256=S8zEpqiRfV6r5m1gSz8MdmMxKSmoqW-9U6YnYmbRVf4,10791
 vidavis/plot/ms_plot/_raster_plot.py,sha256=lNa9i_eJ8F8Fc2zcHLRcaxKKOELk3x_QmXT__T76pg8,10999
@@ -30,8 +30,8 @@ vidavis/toolbox/__init__.py,sha256=MoyrDjzcdMDDa7Rc5WyITD01DcpQ2_VdQEdB7g3Hg9c,1
 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=07NzQXBgNlnw5kSN6ZYxE9By-_RuH3Jyy58Z74sIio0,21
-vidavis-0.0.1.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-vidavis-0.0.1.dist-info/METADATA,sha256=OwsSFPTZltsnaVgcPIlah49UsrcHI6kf_GL6NmtnghA,2735
-vidavis-0.0.1.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-vidavis-0.0.1.dist-info/RECORD,,
+vidavis/__version__.py,sha256=kQOJvtmpbHGE0oVJv6oubUfigE6lAOQFBGPyh3SkWZI,21
+vidavis-0.0.3.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+vidavis-0.0.3.dist-info/METADATA,sha256=aYakK6qhQatXmw7Eu3lY40QfIY8KFRRomTejlAQXMOo,2850
+vidavis-0.0.3.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+vidavis-0.0.3.dist-info/RECORD,,