vidavis 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

vidavis/__version__.py

@@ -1 +1 @@
-__version__ = '0.1.1'
+__version__ = '0.1.2'

vidavis/apps/_ms_raster.py

@@ -2,6 +2,7 @@
 Implementation of the ``MsRaster`` application for measurement set raster plotting and editing
 '''
 
+import threading
 import time
 
 from bokeh.models.formatters import NumeralTickFormatter
@@ -183,8 +184,8 @@ class MsRaster(MsPlot):
 
         start = time.time()
 
-        # If previous plot was shown, unlink from data streams
-        super().unlink_plot_locate()
+        # Unlink previous plot from data streams
+        super()._unlink_plot_locate()
 
         # Clear for new plot
         self._reset_plot(clear_plots)
@@ -450,7 +451,15 @@ class MsRaster(MsPlot):
         }
 
         self._gui_panel = create_raster_gui(callbacks, plot_info, self._empty_plot)
-        self._gui_panel.show(title=self._app_name, threaded=True)
+
+        # Start Panel server in a background daemon thread so it doesn't block process exit.
+        # Note: The Panel server will automatically stop when the Python process exits.
+        # Any open browser windows or tabs displaying the plot will lose connection at that point.
+        server_thread = threading.Thread(
+            target=lambda panel=self._gui_panel, name=self._app_name: panel.show(title=name, threaded=False),
+            daemon=True
+        )
+        server_thread.start()
 
     ###
     ### Main callback to create plot if inputs changed
@@ -496,7 +505,7 @@ class MsRaster(MsPlot):
 
                     # Put plot with dmap for locate streams in gui panel
                     dmap = self._get_locate_dmap(self._locate_gui_points)
-                    self._gui_panel[0][0][0].object = gui_plot * dmap
+                    self._gui_panel[0][0].object = gui_plot * dmap
                 except (ValueError, TypeError, KeyError, RuntimeError) as e:
                     # Clear plot, inputs invalid
                     self._notify(str(e), 'error', 0)
@@ -518,7 +527,7 @@ class MsRaster(MsPlot):
     def _locate_gui_points(self, x, y, data, bounds):
         ''' Callback for locate streams '''
         if self._gui_plot_data:
-            super()._locate_cursor(x, y, self._gui_plot_data, self._gui_panel[0][0][1])
+            super()._locate_cursor(x, y, self._gui_plot_data, self._gui_panel[0][1])
             super()._locate_points(data, self._gui_plot_data, self._gui_panel[2])
             super()._locate_box(bounds, self._gui_plot_data, self._gui_panel[3])
         return self._last_gui_plot
@@ -602,7 +611,7 @@ class MsRaster(MsPlot):
         if not self._gui_panel:
             return None
 
-        selectors = self._gui_panel[0][2][1]
+        selectors = self._gui_panel[4][1]
         if name == "selectors":
             return selectors
 
@@ -688,7 +697,7 @@ class MsRaster(MsPlot):
                 selection_key = MS_SELECTION_OPTIONS[selector.name] if selector.name in MS_SELECTION_OPTIONS else None
                 if selection_key:
                     if selection_key == 'data_group':
-                        selector.options = list(super().data_groups())
+                        selector.options = list(super().data_groups(False))
                     else:
                         selector.options = super().get_dimension_values(selection_key)
 
@@ -753,14 +762,14 @@ class MsRaster(MsPlot):
         ''' Callback to start spinner when Plot button clicked. '''
         if self._gui_panel:
             # Start spinner
-            spinner = self._gui_panel[0][2][2][1]
+            spinner = self._gui_panel[4][2][1]
             spinner.value = plot_clicked
 
     def _update_plot_status(self, plot_changed):
         ''' Change button color when plot inputs change. '''
         if self._gui_panel:
             # Set button color
-            button = self._gui_panel[0][2][2][0]
+            button = self._gui_panel[4][2][0]
             button.button_style = 'solid' if plot_changed else 'outline'
 
     def _show_plot_inputs(self):

vidavis/data/measurement_set/processing_set/_ps_data.py

@@ -85,11 +85,12 @@ class PsData:
         return self._ps_xdt.xr_ps.summary(data_group)
 
     def get_data_groups(self):
-        ''' Returns set of data group names in Processing Set data. '''
-        data_groups = []
+        ''' Returns dict of data groups in Processing Set data. '''
+        data_groups = {}
         for ms_xdt_name in self._ps_xdt:
-            data_groups.extend(list(self._ps_xdt[ms_xdt_name].data_groups))
-        return set(data_groups)
+            for group_name, group_members in self._ps_xdt[ms_xdt_name].data_groups.items():
+                data_groups[group_name] = group_members
+        return data_groups
 
     def plot_antennas(self, label_antennas=False):
         ''' Plot antenna positions.

vidavis/plot/ms_plot/_locate_points.py

@@ -47,7 +47,7 @@ def update_cursor_location(cursor, plot_axes, xds, cursor_locate_box):
     cursor_position = {x_axis: x, y_axis: y}
     cursor_location = _locate_point(xds, cursor_position, vis_axis)
 
-    location_column = pn.Column(pn.widgets.StaticText(name="Cursor Location"))
+    location_column = pn.Column(pn.widgets.StaticText(name="CURSOR LOCATION"))
     # Add row of columns to column layout
     location_row = _layout_point_location(cursor_location)
     location_column.append(location_row)

vidavis/plot/ms_plot/_ms_plot.py

@@ -4,6 +4,7 @@ Base class for ms plots
 
 import os
 import logging
+import threading
 import time
 
 from bokeh.io import export_png, export_svg
@@ -74,7 +75,7 @@ class MsPlot:
         self._last_points = None
         self._last_box = None
         self._locate_plot_options = {
-            'tools': ['hover', 'box_select'],
+            'tools': ['box_select', 'hover'],
             'selection_fill_alpha': 0.2,    # dim selected areas of plot
             'nonselection_fill_alpha': 1.0, # do not dim unselected areas of plot
         }
@@ -107,10 +108,17 @@ class MsPlot:
         else:
             self._logger.error("Error: MS path has not been set")
 
-    def data_groups(self):
-        ''' Returns set of data groups from all ProcessingSet ms_xds. '''
+    def data_groups(self, show=False):
+        ''' Get data groups from all ProcessingSet ms_xds and either print or return them. '''
         if self._ms_data:
-            return self._ms_data.data_groups()
+            ms_data_groups = self._ms_data.data_groups()
+            if show:
+                for name, items in ms_data_groups.items():
+                    print(name, ":")
+                    for item, val in items.items():
+                        print(f"    {item} = {val}")
+                return None
+            return ms_data_groups
         self._logger.error("Error: MS path has not been set")
         return None
 
@@ -152,16 +160,6 @@ class MsPlot:
             self._gui_panel[2].clear() # locate points
             self._gui_panel[3].clear() # locate box
 
-    def unlink_plot_locate(self):
-        ''' Disconnect streams when plot data is going to be replaced '''
-        if self._show_panel and len(self._show_panel.objects) == 4:
-            # Remove dmap (streams with callback) from previous plot
-            self._show_panel[0][0] = self._last_plot.opts(tools=['hover'])
-            # Remove locate widgets
-            self._show_panel[0].pop(1) # cursor locate box
-            self._show_panel.pop(3)    # box locate tab
-            self._show_panel.pop(2)    # points locate tab
-
     def clear_selection(self):
         ''' Clear data selection and restore original ProcessingSet '''
         if self._ms_data:
@@ -203,21 +201,29 @@ class MsPlot:
                 ('Plot',
                     pn.Column(
                         plot * dmap,
-                        pn.WidgetBox(), # cursor info
+                        pn.WidgetBox(sizing_mode='stretch_width'), # cursor info
                     )
                 ),
-                sizing_mode='stretch_width',
+                sizing_mode='stretch_both',
             )
+
+            # Add tabs for inputs and locate
             if inputs_column:
                 self._show_panel.append(('Plot Inputs', inputs_column))
-            self._show_panel.append(('Locate Selected Points', pn.Feed(sizing_mode='stretch_height')))
-            self._show_panel.append(('Locate Selected Box', pn.Feed(sizing_mode='stretch_height')))
+            self._show_panel.append(('Locate Selected Points', pn.Feed(height_policy='max')))
+            self._show_panel.append(('Locate Selected Box', pn.Feed(height_policy='max')))
 
             # return value for locate callback
             self._last_plot = plot
 
-        # Show panel layout
-        self._show_panel.show(title=self._app_name, threaded=True)
+        # Start Panel server in a background daemon thread so it doesn't block process exit.
+        # Note: The Panel server will automatically stop when the Python process exits.
+        # Any open browser windows or tabs displaying the plot will lose connection at that point.
+        server_thread = threading.Thread(
+            target=lambda panel=self._show_panel, name=self._app_name: panel.show(title=name, threaded=False),
+            daemon=True
+        )
+        server_thread.start()
 
     def save(self, filename='ms_plot.png', fmt='auto', width=900, height=600):
         '''
@@ -407,6 +413,16 @@ class MsPlot:
         )
         return dmap * points
 
+    def _unlink_plot_locate(self):
+        ''' Disconnect streams when plot data is going to be replaced '''
+        if self._show_panel and len(self._show_panel.objects) == 4:
+            # Remove dmap (streams with callback) from previous plot
+            self._show_panel[0][0] = self._last_plot.opts(tools=['hover'])
+            # Remove locate widgets
+            self._show_panel[0].pop(1) # cursor locate box
+            self._show_panel.pop(3)    # box locate tab
+            self._show_panel.pop(2)    # points locate tab
+
     def _get_plot_axes(self):
         ''' Return x, y, vis axes '''
         if not self._plot_axes:

vidavis/plot/ms_plot/_ms_plot_selectors.py

@@ -335,7 +335,7 @@ def _add_multi_choice(ps_selection, names):
     for name in names:
         # For value or list
         ps_selection.append(
-            pn.widgets.MultiSelect(
+            pn.widgets.MultiChoice(
                 name=name,
                 sizing_mode='stretch_width',
             )

vidavis/plot/ms_plot/_raster_plot.py

@@ -185,7 +185,6 @@ class RasterPlot:
         x_formatter = get_time_formatter() if x_axis == 'time' else None
         y_formatter = get_time_formatter() if y_axis == 'time' else None
 
-        # Hide flagged colorbar if unflagged colorbar is shown
         if xda.count().values > 0:
             if is_flagged:
                 show_colorbar = style_params['show_flagged_colorbar']
@@ -240,7 +239,6 @@ class RasterPlot:
                 yticks=plot_params['axis_labels']['y']['ticks'],
                 rot=45,
                 marker='s', # square
-                hover=True,
                 responsive=True,
             )
 

vidavis/plot/ms_plot/_raster_plot_gui.py

@@ -8,7 +8,7 @@ from vidavis.plot.ms_plot._ms_plot_selectors import (file_selector, title_select
 
 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
+        callbacks (dist): callback functions for widgets
         plot_info (dict): with keys 'ms', 'data_dims', 'x_axis', 'y_axis'
         empty_plot (hv.Overlay): QuadMesh overlay plot with no data
     '''
@@ -22,24 +22,19 @@ def create_raster_gui(callbacks, plot_info, empty_plot):
     #dmap, points = get_plot_dmap(callbacks, selectors, init_plot)
 
     return pn.Tabs(
-        ('Plot',  pn.Row(                                                  # Tabs[0]
-            pn.Column( # Row[0]
-                pn.pane.HoloViews(empty_plot), # Column[0] plot
-                pn.WidgetBox(),                # Column[1] cursor location
-            ),
-            pn.Spacer(width=10), # Row[1]
-            pn.Column(           # Row[2]
-                pn.Spacer(height=25), # Column[0]
-                selectors,            # Column[1] selectors
-                init_plot,            # Column[2] plot button and spinner
-                width_policy='min',
-                width=300,
-                sizing_mode='stretch_height',
-            ),
+        ('Plot', pn.Column(                                                   # Tabs[0]
+            pn.pane.HoloViews(empty_plot),             # Row[0] plot
+            pn.WidgetBox(sizing_mode='stretch_width'), # Row[1] cursor location
         )),
         ('Plot Inputs', pn.Column()),                                      # Tabs[1]
         ('Locate Selected Points', pn.Feed(sizing_mode='stretch_height')), # Tabs[2]
         ('Locate Selected Box', pn.Feed(sizing_mode='stretch_height')),    # Tabs[3]
+        ('Plot Settings', pn.Column(                                       # Tabs[4]
+            pn.Spacer(height=25), # Column[0]
+            selectors,            # Column[1] selectors
+            init_plot,            # Column[2] plot button and spinner
+            sizing_mode='stretch_both',
+        )),
         sizing_mode='stretch_width',
     )
 
@@ -79,6 +74,7 @@ def get_plot_input_selectors(callbacks, plot_info):
         ("Aggregation", agg_selectors),          # [4]
         ("Iteration", iter_selectors),           # [5]
         ("Plot title", title_input),             # [6]
+        sizing_mode='stretch_width',
     )
     selectors.toggle = True
     return selectors

{vidavis-0.1.1.dist-info → vidavis-0.1.2.dist-info}/METADATA

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

{vidavis-0.1.1.dist-info → vidavis-0.1.2.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=e-vEBjoNajE3gZPSRHUJwWGugHRbdVPBd7WVFYnH3DM,41175
+vidavis/apps/_ms_raster.py,sha256=HR2t6ZYTzZxxFtPnPmAVoI_PADHYA268FwhCrM1u6-o,41600
 vidavis/bokeh/__init__.py,sha256=gdPPxBCe0enCSjvPFxkgMlhpVnAMFXKcw9GN28tVdXM,95
 vidavis/bokeh/_palette.py,sha256=gzfJHuUgqxd8hJpZe-gQPFTCPq9f5I8uLEkHAK5FNDM,2480
 vidavis/data/__init__.py,sha256=-RDRe0PYK6vPlhdRV2Dy1vGbnDGoXWDATmfxaR-gXcE,48
@@ -10,7 +10,7 @@ vidavis/data/measurement_set/_ms_data.py,sha256=7ATsPbGFAv8WtWk_PRxlfoLdqapd6eMv
 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=SDp-0ebd94QjO_jPv00weiYmp-OD1XqsCzWvNc0D-94,3747
-vidavis/data/measurement_set/processing_set/_ps_data.py,sha256=aO_J8ETi-Lqu4eNNKsKUHzvvnyRhww4hECUjbBS9Z9U,11626
+vidavis/data/measurement_set/processing_set/_ps_data.py,sha256=v6ARj5AJYsT30Gp8tWOZCoU7WxDb2_p8pfMbVBW4gVA,11689
 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=m7d0qe5bS-XjGD_1mrpRn9dTobwG8WDidCmAaLP2TWQ,7378
 vidavis/data/measurement_set/processing_set/_ps_select.py,sha256=AtEsLy3bSHEyFUFKM-OO6_-YwUdWOWcGkXkEgFxMaEE,10859
@@ -19,13 +19,13 @@ vidavis/data/measurement_set/processing_set/_xds_data.py,sha256=qLO2VkLINkSAQ7CG
 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=DPGdCHanRkNp-6nYJcZknX8iNMlYrNllKhmQuwxqONQ,11006
-vidavis/plot/ms_plot/_ms_plot.py,sha256=EQx348f6ifYakQREmkfh2ybIefsPYqKjNT5gd44LqjI,19343
+vidavis/plot/ms_plot/_locate_points.py,sha256=PlPAq0WGoKNOEiTsOV8cDKHAcbkQOWfqoc0vRSFbkiA,11006
+vidavis/plot/ms_plot/_ms_plot.py,sha256=0zbZ-QdXdwl91Ze9--H7G47y9FulHkGy_5_2dlm9wuw,20144
 vidavis/plot/ms_plot/_ms_plot_constants.py,sha256=xbn_dEx4QWbZIsUDziJifrT7pXwO2Qr2B5CHyAy16So,940
-vidavis/plot/ms_plot/_ms_plot_selectors.py,sha256=jBjthBjfXDf6W19HG8j8Pzxxzmnte5apeVDjsMy-dDg,11146
+vidavis/plot/ms_plot/_ms_plot_selectors.py,sha256=LeRLuOVkitzuOL--QRHXtoxJIz3DGjhjIjSfbOj7qyI,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=f57Jj9BMNuTTzCC3AgHqL17R0MGfiO9Rxt6u0mesnYA,3623
+vidavis/plot/ms_plot/_raster_plot.py,sha256=6TOZvKSh8oBI79K926zp8Cn5bzk4MJGPB_PQ5S-1H4M,10803
+vidavis/plot/ms_plot/_raster_plot_gui.py,sha256=gsNklMUj4Tx9H2r4Am8XHY0qoEHcCsaDYZDd3FaAmSQ,3563
 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
@@ -33,8 +33,8 @@ vidavis/toolbox/__init__.py,sha256=jqFa-eziVz_frNnXxwjJFK36qNpz1H38s-VlpBcq-R8,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=jZ5uWOiyV1Hb9rhNyo3bAgfWmHx8_xkueUWpcUrkz_w,21
-vidavis-0.1.1.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-vidavis-0.1.1.dist-info/METADATA,sha256=8zI_duU6ZeUuTgbF0ufb3Vr6EnDlrB3MxfdBu5vcunA,2268
-vidavis-0.1.1.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-vidavis-0.1.1.dist-info/RECORD,,
+vidavis/__version__.py,sha256=r_cKr7sbAG8wXvZQ-5WkC2eXGKMDWp6Xe_hNXu43MT0,21
+vidavis-0.1.2.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+vidavis-0.1.2.dist-info/METADATA,sha256=bGXBhlQbWV5_Y82WSurot_OPr4U4on-pjsQZWDX-_d4,2268
+vidavis-0.1.2.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+vidavis-0.1.2.dist-info/RECORD,,