diff --git a/boxes/__init__.py b/boxes/__init__.py index 1aecce2c8..f5bdf7bd8 100755 --- a/boxes/__init__.py +++ b/boxes/__init__.py @@ -2394,7 +2394,7 @@ def rectangularWall(self, x, y, edges="eeee", :param bedBoltSettings: (Default value = None) :param callback: (Default value = None) :param move: (Default value = None) - :param label: rendered to identify parts, it is not ment to be cut or etched (Default value = "") + :param label: rendered to identify parts, it is not meant to be cut or etched (Default value = "") """ if len(edges) != 4: raise ValueError("four edges required") @@ -2448,7 +2448,7 @@ def flangedWall(self, x, y, edges="FFFF", flanges=None, r=0.0, :param r: radius of the corners of the flange :param callback: (Default value = None) :param move: (Default value = None) - :param label: rendered to identify parts, it is not ment to be cut or etched (Default value = "") + :param label: rendered to identify parts, it is not meant to be cut or etched (Default value = "") """ t = self.thickness @@ -2508,7 +2508,7 @@ def rectangularTriangle(self, x, y, edges="eee", r=0.0, num=1, :param bedBoltSettings: (Default value = None) :param callback: (Default value = None) :param move: (Default value = None) - :param label: rendered to identify parts, it is not ment to be cut or etched (Default value = "") + :param label: rendered to identify parts, it is not meant to be cut or etched (Default value = "") """ edges = [self.edges.get(e, e) for e in edges] if len(edges) == 2: @@ -2578,7 +2578,7 @@ def trapezoidWall(self, w, h0, h1, edges="eeee", :param edges: (Default value = "eee") bottom, right, left :param callback: (Default value = None) :param move: (Default value = None) - :param label: rendered to identify parts, it is not ment to be cut or etched (Default value = "") + :param label: rendered to identify parts, it is not meant to be cut or etched (Default value = "") """ edges = [self.edges.get(e, e) for e in edges] @@ -2623,7 +2623,7 @@ def trapezoidSideWall(self, w, h0, h1, edges="eeee", :param radius: (Default value = 0.0) radius of upper corners :param callback: (Default value = None) :param move: (Default value = None) - :param label: rendered to identify parts, it is not ment to be cut or etched (Default value = "") + :param label: rendered to identify parts, it is not meant to be cut or etched (Default value = "") """ edges = [self.edges.get(e, e) for e in edges] @@ -2793,7 +2793,7 @@ def polygonWall(self, borders, edge="f", turtle=False, :param correct_corners: (Default value = True) :param callback: (Default value = None) :param move: (Default value = None) - :param label: rendered to identify parts, it is not ment to be cut or etched (Default value = "") + :param label: rendered to identify parts, it is not meant to be cut or etched (Default value = "") borders is alternating between length of the edge and angle of the corner. For now neither tabs nor radii are supported. None at the end closes the polygon. """ diff --git a/boxes/drawing.py b/boxes/drawing.py index edf351802..1a8cb5992 100644 --- a/boxes/drawing.py +++ b/boxes/drawing.py @@ -847,8 +847,8 @@ def finish(self, inner_corners="loop"): path.faster_edges(inner_corners) num = 0 cnt = 1 - ende = len(path.path)-1 - if self.dbg: + end = len(path.path) - 1 + if self.dbg: for c in path.path: print ("6",num, c) num += 1 @@ -856,9 +856,11 @@ def finish(self, inner_corners="loop"): c = path.path[num] C, x, y = c[0:3] - if self.dbg: print("ende:" ,ende) - while num < ende or (C == "T" and num <= ende): #len(path.path): - if self.dbg: print ("0", num) + if self.dbg: + print("end:", end) + while num < end or (C == "T" and num <= end): # len(path.path): + if self.dbg: + print("0", num) c = path.path[num] if self.dbg: print("first: ", num, c) @@ -879,7 +881,7 @@ def finish(self, inner_corners="loop"): # do something with M done = False bspline = False - while done == False and num < ende: #len(path.path): + while done == False and num < end: # len(path.path): num += 1 c = path.path[num] if self.dbg: print ("next: ",num, c) diff --git a/boxes/generators/bintray.py b/boxes/generators/bintray.py index 8fdd23657..321cddb95 100644 --- a/boxes/generators/bintray.py +++ b/boxes/generators/bintray.py @@ -54,8 +54,8 @@ def __init__(self) -> None: self.addSettingsArgs(edges.FingerJointSettings, surroundingspaces=0.5) self.argparser.add_argument( "--front", action="store", type=float, default=0.4, - help="fraction of bin height covert with slope") - + help="fraction of bin height covered with slope") + def xSlots(self): posx = -0.5 * self.thickness for x in self.sx[:-1]: diff --git a/boxes/generators/bottlestack.py b/boxes/generators/bottlestack.py index 9e9968c53..25d9b0cf2 100644 --- a/boxes/generators/bottlestack.py +++ b/boxes/generators/bottlestack.py @@ -49,7 +49,7 @@ def front(self, h_sides, offset=0, move=None): a = 60 nr = self.number r1 = self.diameter / 2.0 # bottle - r2 = r1 / math.cos(math.radians(90-a)) - r1 # inbetween + r2 = r1 / math.cos(math.radians(90-a)) - r1 # in between if self.double: r3 = 1.5*t # upper corners else: diff --git a/boxes/generators/carbonfilter.py b/boxes/generators/carbonfilter.py index eb2fe7206..d846bb4d7 100644 --- a/boxes/generators/carbonfilter.py +++ b/boxes/generators/carbonfilter.py @@ -232,7 +232,7 @@ def render(self): self.rectangularWall( y, w, "efef", callback=[self.bottomCB, None, self.bottomCB], - label="botton plate", move="up") + label="bottom plate", move="up") self.innerRibs(self.pockets * self.ribs * 2, move="up") self.outerRibs(self.pockets * self.ribs * 2, self.ribs * 2, move="up") diff --git a/boxes/generators/cardbox.py b/boxes/generators/cardbox.py index 9aba721e4..d876a0c1f 100644 --- a/boxes/generators/cardbox.py +++ b/boxes/generators/cardbox.py @@ -66,7 +66,7 @@ class CardBox(Boxes): description = """ ### Description -Versatile Box for Storage of playing cards. Multiple different styles of storage are supportet, e.g. a flat storage or a trading card deck box style storage. See images for ideas. +Versatile Box for Storage of playing cards. Multiple different styles of storage are supported, e.g. a flat storage or a trading card deck box style storage. See images for ideas. #### Building instructions Place inner walls on floor first (if any). Then add the outer walls. Glue the two walls without finger joins to the inside of the side walls. Make sure there is no squeeze out on top, as this is going to form the rail for the lid. diff --git a/boxes/generators/desksign.py b/boxes/generators/desksign.py index f906c737a..60e702547 100644 --- a/boxes/generators/desksign.py +++ b/boxes/generators/desksign.py @@ -17,9 +17,9 @@ from boxes import * class Desksign(Boxes): - """Simple diagonal plate with stands to show name or mesage""" + """Simple diagonal plate with stands to show name or message.""" - description = """Text to be engraved can be genarated by inputing the label and fontsize fields. + description = """Text to be engraved can be generated by inputting the label and fontsize fields. height represents the area that can be used for writing text, does not match the actual height when standing. Generated text is put in the center. Currently only a single line of text is supported.""" diff --git a/boxes/generators/drillstand.py b/boxes/generators/drillstand.py index 2f882ecaa..b5fe3736f 100644 --- a/boxes/generators/drillstand.py +++ b/boxes/generators/drillstand.py @@ -21,7 +21,7 @@ class DrillStand(Boxes): """Box for drills with each compartment of a different height""" - description = """Note: `sh` gives the hight of the rows front to back. It though should have the same number of entries as `sy`. These heights are the one on the left side and increase throughout the row. To have each compartment a bit higher than the previous one the steps in `sh` should be a bit bigger than `extra_height`. + description = """Note: `sh` gives the height of the rows front to back. It though should have the same number of entries as `sy`. These heights are the one on the left side and increase throughout the row. To have each compartment a bit higher than the previous one the steps in `sh` should be a bit bigger than `extra_height`. Assembly: diff --git a/boxes/generators/piratechest.py b/boxes/generators/piratechest.py index 8f3363cfe..d7707a277 100644 --- a/boxes/generators/piratechest.py +++ b/boxes/generators/piratechest.py @@ -65,7 +65,7 @@ def render(self): self.ctx.save() self.rectangularWall(x, y, "FFFF", move="up", label="Bottom") - frontlid, toplids, backlid = self.topside(y, n = n, move="only", bottem='P') + frontlid, toplids, backlid = self.topside(y, n = n, move="only", bottom='P') self.rectangularWall(x, backlid, "qFgF", move="up", label="lid back") for _ in range(n-2): @@ -93,27 +93,27 @@ def render(self): self.rectangularWall(x, h, "fFOF", move="up only") self.rectangularWall(x, 0, "peee", move="up only") - self.topside(y, n = n, move="right", bottem='p', label="lid left") - self.topside(y, n = n, move="right", bottem='P', label="lid right") + self.topside(y, n = n, move="right", bottom='p', label="lid left") + self.topside(y, n = n, move="right", bottom='P', label="lid right") - def topside(self, y, n, bottem, move=None, label=""): + def topside(self, y, n, bottom, move=None, label=""): radius, hp, side = self.regularPolygon((n - 1) * 2, h=y/2.0) tx = y + 2 * self.edges.get('f').spacing() lidheight = hp if n % 2 else radius - ty = lidheight + self.edges.get('f').spacing() + self.edges.get(bottem).spacing() + ty = lidheight + self.edges.get('f').spacing() + self.edges.get(bottom).spacing() if self.move(tx, ty, move, before=True): - return side/2 + self.edges.get(bottem).spacing(), side, side/2 + return side/2 + self.edges.get(bottom).spacing(), side, side/2 - self.moveTo(self.edges.get('f').margin(), self.edges.get(bottem).margin()) + self.moveTo(self.edges.get('f').margin(), self.edges.get(bottom).margin()) - self.edges.get(bottem)(y) + self.edges.get(bottom)(y) self.corner(90) - if bottem == 'p': - self.edges.get('f')(side/2 + self.edges.get(bottem).spacing()) + if bottom == 'p': + self.edges.get('f')(side/2 + self.edges.get(bottom).spacing()) else: self.edges.get('f')(side/2) @@ -122,8 +122,8 @@ def topside(self, y, n, bottem, move=None, label=""): self.edges.get('f')(side) self.corner(180 / (n - 1)) - if bottem == 'P': - self.edges.get('f')(side/2 + self.edges.get(bottem).spacing()) + if bottom == 'P': + self.edges.get('f')(side/2 + self.edges.get(bottom).spacing()) else: self.edges.get('f')(side/2) @@ -131,4 +131,4 @@ def topside(self, y, n, bottem, move=None, label=""): self.move(tx, ty, move, label=label) - return side/2 + self.edges.get(bottem).spacing(), side, side/2 + return side/2 + self.edges.get(bottom).spacing(), side, side/2 diff --git a/boxes/generators/regularbox.py b/boxes/generators/regularbox.py index 4106dcebe..f489cebab 100644 --- a/boxes/generators/regularbox.py +++ b/boxes/generators/regularbox.py @@ -78,7 +78,7 @@ def render(self): # length of side edges #l = (((side0-side1)/2)**2 + (sh0-sh1)**2 + h**2)**0.5 l = ((r0-r1)**2 + h**2)**.5 - # angles of sides -90° aka half of top angle of the full pyramide sides + # angles of sides -90° aka half of top angle of the full pyramid sides a = math.degrees(math.asin((side1-side0)/2/l)) # angle between sides (in boxes style change of travel) phi = 180 - 2 * math.degrees( diff --git a/boxes/generators/sevensegment.py b/boxes/generators/sevensegment.py index 8ce0436e8..8961bcd60 100644 --- a/boxes/generators/sevensegment.py +++ b/boxes/generators/sevensegment.py @@ -19,7 +19,7 @@ class SevenSegmentPattern(Boxes): """Holepatterns and walls for a seven segment digit""" - description = """This pattern is indented to be used with a LED stripe that is wound through alls segments in an S pattern while the stripe being upright on its side. It can probably also be used for small pieces of LED stripes connected with short wires for large enough sizes. + description = """This pattern is indented to be used with a LED stripe that is wound through all segments in an S pattern while the stripe being upright on its side. It can probably also be used for small pieces of LED stripes connected with short wires for large enough sizes. Both is currently untested. """ diff --git a/boxes/generators/sevensegmentclock.py b/boxes/generators/sevensegmentclock.py index 3a37a9b45..c56650433 100644 --- a/boxes/generators/sevensegmentclock.py +++ b/boxes/generators/sevensegmentclock.py @@ -20,11 +20,11 @@ class SevenSegmentClock(SevenSegmentPattern): """Seven segment clock build with LED stripe""" - description = """You need a LED stripe that is wound through alls segments in an S pattern and then continuing to the next digit while the stripe being upright on its side. Selecting *debug* gives a better idea how things fit together. + description = """You need a LED stripe that is wound through all segments in an S pattern and then continuing to the next digit while the stripe being upright on its side. Selecting *debug* gives a better idea how things fit together. -Adding a defusor on top or at the bottom of the segment holes will probably enhance the visuals. Just using paper may be enough. +Adding a diffuser on top or at the bottom of the segment holes will probably enhance the visuals. Just using paper may be enough. -There is currently not a lot of space for elecrtonics and this generator is still untested. Good luck! +There is currently not a lot of space for electronics and this generator is still untested. Good luck! """ ui_group = "Misc" diff --git a/documentation/boxes.xml b/documentation/boxes.xml index aa76213d4..3f831f0b8 100644 --- a/documentation/boxes.xml +++ b/documentation/boxes.xml @@ -103,7 +103,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/ DESCRIPTION &dhpackage; is a program that generates - SVG images that can be viewed directly in a web brower but also + SVG images that can be viewed directly in a web browser but also postscript and - with pstoedit as external helper - other vector formats including dxf, plt (aka hpgl) and gcode. diff --git a/documentation/src/api_architecture.rst b/documentation/src/api_architecture.rst index 2c5e8311a..c723b95a2 100644 --- a/documentation/src/api_architecture.rst +++ b/documentation/src/api_architecture.rst @@ -44,7 +44,7 @@ Part Callbacks Most parts support callbacks - either one in the middle for round parts or one for each edge. They allow placing holes or other features -on the part, indepenent of edge type. Without using callbacks, you +on the part, independent of edge type. Without using callbacks, you will not have consistent placement of internal features. Navigation and Turtle Graphics