vidavis 0.1.4__tar.gz → 0.1.5__tar.gz

{vidavis-0.1.4 → vidavis-0.1.5}/PKG-INFO

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

{vidavis-0.1.4 → vidavis-0.1.5}/pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
 ]
 requires-python = ">=3.11, <3.14"
 readme = "readme.rst"
-version = "0.1.4"
+version = "0.1.5"
 
 [project.license]
 text = "LGPL"

{vidavis-0.1.4 → vidavis-0.1.5}/src/vidavis/apps/_ms_raster.py

@@ -579,17 +579,18 @@ class MsRaster(MsPlot):
         return self._empty_plot
 
     def _create_empty_plot(self):
-        ''' Create empty Overlay plot for DynamicMap with colormap params and required tools enabled '''
+        ''' Create empty Overlay plot for DynamicMap with colormap params enabled '''
         plot_params = self._raster_plot.get_plot_params()
         self._empty_plot = hv.Overlay(
             hv.QuadMesh([]).opts(
-                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'],
+                colorbar_position='left',
+                responsive=True,
+            ) * hv.QuadMesh([]).opts(
+                colorbar=plot_params['style']['show_flagged_colorbar'],
+                colorbar_position='right',
+                cmap=plot_params['style']['flagged_cmap'],
                 responsive=True,
             )
         )

{vidavis-0.1.4 → vidavis-0.1.5}/src/vidavis/plot/ms_plot/_ms_plot.py

@@ -75,7 +75,6 @@ class MsPlot:
         self._last_points = None
         self._last_boxes = None
         self._locate_plot_options = {
-            'tools': ['hover'],
             'muted_alpha': 0,
             'selection_fill_alpha': 0.2,    # dim selected areas of plot
             'nonselection_fill_alpha': 1.0, # do not dim unselected areas of plot
@@ -463,12 +462,14 @@ class MsPlot:
         x = get_locate_value(plot_data, plot_axes[0], x)
         y = get_locate_value(plot_data, plot_axes[1], y)
         cursor = (x, y)
-        if data_changed(cursor, self._last_cursor):
-            # new cursor position - update cursor location box
-            update_cursor_location(cursor, plot_axes, plot_data, cursor_box)
-            self._last_cursor = cursor
-            return True
-        return False
+
+        if not data_changed(cursor, self._last_cursor):
+            return False
+
+        # new cursor position - update cursor location box
+        update_cursor_location(cursor, plot_axes, plot_data, cursor_box)
+        self._last_cursor = cursor
+        return True
 
     def _locate_points(self, point_data, plot_data, points_tab):
         ''' Show points locations from point_draw tool '''
@@ -489,12 +490,14 @@ class MsPlot:
         points_to_locate = get_new_data(data_points, self._last_points)
         self._last_points = data_points
 
+        if not points_to_locate: # point deleted
+            return False
+
         if len(points_to_locate) == len(data_points):
             points_tab.clear() # clear for locating all points
 
-        if points_to_locate:
-            location_info = update_points_location(points_to_locate, self._get_plot_axes(), plot_data, points_tab)
-            self._log_to_file_only(location_info)
+        location_info = update_points_location(points_to_locate, self._get_plot_axes(), plot_data, points_tab)
+        self._log_to_file_only(location_info)
         return True
 
     def _locate_boxes(self, boxes, plot_data, box_tab):
@@ -520,10 +523,12 @@ class MsPlot:
         boxes_to_locate = get_new_data(box_list, self._last_boxes)
         self._last_boxes = box_list
 
-        if boxes_to_locate:
-            box_tab.clear()
-            location_info = update_boxes_location(boxes_to_locate, self._get_plot_axes(), plot_data, box_tab)
-            self._log_to_file_only(location_info)
+        if not boxes_to_locate: # box deleted
+            return False
+
+        box_tab.clear()
+        location_info = update_boxes_location(boxes_to_locate, self._get_plot_axes(), plot_data, box_tab)
+        self._log_to_file_only(location_info)
         return True
 
     def _log_to_file_only(self, messages):

{vidavis-0.1.4 → vidavis-0.1.5}/src/vidavis/plot/ms_plot/_ms_plot_selectors.py

@@ -80,7 +80,8 @@ def style_selector(style_callback, color_range_callback):
     )
 
     color_range_slider = pn.widgets.RangeSlider(
-        name="Colorbar range",
+        name="Set manual color range",
+        align=('start', 'end'), # (horizontal, vertical) to place left (h=start) and bottom (v=end)
     )
 
     select_color_range = pn.bind(color_range_callback, color_mode_selector, color_range_slider)

{vidavis-0.1.4 → vidavis-0.1.5}/src/vidavis/plot/ms_plot/_raster_plot.py

@@ -95,31 +95,31 @@ class RasterPlot:
             return None
 
         data_params = self._plot_params['data']
-        plot_params = self._plot_params['plot']
-
-        x_axis = plot_params['axis_labels']['x']['axis']
-        y_axis = plot_params['axis_labels']['y']['axis']
-        c_axis = plot_params['axis_labels']['c']['axis']
-
-        # Set plot axes to numeric coordinates if needed
-        xds = set_index_coordinates(data, (x_axis, y_axis))
+        axis_labels = self._plot_params['plot']['axis_labels']
 
         # Prefix c_axis name with aggregator
-        xda_name = c_axis
+        xda_name = axis_labels['c']['axis']
         if data_params['aggregator']:
             xda_name = "_".join([data_params['aggregator'], xda_name])
 
-        # Plot unflagged and flagged data
-        xda = xds[data_params['correlated_data']].where(xds.FLAG == 0.0).rename(xda_name)
-        unflagged_plot = self._plot_xda(xda)
-        flagged_xda = xds[data_params['correlated_data']].where(xds.FLAG == 1.0).rename("flagged_" + xda_name)
-        flagged_plot = self._plot_xda(flagged_xda, True)
-
+        # Set plot axes to numeric coordinates if needed
+        xds = set_index_coordinates(data, (axis_labels['x']['axis'], axis_labels['y']['axis']))
+        xda = xds[data_params['correlated_data']].rename(xda_name)
+
+        # Calculate data range for flagged and unflagged data for color limits
+        unflagged_xda = xda.where(xds.FLAG == 0.0)
+        flagged_xda = xda.where(xds.FLAG == 1.0).rename("flagged " + xda_name)
+        unflagged_data_range = (unflagged_xda.min().values.item(), unflagged_xda.max().values.item())
+        flagged_data_range = (flagged_xda.min().values.item(), flagged_xda.max().values.item())
         if is_gui: # update data range for colorbar
-            self._plot_params['data']['data_range'] = (xda.min().values.item(), xda.max().values.item())
+            self._plot_params['data']['data_range'] = unflagged_data_range
+
+        # Plot all data as unflagged (with hover tool), then overlay flagged data
+        unflagged_plot = self._plot_xda(xda, False, unflagged_data_range)
+        flagged_plot = self._plot_xda(flagged_xda, True, flagged_data_range)
 
         # Make Overlay plot
-        return flagged_plot * unflagged_plot
+        return unflagged_plot.opts(tools=['hover']) * flagged_plot.opts(tools=[])
 
     def _get_plot_title(self, data, plot_inputs, ms_name):
         ''' Form string containing ms name and selected values using data (xArray Dataset) '''
@@ -172,34 +172,34 @@ class RasterPlot:
         self._plot_params['plot']['axis_labels'][axis]['label'] = axis_labels[1]
         self._plot_params['plot']['axis_labels'][axis]['ticks'] = axis_labels[2]
 
-    def _plot_xda(self, xda, is_flagged=False):
-        # Returns Quadmesh plot if raster 2D data, Scatter plot if raster 1D data, or None if no data
-        plot_params = self._plot_params['plot']
-        style_params = self._plot_params['style']
+    def _plot_xda(self, xda, is_flagged=False, data_range=None):
+        ''' Return Quadmesh plot if raster 2D data, Scatter plot if raster 1D data, or None if no data '''
+        # Color limits
+        c_lim = self._plot_params['plot']['color_limits']
+        c_lim = data_range if c_lim is None else c_lim
 
-        x_axis = plot_params['axis_labels']['x']['axis']
-        y_axis = plot_params['axis_labels']['y']['axis']
-        c_label = plot_params['axis_labels']['c']['label']
-        c_lim = plot_params['color_limits']
+        axis_labels = self._plot_params['plot']['axis_labels']
+        x_axis = axis_labels['x']['axis']
+        y_axis = axis_labels['y']['axis']
+        c_label = axis_labels['c']['label']
 
+        # Set time formatter
         x_formatter = get_time_formatter() if x_axis == 'time' else None
         y_formatter = get_time_formatter() if y_axis == 'time' else None
 
+        # Show colorbar
+        show_colorbar = False
         if xda.count().values > 0:
-            if is_flagged:
-                show_colorbar = style_params['show_flagged_colorbar']
-            else :
-                show_colorbar = style_params['show_colorbar']
-        else:
-            show_colorbar = False
+            show_colorbar = self._plot_params['style']['show_flagged_colorbar'] if is_flagged else self._plot_params['style']['show_colorbar']
 
+        # Set colorbar label and map
         if is_flagged:
             c_label = "Flagged " + c_label
-            colormap = style_params['flagged_cmap']
-            plot_params['flagged_colorbar'] = show_colorbar
+            colormap = self._plot_params['style']['flagged_cmap']
+            self._plot_params['plot']['flagged_colorbar'] = show_colorbar
         else:
-            colormap = style_params['unflagged_cmap']
-            plot_params['unflagged_colorbar'] = show_colorbar
+            colormap = self._plot_params['style']['unflagged_cmap']
+            self._plot_params['plot']['unflagged_colorbar'] = show_colorbar
 
         if xda[x_axis].size > 1 and xda[y_axis].size > 1:
             # Raster 2D data
@@ -209,16 +209,16 @@ class RasterPlot:
                 clim=c_lim,
                 cmap=colormap,
                 clabel=c_label,
-                title=plot_params['title'],
-                xlabel=plot_params['axis_labels']['x']['label'],
-                ylabel=plot_params['axis_labels']['y']['label'],
+                title=self._plot_params['plot']['title'],
+                xlabel=axis_labels['x']['label'],
+                ylabel=axis_labels['y']['label'],
                 xformatter=x_formatter,
                 yformatter=y_formatter,
-                xticks=plot_params['axis_labels']['x']['ticks'],
-                yticks=plot_params['axis_labels']['y']['ticks'],
+                xticks=axis_labels['x']['ticks'],
+                yticks=axis_labels['y']['ticks'],
                 rot=45, # angle for x axis labels
                 colorbar=show_colorbar,
-                responsive=True, # resize to fill browser window if True
+                responsive=True, # resize to fill browser window
             )
         else:
             # Cannot raster 1D data, use scatter from pandas dataframe
@@ -227,16 +227,16 @@ class RasterPlot:
                 x=x_axis,
                 y=y_axis,
                 c=xda.name,
-                clim=plot_params['color_limits'],
+                clim=c_lim,
                 cmap=colormap,
                 clabel=c_label,
-                title=plot_params['title'],
-                xlabel=plot_params['axis_labels']['x']['label'],
-                ylabel=plot_params['axis_labels']['y']['label'],
+                title=self._plot_params['plot']['title'],
+                xlabel=axis_labels['x']['label'],
+                ylabel=axis_labels['y']['label'],
                 xformatter=x_formatter,
                 yformatter=y_formatter,
-                xticks=plot_params['axis_labels']['x']['ticks'],
-                yticks=plot_params['axis_labels']['y']['ticks'],
+                xticks=axis_labels['x']['ticks'],
+                yticks=axis_labels['y']['ticks'],
                 rot=45,
                 marker='s', # square
                 responsive=True,