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

roundedPlate: Properly lookup edge

This commit is contained in:
Florian Festi 2020-02-03 17:03:23 +01:00
parent 7c004e2d2c
commit 26b33d62ff
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
boxes/__init__.py
View File

@ -1522,18 +1522,19 @@ class Boxes:
""" """
overallwidth = x + 2 * self.edges[edge].spacing() edge = self.edges.get(edge, edge)
overallheight = y + 2 * self.edges[edge].spacing() overallwidth = x + 2 * edge.spacing()
overallheight = y + 2 * edge.spacing()
if self.move(overallwidth, overallheight, move, before=True): if self.move(overallwidth, overallheight, move, before=True):
return return
lx = x - 2*r lx = x - 2*r
ly = y - 2*r ly = y - 2*r
r += self.edges[edge].startwidth() r += edge.startwidth()
self.moveTo(self.edges[edge].margin(), self.moveTo(edge.margin(),
self.edges[edge].margin()) edge.margin())
self.moveTo(r, 0) self.moveTo(r, 0)
if wallpieces > 4: if wallpieces > 4:
@ -1544,23 +1545,23 @@ class Boxes:
if self._splitWall(wallpieces, nr): if self._splitWall(wallpieces, nr):
for i in range(2): for i in range(2):
self.cc(callback, wallcount) self.cc(callback, wallcount)
self.edges[edge](l / 2.0 , edge(l / 2.0 ,
bedBolts=self.getEntry(bedBolts, wallcount), bedBolts=self.getEntry(bedBolts, wallcount),
bedBoltSettings=self.getEntry(bedBoltSettings, wallcount)) bedBoltSettings=self.getEntry(bedBoltSettings, wallcount))
wallcount += 1 wallcount += 1
else: else:
self.cc(callback, wallcount) self.cc(callback, wallcount)
self.edges[edge](l, edge(l,
bedBolts=self.getEntry(bedBolts, wallcount), bedBolts=self.getEntry(bedBolts, wallcount),
bedBoltSettings=self.getEntry(bedBoltSettings, wallcount)) bedBoltSettings=self.getEntry(bedBoltSettings, wallcount))
wallcount += 1 wallcount += 1
self.corner(90, r) self.corner(90, r)
self.ctx.restore() self.ctx.restore()
self.ctx.save() self.ctx.save()
self.moveTo(self.edges[edge].margin(), self.moveTo(edge.margin(),
self.edges[edge].margin()) edge.margin())
if holesMargin is not None: if holesMargin is not None:
self.moveTo(holesMargin, holesMargin) self.moveTo(holesMargin, holesMargin)