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

vidavis/__version__.py

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

vidavis/apps/_ms_raster.py

@@ -184,7 +184,7 @@ class MsRaster(MsPlot):
         start = time.time()
 
         # If previous plot was shown, unlink from data streams
-        super().unlink_plot_streams()
+        super().unlink_plot_locate()
 
         # Clear for new plot
         self._reset_plot(clear_plots)
@@ -518,9 +518,9 @@ 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])
-            super()._locate_points(data, self._gui_plot_data, self._gui_panel[0])
-            super()._locate_box(bounds, self._gui_plot_data, self._gui_panel[0])
+            super()._locate_cursor(x, y, self._gui_plot_data, self._gui_panel[0][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
 
     def _do_gui_selection(self):
@@ -551,6 +551,10 @@ class MsRaster(MsPlot):
 
                 # Make single Overlay raster plot for DynamicMap
                 gui_plot = self._do_plot(True)
+                gui_plot = gui_plot.opts(
+                    hv.opts.QuadMesh(**self._locate_plot_options),
+                    hv.opts.Scatter(**self._locate_plot_options)
+                )
 
                 # Update color limits in gui with data range
                 plot_params = self._raster_plot.get_plot_params()
@@ -598,7 +602,7 @@ class MsRaster(MsPlot):
         if not self._gui_panel:
             return None
 
-        selectors = self._gui_panel[2][1]
+        selectors = self._gui_panel[0][2][1]
         if name == "selectors":
             return selectors
 
@@ -749,19 +753,19 @@ class MsRaster(MsPlot):
         ''' Callback to start spinner when Plot button clicked. '''
         if self._gui_panel:
             # Start spinner
-            spinner = self._gui_panel[2][2][1]
+            spinner = self._gui_panel[0][2][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[2][2][0]
+            button = self._gui_panel[0][2][2][0]
             button.button_style = 'solid' if plot_changed else 'outline'
 
     def _show_plot_inputs(self):
         ''' Show inputs for raster plot in column in GUI tab '''
-        inputs_column = self._gui_panel[0][1]
+        inputs_column = self._gui_panel[1]
         super()._fill_inputs_column(inputs_column)
 
     ###

vidavis/data/measurement_set/processing_set/_ps_data.py

@@ -51,23 +51,28 @@ class PsData:
             print(ps_summary)
         elif columns == "by_ms":
             for row in ps_summary.itertuples(index=False):
-                print(f"MSv4 name: {row[0]}")
-                print(f"intent: {row[1]}")
+                print(f"name: {row[0]}")
+                print(f"scan_intents: {row[1]}")
                 shape = row[2]
                 print(f"shape: {shape[0]} times, {shape[1]} baselines, {shape[2]} channels, {shape[3]} polarizations")
-                print(f"polarization: {row[3]}")
-                scans = [str(scan) for scan in row[4]]
+                print(f"execution_block_UID: {row[3]}")
+                print(f"polarization: {row[4]}")
+                scans = [str(scan) for scan in row[5]]
                 print(f"scan_name: {scans}")
-                print(f"spw_name: {row[5]}")
-                fields = [str(field) for field in row[6]]
+                print(f"spw_name: {row[6]}")
+                print(f"spw_intents: {row[7]}")
+                fields = [str(field) for field in row[8]]
                 print(f"field_name: {fields}")
-                sources = [str(source) for source in row[7]]
+                sources = [str(source) for source in row[9]]
                 print(f"source_name: {sources}")
-                lines = [str(line) for line in row[8]]
+                lines = [str(line) for line in row[10]]
                 print(f"line_name: {lines}")
-                field_coords = row[9]
+                field_coords = row[11]
                 print(f"field_coords: ({field_coords[0]}) {field_coords[1]} {field_coords[2]}")
-                print(f"frequency range: {row[10]:e} - {row[11]:e}")
+                print(f"session_reference_UID: {row[12]}")
+                print(f"scheduling_block_UID: {row[13]}")
+                print(f"project_UID: {row[14]}")
+                print(f"frequency range: {row[15]:e} - {row[16]:e}")
                 print("-----")
         else:
             if isinstance(columns, str):

vidavis/plot/ms_plot/_locate_points.py

@@ -41,9 +41,9 @@ def update_cursor_location(cursor, plot_axes, xds, cursor_locate_box):
     ''' Show data values for cursor x,y position in cursor location box (pn.WidgetBox) '''
     # Convert plot values to selection values to select plot data
     cursor_locate_box.clear()
-
     x, y = cursor
     x_axis, y_axis, vis_axis = plot_axes
+
     cursor_position = {x_axis: x, y_axis: y}
     cursor_location = _locate_point(xds, cursor_position, vis_axis)
 
@@ -54,29 +54,32 @@ def update_cursor_location(cursor, plot_axes, xds, cursor_locate_box):
     # Add location column to widget box
     cursor_locate_box.append(location_column)
 
-def update_points_location(data, plot_axes, xds, points_tab_column, logger):
+def update_points_location(data, plot_axes, xds, points_tab_feed):
     ''' Show data values for points in point_draw in tab and log '''
-    points_tab_column.clear()
+    points_tab_feed.clear()
+    locate_log = []
     if data:
         x_axis, y_axis, vis_axis = plot_axes
-        logger.info("Locate selected points:")
-
+        message = f"Locate {len(data['x'])} points:"
+        locate_log.append(message)
         for point in list(zip(data['x'], data['y'])):
             # Locate point
             point_position = {x_axis: point[0], y_axis: point[1]}
             point_location = _locate_point(xds, point_position, vis_axis)
             # Format location and add to points locate column
             location_layout = _layout_point_location(point_location)
-            points_tab_column.append(location_layout)
-            points_tab_column.append(pn.layout.Divider())
+            points_tab_feed.append(location_layout)
+            points_tab_feed.append(pn.layout.Divider())
 
             # Format and add to log
             location_list = [f"{static_text.name}={static_text.value}" for static_text in point_location]
-            logger.info(", ".join(location_list))
+            locate_log.append(", ".join(location_list))
+    return locate_log
 
-def update_box_location(bounds, plot_axes, xds, box_tab_column, logger):
+def update_box_location(bounds, plot_axes, xds, box_tab_feed):
     ''' Show data values for points in box_select in tab and log '''
-    box_tab_column.clear()
+    box_tab_feed.clear()
+    locate_log = []
     if bounds:
         x_axis, y_axis, vis_axis = plot_axes
         box_bounds = {x_axis: (bounds[0], bounds[2]), y_axis: (bounds[1], bounds[3])}
@@ -84,18 +87,19 @@ def update_box_location(bounds, plot_axes, xds, box_tab_column, logger):
 
         message = f"Locate {npoints} points"
         message += " (only first 100 shown):" if npoints > 100 else ":"
-        logger.info(message)
-        box_tab_column.append(pn.pane.Str(message))
+        locate_log.append(message)
+        box_tab_feed.append(pn.pane.Str(message))
 
         for point in point_locations:
             # Format and add to box locate column
             location_layout = _layout_point_location(point)
-            box_tab_column.append(location_layout)
-            box_tab_column.append(pn.layout.Divider())
+            box_tab_feed.append(location_layout)
+            box_tab_feed.append(pn.layout.Divider())
 
             # Format and add to log
             location_list = [f"{static_text.name}={static_text.value}" for static_text in point]
-            logger.info(", ".join(location_list))
+            locate_log.append(", ".join(location_list))
+    return locate_log
 
 def _locate_point(xds, position, vis_axis):
     '''

vidavis/plot/ms_plot/_ms_plot.py

@@ -3,6 +3,7 @@ Base class for ms plots
 '''
 
 import os
+import logging
 import time
 
 from bokeh.io import export_png, export_svg
@@ -29,7 +30,13 @@ class MsPlot:
 
         # Set logger: use toolviper logger else casalog else python logger
         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())
-        self._logger.propagate = False # avoid repeating unformatted log messages in console
+
+        # For removing stdout logging when using locate
+        self._stdout_handler = None
+        for handler in self._logger.handlers:
+            if isinstance(handler, logging.StreamHandler):
+                self._stdout_handler = handler
+                break
 
         # Save parameters; ms set below
         self._show_gui = show_gui
@@ -142,10 +149,10 @@ class MsPlot:
         self._plot_params.clear()
         self._plot_axes = None
         if self._gui_panel is not None:
-            self._gui_panel[0][2].clear() # locate points
-            self._gui_panel[0][3].clear() # locate box
+            self._gui_panel[2].clear() # locate points
+            self._gui_panel[3].clear() # locate box
 
-    def unlink_plot_streams(self):
+    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
@@ -203,8 +210,8 @@ class MsPlot:
             )
             if inputs_column:
                 self._show_panel.append(('Plot Inputs', inputs_column))
-            self._show_panel.append(('Locate Selected Points', pn.Column()))
-            self._show_panel.append(('Locate Selected Box', pn.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')))
 
             # return value for locate callback
             self._last_plot = plot
@@ -411,35 +418,43 @@ class MsPlot:
 
     def _locate(self, x, y, data, bounds):
         ''' Callback for all show plot streams '''
-        self._locate_cursor(x, y, self._plot_data, self._show_panel)
-        self._locate_points(data, self._plot_data, self._show_panel)
-        self._locate_box(bounds, self._plot_data, self._show_panel)
+        self._locate_cursor(x, y, self._plot_data, self._show_panel[0][1])
+        self._locate_points(data, self._plot_data, self._show_panel[2])
+        self._locate_box(bounds, self._plot_data, self._show_panel[3])
         return self._last_plot
 
-    def _locate_cursor(self, x, y, plot_data, tabs):
+    def _locate_cursor(self, x, y, plot_data, cursor_box):
         ''' Show location from cursor position in cursor locate box '''
         cursor = (x, y)
         if cursor_changed(cursor, self._last_cursor):
             # new cursor position - update cursor location box
-            plot_axes = self._get_plot_axes()
-            cursor_box = tabs[0][1]
-            update_cursor_location(cursor, plot_axes, plot_data, cursor_box)
+            update_cursor_location(cursor, self._get_plot_axes(), plot_data, cursor_box)
             self._last_cursor = cursor
 
-    def _locate_points(self, point_data, plot_data, tabs):
+    def _locate_points(self, point_data, plot_data, points_tab):
         ''' Show points locations from point_draw tool '''
         if points_changed(point_data, self._last_points):
-            # new points position - update selected points location tab
-            plot_axes = self._get_plot_axes()
-            points_tab = tabs[2]
-            update_points_location(point_data, plot_axes, plot_data, points_tab, self._logger)
+            # update selected points location tab
+            location_info = update_points_location(point_data, self._get_plot_axes(), plot_data, points_tab)
+
+            # log to file only
+            self._logger.removeHandler(self._stdout_handler)
+            for info in location_info:
+                self._logger.info(info)
+            self._logger.addHandler(self._stdout_handler)
+
             self._last_points = point_data
 
-    def _locate_box(self, box_bounds, plot_data, tabs):
+    def _locate_box(self, box_bounds, plot_data, box_tab):
         ''' Show points locations in box from box_select tool '''
         if box_changed(box_bounds, self._last_box):
-            # new box_select position - update selected box location tab
-            plot_axes = self._get_plot_axes()
-            box_tab = tabs[3]
-            update_box_location(box_bounds, plot_axes, plot_data, box_tab, self._logger)
+            # update selected box location tab
+            location_info = update_box_location(box_bounds, self._get_plot_axes(), plot_data, box_tab)
+
+            # log to file only
+            self._logger.removeHandler(self._stdout_handler)
+            for info in location_info:
+                self._logger.info(info)
+            self._logger.addHandler(self._stdout_handler)
+
             self._last_box = box_bounds

vidavis/plot/ms_plot/_ms_plot_constants.py

@@ -10,7 +10,7 @@ WEIGHT_AXIS_OPTIONS = ['weight', 'sigma']
 # GUI label to selection keyword
 PS_SELECTION_OPTIONS = {
     'MSv4 Name': 'name',
-    'Intents': 'intents',
+    'Scan Intents': 'scan_intents',
     'Scan Name': 'scan_name',
     'Spectral Window Name': 'spw_name',
     'Field Name': 'field_name',

vidavis/plot/ms_plot/_raster_plot_gui.py

@@ -21,29 +21,26 @@ def create_raster_gui(callbacks, plot_info, empty_plot):
     # 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(
-                    pn.pane.HoloViews(empty_plot), # [0] plot
-                    pn.WidgetBox(),                # [1] cursor location
-                )
+    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
             ),
-            ('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',
+            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 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]
+        sizing_mode='stretch_width',
     )
 
 def get_plot_input_selectors(callbacks, plot_info):

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

@@ -1,14 +1,15 @@
 Metadata-Version: 2.1
 Name: vidavis
-Version: 0.0.15
+Version: 0.1.1
 Summary: Radio astronomy visibility data visualization
 License: LGPL
 Author-email: Darrell Schiebel <darrell@schiebel.us>,Pam Harris <pharris@nrao.edu>
 Requires-Python: >=3.11, <3.14
-Requires-Dist: bokeh==3.6.1
+Requires-Dist: bokeh<3.9,>=3.7
 Requires-Dist: graphviper
 Requires-Dist: hvplot
 Requires-Dist: matplotlib
+Requires-Dist: panel==1.8.2
 Requires-Dist: selenium
 Description-Content-Type: text/x-rst
 

{vidavis-0.0.15.dist-info → vidavis-0.1.1.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=wyY7WS9L4zPXtGMYt_v8dze4HP7xEUQrHUS7phMYTss,40972
+vidavis/apps/_ms_raster.py,sha256=e-vEBjoNajE3gZPSRHUJwWGugHRbdVPBd7WVFYnH3DM,41175
 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=2Ss3iUdyIgtMuMTpl9mAGt4K89zgDmRsoTjbjurpDmc,11353
+vidavis/data/measurement_set/processing_set/_ps_data.py,sha256=aO_J8ETi-Lqu4eNNKsKUHzvvnyRhww4hECUjbBS9Z9U,11626
 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=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/_locate_points.py,sha256=DPGdCHanRkNp-6nYJcZknX8iNMlYrNllKhmQuwxqONQ,11006
+vidavis/plot/ms_plot/_ms_plot.py,sha256=EQx348f6ifYakQREmkfh2ybIefsPYqKjNT5gd44LqjI,19343
+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/_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_gui.py,sha256=f57Jj9BMNuTTzCC3AgHqL17R0MGfiO9Rxt6u0mesnYA,3623
 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=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,,
+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,,