svg-ultralight 0.29.0__tar.gz → 0.30.0__tar.gz

{svg_ultralight-0.29.0/src/svg_ultralight.egg-info → svg_ultralight-0.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: svg-ultralight
-Version: 0.29.0
+Version: 0.30.0
 Summary: a sensible way to create svg files with Python
 Author-email: Shay Hill <shay_public@hotmail.com>
 License: MIT

{svg_ultralight-0.29.0 → svg_ultralight-0.30.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "svg-ultralight"
-version = "0.29.0"
+version = "0.30.0"
 description = "a sensible way to create svg files with Python"
 authors = [{ name = "Shay Hill", email = "shay_public@hotmail.com" }]
 license = { text = "MIT" }
@@ -37,7 +37,7 @@ legacy_tox_ini = """
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.29.0"
+version = "0.30.0"
 tag_format = "$version"
 version_files = ["pyproject.toml:^version"]
 annotated_tag = true

{svg_ultralight-0.29.0 → svg_ultralight-0.30.0}/src/svg_ultralight/__init__.py

@@ -10,7 +10,11 @@ from svg_ultralight.bounding_boxes.bound_helpers import (
     new_element_union,
 )
 from svg_ultralight.bounding_boxes.supports_bounds import SupportsBounds
+<<<<<<< HEAD
 from svg_ultralight.bounding_boxes.type_bound_confederation import BoundConfederation
+=======
+from svg_ultralight.bounding_boxes.type_bound_collection import BoundCollection
+>>>>>>> dev
 from svg_ultralight.bounding_boxes.type_bound_element import BoundElement
 from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
 from svg_ultralight.bounding_boxes.type_padded_text import PaddedText
@@ -41,7 +45,11 @@ from svg_ultralight.string_conversion import (
 from svg_ultralight.transformations import transform_element
 
 __all__ = [
+<<<<<<< HEAD
     "BoundConfederation",
+=======
+    "BoundCollection",
+>>>>>>> dev
     "BoundElement",
     "BoundingBox",
     "NSMAP",

svg_ultralight-0.30.0/src/svg_ultralight/bounding_boxes/type_bound_collection.py

@@ -0,0 +1,71 @@
+"""A class to hold a list of bound elements and transform them together.
+
+:author: Shay Hill
+:created: 2024-05-05
+"""
+
+from __future__ import annotations
+
+import dataclasses
+from typing import TYPE_CHECKING
+
+from lxml.etree import _Element as EtreeElement  # type: ignore
+
+from svg_ultralight.bounding_boxes.bound_helpers import new_bbox_union
+from svg_ultralight.bounding_boxes.type_bounding_box import HasBoundingBox
+from svg_ultralight.transformations import new_transformation_matrix, transform_element
+
+if TYPE_CHECKING:
+    from svg_ultralight.bounding_boxes.supports_bounds import SupportsBounds
+    from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
+
+_Matrix = tuple[float, float, float, float, float, float]
+
+
+@dataclasses.dataclass
+class BoundCollection(HasBoundingBox):
+    """A class to hold a list of bound elements and transform them together.
+
+    This will transform the individual elements in place.
+    """
+
+    blems: list[SupportsBounds | EtreeElement] = dataclasses.field(init=False)
+    bbox: BoundingBox = dataclasses.field(init=False)
+
+    def __init__(self, *blems: SupportsBounds | EtreeElement) -> None:
+        """Initialize the bound collection.
+
+        :param blems: bound elements to be transformed together
+        """
+        self.blems = list(blems)
+        self.bbox = new_bbox_union(*self.blems)
+
+    def transform(
+        self,
+        transformation: _Matrix | None = None,
+        *,
+        scale: float | None = None,
+        dx: float | None = None,
+        dy: float | None = None,
+    ):
+        """Transform each bound element in self.blems.
+
+        :param transformation: 2D transformation matrix
+        :param scale: optional scale factor
+        :param dx: optional x translation
+        :param dy: optional y translation
+
+        Keep track of all compounding transformations in order to have a value for
+        self.scale (required for membersh and to provide access to cumulative
+        transforms should this be useful for any reason. This means all
+        transformations must be applied to two bounding boxes: a persistant bbox to
+        keep track of the scale property and a temporary bbox to isolate each
+        transformation.
+        """
+        tmat = new_transformation_matrix(transformation, scale=scale, dx=dx, dy=dy)
+        self.bbox.transform(tmat)
+        for blem in self.blems:
+            if isinstance(blem, EtreeElement):
+                _ = transform_element(blem, tmat)
+            else:
+                blem.transform(tmat)

{svg_ultralight-0.29.0 → svg_ultralight-0.30.0/src/svg_ultralight.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: svg-ultralight
-Version: 0.29.0
+Version: 0.30.0
 Summary: a sensible way to create svg files with Python
 Author-email: Shay Hill <shay_public@hotmail.com>
 License: MIT

{svg_ultralight-0.29.0 → svg_ultralight-0.30.0}/src/svg_ultralight.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ src/svg_ultralight.egg-info/top_level.txt
 src/svg_ultralight/bounding_boxes/__init__.py
 src/svg_ultralight/bounding_boxes/bound_helpers.py
 src/svg_ultralight/bounding_boxes/supports_bounds.py
+src/svg_ultralight/bounding_boxes/type_bound_collection.py
 src/svg_ultralight/bounding_boxes/type_bound_confederation.py
 src/svg_ultralight/bounding_boxes/type_bound_element.py
 src/svg_ultralight/bounding_boxes/type_bounding_box.py

{svg_ultralight-0.29.0 → svg_ultralight-0.30.0}/tests/test_bounding.py

@@ -9,7 +9,11 @@ import math
 from svg_ultralight.bounding_boxes.type_bound_element import BoundElement
 from svg_ultralight.bounding_boxes.type_padded_text import PaddedText
 from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
+<<<<<<< HEAD
 from svg_ultralight.bounding_boxes.type_bound_confederation import BoundConfederation
+=======
+from svg_ultralight.bounding_boxes.type_bound_collection import BoundCollection
+>>>>>>> dev
 import copy
 from svg_ultralight.constructors import new_element
 
@@ -155,6 +159,7 @@ class TestPaddedText:
         assert math.isclose(bound_element.height, 252.76)
         assert bound_element.y2 == 203.0
 
+<<<<<<< HEAD
 class TestBoundConfederation:
 
     @pytest.fixture
@@ -163,6 +168,16 @@ class TestBoundConfederation:
         bbox = BoundingBox(0, 0, 100, 200)
         blem = PaddedText(elem, bbox, 1, 2, 3, 4)
         return BoundConfederation(blem, copy.deepcopy(elem))
+=======
+class TestBoundCollection:
+
+    @pytest.fixture
+    def bound_collection(self) -> BoundCollection:
+        elem = new_element("rect", x=0, y=0, width=100, height=200)
+        bbox = BoundingBox(0, 0, 100, 200)
+        blem = PaddedText(elem, bbox, 1, 2, 3, 4)
+        return BoundCollection(blem, copy.deepcopy(elem))
+>>>>>>> dev
 
     def test_blem_and_elem(self):
         """Test that bound element and unbound element transforms are the same."""
@@ -170,11 +185,19 @@ class TestBoundConfederation:
         bbox = BoundingBox(0, 0, 100, 200)
         blem = BoundElement(rect, bbox)
         elem = copy.deepcopy(rect)
+<<<<<<< HEAD
         bound_confederation = BoundConfederation(blem, elem)
         bound_confederation.x = -4
         bound_confederation.scale = 10
         bound_confederation.width = 60
         bound_confederation.cy = -40
+=======
+        bound_collection = BoundCollection(blem, elem)
+        bound_collection.x = -4
+        bound_collection.scale = 10
+        bound_collection.width = 60
+        bound_collection.cy = -40
+>>>>>>> dev
         blem_trans = blem.elem.attrib["transform"]
         elem_trans = elem.attrib["transform"]
         assert blem_trans == elem_trans