From 72c7fca53ecb69122df6d80aaec43da8ce588a9e Mon Sep 17 00:00:00 2001 From: Guillaume Collic Date: Sun, 14 Feb 2021 15:27:17 +0100 Subject: [PATCH] Keyboard: clean and column callback spacing default value --- boxes/generators/atreus21.py | 9 ++++----- boxes/generators/keyboard.py | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/boxes/generators/atreus21.py b/boxes/generators/atreus21.py index 50877a8..386cb50 100644 --- a/boxes/generators/atreus21.py +++ b/boxes/generators/atreus21.py @@ -71,20 +71,21 @@ class Atreus21(Boxes, Keyboard): x, y ) + @restore def rim(self): x, y = self._case_x_y() self.moveTo(x * .5, y * .5) self.rectangularHole(0, 0, x, y, 5) - self.moveTo(x * -.5, y * -.5) + @restore def outer(self): x, y = self._case_x_y() b = self.border self.moveTo(0, -b) corner = [90, b] self.polyline(*([x, corner, y, corner] * 2)) - self.moveTo(0, b) + @restore def half(self, hole_cb=None, reverse=False): if hole_cb == None: hole_cb = self.key @@ -92,10 +93,8 @@ class Atreus21(Boxes, Keyboard): self.apply_callback_on_columns( hole_cb, self.columns_definition, - self.STANDARD_KEY_SPACING, - reverse, + reverse=reverse, ) - self.moveTo(-self.half_btn, -self.half_btn) def support(self): self.configured_plate_cutout(support=True) diff --git a/boxes/generators/keyboard.py b/boxes/generators/keyboard.py index b5629d1..c8f942c 100644 --- a/boxes/generators/keyboard.py +++ b/boxes/generators/keyboard.py @@ -165,7 +165,9 @@ class Keyboard: grid_hole(-3, -4, led_hole_size) grid_hole(3, -4, led_hole_size) - def apply_callback_on_columns(self, cb, columns_definition, spacing, reverse=False): + def apply_callback_on_columns(self, cb, columns_definition, spacing=None, reverse=False): + if spacing == None: + spacing = self.STANDARD_KEY_SPACING if reverse: columns_definition = list(reversed(columns_definition))