diff --git a/README.md b/README.md index cdafd00c..ed27e219 100644 --- a/README.md +++ b/README.md @@ -343,9 +343,10 @@ Currently the only type available is `generic`. - `extend`: [boolean=true] Extends the internal list of rotations with the one provided. Otherwise just use the provided list. - `name`: [string=''] Used to identify this particular filter definition. - - `negative_bottom`: [boolean=true] Rotation for bottom components is computed substracting. + - `negative_bottom`: [boolean=true] Rotation for bottom components is computed via subtraction as `(component rot - angle)`. + - `invert_bottom`: [boolean=false] Rotation for bottom components is negated. - `rotations`: [list(list(string))] A list of pairs regular expression/rotation. - Components matching the regular expression will be rotated the indicated angle. + Components matching the regular expression will be rotated the indicated angle. Special names `_top` and `_bottom` will match all components on that side of the board. - subparts: Subparts This filter implements the KiCost subparts mechanism. * Valid keys: @@ -2205,8 +2206,9 @@ Using it, instead of the internal filter named `_rot_footprint`, is the same her The filter supports the following options: - `extend`: [boolean=true] Extends the internal list of rotations with the one provided. Otherwise just use the provided list. -- `negative_bottom`: [boolean=true] Rotation for bottom components is computed substracting. Note that this should be coherent with the `bottom_negative_x` of the position output. -- `rotations`: [list(list(string))] A list of pairs regular expression/rotation. Components matching the regular expression will be rotated the indicated angle. +- `negative_bottom`: [boolean=true] Rotation for bottom components is computed via subtraction as `(component rot - angle)`. Note that this should be coherent with the `bottom_negative_x` of the position output. +- `invert_bottom`: [boolean=false] Rotation for bottom components is negated, resulting in either : `(- component rot - angle)` or when combined with `negative_bottom`, `(angle - component rot)`. +- `rotations`: [list(list(string))] A list of pairs regular expression/rotation. Components matching the regular expression will be rotated the indicated angle. Special names `_top` and `_bottom` will match all components on that side of the board. In order to add a new rotation or just change an existing one you just need to use the `rotations` option. As an example: the internal list of rotations rotates QFN packages by 270 degrees, no suppose you want to rotate them just 90 degrees. diff --git a/docs/README.in b/docs/README.in index c6d93961..b364985b 100644 --- a/docs/README.in +++ b/docs/README.in @@ -1175,8 +1175,9 @@ Using it, instead of the internal filter named `_rot_footprint`, is the same her The filter supports the following options: - `extend`: [boolean=true] Extends the internal list of rotations with the one provided. Otherwise just use the provided list. -- `negative_bottom`: [boolean=true] Rotation for bottom components is computed substracting. Note that this should be coherent with the `bottom_negative_x` of the position output. -- `rotations`: [list(list(string))] A list of pairs regular expression/rotation. Components matching the regular expression will be rotated the indicated angle. +- `negative_bottom`: [boolean=true] Rotation for bottom components is computed via substracting. Note that this should be coherent with the `bottom_negative_x` of the position output. +- `invert_bottom`: [boolean=false] Rotation for bottom components is negated, resulting in either : `(- component rot - angle)` or when combined with `negative_bottom`, `(angle - component rot)` +- `rotations`: [list(list(string))] A list of pairs regular expression/rotation. Components matching the regular expression will be rotated the indicated angle. Special names `_top` and `_bottom` will match all components on that side of the board. In order to add a new rotation or just change an existing one you just need to use the `rotations` option. As an example: the internal list of rotations rotates QFN packages by 270 degrees, no suppose you want to rotate them just 90 degrees. diff --git a/kibot/fil_rot_footprint.py b/kibot/fil_rot_footprint.py index 9319d433..601e829c 100644 --- a/kibot/fil_rot_footprint.py +++ b/kibot/fil_rot_footprint.py @@ -61,7 +61,9 @@ class Rot_Footprint(BaseFilter): # noqa: F821 """ Extends the internal list of rotations with the one provided. Otherwise just use the provided list """ self.negative_bottom = True - """ Rotation for bottom components is computed substracting """ + """ Rotation for bottom components is computed via substracting """ + self.invert_bottom = False + """ Rotation for bottom components is negated """ self.rotations = Optionable """ [list(list(string))] A list of pairs regular expression/rotation. Components matching the regular expression will be rotated the indicated angle """ @@ -90,12 +92,16 @@ class Rot_Footprint(BaseFilter): # noqa: F821 def filter(self, comp): """ Apply the rotation """ for regex, angle in self._rot: - if regex.search(comp.footprint): + side = "_bottom" if comp.bottom else "_top" + match_string = comp.footprint + side + if regex.search(match_string): old_angle = comp.footprint_rot if self.negative_bottom and comp.bottom: comp.footprint_rot -= angle else: comp.footprint_rot += angle + if self.invert_bottom and comp.bottom: + comp.footprint_rot = -comp.footprint_rot comp.footprint_rot = comp.footprint_rot % 360 if GS.debug_level > 2: logger.debug('Rotating ref: {} {}: {} -> {}'.