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

repetitions affect bounds

Browse Source
This commit is contained in:
jan 2023-04-12 19:31:17 -07:00
parent 835bcc24e0
commit 237b24ae8e
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
masque/pattern.py
View File

@ -326,7 +326,7 @@ class Pattern(PortList, AnnotatableImpl, Mirrorable):
if self.is_empty(): if self.is_empty():
return None return None
rbounds = numpy.array([ cbounds = numpy.array([
(+inf, +inf), (+inf, +inf),
(-inf, -inf), (-inf, -inf),
]) ])
@ -335,8 +335,10 @@ class Pattern(PortList, AnnotatableImpl, Mirrorable):
bounds = cast(Bounded, entry).get_bounds() bounds = cast(Bounded, entry).get_bounds()
if bounds is None: if bounds is None:
continue continue
rbounds[0] = numpy.minimum(rbounds[0], bounds[0]) if entry.repetition is not None:
rbounds[1] = numpy.maximum(rbounds[1], bounds[1]) bounds += entry.repetition.get_bounds()
cbounds[0] = numpy.minimum(cbounds[0], bounds[0])
cbounds[1] = numpy.maximum(cbounds[1], bounds[1])
if recurse and self.has_refs(): if recurse and self.has_refs():
if library is None: if library is None:
@ -353,7 +355,7 @@ class Pattern(PortList, AnnotatableImpl, Mirrorable):
if target in cache: if target in cache:
unrot_bounds = cache[target] unrot_bounds = cache[target]
elif any(numpy.isclose(ref.rotation % pi, 0) for ref in refs): elif any(numpy.isclose(ref.rotation % pi / 2, 0) for ref in refs):
unrot_bounds = library[target].get_bounds(library=library, recurse=recurse, cache=cache) unrot_bounds = library[target].get_bounds(library=library, recurse=recurse, cache=cache)
cache[target] = unrot_bounds cache[target] = unrot_bounds
@ -368,7 +370,7 @@ class Pattern(PortList, AnnotatableImpl, Mirrorable):
ubounds[:, 1] *= -1 ubounds[:, 1] *= -1
bounds = numpy.round(rotation_matrix(ref.rotation + rot2)) @ ubounds bounds = numpy.round(rotation_matrix(ref.rotation + rot2)) @ ubounds
# note: rounding fixes up # note: rounding fixes up
# TODO: repetitions!
else: else:
# Non-manhattan rotation, have to figure out bounds by rotating the pattern # Non-manhattan rotation, have to figure out bounds by rotating the pattern
bounds = ref.get_bounds(library[target], library=library) bounds = ref.get_bounds(library[target], library=library)
@ -376,13 +378,16 @@ class Pattern(PortList, AnnotatableImpl, Mirrorable):
if bounds is None: if bounds is None:
continue continue
rbounds[0] = numpy.minimum(rbounds[0], bounds[0]) if ref.repetition is not None:
rbounds[1] = numpy.maximum(rbounds[1], bounds[1]) bounds += ref.repetition.get_bounds()
if (rbounds[1] < rbounds[0]).any(): cbounds[0] = numpy.minimum(cbounds[0], bounds[0])
cbounds[1] = numpy.maximum(cbounds[1], bounds[1])
if (cbounds[1] < cbounds[0]).any():
return None return None
else: else:
return rbounds return cbounds
def get_bounds_nonempty( def get_bounds_nonempty(
self, self,

2
masque/repetition.py
View File

@ -15,7 +15,7 @@ from .error import PatternError
from .utils import rotation_matrix_2d from .utils import rotation_matrix_2d
class Repetition(Copyable, Rotatable, Mirrorable, Scalable, metaclass=ABCMeta): class Repetition(Copyable, Rotatable, Mirrorable, Scalable, Bounded, metaclass=ABCMeta):
""" """
Interface common to all objects which specify repetitions Interface common to all objects which specify repetitions
""" """

2
masque/shapes/polygon.py
View File

@ -327,7 +327,7 @@ class Polygon(Shape):
) -> list['Polygon']: ) -> list['Polygon']:
return [copy.deepcopy(self)] return [copy.deepcopy(self)]
def get_bounds(self) -> NDArray[numpy.float64]: def get_bounds(self) -> NDArray[numpy.float64]: # TODO note shape get_bounds doesn't include repetition
return numpy.vstack((self.offset + numpy.min(self.vertices, axis=0), return numpy.vstack((self.offset + numpy.min(self.vertices, axis=0),
self.offset + numpy.max(self.vertices, axis=0))) self.offset + numpy.max(self.vertices, axis=0)))