From f4989633d1f8232f59bb671e3a9f37cb11d80212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Wi=C5=9Bniewski?= Date: Fri, 31 Jan 2025 15:31:33 +0100 Subject: [PATCH] Fix inconsisten order of box and origin in create_eager_layer and create_deferred_layer --- src/pygerber/vm/pillow/vm.py | 2 +- src/pygerber/vm/shapely/vm.py | 2 +- src/pygerber/vm/vm.py | 6 +++--- test/unit/test_vm/test_vm.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pygerber/vm/pillow/vm.py b/src/pygerber/vm/pillow/vm.py index e0f887bc..21a93a22 100644 --- a/src/pygerber/vm/pillow/vm.py +++ b/src/pygerber/vm/pillow/vm.py @@ -340,7 +340,7 @@ def layer(self) -> PillowEagerLayer: """Get current layer.""" return super().layer # type: ignore[return-value] - def create_eager_layer(self, layer_id: LayerID, box: Box, origin: Vector) -> Layer: + def create_eager_layer(self, layer_id: LayerID, origin: Vector, box: Box) -> Layer: """Create new eager layer instances (factory method).""" assert box.width > 0 assert box.height > 0 diff --git a/src/pygerber/vm/shapely/vm.py b/src/pygerber/vm/shapely/vm.py index 1218e81a..dcc53ec6 100644 --- a/src/pygerber/vm/shapely/vm.py +++ b/src/pygerber/vm/shapely/vm.py @@ -223,7 +223,7 @@ def layer(self) -> ShapelyEagerLayer: """Get current layer.""" return super().layer # type: ignore[return-value] - def create_eager_layer(self, layer_id: LayerID, box: Box, origin: Vector) -> Layer: + def create_eager_layer(self, layer_id: LayerID, origin: Vector, box: Box) -> Layer: """Create new eager layer instances (factory method).""" return ShapelyEagerLayer(layer_id, origin, box) diff --git a/src/pygerber/vm/vm.py b/src/pygerber/vm/vm.py index 9658f037..f01f1bd4 100644 --- a/src/pygerber/vm/vm.py +++ b/src/pygerber/vm/vm.py @@ -152,7 +152,7 @@ def set_deferred_handlers(self) -> None: self._on_shape_handler = self.on_shape_deferred self._on_paste_layer_handler = self.on_paste_layer_deferred - def create_eager_layer(self, layer_id: LayerID, box: Box, origin: Vector) -> Layer: + def create_eager_layer(self, layer_id: LayerID, origin: Vector, box: Box) -> Layer: """Create new eager layer instances (factory method).""" return EagerLayer(layer_id, box, origin) @@ -203,7 +203,7 @@ def on_start_layer(self, command: StartLayer) -> None: self.set_deferred_handlers() else: - layer = self.create_eager_layer(command.id, command.box, command.origin) + layer = self.create_eager_layer(command.id, command.origin, command.box) self.set_layer(command.id, layer) self.set_eager_handlers() @@ -263,7 +263,7 @@ def on_end_layer(self, command: EndLayer) -> None: raise EmptyAutoSizedLayerNotAllowedError(top_layer.layer_id) new_layer = self.create_eager_layer( - top_layer.layer_id, box, top_layer.origin + top_layer.layer_id, top_layer.origin, box ) self.set_layer(top_layer.layer_id, new_layer) diff --git a/test/unit/test_vm/test_vm.py b/test/unit/test_vm/test_vm.py index 0fbcb4f0..486add7d 100644 --- a/test/unit/test_vm/test_vm.py +++ b/test/unit/test_vm/test_vm.py @@ -79,7 +79,7 @@ def test_set_deferred_handlers_for_layer(self, mocker: MockerFixture) -> None: def test_create_eager_layer(self) -> None: vm = VirtualMachine() layer = vm.create_eager_layer( - layer_id=LayerID(id="layer"), box=Box(), origin=Vector(x=0, y=0) + layer_id=LayerID(id="layer"), origin=Vector(x=0, y=0), box=Box() ) assert isinstance(layer, EagerLayer) assert layer.layer_id == LayerID(id="layer")