scitex 2.5.0__py3-none-any.whl → 2.7.0__py3-none-any.whl

scitex/plt/_subplots/_AxisWrapper.py

@@ -24,10 +24,12 @@ from ._AxisWrapperMixins import (
 from scitex.plt.styles import apply_plot_defaults, apply_plot_postprocess
 
 
-class AxisWrapper(MatplotlibPlotMixin, SeabornMixin, AdjustmentMixin, TrackingMixin, UnitAwareMixin):
+class AxisWrapper(
+    MatplotlibPlotMixin, SeabornMixin, AdjustmentMixin, TrackingMixin, UnitAwareMixin
+):
     def __init__(self, fig_scitex, axis_mpl, track):
         """Initialize the AxisWrapper.
-        
+
         Args:
             fig_scitex: Parent figure wrapper
             axis_mpl: Matplotlib axis to wrap
@@ -53,31 +55,35 @@ class AxisWrapper(MatplotlibPlotMixin, SeabornMixin, AdjustmentMixin, TrackingMi
         self.id = 0
         self._counter_part = matplotlib.axes.Axes
         self._tracking_depth = 0  # Depth counter to prevent tracking internal calls
-        
+
         # Initialize unit awareness
         UnitAwareMixin.__init__(self)
 
     def get_figure(self, root=True):
         """Get the figure, compatible with matplotlib 3.8+"""
         return self._fig_mpl
-    
+
     def twinx(self):
         """Create a twin y-axis and wrap it with AxisWrapper."""
         twin_ax = self._axes_mpl.twinx()
+
         # Create a mock figure wrapper for the twin axis
         class MockFigWrapper:
             def __init__(self, fig_mpl):
                 self._fig_mpl = fig_mpl
+
         mock_fig = MockFigWrapper(self._fig_mpl)
         return AxisWrapper(fig_scitex=mock_fig, axis_mpl=twin_ax, track=self.track)
-    
+
     def twiny(self):
         """Create a twin x-axis and wrap it with AxisWrapper."""
         twin_ax = self._axes_mpl.twiny()
+
         # Create a mock figure wrapper for the twin axis
         class MockFigWrapper:
             def __init__(self, fig_mpl):
                 self._fig_mpl = fig_mpl
+
         mock_fig = MockFigWrapper(self._fig_mpl)
         return AxisWrapper(fig_scitex=mock_fig, axis_mpl=twin_ax, track=self.track)
 
@@ -102,17 +108,19 @@ class AxisWrapper(MatplotlibPlotMixin, SeabornMixin, AdjustmentMixin, TrackingMi
                     # Increment tracking depth to detect internal calls
                     # Internal calls (depth > 1) won't be tracked
                     self._tracking_depth += 1
-                    is_top_level_call = (self._tracking_depth == 1)
+                    is_top_level_call = self._tracking_depth == 1
 
                     try:
                         # Apply pre-processing defaults from styles module
-                        apply_plot_defaults(__method_name__, kwargs, id_value, self._axes_mpl)
+                        apply_plot_defaults(
+                            __method_name__, kwargs, id_value, self._axes_mpl
+                        )
 
                         # Pop scitex-specific kwargs before calling matplotlib
                         # These are handled in post-processing
                         scitex_kwargs = {}
-                        if __method_name__ == 'violinplot':
-                            scitex_kwargs['boxplot'] = kwargs.pop('boxplot', True)
+                        if __method_name__ == "violinplot":
+                            scitex_kwargs["boxplot"] = kwargs.pop("boxplot", True)
 
                         # Call the original matplotlib method
                         result = orig_attr(*args, **kwargs)
@@ -124,7 +132,9 @@ class AxisWrapper(MatplotlibPlotMixin, SeabornMixin, AdjustmentMixin, TrackingMi
                                 # plot() returns list of Line2D objects
                                 for item in result:
                                     item._scitex_id = id_value
-                            elif hasattr(result, '__iter__') and not isinstance(result, str):
+                            elif hasattr(result, "__iter__") and not isinstance(
+                                result, str
+                            ):
                                 # Other containers (e.g., bar containers)
                                 try:
                                     for item in result:
@@ -142,7 +152,9 @@ class AxisWrapper(MatplotlibPlotMixin, SeabornMixin, AdjustmentMixin, TrackingMi
                         kwargs.update(scitex_kwargs)
 
                         # Apply post-processing styling from styles module
-                        apply_plot_postprocess(__method_name__, result, self._axes_mpl, kwargs, args)
+                        apply_plot_postprocess(
+                            __method_name__, result, self._axes_mpl, kwargs, args
+                        )
 
                         # Determine if tracking should occur
                         # Only track top-level calls (depth == 1), not internal matplotlib calls
@@ -154,21 +166,44 @@ class AxisWrapper(MatplotlibPlotMixin, SeabornMixin, AdjustmentMixin, TrackingMi
                         # Expanded list of matplotlib plotting methods to track
                         tracking_methods = {
                             # Basic plots
-                            'plot', 'scatter', 'bar', 'barh', 'hist', 'boxplot', 'violinplot',
+                            "plot",
+                            "scatter",
+                            "bar",
+                            "barh",
+                            "hist",
+                            "boxplot",
+                            "violinplot",
                             # Line plots
-                            'fill_between', 'fill_betweenx', 'errorbar', 'step', 'stem',
+                            "fill_between",
+                            "fill_betweenx",
+                            "errorbar",
+                            "step",
+                            "stem",
                             # Statistical plots
-                            'hist2d', 'hexbin', 'pie',
+                            "hist2d",
+                            "hexbin",
+                            "pie",
                             # Contour plots
-                            'contour', 'contourf', 'tricontour', 'tricontourf',
+                            "contour",
+                            "contourf",
+                            "tricontour",
+                            "tricontourf",
                             # Image plots
-                            'imshow', 'matshow', 'spy',
+                            "imshow",
+                            "matshow",
+                            "spy",
                             # Quiver plots
-                            'quiver', 'streamplot',
+                            "quiver",
+                            "streamplot",
                             # 3D-related (if axes3d)
-                            'plot3D', 'scatter3D', 'bar3d', 'plot_surface', 'plot_wireframe',
+                            "plot3D",
+                            "scatter3D",
+                            "bar3d",
+                            "plot_surface",
+                            "plot_wireframe",
                             # Text and annotations (data-containing)
-                            'annotate', 'text'
+                            "annotate",
+                            "text",
                         }
                         if should_track and __method_name__ in tracking_methods:
                             # Use the _track method from TrackingMixin
@@ -177,7 +212,11 @@ class AxisWrapper(MatplotlibPlotMixin, SeabornMixin, AdjustmentMixin, TrackingMi
                                 # Convert args to tracked_dict for consistency with other tracking
                                 tracked_dict = {"args": args}
                                 self._track(
-                                    should_track, id_value, __method_name__, tracked_dict, kwargs
+                                    should_track,
+                                    id_value,
+                                    __method_name__,
+                                    tracked_dict,
+                                    kwargs,
                                 )
                             except AttributeError:
                                 warnings.warn(
@@ -233,47 +272,69 @@ class AxisWrapper(MatplotlibPlotMixin, SeabornMixin, AdjustmentMixin, TrackingMi
     def __dir__(self):
         # Start with attributes from the class and all parent classes (mixins)
         attrs = set()
-        
+
         # Get attributes from all parent classes including mixins
         for cls in self.__class__.__mro__:
             attrs.update(cls.__dict__.keys())
-        
+
         # Add instance attributes
         attrs.update(self.__dict__.keys())
-        
+
         # Safely get matplotlib axes attributes
         try:
             # Get attributes from the wrapped matplotlib axes
-            if hasattr(self._axes_mpl, '__class__'):
+            if hasattr(self._axes_mpl, "__class__"):
                 # Get class methods from matplotlib.axes.Axes
                 for cls in self._axes_mpl.__class__.__mro__:
-                    attrs.update(name for name in cls.__dict__.keys() if not name.startswith('_'))
-            
+                    attrs.update(
+                        name for name in cls.__dict__.keys() if not name.startswith("_")
+                    )
+
             # Add instance attributes of the matplotlib axes
-            if hasattr(self._axes_mpl, '__dict__'):
-                attrs.update(name for name in self._axes_mpl.__dict__.keys() if not name.startswith('_'))
-                
+            if hasattr(self._axes_mpl, "__dict__"):
+                attrs.update(
+                    name
+                    for name in self._axes_mpl.__dict__.keys()
+                    if not name.startswith("_")
+                )
+
         except Exception:
             # If any error occurs, add common matplotlib methods manually
-            attrs.update(['plot', 'scatter', 'bar', 'barh', 'hist', 'boxplot', 
-                         'set_xlabel', 'set_ylabel', 'set_title', 'legend',
-                         'set_xlim', 'set_ylim', 'grid', 'annotate', 'text'])
-        
+            attrs.update(
+                [
+                    "plot",
+                    "scatter",
+                    "bar",
+                    "barh",
+                    "hist",
+                    "boxplot",
+                    "set_xlabel",
+                    "set_ylabel",
+                    "set_title",
+                    "legend",
+                    "set_xlim",
+                    "set_ylim",
+                    "grid",
+                    "annotate",
+                    "text",
+                ]
+            )
+
         # Remove private attributes
-        attrs = {attr for attr in attrs if not attr.startswith('_')}
-        
+        attrs = {attr for attr in attrs if not attr.startswith("_")}
+
         return sorted(attrs)
-        
+
     def flatten(self):
         """Return a list containing just this axis.
-        
+
         This method makes AxisWrapper compatible with code that calls flatten()
         on an axes collection. It returns a list containing just this single axis
         to maintain consistency with AxesWrapper.flatten().
-        
+
         Returns:
             list: A list containing this axis wrapper
-            
+
         Example:
             # When working with either AxesWrapper or AxisWrapper, this works:
             axes_list = list(axes.flatten())

scitex/plt/_subplots/_AxisWrapperMixins/_AdjustmentMixin.py

@@ -4,6 +4,7 @@
 # File: /ssh:ywatanabe@sp:/home/ywatanabe/proj/.claude-worktree/scitex_repo/src/scitex/plt/_subplots/_AxisWrapperMixins/_AdjustmentMixin.py
 # ----------------------------------------
 import os
+
 __FILE__ = __file__
 __DIR__ = os.path.dirname(__FILE__)
 # ----------------------------------------
@@ -29,11 +30,11 @@ class AdjustmentMixin:
         tight_layout: bool = False,
     ) -> None:
         """Rotate x and y axis labels with automatic positioning.
-        
+
         Parameters
         ----------
         x : float or None, optional
-            Rotation angle for x-axis labels in degrees. 
+            Rotation angle for x-axis labels in degrees.
             If None or 0, x-axis labels are not rotated. Default is None.
         y : float or None, optional
             Rotation angle for y-axis labels in degrees.
@@ -54,13 +55,21 @@ class AdjustmentMixin:
             Whether to apply tight_layout to prevent overlapping. Default is False.
         """
         self._axis_mpl = ax_module.rotate_labels(
-            self._axis_mpl, x=x, y=y, x_ha=x_ha, y_ha=y_ha,
-            x_va=x_va, y_va=y_va, auto_adjust=auto_adjust,
+            self._axis_mpl,
+            x=x,
+            y=y,
+            x_ha=x_ha,
+            y_ha=y_ha,
+            x_va=x_va,
+            y_va=y_va,
+            auto_adjust=auto_adjust,
             scientific_convention=scientific_convention,
-            tight_layout=tight_layout
+            tight_layout=tight_layout,
         )
 
-    def legend(self, *args, loc: str = "best", check_overlap: bool = False, **kwargs) -> None:
+    def legend(
+        self, *args, loc: str = "best", check_overlap: bool = False, **kwargs
+    ) -> None:
         """Places legend at specified location, with support for outside positions.
 
         Parameters
@@ -90,42 +99,41 @@ class AdjustmentMixin:
         if loc == "outer":
             # Place legend outside on the right, adjusting figure to make room
             legend = self._axis_mpl.legend(
-                *args,
-                loc='center left',
-                bbox_to_anchor=(1.02, 0.5),
-                **kwargs
+                *args, loc="center left", bbox_to_anchor=(1.02, 0.5), **kwargs
             )
             # Adjust figure to prevent legend cutoff
-            if hasattr(self, '_figure_wrapper') and self._figure_wrapper:
+            if hasattr(self, "_figure_wrapper") and self._figure_wrapper:
                 self._figure_wrapper._fig_mpl.tight_layout()
                 self._figure_wrapper._fig_mpl.subplots_adjust(right=0.85)
             return legend
-            
+
         elif loc == "separate":
             # Set flag to save legend separately when figure is saved
             import warnings
-            
+
             handles, labels = self._axis_mpl.get_legend_handles_labels()
             if not handles:
-                warnings.warn("No legend handles found. Create plots with labels first.")
+                warnings.warn(
+                    "No legend handles found. Create plots with labels first."
+                )
                 return None
-            
+
             # Store legend params for later use during save
             fig = self._axis_mpl.get_figure()
-            if not hasattr(fig, '_separate_legend_params'):
+            if not hasattr(fig, "_separate_legend_params"):
                 fig._separate_legend_params = []
-            
+
             # Extract separate-specific kwargs
-            figsize = kwargs.pop('figsize', (4, 3))
-            dpi = kwargs.pop('dpi', 150)
-            frameon = kwargs.pop('frameon', True)
-            fancybox = kwargs.pop('fancybox', True)
-            shadow = kwargs.pop('shadow', True)
-            
+            figsize = kwargs.pop("figsize", (4, 3))
+            dpi = kwargs.pop("dpi", 150)
+            frameon = kwargs.pop("frameon", True)
+            fancybox = kwargs.pop("fancybox", True)
+            shadow = kwargs.pop("shadow", True)
+
             # Store parameters for this axes
             # Include axis index or name for unique filenames
             axis_id = None
-            
+
             # Try to find axis index in parent figure
             try:
                 fig_axes = fig.get_axes()
@@ -135,9 +143,9 @@ class AdjustmentMixin:
                         break
             except:
                 pass
-            
+
             # If not found, try subplot spec
-            if axis_id is None and hasattr(self._axis_mpl, 'get_subplotspec'):
+            if axis_id is None and hasattr(self._axis_mpl, "get_subplotspec"):
                 try:
                     spec = self._axis_mpl.get_subplotspec()
                     if spec is not None:
@@ -147,34 +155,40 @@ class AdjustmentMixin:
                         rowspan = spec.rowspan
                         colspan = spec.colspan
                         # Calculate flat index from row/col position
-                        row_start = rowspan.start if hasattr(rowspan, 'start') else rowspan
-                        col_start = colspan.start if hasattr(colspan, 'start') else colspan
+                        row_start = (
+                            rowspan.start if hasattr(rowspan, "start") else rowspan
+                        )
+                        col_start = (
+                            colspan.start if hasattr(colspan, "start") else colspan
+                        )
                         flat_idx = row_start * ncols + col_start
                         axis_id = f"ax_{flat_idx:02d}"
                 except:
                     pass
-            
+
             # Fallback to sequential numbering
             if axis_id is None:
                 axis_id = f"ax_{len(fig._separate_legend_params):02d}"
-                
-            fig._separate_legend_params.append({
-                'axis': self._axis_mpl,
-                'axis_id': axis_id,
-                'handles': handles,
-                'labels': labels,
-                'figsize': figsize,
-                'dpi': dpi,
-                'frameon': frameon,
-                'fancybox': fancybox,
-                'shadow': shadow,
-                'kwargs': kwargs
-            })
-            
+
+            fig._separate_legend_params.append(
+                {
+                    "axis": self._axis_mpl,
+                    "axis_id": axis_id,
+                    "handles": handles,
+                    "labels": labels,
+                    "figsize": figsize,
+                    "dpi": dpi,
+                    "frameon": frameon,
+                    "fancybox": fancybox,
+                    "shadow": shadow,
+                    "kwargs": kwargs,
+                }
+            )
+
             # Remove legend from main figure immediately
             if self._axis_mpl.get_legend():
                 self._axis_mpl.get_legend().remove()
-            
+
             return None
 
         # Original outside positions
@@ -210,7 +224,9 @@ class AdjustmentMixin:
         # Place the legend
         if loc in outside_positions:
             location, bbox = outside_positions[loc]
-            legend_obj = self._axis_mpl.legend(*args, loc=location, bbox_to_anchor=bbox, **kwargs)
+            legend_obj = self._axis_mpl.legend(
+                *args, loc=location, bbox_to_anchor=bbox, **kwargs
+            )
         else:
             legend_obj = self._axis_mpl.legend(*args, loc=loc, **kwargs)
 
@@ -266,11 +282,16 @@ class AdjustmentMixin:
             # Check for overlap
             if data_bboxes:
                 import numpy as np
+
                 all_data = np.vstack(data_bboxes)
 
                 # Count how many data points fall within legend bbox
-                x_overlap = (all_data[:, 0] >= legend_bbox_data.x0) & (all_data[:, 0] <= legend_bbox_data.x1)
-                y_overlap = (all_data[:, 1] >= legend_bbox_data.y0) & (all_data[:, 1] <= legend_bbox_data.y1)
+                x_overlap = (all_data[:, 0] >= legend_bbox_data.x0) & (
+                    all_data[:, 0] <= legend_bbox_data.x1
+                )
+                y_overlap = (all_data[:, 1] >= legend_bbox_data.y0) & (
+                    all_data[:, 1] <= legend_bbox_data.y1
+                )
                 overlap_points = np.sum(x_overlap & y_overlap)
 
                 # Calculate overlap percentage
@@ -285,7 +306,7 @@ class AdjustmentMixin:
                         f"  - ax.legend(loc='separate')  # Save as separate file\n"
                         f"  - Manually adjust with loc='upper left', 'lower right', etc.",
                         UserWarning,
-                        stacklevel=3
+                        stacklevel=3,
                     )
                     return True  # Overlap detected
 
@@ -408,7 +429,7 @@ class AdjustmentMixin:
         experimental_details=None,
         journal_style=None,
         significance=None,
-        **kwargs
+        **kwargs,
     ) -> None:
         """Set comprehensive scientific metadata with YAML export capability.
 
@@ -440,7 +461,7 @@ class AdjustmentMixin:
             experimental_details=experimental_details,
             journal_style=journal_style,
             significance=significance,
-            **kwargs
+            **kwargs,
         )
 
     def set_figure_meta(
@@ -452,7 +473,7 @@ class AdjustmentMixin:
         funding=None,
         conflicts=None,
         data_availability=None,
-        **kwargs
+        **kwargs,
     ) -> None:
         """Set figure-level metadata for multi-panel figures.
 
@@ -484,7 +505,7 @@ class AdjustmentMixin:
             funding=funding,
             conflicts=conflicts,
             data_availability=data_availability,
-            **kwargs
+            **kwargs,
         )
 
     def set_ticks(
@@ -534,4 +555,5 @@ class AdjustmentMixin:
     def shift(self, dx: float = 0, dy: float = 0) -> None:
         self._axis_mpl = ax_module.shift(self._axis_mpl, dx=dx, dy=dy)
 
+
 # EOF