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

Use chain() instead of adding lists

Browse Source
This commit is contained in:
Jan Petykiewicz 2020-09-18 19:46:57 -07:00
parent 5f72fe318f
commit 3f59168cec
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
masque/pattern.py
View File

@ -5,8 +5,8 @@
from typing import List, Callable, Tuple, Dict, Union, Set, Sequence, Optional, Type, overload from typing import List, Callable, Tuple, Dict, Union, Set, Sequence, Optional, Type, overload
from typing import MutableMapping, Iterable from typing import MutableMapping, Iterable
import copy import copy
import itertools
import pickle import pickle
from itertools import chain
from collections import defaultdict from collections import defaultdict
import numpy # type: ignore import numpy # type: ignore
@ -321,7 +321,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
self self
""" """
old_shapes = self.shapes old_shapes = self.shapes
self.shapes = list(itertools.chain.from_iterable( self.shapes = list(chain.from_iterable(
(shape.to_polygons(poly_num_points, poly_max_arclen) (shape.to_polygons(poly_num_points, poly_max_arclen)
for shape in old_shapes))) for shape in old_shapes)))
for subpat in self.subpatterns: for subpat in self.subpatterns:
@ -347,7 +347,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
self.polygonize().flatten() self.polygonize().flatten()
old_shapes = self.shapes old_shapes = self.shapes
self.shapes = list(itertools.chain.from_iterable( self.shapes = list(chain.from_iterable(
(shape.manhattanize(grid_x, grid_y) for shape in old_shapes))) (shape.manhattanize(grid_x, grid_y) for shape in old_shapes)))
return self return self
@ -525,13 +525,12 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
Returns: Returns:
`[[x_min, y_min], [x_max, y_max]]` or `None` `[[x_min, y_min], [x_max, y_max]]` or `None`
""" """
entries = self.shapes + self.subpatterns + self.labels if self.is_empty():
if not entries:
return None return None
min_bounds = numpy.array((+inf, +inf)) min_bounds = numpy.array((+inf, +inf))
max_bounds = numpy.array((-inf, -inf)) max_bounds = numpy.array((-inf, -inf))
for entry in entries: for entry in chain(self.shapes, self.subpatterns, self.labels):
bounds = entry.get_bounds() bounds = entry.get_bounds()
if bounds is None: if bounds is None:
continue continue
@ -634,7 +633,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
Returns: Returns:
self self
""" """
for entry in self.shapes + self.subpatterns + self.labels: for entry in chain(self.shapes, self.subpatterns, self.labels):
entry.translate(offset) entry.translate(offset)
return self return self
@ -648,7 +647,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
Returns: Returns:
self self
""" """
for entry in self.shapes + self.subpatterns: for entry in chain(self.shapes, self.subpatterns):
entry.scale_by(c) entry.scale_by(c)
return self return self
@ -663,7 +662,8 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
Returns: Returns:
self self
""" """
for entry in self.shapes + self.subpatterns: entry: Scalable
for entry in chain(self.shapes, self.subpatterns):
entry.offset *= c entry.offset *= c
entry.scale_by(c) entry.scale_by(c)
for label in self.labels: for label in self.labels:
@ -698,7 +698,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
Returns: Returns:
self self
""" """
for entry in self.shapes + self.subpatterns + self.labels: for entry in chain(self.shapes, self.subpatterns, self.labels):
entry.offset = numpy.dot(rotation_matrix_2d(rotation), entry.offset) entry.offset = numpy.dot(rotation_matrix_2d(rotation), entry.offset)
return self return self
@ -712,7 +712,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
Returns: Returns:
self self
""" """
for entry in self.shapes + self.subpatterns: for entry in chain(self.shapes, self.subpatterns):
entry.rotate(rotation) entry.rotate(rotation)
return self return self
@ -727,7 +727,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
Returns: Returns:
self self
""" """
for entry in self.shapes + self.subpatterns + self.labels: for entry in chain(self.shapes, self.subpatterns, self.labels):
entry.offset[axis - 1] *= -1 entry.offset[axis - 1] *= -1
return self return self
@ -743,7 +743,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
Returns: Returns:
self self
""" """
for entry in self.shapes + self.subpatterns: for entry in chain(self.shapes, self.subpatterns):
entry.mirror(axis) entry.mirror(axis)
return self return self
@ -772,7 +772,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
Return: Return:
self self
""" """
for entry in self.shapes + self.subpatterns: for entry in chain(self.shapes, self.subpatterns):
entry.dose *= c entry.dose *= c
return self return self
@ -843,7 +843,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
self self
""" """
self.lock() self.lock()
for ss in self.shapes + self.labels: for ss in chain(self.shapes, self.labels):
ss.lock() ss.lock()
for sp in self.subpatterns: for sp in self.subpatterns:
sp.deeplock() sp.deeplock()
@ -860,7 +860,7 @@ class Pattern(LockableImpl, AnnotatableImpl, metaclass=AutoSlots):
self self
""" """
self.unlock() self.unlock()
for ss in self.shapes + self.labels: for ss in chain(self.shapes, self.labels):
ss.unlock() ss.unlock()
for sp in self.subpatterns: for sp in self.subpatterns:
sp.deepunlock() sp.deepunlock()