CLN: misc cleanup and debug messages

Author: gdementen

larray_editor/arraywidget.py

@@ -644,7 +644,7 @@ def scroll_to_global_pos(self, global_v_pos, global_h_pos):
 
     def autofit_columns(self):
         """Resize cells to contents"""
-        print(f"{self.__class__.__name__}.autofit_columns()")
+        # print(f"{self.__class__.__name__}.autofit_columns()")
         QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
 
         # for column in range(self.model_axes.columnCount()):
@@ -1400,6 +1400,10 @@ def __init__(self, parent, data=None, readonly=False, attributes=None, bg_gradie
         hlabels_h_header.sectionResized.connect(self.on_hlabels_column_resized)
         vlabels_v_header.sectionResized.connect(self.on_vlabels_row_resized)
 
+        # only useful for debugging
+        # data_h_header = self.view_data.horizontalHeader()
+        # data_h_header.sectionResized.connect(self.on_data_column_resized)
+
         # Propagate auto-resizing requests
         axes_h_header.sectionHandleDoubleClicked.connect(self.resize_axes_column_to_contents)
         hlabels_h_header.sectionHandleDoubleClicked.connect(self.resize_hlabels_column_to_contents)
@@ -1816,12 +1820,17 @@ def on_axes_row_resized(self, logical_index, old_size, new_size):
 
     def on_hlabels_column_resized(self, logical_index, old_size, new_size):
         # synchronize with linked view
+        # logger.debug(f"on_hlabels_column_resized {logical_index=} {new_size=}")
         self.view_data.setColumnWidth(logical_index, new_size)
         if self._updating_hlabels_column_widths:
             return
         h_offset = self.model_data.h_offset
         self.user_defined_hlabels_column_widths[logical_index + h_offset] = new_size
 
+    # def on_data_column_resized(self, logical_index, old_size, new_size):
+        # log_caller()
+        # logger.debug(f"on_data_column_resized {logical_index=} {new_size=}")
+
     def on_vlabels_row_resized(self, logical_index, old_size, new_size):
         # synchronize with linked view
         self.view_data.setRowHeight(logical_index, new_size)
@@ -2239,24 +2248,28 @@ def resize_axes_column_to_contents(self, col_idx):
     # view_hlabels.horizontalHeader().sectionHandleDoubleClicked
     def resize_hlabels_column_to_contents(self, local_col_idx,
                                           min_width=None, max_width=None):
-        # clsname = self.__class__.__name__
-        # print(f"{clsname}.resize_hlabels_column_to_contents({local_col_idx})")
         global_col_idx = self.model_data.h_offset + local_col_idx
         prev_width = self.detected_hlabels_column_widths.get(global_col_idx, 0)
+        # logger.debug("ArrayEditorWidget.resize_hlabels_column_to_contents("
+        #              f"{local_col_idx=}, {min_width=}, {max_width=})")
         width = max(self.view_hlabels.sizeHintForColumn(local_col_idx),
                     self.view_data.sizeHintForColumn(local_col_idx),
                     prev_width)
+        # logger.debug(f"   {global_col_idx=} {prev_width=} => (before clip) "
+        #              f"{width=} ")
         if min_width is not None:
             width = max(width, min_width)
         if max_width is not None:
             width = min(width, max_width)
+        # logger.debug(f"   -> (after clip) {width=}")
         # view_data column width will be synchronized automatically
         self.view_hlabels.horizontalHeader().resizeSection(local_col_idx, width)
 
         # set that column's width back to "automatic width"
         if global_col_idx in self.user_defined_hlabels_column_widths:
             del self.user_defined_hlabels_column_widths[global_col_idx]
         if width > prev_width:
+            # logger.debug(f"   -> width > prev_width (updating detected)")
             self.detected_hlabels_column_widths[global_col_idx] = width
 
     # must be connected to signal:

larray_editor/tests/test_api_larray.py

@@ -351,8 +351,8 @@ def make_test_df(size):
 pl_df3 = pl_df1.select(pl.from_epoch(pl.col('M')).alias('datetime_col'), 'M').limit(5)
 pl_df_big = pl.from_pandas(pd_df_big, include_index=True)
 pl_df_mixed = pl.from_pandas(pd_df_mixed, include_index=False)
-pl_lf1 = pl.scan_parquet('big.parquet')
-pl_lf2 = pl.scan_ipc('big.feather')
+pl_lf_parquet = pl.scan_parquet('big.parquet')
+pl_lf_feather = pl.scan_ipc('big.feather')
 
 path_dir = Path('.')
 path_py = Path('test_adapter.py')

larray_editor/utils.py

@@ -40,6 +40,7 @@
 
 # field is field_name + conversion if any
 M_SPECIFIER_PATTERN = re.compile(r'\{(?P<field>[^:}]*):(?P<format_spec>[^m}]*)m\}')
+ICON_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'images')
 
 logger = logging.getLogger("editor")
 
@@ -240,17 +241,17 @@ def get_idx_rect(index_list):
 
 class IconManager:
     _icons = {'larray': 'larray.ico'}
-    _icon_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'images')
 
     def icon(self, ref):
         if ref in self._icons:
-            icon_path = os.path.join(self._icon_dir, self._icons[ref])
+            icon_path = os.path.join(ICON_DIR, self._icons[ref])
+            assert os.path.exists(icon_path)
             return QIcon(icon_path)
         else:
-            # By default, only X11 will support themed icons. In order to use
-            # themed icons on Mac and Windows, you will have to bundle a compliant
-            # theme in one of your PySide.QtGui.QIcon.themeSearchPaths() and set the
-            # appropriate PySide.QtGui.QIcon.themeName() .
+            # By default, only X11 supports themed icons. In order to use
+            # themed icons on Mac and Windows, we need to bundle a
+            # compliant theme in one of the QtGui.QIcon.themeSearchPaths()
+            # directories and set QtGui.QIcon.themeName() accordingly.
             return QIcon.fromTheme(ref)
 
 
@@ -352,7 +353,8 @@ def __getitem__(self, key):
             key_isnan = np.isnan(key)[..., np.newaxis]
             color = color0 + (color1 - color0) * normalized_value[..., np.newaxis]
             color = np.where(key_isnan, self.nan_color.getHsvF(), color)
-            return from_hsvf(color[..., 0], color[..., 1], color[..., 2], color[..., 3])
+            return from_hsvf(color[..., 0], color[..., 1], color[..., 2],
+                             color[..., 3])
 
 
 class PlotDialog(QDialog):
@@ -493,7 +495,8 @@ def __init__(self, list_name, parent_action=None, triggered=None):
         if self.settings.value(list_name) is None:
             self.settings.setValue(list_name, [])
         if parent_action is not None:
-            actions = [QAction(parent_action) for _ in range(self.MAX_RECENT_FILES)]
+            actions = [QAction(parent_action)
+                       for _ in range(self.MAX_RECENT_FILES)]
             for action in actions:
                 action.setVisible(False)
                 if triggered is not None:
@@ -544,7 +547,8 @@ def _update_actions(self):
                 action.setStatusTip(filepath)
                 action.setData(filepath)
                 action.setVisible(True)
-            # if we have less recent files than actions, hide the remaining actions
+            # if we have less recent files than actions, hide the remaining
+            # actions
             for action in self.actions[len(recent_files):]:
                 action.setVisible(False)
 
@@ -553,7 +557,8 @@ def cached_property(must_invalidate_cache_method):
     """A decorator to cache class properties."""
     def getter_decorator(original_getter):
         def caching_getter(self):
-            if must_invalidate_cache_method(self) or not hasattr(self, '_cached_property_values'):
+            if (must_invalidate_cache_method(self) or
+                    not hasattr(self, '_cached_property_values')):
                 self._cached_property_values = {}
             try:
                 # cache hit
@@ -803,7 +808,7 @@ def get_func_name(frame):
     func_name = frame.f_code.co_name
     if 'self' in frame.f_locals:
         # We do not use Python 3.11+ frame.f_code.co_qualname because
-        # because it returns the (super) class where the method is
+        # it returns the (super) class where the method is
         # defined, not the instance class which is usually much more useful
         func_name = f"{frame.f_locals['self'].__class__.__name__}.{func_name}"
     return func_name