drawlib 0.2.3.dev3__tar.gz → 0.2.3.dev4__tar.gz

{drawlib-0.2.3.dev3 → drawlib-0.2.3.dev4}/PKG-INFO

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

{drawlib-0.2.3.dev3 → drawlib-0.2.3.dev4}/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.dev3"
+LIB_VERSION = "0.2.3.dev4"
 
 # please list active main committers (1+ commits per month)
 AUTHORS: Final[List[str]] = [

{drawlib-0.2.3.dev3 → drawlib-0.2.3.dev4}/drawlib/v0_2/apis.py

@@ -55,7 +55,9 @@ from drawlib.v0_2.private.core_canvas.canvas import (
     # shape original
     arrow,
     arrow_arc,
-    arrows,
+    arrow_l,
+    arrow_polyline,
+    arrow_u,
     chevron,
     circle,
     # base

{drawlib-0.2.3.dev3 → drawlib-0.2.3.dev4}/drawlib/v0_2/private/core_canvas/base.py

@@ -18,7 +18,10 @@ import matplotlib.lines
 import matplotlib.text
 import PIL.Image
 from matplotlib import pyplot
-from matplotlib.patches import PathPatch
+from matplotlib.patches import (
+    PathPatch,
+    Polygon,
+)
 from matplotlib.path import Path
 
 import drawlib.v0_2.private.validators.args as validator
@@ -235,6 +238,55 @@ class CanvasBase:
     # Shape
     #
 
+    @error_handler
+    def polygon(
+        self,
+        xys: List[Tuple[float, float]],
+        style: Union[ShapeStyle, str, None] = None,
+        text: str = "",
+        textsize: Optional[float] = None,
+        textstyle: Union[ShapeTextStyle, str, None] = None,
+    ) -> None:
+        """Draw a polygon on the canvas.
+
+        Args:
+            xys: List of vertices [(x1, y1), ...(x_n, y_n)].
+            style (optional): Style of the polygon.
+            text (optional): Text shown at the center of the polygon.
+            textsize (optional): Font size of the text.
+            textstyle (optional): Style of the text.
+
+        Returns:
+            None
+        """
+        style, textstyle = ShapeUtil.format_styles(
+            style,
+            textstyle,
+            dtheme.polygonstyles.get,
+            dtheme.polygontextstyles.get,
+        )
+        validator.validate_shape_args(locals())
+
+        if textsize is not None:
+            textstyle.size = textsize
+
+        style.halign = None
+        style.valign = None
+        options = ShapeUtil.get_shape_options(style)
+        self._artists.append(Polygon(xy=xys, closed=True, **options))
+
+        if not text:
+            return
+        center, (_, _) = get_center_and_size(xys)
+        self._artists.append(
+            ShapeUtil.get_shape_text(
+                center,
+                text=text,
+                angle=0,
+                style=textstyle,
+            ),
+        )
+
     @error_handler
     def shape(  # noqa: C901
         self,

{drawlib-0.2.3.dev3 → drawlib-0.2.3.dev4}/drawlib/v0_2/private/core_canvas/canvas.py

@@ -276,12 +276,16 @@ rhombus = canvas.rhombus
 trapezoid = canvas.trapezoid
 parallelogram = canvas.parallelogram
 triangle = canvas.triangle
-arrow = canvas.arrow
-arrows = canvas.arrows
-arrow_arc = canvas.arrow_arc
 star = canvas.star
 chevron = canvas.chevron
 
+# original arrow
+arrow = canvas.arrow
+arrow_polyline = canvas.arrow_polyline
+arrow_arc = canvas.arrow_arc
+arrow_l = canvas.arrow_l
+arrow_u = canvas.arrow_u
+
 # patches
 arc = canvas.arc
 circle = canvas.circle

{drawlib-0.2.3.dev3 → drawlib-0.2.3.dev4}/drawlib/v0_2/private/core_canvas/line.py

@@ -20,7 +20,7 @@ import drawlib.v0_2.private.validators.args as validator
 from drawlib.v0_2.private.core.model import LineStyle
 from drawlib.v0_2.private.core.util import LineUtil
 from drawlib.v0_2.private.core_canvas.base import CanvasBase
-from drawlib.v0_2.private.util import error_handler
+from drawlib.v0_2.private.util import error_handler, get_rotated_path_points
 
 
 class CanvasLineFeature(CanvasBase):
@@ -197,10 +197,11 @@ class CanvasLineFeature(CanvasBase):
         xy: Tuple[float, float],
         width: float,
         height: float,
-        from_angle: float = 0,
-        to_angle: float = 180,
-        lwidth: Optional[float] = None,
+        angle_start: float = 0,
+        angle_end: float = 180,
+        angle: float = 0,
         arrowhead: Literal["", "->", "<-", "<->"] = "",
+        lwidth: Optional[float] = None,
         style: Union[LineStyle, str, None] = None,
     ) -> None:
         """Draw arc line on ellipse.
@@ -209,10 +210,11 @@ class CanvasLineFeature(CanvasBase):
             xy: Tuple[float, float]: The center point of the ellipse from which the arc is drawn.
             width: float: The width of the ellipse.
             height: float: The height of the ellipse
-            from_angle: float: The starting angle of the arc in degrees (default is 0).
-            to_angle: float: The ending angle of the arc in degrees (default is 180).
-            lwidth: Optional[float]: Optional width of the line.
+            angle_start: float: The starting angle of the arc in degrees (default is 0).
+            angle_end: float: The ending angle of the arc in degrees (default is 180).
+            angle (float): The angle of ellipse.
             arrowhead: Literal["", "->", "<-", "<->"]: Optional arrowhead style ("", "->", "<-", "<->").
+            lwidth: Optional[float]: Optional width of the line.
             style: Union[LineStyle, str, None]: Optional line style.
 
         Returns:
@@ -221,15 +223,19 @@ class CanvasLineFeature(CanvasBase):
         style = LineUtil.format_style(style)
         # validator.validate_line_args(locals())
 
-        if from_angle > to_angle:
-            from_angle = -1 * (360 - from_angle)
+        if angle_start > angle_end:
+            angle_start = -1 * (360 - angle_start)
         path_points = LineArcHelper.get_ellipse_path_points(
             xy,
             width,
             height,
-            from_angle,
-            to_angle,
+            angle_start,
+            angle_end,
         )
+
+        if angle != 0:
+            path_points = get_rotated_path_points(path_points, xy, angle)  # type: ignore
+
         start_point = path_points[0]
         path_points = path_points[1:]
 
@@ -410,8 +416,8 @@ class LineArcHelper:
         xy: Tuple[float, float],
         width: float,
         height: float,
-        from_angle: float,
-        to_angle: float,
+        angle_start: float,
+        angle_end: float,
     ) -> List[
         Union[
             Tuple[float, float],
@@ -419,9 +425,9 @@ class LineArcHelper:
         ]
     ]:
         """Internal function"""
-        diff = to_angle - from_angle
+        diff = angle_end - angle_start
         if abs(diff) > 270:
-            # having +2 for avoiding situation next_mid_angle == to_angle
+            # having +2 for avoiding situation next_mid_angle == angle_end
             step = int(diff / 3)
         elif abs(diff) > 135:
             step = int(diff / 2)
@@ -430,8 +436,8 @@ class LineArcHelper:
                 xy,
                 width,
                 height,
-                from_angle,
-                to_angle,
+                angle_start,
+                angle_end,
             )
             return [p1, (p2, p3, p4)]
         if diff >= 0:
@@ -443,15 +449,15 @@ class LineArcHelper:
         start = None
         path_points = []
         while True:
-            last_mid_angle = from_angle + step * i
-            next_mid_angle = from_angle + step * (i + 1)
+            last_mid_angle = angle_start + step * i
+            next_mid_angle = angle_start + step * (i + 1)
 
-            if from_angle < to_angle:
+            if angle_start < angle_end:
                 # anti clock wise
-                is_last = next_mid_angle > to_angle
+                is_last = next_mid_angle > angle_end
             else:
                 # clock wise
-                is_last = to_angle > next_mid_angle
+                is_last = angle_end > next_mid_angle
 
             if is_last:
                 p1, p2, p3, p4 = cls.bezier_ellipse_arc_approximation(
@@ -459,7 +465,7 @@ class LineArcHelper:
                     width,
                     height,
                     last_mid_angle,
-                    to_angle,
+                    angle_end,
                 )
                 if start is None:
                     start = p1