Profouzors
/
boxespy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bug where the option hexpattern=True would cause an error.

This commit is contained in:
Ba-So 2020-08-14 11:54:36 +02:00 committed by Florian Festi
parent 676772ee64
commit f6e2773810
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
boxes/__init__.py
View File

@ -452,7 +452,7 @@ class Boxes:
prefix = prefix or settings.__name__[:-len("Settings")] prefix = prefix or settings.__name__[:-len("Settings")]
settings.parserArguments(self.argparser, prefix, **defaults) settings.parserArguments(self.argparser, prefix, **defaults)
self.edgesettings[prefix] = {} self.edgesettings[prefix] = {}
def parseArgs(self, args=None): def parseArgs(self, args=None):
""" """
@ -469,7 +469,7 @@ class Boxes:
args = [a for a in args if not a.startswith('--tab=')] args = [a for a in args if not a.startswith('--tab=')]
self.metadata["cli"] = "boxes " + self.__class__.__name__ + " " + " ".join((quote(arg) for arg in args)) self.metadata["cli"] = "boxes " + self.__class__.__name__ + " " + " ".join((quote(arg) for arg in args))
for key, value in vars(self.argparser.parse_args(args=args)).items(): for key, value in vars(self.argparser.parse_args(args=args)).items():
# treat edge settings separately # treat edge settings separately
for setting in self.edgesettings: for setting in self.edgesettings:
if key.startswith(setting + '_'): if key.startswith(setting + '_'):
self.edgesettings[setting][key[len(setting)+1:]] = value self.edgesettings[setting][key[len(setting)+1:]] = value
@ -774,12 +774,12 @@ class Boxes:
def curveTo(self, x1, y1, x2, y2, x3, y3): def curveTo(self, x1, y1, x2, y2, x3, y3):
"""control point 1, control point 2, end point """control point 1, control point 2, end point
:param x1: :param x1:
:param y1: :param y1:
:param x2: :param x2:
:param y2: :param y2:
:param x3: :param x3:
:param y3: :param y3:
""" """
self.ctx.curve_to(x1, y1, x2, y2, x3, y3) self.ctx.curve_to(x1, y1, x2, y2, x3, y3)
@ -1383,6 +1383,7 @@ class Boxes:
""" """
if settings is None: if settings is None:
settings = self.hexHolesSettings settings = self.hexHolesSettings
r, b, style = settings.diameter/2, settings.distance, settings.style r, b, style = settings.diameter/2, settings.distance, settings.style
@ -1437,12 +1438,12 @@ class Boxes:
def skip(x, y, r, b, posx, posy): def skip(x, y, r, b, posx, posy):
""" """
:param x: :param x:
:param y: :param y:
:param r: :param r:
:param b: :param b:
:param posx: :param posx:
:param posy: :param posy:
""" """
posx = abs(posx - (x / 2.0)) posx = abs(posx - (x / 2.0))
@ -1670,7 +1671,7 @@ class Boxes:
:param x: width of matching roundedPlate :param x: width of matching roundedPlate
:param y: height of matching roundedPlate :param y: height of matching roundedPlate
:param r: corner radius of matching roundedPlate :param r: corner radius of matching roundedPlate
:param h: inner height of the wall (without edges) :param h: inner height of the wall (without edges)
:param bottom: (Default value = 'e') Edge type :param bottom: (Default value = 'e') Edge type
:param top: (Default value = 'e') Edge type :param top: (Default value = 'e') Edge type
:param left: (Default value = 'D') left edge(s) :param left: (Default value = 'D') left edge(s)
@ -2116,7 +2117,7 @@ class Boxes:
if not turtle: if not turtle:
if self.move(tw, th, move, True): if self.move(tw, th, move, True):
return return
self.moveTo(-minx, -miny) self.moveTo(-minx, -miny)
length_correction = 0. length_correction = 0.

8
boxes/generators/paintbox.py
View File

@ -48,9 +48,13 @@ class PaintStorage(Boxes):
if self.hexpattern: if self.hexpattern:
self.moveTo(self.minspace/2, self.minspace/2) self.moveTo(self.minspace/2, self.minspace/2)
settings = self.hexHolesSettings
settings.setValues('diameter', self.candiameter)
settings.setValues('distance', self.minspace)
settings.setValues('style', 'cricle')
self.hexHolesRectangle(self.y - 1*self.minspace, self.hexHolesRectangle(self.y - 1*self.minspace,
self.x - 1*self.minspace, self.x - 1*self.minspace,
(self.candiameter/2, self.minspace, 'circle')) settings)
return return
n_x = int(self.x / (self.candiameter+self.minspace)) n_x = int(self.x / (self.candiameter+self.minspace))
n_y = int(self.y / (self.candiameter+self.minspace)) n_y = int(self.y / (self.candiameter+self.minspace))
@ -71,7 +75,7 @@ class PaintStorage(Boxes):
# adjust to the variables you want in the local scope # adjust to the variables you want in the local scope
x, y = self.x, self.y x, y = self.x, self.y
t = self.thickness t = self.thickness
stack = self.edges['s'].settings stack = self.edges['s'].settings
h = self.canheight - stack.height - stack.holedistance + t h = self.canheight - stack.height - stack.holedistance + t