maidr 1.7.0__py3-none-any.whl → 1.7.1__py3-none-any.whl

maidr/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.7.0"
+__version__ = "1.7.1"
 
 from .api import close, render, save_html, show, stacked
 from .core import Maidr

maidr/core/plot/lineplot.py

@@ -114,13 +114,18 @@ class MultiLinePlot(MaidrPlot, LineExtractorMixin):
             elif not label.startswith("_child"):
                 line_type = label
 
+            # Use the new method to extract data with categorical labels
+            line_coords = LineExtractorMixin.extract_line_data_with_categorical_labels(self.ax, line)
+            if line_coords is None:
+                continue
+
             line_data = [
                 {
-                    MaidrKey.X: float(x),
-                    MaidrKey.Y: float(y),
+                    MaidrKey.X: x,
+                    MaidrKey.Y: y,
                     **({MaidrKey.FILL: line_type} if line_type else {}),
                 }
-                for x, y in line.get_xydata()  # type: ignore
+                for x, y in line_coords
             ]
 
             if line_data:

maidr/util/mixin/extractor_mixin.py

@@ -1,6 +1,5 @@
-from __future__ import annotations
-
-from typing import Any
+import numpy as np
+from typing import Any, List, Optional, Tuple, Union
 
 from matplotlib.axes import Axes
 from matplotlib.cm import ScalarMappable
@@ -38,7 +37,7 @@ class ContainerExtractorMixin:
 
 class LevelExtractorMixin:
     @staticmethod
-    def extract_level(ax: Axes, key: MaidrKey = MaidrKey.X) -> list[str] | None:
+    def extract_level(ax: Axes, key: MaidrKey = MaidrKey.X) -> Optional[List[str]]:
         """Retrieve label texts from Axes based on the specified Maidr key."""
         if ax is None:
             return None
@@ -95,7 +94,7 @@ class LevelExtractorMixin:
 
 class LineExtractorMixin:
     @staticmethod
-    def extract_line(ax: Axes) -> Line2D | None:
+    def extract_line(ax: Axes) -> Optional[Line2D]:
         """Retrieve the last line object from Axes, if available."""
         if ax is None or ax.get_lines() is None:
             return None
@@ -105,7 +104,7 @@ class LineExtractorMixin:
         return ax.get_lines()[-1]
 
     @staticmethod
-    def extract_lines(ax: Axes) -> list[Line2D] | None:
+    def extract_lines(ax: Axes) -> Optional[List[Line2D]]:
         """Retrieve all line objects from Axes, if available."""
         if ax is None or ax.get_lines() is None:
             return None
@@ -114,6 +113,54 @@ class LineExtractorMixin:
         # `maidr` package supports the same.
         return ax.get_lines()
 
+    @staticmethod
+    def extract_line_data_with_categorical_labels(ax: Axes, line: Line2D) -> Optional[List[Tuple[Union[str, float], float]]]:
+        """
+        Extract line data with proper handling of categorical x-axis labels.
+
+        Parameters
+        ----------
+        ax : Axes
+            The matplotlib axes object
+        line : Line2D
+            The line object to extract data from
+
+        Returns
+        -------
+        Optional[List[Tuple[Union[str, float], float]]]
+            List of (x, y) tuples where x values are categorical labels if available,
+            or numeric values if no categorical labels are found
+        """
+        if ax is None or line is None:
+            return None
+
+        xydata = line.get_xydata()
+        if xydata is None:
+            return None
+
+        # Convert to numpy array for easier handling
+        xy_array = np.asarray(xydata)
+        if xy_array.size == 0:
+            return None
+
+        # Extract x-axis labels for categorical data
+        x_labels = LevelExtractorMixin.extract_level(ax, MaidrKey.X)
+
+        # If we have categorical labels, map numeric coordinates to labels
+        if x_labels:
+            result = []
+            for x, y in xy_array:
+                # Map numeric x-coordinate to categorical label if available
+                if isinstance(x, (int, float)) and 0 <= int(x) < len(x_labels):
+                    x_value = x_labels[int(x)]
+                else:
+                    x_value = float(x)
+                result.append((x_value, float(y)))
+            return result
+        else:
+            # No categorical labels, return numeric values
+            return [(float(x), float(y)) for x, y in xy_array]
+
 
 class CollectionExtractorMixin:
     @staticmethod
@@ -133,7 +180,7 @@ class CollectionExtractorMixin:
 
 class ScalarMappableExtractorMixin:
     @staticmethod
-    def extract_scalar_mappable(ax: Axes) -> ScalarMappable | None:
+    def extract_scalar_mappable(ax: Axes) -> Optional[ScalarMappable]:
         """Retrieve the first collection ScalarMappable from an Axes object."""
         if ax is None or ax.get_children() is None:
             return None

{maidr-1.7.0.dist-info → maidr-1.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maidr
-Version: 1.7.0
+Version: 1.7.1
 Summary: Multimodal Access and Interactive Data Representations
 Project-URL: Homepage, https://xability.github.io/py-maidr
 Project-URL: Repository, https://github.com/xability/py-maidr

{maidr-1.7.0.dist-info → maidr-1.7.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maidr/__init__.py,sha256=N6tFj8F07eJxaRvcZZNW0wNWTR2I2JcTgM9PTSKWGtM,415
+maidr/__init__.py,sha256=5pE1kfXuUom-1WcK9Z4Dl8PFegDww1BeKyscUSWJ4Rg,415
 maidr/api.py,sha256=gRNLXqUWpFGdD-I7Nu6J0_LeEni9KRAr0TBHwHaDAsc,1928
 maidr/core/__init__.py,sha256=WgxLpSEYMc4k3OyEOf1shOxfEq0ASzppEIZYmE91ThQ,25
 maidr/core/context_manager.py,sha256=6cT7ZGOApSpC-SLD2XZWWU_H08i-nfv-JUlzXOtvWYw,3374
@@ -16,7 +16,7 @@ maidr/core/plot/candlestick.py,sha256=9R1ddSnUkGEE9WJgUPeuZhRtxXNBnOM9rbJdfJcY8b
 maidr/core/plot/grouped_barplot.py,sha256=_zn4XMeEnSiDHtf6t4-z9ErBqg_CijhAS2CCtlHgYIQ,2077
 maidr/core/plot/heatmap.py,sha256=yMS-31tS2GW4peds9LtZesMxmmTV_YfqYO5M_t5KasQ,2521
 maidr/core/plot/histogram.py,sha256=QV5W-6ZJQQcZsrM91JJBX-ONktJzH7yg_et5_bBPfQQ,1525
-maidr/core/plot/lineplot.py,sha256=48aEkx8rjZ9lYEZSHWCJcSzdVblKwcdJZDZK0vnxmPo,4291
+maidr/core/plot/lineplot.py,sha256=VbMjG-D5X-oeehduAtbqsyZ-hbcFc4NQYBwpCzgk4lo,4492
 maidr/core/plot/maidr_plot.py,sha256=9T0boWaonM99jggEed97-rCy_cufRMWXrXo-CbmPudE,4230
 maidr/core/plot/maidr_plot_factory.py,sha256=NW2iFScswgXbAC9rAOo4iMkAFsjY43DAvFioGr0yzx4,2732
 maidr/core/plot/mplfinance_barplot.py,sha256=zhTp2i6BH0xn7vQvGTotKgu2HbzlKT4p6zA5CVUUHHc,5673
@@ -48,11 +48,11 @@ maidr/util/plot_detection.py,sha256=bgLHoDcHSRwOiyKzUK3EqGwdAIhF44ocHW5ox6xYGZw,
 maidr/util/regression_line_utils.py,sha256=yFKr-H0whT_su2YVZwNksBLp5EC5s77sr6HUFgNcsyY,2329
 maidr/util/svg_utils.py,sha256=2gyzBtNKFHs0utrw1iOlxTmznzivOWQMV2aW8zu2c8E,1442
 maidr/util/mixin/__init__.py,sha256=aGJZNhtWh77yIVPc7ipIZm1OajigjMtCWYKPuDWTC-c,217
-maidr/util/mixin/extractor_mixin.py,sha256=oHtwpmS5kARvaLrSO3DKTPQxyFUw9nOcKN7rzTj1q4g,5192
+maidr/util/mixin/extractor_mixin.py,sha256=l1DQTqZiVeZ18qXrz-rKCh8ETFofucBfwjIjO4S85HU,6923
 maidr/util/mixin/merger_mixin.py,sha256=V0qLw_6DUB7X6CQ3BCMpsCQX_ZuwAhoSTm_E4xAJFKM,712
 maidr/widget/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maidr/widget/shiny.py,sha256=wrrw2KAIpE_A6CNQGBtNHauR1DjenA_n47qlFXX9_rk,745
-maidr-1.7.0.dist-info/METADATA,sha256=rjXKEyignRmgCOB6C6E_FhvqEkPvjGHIMuxFkZAHpos,3154
-maidr-1.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-maidr-1.7.0.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-maidr-1.7.0.dist-info/RECORD,,
+maidr-1.7.1.dist-info/METADATA,sha256=WjKqqdKOwH8ZkI00md0BINyrpZv_hpD3WL5ZL1_iXkM,3154
+maidr-1.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+maidr-1.7.1.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+maidr-1.7.1.dist-info/RECORD,,