plotnine 0.15.0.dev2__py3-none-any.whl → 0.15.1__py3-none-any.whl

plotnine/__init__.py

@@ -198,6 +198,7 @@ from .scales import (
     scale_size_radius,
     scale_stroke,
     scale_stroke_continuous,
+    scale_stroke_identity,
     scale_x_continuous,
     scale_x_date,
     scale_x_datetime,
@@ -441,6 +442,7 @@ __all__ = (
     "scale_size_radius",
     "scale_stroke",
     "scale_stroke_continuous",
+    "scale_stroke_identity",
     "scale_x_continuous",
     "scale_x_date",
     "scale_x_datetime",

plotnine/_mpl/layout_manager/_engine.py

@@ -13,7 +13,7 @@ if TYPE_CHECKING:
     from matplotlib.figure import Figure
 
     from plotnine import ggplot
-    from plotnine.plot_composition import Compose
+    from plotnine.composition import Compose
 
 
 class PlotnineLayoutEngine(LayoutEngine):

plotnine/_mpl/layout_manager/_layout_items.py

@@ -6,6 +6,8 @@ from typing import TYPE_CHECKING, cast
 
 from matplotlib.text import Text
 
+from plotnine._mpl.patches import StripTextPatch
+from plotnine._utils import ha_as_float, va_as_float
 from plotnine.exceptions import PlotnineError
 
 from ..utils import (
@@ -35,7 +37,11 @@ if TYPE_CHECKING:
     from plotnine._mpl.text import StripText
     from plotnine.iapi import legend_artists
     from plotnine.themes.elements import margin as Margin
-    from plotnine.typing import StripPosition
+    from plotnine.typing import (
+        HorizontalJustification,
+        StripPosition,
+        VerticalJustification,
+    )
 
     from ._spaces import LayoutSpaces
 
@@ -299,43 +305,9 @@ class LayoutItems:
 
         return chain(major, minor)
 
-    def axis_text_x_margin(self, ax: Axes) -> Iterator[float]:
-        """
-        Return XTicks paddings
-        """
-        # In plotnine tick padding are specified as a margin to the
-        # the axis_text.
-        major, minor = [], []
-        if not self._is_blank("axis_text_x"):
-            h = self.plot.figure.bbox.height
-            major = [
-                (t.get_pad() or 0) / h for t in ax.xaxis.get_major_ticks()
-            ]
-            minor = [
-                (t.get_pad() or 0) / h for t in ax.xaxis.get_minor_ticks()
-            ]
-        return chain(major, minor)
-
-    def axis_text_y_margin(self, ax: Axes) -> Iterator[float]:
-        """
-        Return YTicks paddings
-        """
-        # In plotnine tick padding are specified as a margin to the
-        # the axis_text.
-        major, minor = [], []
-        if not self._is_blank("axis_text_y"):
-            w = self.plot.figure.bbox.width
-            major = [
-                (t.get_pad() or 0) / w for t in ax.yaxis.get_major_ticks()
-            ]
-            minor = [
-                (t.get_pad() or 0) / w for t in ax.yaxis.get_minor_ticks()
-            ]
-        return chain(major, minor)
-
-    def strip_text_x_height(self, position: StripPosition) -> float:
+    def strip_text_x_extra_height(self, position: StripPosition) -> float:
         """
-        Height taken up by the top strips
+        Height taken up by the top strips that is outside the panels
         """
         if not self.strip_text_x:
             return 0
@@ -345,11 +317,23 @@ class LayoutItems:
             for st in self.strip_text_x
             if st.patch.position == position
         ]
-        return self.calc.max_height(artists)
 
-    def strip_text_y_width(self, position: StripPosition) -> float:
+        heights = []
+
+        for a in artists:
+            info = (
+                a.text.draw_info
+                if isinstance(a, StripTextPatch)
+                else a.draw_info
+            )
+            h = self.calc.height(a)
+            heights.append(max(h + h * info.strip_align, 0))
+
+        return max(heights)
+
+    def strip_text_y_extra_width(self, position: StripPosition) -> float:
         """
-        Width taken up by the right strips
+        Width taken up by the top strips that is outside the panels
         """
         if not self.strip_text_y:
             return 0
@@ -359,7 +343,19 @@ class LayoutItems:
             for st in self.strip_text_y
             if st.patch.position == position
         ]
-        return self.calc.max_width(artists)
+
+        widths = []
+
+        for a in artists:
+            info = (
+                a.text.draw_info
+                if isinstance(a, StripTextPatch)
+                else a.draw_info
+            )
+            w = self.calc.width(a)
+            widths.append(max(w + w * info.strip_align, 0))
+
+        return max(widths)
 
     def axis_ticks_x_max_height_at(self, location: AxesLocation) -> float:
         """
@@ -377,10 +373,7 @@ class LayoutItems:
         Return maximum height[figure space] of x tick labels
         """
         heights = [
-            self.calc.tight_height(label) + pad
-            for label, pad in zip(
-                self.axis_text_x(ax), self.axis_text_x_margin(ax)
-            )
+            self.calc.tight_height(label) for label in self.axis_text_x(ax)
         ]
         return max(heights) if len(heights) else 0
 
@@ -410,10 +403,7 @@ class LayoutItems:
         Return maximum width[figure space] of y tick labels
         """
         widths = [
-            self.calc.tight_width(label) + pad
-            for label, pad in zip(
-                self.axis_text_y(ax), self.axis_text_y_margin(ax)
-            )
+            self.calc.tight_width(label) for label in self.axis_text_y(ax)
         ]
         return max(widths) if len(widths) else 0
 
@@ -529,6 +519,8 @@ class LayoutItems:
 
         self._adjust_axis_text_x(justify)
         self._adjust_axis_text_y(justify)
+        self._strip_text_x_background_equal_heights()
+        self._strip_text_y_background_equal_widths()
 
     def _adjust_axis_text_x(self, justify: TextJustifier):
         """
@@ -614,6 +606,36 @@ class LayoutItems:
                     text, ha, -axis_text_col_width, 0, width=width
                 )
 
+    def _strip_text_x_background_equal_heights(self):
+        """
+        Make the strip_text_x_backgrounds have equal heights
+
+        The smaller heights are expanded to match the largest height
+        """
+        if not self.strip_text_x:
+            return
+
+        heights = [self.calc.bbox(t.patch).height for t in self.strip_text_x]
+        max_height = max(heights)
+        relative_heights = [max_height / h for h in heights]
+        for text, scale in zip(self.strip_text_x, relative_heights):
+            text.patch.expand = scale
+
+    def _strip_text_y_background_equal_widths(self):
+        """
+        Make the strip_text_y_backgrounds have equal widths
+
+        The smaller widths are expanded to match the largest width
+        """
+        if not self.strip_text_y:
+            return
+
+        widths = [self.calc.bbox(t.patch).width for t in self.strip_text_y]
+        max_width = max(widths)
+        relative_widths = [max_width / w for w in widths]
+        for text, scale in zip(self.strip_text_y, relative_widths):
+            text.patch.expand = scale
+
 
 def _text_is_visible(text: Text) -> bool:
     """
@@ -636,7 +658,7 @@ class TextJustifier:
     def horizontally(
         self,
         text: Text,
-        ha: str | float,
+        ha: HorizontalJustification | float,
         left: float,
         right: float,
         width: float | None = None,
@@ -644,8 +666,7 @@ class TextJustifier:
         """
         Horizontally Justify text between left and right
         """
-        lookup = {"left": 0.0, "center": 0.5, "right": 1.0}
-        rel = lookup.get(ha, ha)  # pyright: ignore[reportCallIssue, reportArgumentType]
+        rel = ha_as_float(ha)
         if width is None:
             width = self.spaces.items.calc.width(text)
         x = rel_position(rel, width, left, right)
@@ -655,7 +676,7 @@ class TextJustifier:
     def vertically(
         self,
         text: Text,
-        va: str | float,
+        va: VerticalJustification | float,
         bottom: float,
         top: float,
         height: float | None = None,
@@ -663,14 +684,7 @@ class TextJustifier:
         """
         Vertically Justify text between bottom and top
         """
-        lookup = {
-            "top": 1.0,
-            "center": 0.5,
-            "baseline": 0.5,
-            "center_baseline": 0.5,
-            "bottom": 0.0,
-        }
-        rel = lookup.get(va, va)  # pyright: ignore[reportCallIssue, reportArgumentType]
+        rel = va_as_float(va)
 
         if height is None:
             height = self.spaces.items.calc.height(text)
@@ -678,13 +692,19 @@ class TextJustifier:
         text.set_y(y)
         text.set_verticalalignment("bottom")
 
-    def horizontally_across_panel(self, text: Text, ha: str | float):
+    def horizontally_across_panel(
+        self, text: Text, ha: HorizontalJustification | float
+    ):
         """
         Horizontally Justify text accross the panel(s) width
         """
-        self.horizontally(text, ha, self.spaces.l.left, self.spaces.r.right)
+        self.horizontally(
+            text, ha, self.spaces.l.panel_left, self.spaces.r.panel_right
+        )
 
-    def horizontally_across_plot(self, text: Text, ha: str | float):
+    def horizontally_across_plot(
+        self, text: Text, ha: HorizontalJustification | float
+    ):
         """
         Horizontally Justify text across the plot's width
         """
@@ -692,13 +712,19 @@ class TextJustifier:
             text, ha, self.spaces.l.plot_left, self.spaces.r.plot_right
         )
 
-    def vertically_along_panel(self, text: Text, va: str | float):
+    def vertically_along_panel(
+        self, text: Text, va: VerticalJustification | float
+    ):
         """
         Horizontally Justify text along the panel(s) height
         """
-        self.vertically(text, va, self.spaces.b.bottom, self.spaces.t.top)
+        self.vertically(
+            text, va, self.spaces.b.panel_bottom, self.spaces.t.panel_top
+        )
 
-    def vertically_along_plot(self, text: Text, va: str | float):
+    def vertically_along_plot(
+        self, text: Text, va: VerticalJustification | float
+    ):
         """
         Vertically Justify text along the plot's height
         """
@@ -763,7 +789,7 @@ def set_legends_position(legends: legend_artists, spaces: LayoutSpaces):
     if legends.right:
         y = rel_position(
             legends.right.justification,
-            spaces.r._legend_height,
+            spaces.r.legend_height,
             params.bottom,
             params.top,
         )
@@ -773,7 +799,7 @@ def set_legends_position(legends: legend_artists, spaces: LayoutSpaces):
     if legends.left:
         y = rel_position(
             legends.left.justification,
-            spaces.l._legend_height,
+            spaces.l.legend_height,
             params.bottom,
             params.top,
         )
@@ -783,7 +809,7 @@ def set_legends_position(legends: legend_artists, spaces: LayoutSpaces):
     if legends.top:
         x = rel_position(
             legends.top.justification,
-            spaces.t._legend_width,
+            spaces.t.legend_width,
             params.left,
             params.right,
         )
@@ -793,7 +819,7 @@ def set_legends_position(legends: legend_artists, spaces: LayoutSpaces):
     if legends.bottom:
         x = rel_position(
             legends.bottom.justification,
-            spaces.b._legend_width,
+            spaces.b.legend_width,
             params.left,
             params.right,
         )
@@ -870,7 +896,10 @@ def set_plot_tag_position(tag: Text, spaces: LayoutSpaces):
 
 def set_plot_tag_position_in_margin(tag: Text, spaces: LayoutSpaces):
     """
-    Place the tag in the margin around the plot
+    Place the tag in an inner margin around the plot
+
+    The panel_margin remains outside the tag. For compositions, the
+    tag is placed and within the tag_alignment space.
     """
     position: TagPosition = spaces.plot.theme.getp("plot_tag_position")
     if not isinstance(position, str):
@@ -880,18 +909,34 @@ def set_plot_tag_position_in_margin(tag: Text, spaces: LayoutSpaces):
         )
 
     tag.set_position(spaces.to_figure_space((0.5, 0.5)))
-    if "top" in position:
-        tag.set_y(spaces.t.y2("plot_tag"))
-        tag.set_verticalalignment("top")
-    if "bottom" in position:
-        tag.set_y(spaces.b.y1("plot_tag"))
-        tag.set_verticalalignment("bottom")
-    if "left" in position:
-        tag.set_x(spaces.l.x1("plot_tag"))
+    ha = spaces.plot.theme.get_ha("plot_tag")
+    va = spaces.plot.theme.get_va("plot_tag")
+    if "left" in position:  # left, topleft, bottomleft
+        space = spaces.l.tag_alignment
+        x = spaces.l.x1("plot_tag") - (1 - ha) * space
+        tag.set_x(x)
+        tag.set_horizontalalignment("left")
+    if "right" in position:  # right, topright, bottomright
+        space = spaces.r.tag_alignment
+        x = spaces.r.x1("plot_tag") + ha * space
+        tag.set_x(x)
         tag.set_horizontalalignment("left")
-    if "right" in position:
-        tag.set_x(spaces.r.x2("plot_tag"))
-        tag.set_horizontalalignment("right")
+    if "bottom" in position:  # bottom, bottomleft, bottomright
+        space = spaces.b.tag_alignment
+        y = spaces.b.y1("plot_tag") + (1 - va) * space
+        tag.set_y(y)
+        tag.set_verticalalignment("bottom")
+    if "top" in position:  # top, topleft, topright
+        space = spaces.t.tag_alignment
+        y = spaces.t.y1("plot_tag") + va * space
+        tag.set_y(y)
+        tag.set_verticalalignment("bottom")
+
+    justify = TextJustifier(spaces)
+    if position in ("left", "right"):
+        justify.vertically_along_plot(tag, va)
+    elif position in ("top", "bottom"):
+        justify.horizontally_across_plot(tag, ha)
 
 
 def _plot_tag_margin_adjustment(