maidr 1.7.0__tar.gz → 1.7.1__tar.gz

{maidr-1.7.0 → maidr-1.7.1}/CHANGELOG.md

@@ -1,6 +1,14 @@
 # CHANGELOG
 
 
+## v1.7.1 (2025-09-03)
+
+### Bug Fixes
+
+- Address categorical x-values in line plot ([#236](https://github.com/xability/py-maidr/pull/236),
+  [`d4e0eea`](https://github.com/xability/py-maidr/commit/d4e0eea6e558fc6540eb9500b82dedb339f739b4))
+
+
 ## v1.7.0 (2025-08-21)
 
 ### Features

{maidr-1.7.0 → maidr-1.7.1}/PKG-INFO

@@ -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 → maidr-1.7.1}/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-1.7.0 → maidr-1.7.1}/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-1.7.0 → maidr-1.7.1}/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 → maidr-1.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "maidr"
-version = "1.7.0"
+version = "1.7.1"
 description = "Multimodal Access and Interactive Data Representations"
 authors = [
     { name = "JooYoung Seo", email = "jseo1005@illinois.edu" },

{maidr-1.7.0 → maidr-1.7.1}/uv.lock

@@ -1675,7 +1675,7 @@ wheels = [
 
 [[package]]
 name = "maidr"
-version = "1.6.1"
+version = "1.7.0"
 source = { editable = "." }
 dependencies = [
     { name = "htmltools" },