jan/masque
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable repetition arg for other Polygon constructors

Browse Source
This commit is contained in:
Jan Petykiewicz 2021-06-18 18:45:40 -07:00
parent 78a4416f4c
commit 21ef4207df
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
masque/shapes/polygon.py
View File

@ -119,6 +119,7 @@ class Polygon(Shape, metaclass=AutoSlots):
offset: vector2 = (0.0, 0.0), offset: vector2 = (0.0, 0.0),
layer: layer_t = 0, layer: layer_t = 0,
dose: float = 1.0, dose: float = 1.0,
repetition: Optional[Repetition] = None,
) -> 'Polygon': ) -> 'Polygon':
""" """
Draw a square given side_length, centered on the origin. Draw a square given side_length, centered on the origin.
@ -129,6 +130,7 @@ class Polygon(Shape, metaclass=AutoSlots):
offset: Offset, default `(0, 0)` offset: Offset, default `(0, 0)`
layer: Layer, default `0` layer: Layer, default `0`
dose: Dose, default `1.0` dose: Dose, default `1.0`
repetition: `Repetition` object, default `None`
Returns: Returns:
A Polygon object containing the requested square A Polygon object containing the requested square
@ -138,7 +140,8 @@ class Polygon(Shape, metaclass=AutoSlots):
[+1, +1], [+1, +1],
[+1, -1]], dtype=float) [+1, -1]], dtype=float)
vertices = 0.5 * side_length * norm_square vertices = 0.5 * side_length * norm_square
poly = Polygon(vertices, offset=offset, layer=layer, dose=dose) poly = Polygon(vertices, offset=offset, layer=layer, dose=dose,
repetition=repetition)
poly.rotate(rotation) poly.rotate(rotation)
return poly return poly
@ -149,6 +152,7 @@ class Polygon(Shape, metaclass=AutoSlots):
offset: vector2 = (0.0, 0.0), offset: vector2 = (0.0, 0.0),
layer: layer_t = 0, layer: layer_t = 0,
dose: float = 1.0, dose: float = 1.0,
repetition: Optional[Repetition] = None,
) -> 'Polygon': ) -> 'Polygon':
""" """
Draw a rectangle with side lengths lx and ly, centered on the origin. Draw a rectangle with side lengths lx and ly, centered on the origin.
@ -160,6 +164,7 @@ class Polygon(Shape, metaclass=AutoSlots):
offset: Offset, default `(0, 0)` offset: Offset, default `(0, 0)`
layer: Layer, default `0` layer: Layer, default `0`
dose: Dose, default `1.0` dose: Dose, default `1.0`
repetition: `Repetition` object, default `None`
Returns: Returns:
A Polygon object containing the requested rectangle A Polygon object containing the requested rectangle
@ -168,7 +173,8 @@ class Polygon(Shape, metaclass=AutoSlots):
[-lx, +ly], [-lx, +ly],
[+lx, +ly], [+lx, +ly],
[+lx, -ly]], dtype=float) [+lx, -ly]], dtype=float)
poly = Polygon(vertices, offset=offset, layer=layer, dose=dose) poly = Polygon(vertices, offset=offset, layer=layer, dose=dose,
repetition=repetition)
poly.rotate(rotation) poly.rotate(rotation)
return poly return poly
@ -183,6 +189,7 @@ class Polygon(Shape, metaclass=AutoSlots):
ly: Optional[float] = None, ly: Optional[float] = None,
layer: layer_t = 0, layer: layer_t = 0,
dose: float = 1.0, dose: float = 1.0,
repetition: Optional[Repetition] = None,
) -> 'Polygon': ) -> 'Polygon':
""" """
Draw a rectangle by specifying side/center positions. Draw a rectangle by specifying side/center positions.
@ -201,6 +208,7 @@ class Polygon(Shape, metaclass=AutoSlots):
ly: Length along y direction ly: Length along y direction
layer: Layer, default `0` layer: Layer, default `0`
dose: Dose, default `1.0` dose: Dose, default `1.0`
repetition: `Repetition` object, default `None`
Returns: Returns:
A Polygon object containing the requested rectangle A Polygon object containing the requested rectangle
@ -266,7 +274,7 @@ class Polygon(Shape, metaclass=AutoSlots):
raise PatternError('Two of ymin, yctr, ymax, ly must be None!') raise PatternError('Two of ymin, yctr, ymax, ly must be None!')
poly = Polygon.rectangle(lx, ly, offset=(xctr, yctr), poly = Polygon.rectangle(lx, ly, offset=(xctr, yctr),
layer=layer, dose=dose) layer=layer, dose=dose, repetition=repetition)
return poly return poly
@staticmethod @staticmethod
@ -278,6 +286,7 @@ class Polygon(Shape, metaclass=AutoSlots):
rotation: float = 0.0, rotation: float = 0.0,
layer: layer_t = 0, layer: layer_t = 0,
dose: float = 1.0, dose: float = 1.0,
repetition: Optional[Repetition] = None,
) -> 'Polygon': ) -> 'Polygon':
""" """
Draw an octagon given one of (side length, inradius, circumradius). Draw an octagon given one of (side length, inradius, circumradius).
@ -297,6 +306,7 @@ class Polygon(Shape, metaclass=AutoSlots):
irregular octagon). irregular octagon).
layer: Layer, default `0` layer: Layer, default `0`
dose: Dose, default `1.0` dose: Dose, default `1.0`
repetition: `Repetition` object, default `None`
Returns: Returns:
A Polygon object containing the requested octagon A Polygon object containing the requested octagon
@ -322,7 +332,7 @@ class Polygon(Shape, metaclass=AutoSlots):
side_length = 2 * inner_radius / s side_length = 2 * inner_radius / s
vertices = 0.5 * side_length * norm_oct vertices = 0.5 * side_length * norm_oct
poly = Polygon(vertices, offset=center, layer=layer, dose=dose) poly = Polygon(vertices, offset=center, layer=layer, dose=dose, repetition=repetition)
poly.rotate(rotation) poly.rotate(rotation)
return poly return poly