From 8de9c304d6ab51188538d276fcdb41fa0ce57f90 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Fri, 21 Mar 2014 21:08:54 +0100 Subject: [PATCH] Move finalization into global function --- box.py | 4 +--- box2.py | 4 +--- box3.py | 4 +--- boxes.py | 8 +++++--- castle.py | 4 +--- drillbox.py | 4 +--- flexbox.py | 3 +-- flexbox2.py | 3 +-- flexbox3.py | 3 +-- flextest.py | 3 +-- folder.py | 4 +--- lamp.py | 3 +-- magazinefile.py | 4 +--- printer.py | 4 +--- silverwarebox.py | 6 +----- typetray.py | 5 +---- 16 files changed, 20 insertions(+), 46 deletions(-) diff --git a/box.py b/box.py index 7922fa7..e4392e8 100755 --- a/box.py +++ b/box.py @@ -39,9 +39,7 @@ class Box(Boxes): self.rectangularWall(x, y, "ffff", bedBolts=[d2, d3, d2, d3], move="right") self.rectangularWall(x, y, "ffff", bedBolts=[d2, d3, d2, d3]) - self.ctx.stroke() - self.surface.flush() - self.surface.finish() + self.close() b = Box(140, 202, 50, thickness=4.0) b.edges["f"].settings.setValues(b.thickness, space=3, finger=3, diff --git a/box2.py b/box2.py index bccfce0..bc804de 100755 --- a/box2.py +++ b/box2.py @@ -39,9 +39,7 @@ class Box(Boxes): self.rectangularWall(x, y, "ffff", bedBolts=[d2, d3, d2, d3]) - self.ctx.stroke() - self.surface.flush() - self.surface.finish() + self.close() b = Box(200, 200, 200, thickness=4.0) b.edges["f"].settings.setValues(b.thickness, space=3, finger=3, diff --git a/box3.py b/box3.py index fb5112b..6285f68 100755 --- a/box3.py +++ b/box3.py @@ -39,9 +39,7 @@ class Box(Boxes): self.rectangularWall(x, y, "efff", bedBolts=[d2, d3, d2, d3], move="left") #self.rectangularWall(x, y, "ffff", bedBolts=[d2, d3, d2, d3]) - self.ctx.stroke() - self.surface.flush() - self.surface.finish() + self.close() t = 6.0 b = Box(380-2*t, 370-2*t, 120-t, thickness=t) diff --git a/boxes.py b/boxes.py index 8d75030..a7352e8 100755 --- a/boxes.py +++ b/boxes.py @@ -516,6 +516,10 @@ class Boxes: else: return param + def close(self): + self.ctx.stroke() + self.surface.flush() + self.surface.finish() ############################################################ ### Turtle graphics commands @@ -1034,9 +1038,7 @@ class Boxes: self.moveTo(-x-y-40, h+20) - self.ctx.stroke() - self.surface.flush() - self.surface.finish() + self.close() if __name__ == '__main__': b = Boxes(900, 700) diff --git a/castle.py b/castle.py index 4e5143b..2c9e96f 100755 --- a/castle.py +++ b/castle.py @@ -42,9 +42,7 @@ class Castle(Boxes): self.rectangularWall(w1_x, w1_h, "efpe", move="right") self.rectangularWall(w2_x, w2_h, "efpe", move="right") - self.ctx.stroke() - self.surface.finish() - + self.close() c = Castle() c.render() diff --git a/drillbox.py b/drillbox.py index 6642c89..e25dd03 100755 --- a/drillbox.py +++ b/drillbox.py @@ -66,9 +66,7 @@ class Box(Boxes): self.description], move="up") - self.ctx.stroke() - self.surface.flush() - self.surface.finish() + self.close() b = Box(120, 240, 60, thickness=4.0) b.edges["f"].settings.setValues(b.thickness, space=3, finger=3, diff --git a/flexbox.py b/flexbox.py index 2410608..d22a80b 100755 --- a/flexbox.py +++ b/flexbox.py @@ -82,9 +82,8 @@ class FlexBox(boxes.Boxes): self.moveTo(2*self.x+3*self.thickness, 0) self.ctx.scale(-1, 1) self.flexBoxSide(self.x, self.y, self.r) - self.ctx.stroke() - self.surface.finish() + self.close() if __name__=="__main__": b = FlexBox(50, 70, 50, r=15) diff --git a/flexbox2.py b/flexbox2.py index d901fd1..8fd929d 100755 --- a/flexbox2.py +++ b/flexbox2.py @@ -87,8 +87,7 @@ class FlexBox(Boxes): self.ctx.scale(-1, 1) self.moveTo(2*self.thickness, 0) self.rectangularWall(self.z, self.y-self.r-self.latchsize, edges="fFeF") - self.ctx.stroke() - self.surface.finish() + self.close() if __name__=="__main__": diff --git a/flexbox3.py b/flexbox3.py index 23bcaee..23c8e76 100755 --- a/flexbox3.py +++ b/flexbox3.py @@ -130,9 +130,8 @@ class FlexBox(Boxes): self.ctx.scale(-1, 1) self.moveTo(2*self.thickness, -self.thickness) self.rectangularWall(z, y, edges="fFeF") - self.ctx.stroke() - self.surface.finish() + self.close() if __name__=="__main__": b = FlexBox(100, 40, 100, r=20, h=10, thickness=4.0) diff --git a/flextest.py b/flextest.py index e1a8eea..1f585d7 100755 --- a/flextest.py +++ b/flextest.py @@ -32,8 +32,7 @@ class FlexTest(Boxes): self.edge(y) self.corner(90) - self.ctx.stroke() - self.surface.flush() + self.close() x = 40 y = 100 diff --git a/folder.py b/folder.py index de88fab..c3d1e84 100755 --- a/folder.py +++ b/folder.py @@ -41,9 +41,7 @@ class Folder(Boxes): self.edge(y-2*r) self.corner(90, r) - self.ctx.stroke() - self.surface.flush() - self.surface.finish() + self.close() f = Folder(240, 350, 20, 15) f.render() diff --git a/lamp.py b/lamp.py index afd6158..03582f2 100755 --- a/lamp.py +++ b/lamp.py @@ -109,9 +109,8 @@ class Lamp(Boxes): self.rectangularWall(x, h, edges='hFFF', holesMargin=5, move="right") self.rectangularWall(x, h, edges='hFFF', holesMargin=5) - self.ctx.stroke() - self.surface.finish() + self.close() l = Lamp() l.flexSettings = (3, 5.0, 20.0) diff --git a/magazinefile.py b/magazinefile.py index 3756ddb..bb02fe7 100755 --- a/magazinefile.py +++ b/magazinefile.py @@ -71,9 +71,7 @@ class Box(Boxes): self.moveTo(y+15, h+h2+15, 180) self.side(y, h, h2) - self.ctx.stroke() - self.surface.flush() - self.surface.finish() + self.close() b = Box(80, 235, 300, 150) b.edges["f"].settings.setValues(b.thickness, space=2, finger=2) diff --git a/printer.py b/printer.py index 3903bf6..6770c0a 100755 --- a/printer.py +++ b/printer.py @@ -172,9 +172,7 @@ class Printer(Boxes): callback=self.mainPlate, move="right") self.head() - - self.ctx.stroke() - self.surface.finish() + self.close() p = Printer() p.render() diff --git a/silverwarebox.py b/silverwarebox.py index 04aa561..28bb50f 100755 --- a/silverwarebox.py +++ b/silverwarebox.py @@ -68,7 +68,6 @@ class Silverware(Boxes): def render(self, x, y, h, r): t = self.thickness b = self.burn - self.ctx.save() self.wall(x, y, h, r) self.centerWall(x,h) @@ -80,10 +79,7 @@ class Silverware(Boxes): self.moveTo(-3.0*(l+2*t+8*b), h-10+2*t+8*b) self.basePlate(x, y, r) - self.ctx.restore() - - self.ctx.stroke() - self.surface.finish() + self.close() b = Silverware(750, 350, thickness=5.0, burn=0.05) b.render(250, 250/1.618, 120, 30) diff --git a/typetray.py b/typetray.py index db441a0..89b938a 100755 --- a/typetray.py +++ b/typetray.py @@ -132,10 +132,7 @@ class TypeTray(Boxes): TopEdge(self, self.x, 0.5*hi), "f"] self.rectangularWall(x, hi, e, move="up") - - self.ctx.stroke() - self.surface.flush() - self.surface.finish() + self.close() x = 260 # outer width nx = 3