drawlib 0.2.3.dev5__py3-none-any.whl → 0.2.3.dev7__py3-none-any.whl

drawlib/__init__.py

@@ -14,7 +14,7 @@ import sys
 from typing import Final, List
 
 # please update here when you release new version
-LIB_VERSION = "0.2.3.dev5"
+LIB_VERSION: Final[str] = "0.2.3.dev7"
 
 # please list active main committers (1+ commits per month)
 AUTHORS: Final[List[str]] = [

drawlib/v0_2/private/core/util.py

@@ -11,7 +11,7 @@
 """Utility module for converting drawlib data to matplotlib data."""
 
 import math
-from typing import Any, Callable, Dict, Literal, Optional, Tuple, Union
+from typing import Any, Callable, Dict, List, Literal, Optional, Tuple, Union
 
 from matplotlib.font_manager import FontProperties
 from matplotlib.text import Text
@@ -238,6 +238,58 @@ class ImageUtil:
 class LineUtil:
     """A utility class for handling line styles and options."""
 
+    @staticmethod
+    def sanitize_xys(xys: List[Tuple[float, float]]) -> List[Tuple[float, float]]:
+        def remove_consecutive_duplicates(xys: List[Tuple[float, float]]) -> List[Tuple[float, float]]:
+            return [v for i, v in enumerate(xys) if i == 0 or v != xys[i - 1]]
+
+        def merge_straight_lines(xys: List[Tuple[float, float]]) -> List[Tuple[float, float]]:  # noqa: C901
+            points: List[Tuple[float, float]] = []
+
+            skip_next = False
+            for i in range(len(xys) - 1):
+                if skip_next:
+                    skip_next = False
+                    continue
+
+                if i == 0:
+                    points.append(xys[i])
+                    continue
+
+                x0, y0 = points[-1]
+                x1, y1 = xys[i]
+                x2, y2 = xys[i + 1]
+                if x1 - x0 == 0:
+                    if x2 - x1 == 0:
+                        points.append(xys[i + 1])
+                        skip_next = True
+                        continue
+                    else:
+                        points.append(xys[i])
+                        if i == len(xys) - 2:
+                            points.append(xys[i + 1])
+                        continue
+
+                if x2 - x1 == 0:
+                    points.append(xys[i])
+                    if i == len(xys) - 2:
+                        points.append(xys[i + 1])
+                    continue
+
+                m1 = (y1 - y0) / (x1 - x0)
+                m2 = (y2 - y1) / (x2 - x1)
+                if m1 == m2:
+                    skip_next = True
+                    points.append(xys[i + 1])
+                else:
+                    points.append(xys[i])
+                    if i == len(xys) - 2:
+                        points.append(xys[i + 1])
+
+            return points
+
+        return merge_straight_lines(remove_consecutive_duplicates(xys))
+
     @staticmethod
     def format_style(
         style: Union[LineStyle, str, None],

drawlib/v0_2/private/core_canvas/line.py

@@ -268,7 +268,7 @@ class CanvasLineFeature(CanvasBase):
         """
         style = LineUtil.format_style(style)
         validator.validate_line_args(locals())
-
+        xys = LineUtil.sanitize_xys(xys)
         self.lines_bezier(
             xy=xys[0],
             path_points=xys[1:],  # type: ignore
@@ -300,10 +300,12 @@ class CanvasLineFeature(CanvasBase):
         """
         style = LineUtil.format_style(style)
         validator.validate_line_args(locals())
+
         if len(xys) == 2:
-            self.lines(xys, width=width, arrowhead=arrowhead, style=style)
+            self.line(xys[0], xys[1], width=width, arrowhead=arrowhead, style=style)
             return
 
+        xys = LineUtil.sanitize_xys(xys)
         path_points = []
         last_i = len(xys) - 2
         # last_xy = (0, 0)

drawlib/v0_2/private/core_canvas/original_arrow.py

@@ -19,7 +19,7 @@ from matplotlib.path import Path
 import drawlib.v0_2.private.validators.args as validator
 from drawlib.v0_2.private.core.model import ShapeStyle, ShapeTextStyle
 from drawlib.v0_2.private.core.theme import dtheme
-from drawlib.v0_2.private.core.util import ShapeUtil
+from drawlib.v0_2.private.core.util import LineUtil, ShapeUtil
 from drawlib.v0_2.private.core_canvas.base import CanvasBase
 from drawlib.v0_2.private.core_canvas.line import LineArcHelper
 from drawlib.v0_2.private.util import (
@@ -205,6 +205,7 @@ class CanvasOriginalArrowFeature(CanvasBase):
             new_point = (a[0] + scaled_vector[0], a[1] + scaled_vector[1])
             return new_point
 
+        xys = LineUtil.sanitize_xys(xys)
         if head in {"<-", "<->"}:
             xys_start = point_on_line(xys[0], xys[1], head_length)
         else:
@@ -568,9 +569,6 @@ class ArrowPolylineHelper:
                 curve.append((x, y))
             return curve
 
-        def remove_consecutive_duplicates(lst: List[Any]) -> List[Any]:
-            return [v for i, v in enumerate(lst) if i == 0 or v != lst[i - 1]]
-
         self._r = r
         if r == 0:
             self._original_points = xys[:]
@@ -600,7 +598,7 @@ class ArrowPolylineHelper:
             points.extend(get_points(bezier_points))
             bezier_start = p2
 
-        self._original_points = remove_consecutive_duplicates(points)
+        self._original_points = points
 
     def get_parallel_points(self, distance: float) -> List[Tuple[float, float]]:
         """Internal function"""
@@ -619,7 +617,6 @@ class ArrowPolylineHelper:
             p0, p1 = self._original_points[i - 1], self._original_points[i]
             dx, dy = p1[0] - p0[0], p1[1] - p0[1]
             length = get_distance(p0, p1)
-            print(p0, p1, length)
             nx, ny = -dy / length, dx / length
             px0, py0 = p0[0] + distance * nx, p0[1] + distance * ny
             px1, py1 = p1[0] + distance * nx, p1[1] + distance * ny

drawlib/v0_2/private/smartarts/boxlist.py

@@ -10,6 +10,7 @@
 
 """BoxList implementation module."""
 
+import dataclasses
 from typing import Any, List, Literal, Optional, Tuple, Union
 
 from drawlib.v0_2.private.core.colors import Colors
@@ -32,47 +33,135 @@ class BoxList:
     @error_handler
     def __init__(
         self,
-        box_style: Union[str, ShapeStyle, None] = None,
-        text_style: Union[str, ShapeTextStyle, None] = None,
-        box_highlight_style: Union[str, ShapeStyle, None] = None,
-        text_highlight_style: Union[str, ShapeTextStyle, None] = None,
+        default_box_style: Union[str, ShapeStyle, None] = None,
+        default_text_style: Union[str, ShapeTextStyle, None] = None,
     ) -> None:
         """Initialize BoxList.
 
         Args:
-            box_style (Union[str, ShapeStyle, None]): The style for the boxes.
-            text_style (Union[str, ShapeTextStyle, None]): The style for the text inside the boxes.
+            default_box_style (Union[str, ShapeStyle, None]): The style for the boxes.
+            default_text_style (Union[str, ShapeTextStyle, None]): The style for the text inside the boxes.
             box_highlight_style (Union[str, ShapeStyle, None]): The style for the highlighted boxes.
             text_highlight_style (Union[str, ShapeTextStyle, None]):
                     The style for the text inside the highlighted boxes.
         """
+        if isinstance(default_box_style, str):
+            default_box_style = dtheme.rectanglestyles.get(default_box_style)
+        if default_box_style is None:
+            default_box_style = dtheme.rectanglestyles.get()
+        default_box_style.halign = "center"
+        default_box_style.valign = "center"
+        self._default_box_style = default_box_style
+
+        if isinstance(default_text_style, str):
+            default_text_style = dtheme.rectangletextstyles.get(default_text_style)
+        if default_text_style is None:
+            default_text_style = dtheme.rectangletextstyles.get()
+        self._default_text_style = default_text_style
+
+        self._list: List[_Item] = []
+
+    @error_handler
+    def append(
+        self,
+        text: str,
+        box_style: Union[str, ShapeStyle, None] = None,
+        text_style: Union[str, ShapeTextStyle, None] = None,
+    ) -> None:
+        """
+        Appends a new box with text to the BoxList.
+
+        Args:
+            text (str): The text to be displayed inside the box.
+            box_style (Union[str, ShapeStyle, None], optional):
+                The style for the box. Can be a style name, a ShapeStyle object, or None.
+                If None, the default box style is used.
+            text_style (Union[str, ShapeTextStyle, None], optional):
+                The style for the text inside the box. Can be a style name, a ShapeTextStyle object, or None.
+                If None, the default text style is used.
+        """
+        self.extend([text], box_style=box_style, text_style=text_style)
+
+    @error_handler
+    def insert(
+        self,
+        index: int,
+        text: str,
+        box_style: Union[str, ShapeStyle, None] = None,
+        text_style: Union[str, ShapeTextStyle, None] = None,
+    ) -> None:
+        """
+        Inserts a new box with text at a specified position in the BoxList.
+
+        Args:
+            index (int): The position at which to insert the new box.
+            text (str): The text to be displayed inside the box.
+            box_style (Union[str, ShapeStyle, None], optional):
+                The style for the box. Can be a style name, a ShapeStyle object, or None.
+                If None, the default box style is used.
+            text_style (Union[str, ShapeTextStyle, None], optional):
+                The style for the text inside the box. Can be a style name, a ShapeTextStyle object, or None.
+                If None, the default text style is used.
+        """
+        is_custom_style = box_style is not None or text_style is not None
+
+        if isinstance(box_style, str):
+            box_style = dtheme.rectanglestyles.get(box_style)
+        elif box_style is None:
+            box_style = self._default_box_style
+
+        if isinstance(text_style, str):
+            text_style = dtheme.rectangletextstyles.get(text_style)
+        elif text_style is None:
+            text_style = self._default_text_style
+
+        item = _Item(
+            text=text,
+            box_style=box_style,
+            text_style=text_style,
+            is_custom_style=is_custom_style,
+        )
+        self._list.insert(index, item)
+
+    @error_handler
+    def extend(
+        self,
+        texts: List[str],
+        box_style: Union[str, ShapeStyle, None] = None,
+        text_style: Union[str, ShapeTextStyle, None] = None,
+    ) -> None:
+        """
+        Extends the BoxList by appending multiple boxes with text.
+
+        Args:
+            texts (List[str]): A list of texts to be displayed inside the boxes.
+            box_style (Union[str, ShapeStyle, None], optional):
+                The style for the boxes. Can be a style name, a ShapeStyle object, or None.
+                If None, the default box style is used.
+            text_style (Union[str, ShapeTextStyle, None], optional):
+                The style for the text inside the boxes. Can be a style name, a ShapeTextStyle object, or None.
+                If None, the default text style is used.
+        """
+        is_custom_style = box_style is not None or text_style is not None
+
         if isinstance(box_style, str):
             box_style = dtheme.rectanglestyles.get(box_style)
-        if box_style is None:
-            box_style = dtheme.rectanglestyles.get()
-        box_style.halign = "center"
-        box_style.valign = "center"
-        self._box_style = box_style
+        elif box_style is None:
+            box_style = self._default_box_style
 
         if isinstance(text_style, str):
             text_style = dtheme.rectangletextstyles.get(text_style)
-        if text_style is None:
-            text_style = dtheme.rectangletextstyles.get()
-        self._text_style = text_style
-
-        if isinstance(box_highlight_style, str):
-            box_highlight_style = dtheme.rectanglestyles.get(box_highlight_style)
-        if box_highlight_style is None:
-            box_highlight_style = box_style
-        box_highlight_style.halign = "center"
-        box_highlight_style.valign = "center"
-        self._box_highlight_style = box_highlight_style
-
-        if isinstance(text_highlight_style, str):
-            text_highlight_style = dtheme.rectangletextstyles.get(text_highlight_style)
-        if text_highlight_style is None:
-            text_highlight_style = text_style
-        self._text_highlight_style = text_highlight_style
+        elif text_style is None:
+            text_style = self._default_text_style
+
+        for text in texts:
+            item = _Item(
+                text=text,
+                box_style=box_style,
+                text_style=text_style,
+                is_custom_style=is_custom_style,
+            )
+            self._list.append(item)
 
     @error_handler
     def draw(
@@ -80,9 +169,6 @@ class BoxList:
         xy: Tuple[float, float],
         box_width: float,
         box_height: float,
-        items: List[Any],
-        highlight_indexs: Optional[List[int]] = None,
-        length: Optional[int] = None,
         align: Literal["left", "right", "bottom", "top"] = "left",
     ) -> None:
         """Draws a list of boxes at the specified location.
@@ -99,48 +185,33 @@ class BoxList:
                     The alignment of the boxes relative to the starting point.
 
         """
-        if highlight_indexs is None:
-            highlight_indexs = []
-
-        if length is not None:
-            indexs = range(length)
-        else:
-            indexs = range(len(items))
-
-        non_highlight_indexs = [item for item in indexs if item not in highlight_indexs]
-        highlight_indexs = [item for item in indexs if item in highlight_indexs]
-
-        for index in non_highlight_indexs:
-            if index <= len(items) - 1:
-                text = str(items[index])
-            else:
-                text = ""
+        for index, item in enumerate(self._list):
+            if item.is_custom_style:
+                continue
 
             self._draw_cell(
                 start_xy=xy,
                 index=index,
-                text=text,
+                text=item.text,
                 box_width=box_width,
                 box_height=box_height,
-                box_style=self._box_style,
-                text_style=self._text_style,
+                box_style=item.box_style,
+                text_style=item.text_style,
                 align=align,
             )
 
-        for index in highlight_indexs:
-            if index <= len(items) - 1:
-                text = str(items[index])
-            else:
-                text = ""
+        for index, item in enumerate(self._list):
+            if not item.is_custom_style:
+                continue
 
             self._draw_cell(
                 start_xy=xy,
                 index=index,
-                text=text,
+                text=item.text,
                 box_width=box_width,
                 box_height=box_height,
-                box_style=self._box_highlight_style,
-                text_style=self._text_highlight_style,
+                box_style=item.box_style,
+                text_style=item.text_style,
                 align=align,
             )
 
@@ -176,3 +247,11 @@ class BoxList:
             text=text,
             textstyle=text_style,
         )
+
+
+@dataclasses.dataclass
+class _Item:
+    text: str
+    box_style: ShapeStyle
+    text_style: ShapeTextStyle
+    is_custom_style: bool

drawlib/v0_2/private/smartarts/gridlayout.py

@@ -49,8 +49,9 @@ class GridLayout:
     @error_handler
     def add(  # noqa: C901
         self,
-        column_range: Tuple[int, int],
-        row_range: Tuple[int, int],
+        position: Tuple[int, int],
+        width: int,
+        height: int,
         r: Optional[int] = None,
         style: Union[str, ShapeStyle, None] = None,
         text: str = "",
@@ -62,8 +63,9 @@ class GridLayout:
         Add an item to the grid layout.
 
         Args:
-            column_range (Tuple[int, int]): The range of columns the item will span.
-            row_range (Tuple[int, int]): The range of rows the item will span.
+            position (Tuple[int, int]): Cell start (column, row) point.
+            width (int): How many column cells.
+            height (int): How many row cells.
             r (Optional[int], optional): The radius of the item. Default is None, which uses the default radius.
             style (Union[str, ShapeStyle, None], optional):
                     The style of the item.
@@ -81,25 +83,24 @@ class GridLayout:
         Raises:
             ValueError: If the column or row ranges are invalid or out of bounds.
         """
-        # validate column
-        c1, c2 = column_range
-        if c1 > c2:
-            column_range = (c2, c1)
-            c1, c2 = c2, c1
-        if c1 < 0:
-            raise ValueError("Column range must be between 0 ~ last-index.")
-        if c2 > self._num_column:
-            raise ValueError("Column range must be between 0 ~ last-index.")
-
-        # validate row
-        r1, r2 = row_range
-        if r1 > r2:
-            row_range = (r2, r1)
-            r1, r2 = r2, r1
-        if r1 < 0:
-            raise ValueError("Row range must be between 0 ~ last-index.")
-        if r2 > self._num_column:
-            raise ValueError("Row range must be between 0 ~ last-index.")
+        # validate
+        if width < 1:
+            raise ValueError("Grid cell must have 1+ columns")
+        if height < 1:
+            raise ValueError("Grid cell must have 1+ rows")
+
+        column_start, row_start = position
+        if not 0 <= column_start < self._num_column:
+            raise ValueError("Grid cell's column start position must be between 0 ~ last-column.")
+        if not 0 <= row_start < self._num_row:
+            raise ValueError("Grid cell's row start position must be between 0 ~ last-column.")
+
+        column_end = column_start + width - 1
+        row_end = row_start + height - 1
+        if column_end >= self._num_column:
+            raise ValueError("Grid cell's column start position must be between 0 ~ last-column.")
+        if row_end >= self._num_row:
+            raise ValueError("Grid cell's row start position must be between 0 ~ last-column.")
 
         # string style to Style class
         if isinstance(style, str):
@@ -137,8 +138,8 @@ class GridLayout:
 
         # push
         item = _GridLayoutItem(
-            column_range=column_range,
-            row_range=row_range,
+            column_range=(column_start, column_end),
+            row_range=(row_start, row_end),
             r=r,
             text=text,
             style=style,
@@ -153,7 +154,7 @@ class GridLayout:
         width: float,
         height: float,
         margin: float,
-        outer_r: int = 0,
+        outer_r: Optional[int] = None,
         outer_style: Union[str, ShapeStyle, None] = None,
     ) -> None:
         """Draw the grid layout.
@@ -168,15 +169,16 @@ class GridLayout:
                     The style for the outer grid border. Can be a string key for a predefined style,
                     a ShapeStyle object, or None.
         """
-        column_widths = [width / self._num_column] * self._num_column
-        row_heights = [height / self._num_row] * self._num_row
-
         if outer_style is None:
-            column_margins = [margin] + [margin * 2] * (self._num_column - 1) + [margin]
-            row_margins = [margin] + [margin * 2] * (self._num_row - 1) + [margin]
+            column_widths = [(width - margin * (self._num_column - 1)) / self._num_column] * self._num_column
+            row_heights = [(height - margin * (self._num_row - 1)) / self._num_row] * self._num_row
+            column_margins = [0] + [margin] * (self._num_column - 1) + [0]
+            row_margins = [0] + [margin] * (self._num_row - 1) + [0]
         else:
-            column_margins = [margin * 2] * (self._num_column + 1)
-            row_margins = [margin * 2] * (self._num_row + 1)
+            column_widths = [(width - margin * (self._num_column + 1)) / self._num_column] * self._num_column
+            row_heights = [(height - margin * (self._num_row + 1)) / self._num_row] * self._num_row
+            column_margins = [margin] * (self._num_column + 1)
+            row_margins = [margin] * (self._num_row + 1)
 
         self.draw_flexible(
             xy=xy,
@@ -196,7 +198,7 @@ class GridLayout:
         column_margins: List[float],
         row_heights: List[float],
         row_margins: List[float],
-        outer_r: int = 0,
+        outer_r: Optional[int] = None,
         outer_style: Union[str, ShapeStyle, None] = None,
     ) -> None:
         """Draw the grid layout with flexible column widths and row heights.
@@ -231,19 +233,31 @@ class GridLayout:
                 outer_style = dtheme.rectanglestyles.get(outer_style)
             outer_style.halign = "left"
             outer_style.valign = "bottom"
+            if outer_r is None:
+                outer_r = self._default_r
+
             rectangle(
                 xy=xy,
-                width=sum(column_widths),
-                height=sum(row_heights),
+                width=sum(column_widths) + sum(column_margins),
+                height=sum(row_heights) + sum(row_margins),
                 r=outer_r,
                 style=outer_style,
             )
 
         # utility
-        def sum_till_index(lst: List[float], index: int) -> float:
-            if index == 0:
-                return 0
-            return sum([lst[i] for i in range(index)])
+        def get_position(column_index: int, row_index: int) -> Tuple[float, float]:
+            x, y = xy
+            if column_index == 0:
+                new_x = x + column_margins[0]
+            else:
+                new_x = x + sum(column_margins[: column_index + 1]) + sum(column_widths[:column_index])
+
+            if row_index == 0:
+                new_y = y + row_margins[0]
+            else:
+                new_y = y + sum(row_margins[: row_index + 1]) + sum(row_heights[:row_index])
+
+            return (new_x, new_y)
 
         for item in self._items:
             column_range = item.column_range
@@ -258,25 +272,17 @@ class GridLayout:
             rr0 = row_range[0]
             rr1 = row_range[1]
 
-            # coordinate without margin
-            lb_xy = (sum_till_index(column_widths, cr0), sum_till_index(row_heights, rr0))
-            width = sum_till_index(column_widths, cr1 + 1) - lb_xy[0]
-            height = sum_till_index(row_heights, rr1 + 1) - lb_xy[1]
-
-            # get margins
-            margin_left = column_margins[cr0] if cr0 == 0 else column_margins[cr0] / 2
-            margin_right = column_margins[cr1 + 1] if cr1 + 1 == self._num_column else column_margins[cr1 + 1] / 2
-            margin_bottom = row_margins[rr0] if rr0 == 0 else row_margins[rr0] / 2
-            margin_top = row_margins[rr1 + 1] if rr1 + 1 == self._num_row else row_margins[rr1 + 1] / 2
+            item_xy_left_bottom = get_position(cr0, rr0)
+            t = get_position(cr1, rr1)
+            item_xy_right_top = (t[0] + column_widths[cr1], t[1] + row_heights[rr1])
 
-            # update coordinate
-            lb_xy = (lb_xy[0] + margin_left, lb_xy[1] + margin_bottom)
-            width = width - margin_left - margin_right
-            height = height - margin_bottom - margin_top
+            width, height = (
+                item_xy_right_top[0] - item_xy_left_bottom[0],
+                item_xy_right_top[1] - item_xy_left_bottom[1],
+            )
 
-            # draw
             rectangle(
-                xy=(xy[0] + lb_xy[0], xy[1] + lb_xy[1]),
+                xy=item_xy_left_bottom,
                 width=width,
                 height=height,
                 r=r,

drawlib/v0_2/private/smartarts/pyramid.py

@@ -19,6 +19,13 @@ from drawlib.v0_2.private.core_canvas.canvas import trapezoid, triangle
 from drawlib.v0_2.private.util import error_handler
 
 
+@dataclasses.dataclass
+class _PyramidItem:
+    style: ShapeStyle
+    text: str
+    textstyle: ShapeTextStyle
+
+
 class Pyramid:
     """Class for rendering smart art pyramid."""
 
@@ -116,6 +123,7 @@ class Pyramid:
         height: float,
         margin: float,
         align: Literal["bottom", "top", "left", "right"] = "bottom",
+        order: Literal["vertex_to_base", "base_to_vertex"] = "vertex_to_base",
     ) -> None:
         """Draw smart art pyramid.
 
@@ -125,6 +133,7 @@ class Pyramid:
             height (float): The heifht of the pyramid.
             margin (float): The margin between pyramid items.
             align (str): Alignment of a pyramid.
+            order (str): Item order. "vertex -> base" or "base -> vertex". default is "vertex -> base".
         """
         if len(self._items) == 0:
             raise ValueError("Number of pyramid item is 0.")
@@ -139,6 +148,7 @@ class Pyramid:
             item_heights=item_heights,
             margins=margins,
             align=align,
+            order=order,
         )
 
     @error_handler
@@ -149,6 +159,7 @@ class Pyramid:
         item_heights: List[float],
         margins: List[float],
         align: Literal["bottom", "top", "left", "right"] = "bottom",
+        order: Literal["vertex_to_base", "base_to_vertex"] = "vertex_to_base",
     ) -> None:
         """Draw smart art pyramid with flexible pyramid item heights.
 
@@ -158,6 +169,7 @@ class Pyramid:
             item_heights (float): The height of the each pyramid items.
             margins (float): The margin between pyramid items.
             align (str): Alignment of a pyramid.
+            order (str): Item order. "vertex -> base" or "base -> vertex". default is "vertex -> base".
 
         Raises:
             ValueError: If the lengths of column_widths, column_margins, row_heights, or row_margins are incorrect.
@@ -172,35 +184,38 @@ class Pyramid:
         if len(self._items) != len(margins) + 1:
             raise ValueError('Number of pyramid item and arg "margins" length does not match.')
 
+        items = self._items[::-1] if order == "vertex_to_base" else self._items[::]
+
         if align == "bottom":
-            self._draw_flexible_bottom(xy, width, item_heights, margins)
+            self._draw_flexible_bottom(xy, width, item_heights, margins, items)
         elif align == "top":
-            self._draw_flexible_top(xy, width, item_heights, margins)
+            self._draw_flexible_top(xy, width, item_heights, margins, items)
         elif align == "left":
-            self._draw_flexible_left(xy, width, item_heights, margins)
+            self._draw_flexible_left(xy, width, item_heights, margins, items)
         elif align == "right":
-            self._draw_flexible_right(xy, width, item_heights, margins)
+            self._draw_flexible_right(xy, width, item_heights, margins, items)
         else:
             raise ValueError("Drawlib internal error.")
 
+    @staticmethod
     def _draw_flexible_bottom(
-        self,
         xy: Tuple[float, float],
         width: float,
         item_heights: List[float],
         margins: List[float],
+        items: List[_PyramidItem],
     ) -> None:
         x = xy[0] + width / 2
         height = sum(item_heights) + sum(margins)
         current_height = 0
-        for i, item in enumerate(self._items):
+        for i, item in enumerate(items):
             text = item.text
             style = item.style
             style.halign = "center"
             style.valign = "bottom"
             textstyle = item.textstyle
 
-            is_last = i == len(self._items) - 1
+            is_last = i == len(items) - 1
             if is_last:
                 ratio = (height - current_height) / height
                 item_width = ratio * width
@@ -231,24 +246,25 @@ class Pyramid:
             )
             current_height += item_height + margins[i]
 
+    @staticmethod
     def _draw_flexible_top(
-        self,
         xy: Tuple[float, float],
         width: float,
         item_heights: List[float],
         margins: List[float],
+        items: List[_PyramidItem],
     ) -> None:
         x = xy[0] + width / 2
         height = sum(item_heights) + sum(margins)
         current_height = 0
-        for i, item in enumerate(self._items):
+        for i, item in enumerate(items):
             text = item.text
             style = item.style
             style.halign = "center"
             style.valign = "bottom"
             textstyle = item.textstyle
 
-            is_last = i == len(self._items) - 1
+            is_last = i == len(items) - 1
             if is_last:
                 ratio = (height - current_height) / height
                 item_width = ratio * width
@@ -284,17 +300,18 @@ class Pyramid:
             )
             current_height += item_height + margins[i]
 
+    @staticmethod
     def _draw_flexible_left(
-        self,
         xy: Tuple[float, float],
         width: float,
         item_heights: List[float],
         margins: List[float],
+        items: List[_PyramidItem],
     ) -> None:
         y = xy[1] + width / 2
         height = sum(item_heights) + sum(margins)
         current_height = 0
-        for i, item in enumerate(self._items):
+        for i, item in enumerate(items):
             text = item.text
             style = item.style
             style.halign = "center"
@@ -304,7 +321,7 @@ class Pyramid:
             if textstyle.angle is None:
                 textstyle.angle = 0
 
-            is_last = i == len(self._items) - 1
+            is_last = i == len(items) - 1
             if is_last:
                 ratio = (height - current_height) / height
                 item_width = ratio * width
@@ -339,17 +356,18 @@ class Pyramid:
             )
             current_height += item_height + margins[i]
 
+    @staticmethod
     def _draw_flexible_right(
-        self,
         xy: Tuple[float, float],
         width: float,
         item_heights: List[float],
         margins: List[float],
+        items: List[_PyramidItem],
     ) -> None:
         y = xy[1] + width / 2
         height = sum(item_heights) + sum(margins)
         current_height = 0
-        for i, item in enumerate(self._items):
+        for i, item in enumerate(items):
             text = item.text
             style = item.style
             style.halign = "center"
@@ -358,7 +376,7 @@ class Pyramid:
             if textstyle.angle is None:
                 textstyle.angle = 0
 
-            is_last = i == len(self._items) - 1
+            is_last = i == len(items) - 1
             if is_last:
                 ratio = (height - current_height) / height
                 item_width = ratio * width
@@ -392,10 +410,3 @@ class Pyramid:
                 angle=90,
             )
             current_height += item_height + margins[i]
-
-
-@dataclasses.dataclass
-class _PyramidItem:
-    style: ShapeStyle
-    text: str
-    textstyle: ShapeTextStyle

{drawlib-0.2.3.dev5.dist-info → drawlib-0.2.3.dev7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drawlib
-Version: 0.2.3.dev5
+Version: 0.2.3.dev7
 Summary: Python drawing library. Illustration as Code.
 Home-page: https://www.drawlib.com
 Author: Yuichi Ito

{drawlib-0.2.3.dev5.dist-info → drawlib-0.2.3.dev7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-drawlib/__init__.py,sha256=yuaqeWXsVZ_zJ5lJedaZVNNb5A7sKIjkkQeZm_vLhak,2678
+drawlib/__init__.py,sha256=pyjdLbbUAFUzhoVCy3PoW8t4cN_seywKer9Rf10ioYI,2690
 drawlib/__main__.py,sha256=UDsH6DiEIWBEwlClbYI10aWYBw_gOmaNCB0TSImWZ-c,604
 drawlib/apis.py,sha256=Q1Uz4U6IK63ZtjaV_UTWPZq7xDpxTz99qHfpGsL8SnI,531
 drawlib/assets/__init__.py,sha256=bYT4EWquLr0oyEziAuixlD9M4EPnMY6PyhknOxJjxqY,437
@@ -20,13 +20,13 @@ drawlib/v0_2/private/core/model_system_default.py,sha256=oK9WpeQVX_baJJmjwz4L23G
 drawlib/v0_2/private/core/theme.py,sha256=QcuaCw615fRN0C753gjfay9cqCbHILERqBIDNpO1whQ,47118
 drawlib/v0_2/private/core/theme_officials.py,sha256=AeZdENE-B8kSTcDAnWLKU-b77PssjwqFa_D-42HWNjg,19832
 drawlib/v0_2/private/core/theme_style_caches.py,sha256=k22Jrm0nsZITg_Mv0qGyv5pMkivLOb-s-svnWqqm8xY,186385
-drawlib/v0_2/private/core/util.py,sha256=FaOlxKnQPcJT2oHiy06ZtVq0ZNO3tppAL-8xvW9Un4c,28437
+drawlib/v0_2/private/core/util.py,sha256=uf_VgDJ7HKwK1RuF-kIklwVVJnHXIR_SDoWeFy9jHiQ,30314
 drawlib/v0_2/private/core_canvas/__init__.py,sha256=6HANaWCLm6GjIU7cZGAOdUCrvIxbtQx3KTkQWK-nEhU,455
 drawlib/v0_2/private/core_canvas/base.py,sha256=FipdPyX9M-JWL9FQpAT1r8hoo9o1wyCS1QGx3kINwLQ,20603
 drawlib/v0_2/private/core_canvas/canvas.py,sha256=haDITKf-Wz2zA2zDC_NmrdH-QsSagukQ7LT7xEB2crY,9594
 drawlib/v0_2/private/core_canvas/image.py,sha256=1KoLmCTbr4VoTZi0rI_e1_HIYOmpGklygeq5ACgwVus,6958
-drawlib/v0_2/private/core_canvas/line.py,sha256=qp5IcQUTfLyH1hi4JOKa-h_8TVWRWCEthfSSEEErMgQ,17862
-drawlib/v0_2/private/core_canvas/original_arrow.py,sha256=rJJhoBf1Z2nWt1Ny6WTRYhoBLQHU5xzuXPVxLjyyuy8,24632
+drawlib/v0_2/private/core_canvas/line.py,sha256=7TN4pRDWzaanGYQaox7HywIPQuUx4CfOnwvM7mN2e7I,17954
+drawlib/v0_2/private/core_canvas/original_arrow.py,sha256=13MqxSEcWR9tbYmcrSdF8AMdjm8rkP6-q42Olk3jfKc,24466
 drawlib/v0_2/private/core_canvas/original_polygon.py,sha256=uvBbfr72J3QEw9efxHdd5YXl1IKZhEA82qzEXdEK7Kc,14546
 drawlib/v0_2/private/core_canvas/patches.py,sha256=uDRZMYqMnkh37lXVLGwTUmsb7XuNjNMNZBjP3Cgi5Eg,14211
 drawlib/v0_2/private/core_canvas/text.py,sha256=bqdiqptdXeV8HVjp0Fx2pl2eA0q29XHYtWcK4WSyCw8,3520
@@ -41,13 +41,13 @@ drawlib/v0_2/private/icons/phosphor.py,sha256=4xwcmDvFB6raCZZFQdrU2eR7l5QhYz9Bg_
 drawlib/v0_2/private/icons/util.py,sha256=9ZH67tRO1diuzwhENVki6exgNFJbKa1WDICYsxDbaWs,2367
 drawlib/v0_2/private/logging.py,sha256=tZT62wFfPbwY2JBQVtwoS2qf7HBvCjfB-oXdATEnupc,802
 drawlib/v0_2/private/smartarts/__init__.py,sha256=ii_xf3fXWPvP4SqSdcLO0gIbx643oRbVch58KlaYAnA,445
-drawlib/v0_2/private/smartarts/boxlist.py,sha256=ymY5yAWhev3JpQi493_8mkTydYaqNMjohj7kpoMFnLw,6714
+drawlib/v0_2/private/smartarts/boxlist.py,sha256=fPBauEoZAMO-7o_z6eZ32oJ-h0Gp0dL5dZPfW0jy14g,9679
 drawlib/v0_2/private/smartarts/boxtree.py,sha256=f6EXkPMEkU8v4vvBxA2Bu2_vV6nJ1nIxppuj9UPhf2E,4655
 drawlib/v0_2/private/smartarts/bubblespeech.py,sha256=2ynQt0W5A0EGRpE1MX-1DQnd01NzM4zIjEUGunEWnIE,4219
 drawlib/v0_2/private/smartarts/bulletpoints.py,sha256=2wOa5O7pq1qlrdagPaiA9t3UrSCKYAZ5HuVGgrG04u4,6039
 drawlib/v0_2/private/smartarts/dsart.py,sha256=3wKpD4x_ZqZFG3QJAtD3NhKL7_lDlwJ3tY08sfUF02o,1245
-drawlib/v0_2/private/smartarts/gridlayout.py,sha256=5gJGNa5uILFOl7DDPB-GBE-MrzaLq74aMFbDnJI4ZRc,11472
-drawlib/v0_2/private/smartarts/pyramid.py,sha256=bVCkIo6w-9qDqRfOXShvOozxOzI6WlxR_dQMc4l5Q48,14314
+drawlib/v0_2/private/smartarts/gridlayout.py,sha256=BNaF44K1NJRELCWB0v4QuoCbOVQ1kEnMsu7wBrqdjn0,11870
+drawlib/v0_2/private/smartarts/pyramid.py,sha256=k2zIFQkrLGzLuhS5X0LwiV48wEsny75mVUQmhdWuFAo,14926
 drawlib/v0_2/private/smartarts/sourcecode.py,sha256=VkPrmxNeYR_E0kyfFsezAKJE7dVNIdrIJUsq348iqyE,8922
 drawlib/v0_2/private/smartarts/table.py,sha256=Fyji-xUt8JnZQPzbjt0GgibVB0qcr4zA2VgqDXddPmw,25407
 drawlib/v0_2/private/smartarts/tree.py,sha256=BStMQ77yO26RufYwfAbc5H4PEhCynkv9QKD5DbDasUg,11230
@@ -75,8 +75,8 @@ drawlib/v0_2/private/validators/smartarts.py,sha256=fOAlC0syvZVk-GCLQgaPhhfWr3gc
 drawlib/v0_2/private/validators/style.py,sha256=R7aLlaVfzdo33L7GLQ3WVfzzD_EsgV2-Y7ERcbFq7QI,3308
 drawlib/v0_2/private/validators/text.py,sha256=ELT87nekr9hMx7m-wpVTku0QPxL3qCIX4cxI5RbFoIc,1126
 drawlib/v0_2/private/validators/types.py,sha256=KtiIgivuaFyFaxIGeqr5N8xpzqIk9soiacSzcFDdjSA,4155
-drawlib-0.2.3.dev5.dist-info/LICENSE.txt,sha256=h_ZiliCgEDqIYpxmUPmqGGP87VBcUHil1S4wUI48ZKg,11344
-drawlib-0.2.3.dev5.dist-info/METADATA,sha256=ICI9-Seg7xPDVr4pIG0xdrSjd9iQea3YEfNOjDe-9do,4007
-drawlib-0.2.3.dev5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-drawlib-0.2.3.dev5.dist-info/entry_points.txt,sha256=Lp6mbrRMP-g6c7P6Iz21CEjceLITCWrma3b0ncP30oQ,49
-drawlib-0.2.3.dev5.dist-info/RECORD,,
+drawlib-0.2.3.dev7.dist-info/LICENSE.txt,sha256=h_ZiliCgEDqIYpxmUPmqGGP87VBcUHil1S4wUI48ZKg,11344
+drawlib-0.2.3.dev7.dist-info/METADATA,sha256=Jl62LmhaUAhBgsh5XF-GfIQXhGIJvZvMIO0luZn4nAM,4007
+drawlib-0.2.3.dev7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+drawlib-0.2.3.dev7.dist-info/entry_points.txt,sha256=Lp6mbrRMP-g6c7P6Iz21CEjceLITCWrma3b0ncP30oQ,49
+drawlib-0.2.3.dev7.dist-info/RECORD,,