Skip to content

Commit

Permalink
Fix inconsisten order of box and origin in create_eager_layer and cre…
Browse files Browse the repository at this point in the history
…ate_deferred_layer
  • Loading branch information
Argmaster committed Jan 31, 2025
1 parent 778ab45 commit f498963
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/pygerber/vm/pillow/vm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/pygerber/vm/shapely/vm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions src/pygerber/vm/vm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion test/unit/test_vm/test_vm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit f498963

Please sign in to comment.