diff options
Diffstat (limited to 'archipack')
-rw-r--r-- | archipack/archipack_2d.py | 10 | ||||
-rw-r--r-- | archipack/archipack_autoboolean.py | 4 | ||||
-rw-r--r-- | archipack/archipack_cutter.py | 4 | ||||
-rw-r--r-- | archipack/archipack_door.py | 2 | ||||
-rw-r--r-- | archipack/archipack_fence.py | 2 | ||||
-rw-r--r-- | archipack/archipack_floor.py | 2 | ||||
-rw-r--r-- | archipack/archipack_gl.py | 2 | ||||
-rw-r--r-- | archipack/archipack_keymaps.py | 2 | ||||
-rw-r--r-- | archipack/archipack_manipulator.py | 30 | ||||
-rw-r--r-- | archipack/archipack_material.py | 4 | ||||
-rw-r--r-- | archipack/archipack_object.py | 4 | ||||
-rw-r--r-- | archipack/archipack_reference_point.py | 2 | ||||
-rw-r--r-- | archipack/archipack_rendering.py | 4 | ||||
-rw-r--r-- | archipack/archipack_roof.py | 52 | ||||
-rw-r--r-- | archipack/archipack_slab.py | 6 | ||||
-rw-r--r-- | archipack/archipack_stair.py | 2 | ||||
-rw-r--r-- | archipack/archipack_wall2.py | 2 | ||||
-rw-r--r-- | archipack/archipack_window.py | 4 | ||||
-rw-r--r-- | archipack/panel.py | 2 |
19 files changed, 70 insertions, 70 deletions
diff --git a/archipack/archipack_2d.py b/archipack/archipack_2d.py index 4bf0d1f1..0078ae3c 100644 --- a/archipack/archipack_2d.py +++ b/archipack/archipack_2d.py @@ -674,7 +674,7 @@ class Arc(Circle): def tangeant(self, t, length): """ - Tangeant line so we are able to chain Circle and lines + Tangent line so we are able to chain Circle and lines Beware, counterpart on Line does return an Arc ! """ a = self.a0 + t * self.da @@ -688,7 +688,7 @@ class Arc(Circle): def tangeant_unit_vector(self, t): """ - Return Tangeant vector of length 1 + Return Tangent vector of length 1 """ a = self.a0 + t * self.da ca = cos(a) @@ -700,7 +700,7 @@ class Arc(Circle): def straight(self, length, t=1): """ - Return a tangeant Line + Return a tangent Line Counterpart on Line also return a Line """ return self.tangeant(t, length) @@ -721,7 +721,7 @@ class Arc(Circle): def rotate(self, a): """ - Rotate center so we rotate ccw arround p0 + Rotate center so we rotate ccw around p0 """ ca = cos(a) sa = sin(a) @@ -941,7 +941,7 @@ class Line3d(Line): def sized_normal(self, t, size): """ 3d Line perpendicular on plane defined by z_axis and of given size - positionned at t in current line + positioned at t in current line lie on the right side p1 |--x diff --git a/archipack/archipack_autoboolean.py b/archipack/archipack_autoboolean.py index 93e9bc98..c7e60305 100644 --- a/archipack/archipack_autoboolean.py +++ b/archipack/archipack_autoboolean.py @@ -226,9 +226,9 @@ class ArchipackBoolManager(): remove holes not found in childs robust -> mixed: - there is only one object taged with "archipack_robusthole" + there is only one object tagged with "archipack_robusthole" interactive -> mixed: - many modifisers on wall taged with "archipack_hole" + many modifisers on wall tagged with "archipack_hole" keep objects """ existing = [] diff --git a/archipack/archipack_cutter.py b/archipack/archipack_cutter.py index b5a64776..2ce37d4c 100644 --- a/archipack/archipack_cutter.py +++ b/archipack/archipack_cutter.py @@ -290,7 +290,7 @@ class CutAblePolygon(): # sort by seg and param t of seg inter.sort() - # reorder so we realy start from s_start + # reorder so we really start from s_start for i, it in enumerate(inter): if it[0] >= s_start: order = i @@ -366,7 +366,7 @@ class CutAblePolygon(): def slice(self, cutter): """ Simple 2d Boolean between boundary and roof part - Dosen't handle slicing roof into multiple parts + Doesn't handle slicing roof into multiple parts 4 cases: 1 pitch has point in boundary -> start from this point diff --git a/archipack/archipack_door.py b/archipack/archipack_door.py index 22b9123a..3e85cf31 100644 --- a/archipack/archipack_door.py +++ b/archipack/archipack_door.py @@ -1808,7 +1808,7 @@ class ARCHIPACK_OT_door_draw(ArchpackDrawTool, Operator): ('LEFTCLICK, RET, SPACE, ENTER', 'Create a door'), ('BACKSPACE, CTRL+Z', 'undo last'), ('C', 'Choose another door'), - ('SHIFT', 'Make independant copy'), + ('SHIFT', 'Make independent copy'), ('RIGHTCLICK or ESC', 'exit') ]) self.feedback.enable() diff --git a/archipack/archipack_fence.py b/archipack/archipack_fence.py index 0f5f3b37..a94023fd 100644 --- a/archipack/archipack_fence.py +++ b/archipack/archipack_fence.py @@ -157,7 +157,7 @@ class FenceGenerator(): def param_t(self, angle_limit, post_spacing): """ setup corners and fences dz - compute index of fences wich belong to each group of fences between corners + compute index of fences which belong to each group of fences between corners compute t of each fence """ # segments are group of parts separated by limit angle diff --git a/archipack/archipack_floor.py b/archipack/archipack_floor.py index 8664b637..ed52fd8f 100644 --- a/archipack/archipack_floor.py +++ b/archipack/archipack_floor.py @@ -1571,7 +1571,7 @@ class archipack_floor_cutter_segment(ArchipackCutterPart, PropertyGroup): items=( ('DEFAULT', 'Side', 'Side with rake', 0), ('BOTTOM', 'Bottom', 'Bottom with gutter', 1), - ('LINK', 'Side link', 'Side witout decoration', 2), + ('LINK', 'Side link', 'Side without decoration', 2), ('AXIS', 'Top', 'Top part with hip and beam', 3) # ('LINK_VALLEY', 'Side valley', 'Side with valley', 3), # ('LINK_HIP', 'Side hip', 'Side with hip', 4) diff --git a/archipack/archipack_gl.py b/archipack/archipack_gl.py index c50c61a2..a85a3080 100644 --- a/archipack/archipack_gl.py +++ b/archipack/archipack_gl.py @@ -391,7 +391,7 @@ class GlLine(GlBaseLine): def sized_normal(self, t, size): """ GlLine perpendicular on plane defined by z_axis and of given size - positionned at t in current line + positioned at t in current line lie on the right side p1 |--x diff --git a/archipack/archipack_keymaps.py b/archipack/archipack_keymaps.py index 65b295bf..c4c8176e 100644 --- a/archipack/archipack_keymaps.py +++ b/archipack/archipack_keymaps.py @@ -91,7 +91,7 @@ class Keymaps: def dump_keys(self, context, filename="c:\\tmp\\keymap.txt"): """ - Utility for developpers : + Utility for developers : Dump all keymaps to a file filename : string a file path to dump keymaps """ diff --git a/archipack/archipack_manipulator.py b/archipack/archipack_manipulator.py index 44b30b49..4e916240 100644 --- a/archipack/archipack_manipulator.py +++ b/archipack/archipack_manipulator.py @@ -48,12 +48,12 @@ from .archipack_gl import ( # as transform.translate in use to allow snap # does catch all events. # This however has a wanted side effect: -# the manipulator take precedence over allready running +# the manipulator take precedence over already running # ones, and prevent select mode to start. # # TODO: # Other manipulators should use same technique to take -# precedence over allready running ones when active +# precedence over already running ones when active # # NOTE: # Select mode does suffer from this stack effect: @@ -178,7 +178,7 @@ def empty_stack(): def add_manipulable(key, manipulable): """ add a ArchipackActiveManip into the stack - if not allready present + if not already present setup reference to manipulable return manipulators stack """ @@ -263,7 +263,7 @@ class Manipulator(): else: print("Manipulator.exit() handle not found %s" % (type(self).__name__)) - # Mouse event handlers, MUST be overriden + # Mouse event handlers, MUST be overridden def mouse_press(self, context, event): """ Manipulators must implement @@ -288,7 +288,7 @@ class Manipulator(): """ raise NotImplementedError - # Keyboard event handlers, MAY be overriden + # Keyboard event handlers, MAY be overridden def keyboard_done(self, context, event, value): """ Manipulators may implement @@ -332,8 +332,8 @@ class Manipulator(): """ return False - # Internal, do not override unless you realy - # realy realy deeply know what you are doing + # Internal, do not override unless you really + # really really deeply know what you are doing def keyboard_eval(self, context, event): """ evaluate keyboard entry while typing @@ -1950,7 +1950,7 @@ manipulators_class_lookup = {} def register_manipulator(type_key, manipulator_class): if type_key in manipulators_class_lookup.keys(): - raise RuntimeError("Manipulator of type {} allready exists, unable to override".format(type_key)) + raise RuntimeError("Manipulator of type {} already exists, unable to override".format(type_key)) manipulators_class_lookup[type_key] = manipulator_class @@ -1966,9 +1966,9 @@ class archipack_manipulator(PropertyGroup): type_key = StringProperty(default='SIZE') # How 3d points are stored in manipulators ? - # SIZE = 2 absolute positionned and a scaling vector - # RADIUS = 1 absolute positionned (center) and 2 relatives (sides) - # POLYGON = 2 absolute positionned and a relative vector (for rect polygons) + # SIZE = 2 absolute positioned and a scaling vector + # RADIUS = 1 absolute positioned (center) and 2 relatives (sides) + # POLYGON = 2 absolute positioned and a relative vector (for rect polygons) pts_mode = StringProperty(default='SIZE') prop1_name = StringProperty() @@ -1984,7 +1984,7 @@ class archipack_manipulator(PropertyGroup): """ set 3d location of gl points (in object space) pts: array of 3 vectors 3d - normal: optionnal vector 3d default to Z axis + normal: optional vector 3d default to Z axis """ pts = [Vector(p) for p in pts] self.p0, self.p1, self.p2 = pts @@ -2031,7 +2031,7 @@ class archipack_manipulator(PropertyGroup): if self.type_key not in manipulators_class_lookup.keys() or \ not manipulators_class_lookup[self.type_key].poll(context): # RuntimeError is overkill but may be enabled for debug purposes - # Silentely ignore allow skipping manipulators if / when deps as not meet + # Silently ignore allow skipping manipulators if / when deps as not meet # manip stack will simply be filled with None objects # raise RuntimeError("Manipulator of type {} not found".format(self.type_key)) return None @@ -2255,9 +2255,9 @@ class Manipulable(): def manipulable_modal(self, context, event): """ call in operator modal() - should not be overriden + should not be overridden as it provide all needed - functionnality out of the box + functionality out of the box """ # setup again when manipulators type change if self.manipulable_refresh: diff --git a/archipack/archipack_material.py b/archipack/archipack_material.py index 22da496d..ddb44009 100644 --- a/archipack/archipack_material.py +++ b/archipack/archipack_material.py @@ -273,7 +273,7 @@ class MaterialSetManager(): material_sets[s_key] = [] material_sets[s_key].append(mat_name.strip()) except: - print("Archipack: An error occured while loading {}".format(filename)) + print("Archipack: An error occurred while loading {}".format(filename)) pass finally: f.close() @@ -298,7 +298,7 @@ class MaterialSetManager(): f = open(filename, 'w') f.writelines(lines) except: - print("Archipack: An error occured while saving {}".format(filename)) + print("Archipack: An error occurred while saving {}".format(filename)) pass finally: f.close() diff --git a/archipack/archipack_object.py b/archipack/archipack_object.py index 9b22bc2f..b479ea30 100644 --- a/archipack/archipack_object.py +++ b/archipack/archipack_object.py @@ -57,7 +57,7 @@ class ArchipackObject(): Filter object with this class in data return True when object contains this datablock - False otherwhise + False otherwise usage: class_name.filter(object) from outside world self.__class__.filter(object) from instance @@ -171,7 +171,7 @@ class ArchipackCreateTool(): d.auto_update = True def add_material(self, o, material='DEFAULT', category=None): - # skip if preset allready add material + # skip if preset already add material if "archipack_material" in o: return try: diff --git a/archipack/archipack_reference_point.py b/archipack/archipack_reference_point.py index 5e8f1f59..2f58c088 100644 --- a/archipack/archipack_reference_point.py +++ b/archipack/archipack_reference_point.py @@ -70,7 +70,7 @@ class archipack_reference_point(PropertyGroup): Filter object with this class in data return True when object contains this datablock - False otherwhise + False otherwise usage: class_name.filter(object) from outside world self.__class__.filter(object) from instance diff --git a/archipack/archipack_rendering.py b/archipack/archipack_rendering.py index fced24ac..8ea06ef9 100644 --- a/archipack/archipack_rendering.py +++ b/archipack/archipack_rendering.py @@ -82,7 +82,7 @@ class ARCHIPACK_OT_render_thumbs(Operator): Copy factory presets to writeable presets folder Two cases here: 1 there is not presets thumbs found (official version) - 2 thumbs allready are there (unofficial) + 2 thumbs already are there (unofficial) """ file_list = [] # load default presets @@ -110,7 +110,7 @@ class ARCHIPACK_OT_render_thumbs(Operator): if f.endswith(".txt"): skipfiles.append(f) - # when thumbs allready are in factory folder but not found in user one + # when thumbs already are in factory folder but not found in user one # simply copy them, and add preset to skip list thumb_filename = f[:-3] + ".png" if path.exists(source_path + path.sep + thumb_filename): diff --git a/archipack/archipack_roof.py b/archipack/archipack_roof.py index aba6f12e..024dccb7 100644 --- a/archipack/archipack_roof.py +++ b/archipack/archipack_roof.py @@ -297,7 +297,7 @@ class RoofPolygon(CutAblePolygon): self.side = side # backward deps self.backward = False - # pointers to neighboors along axis + # pointers to neighbors along axis self.last = None self.next = None self.other_side = None @@ -407,7 +407,7 @@ class RoofPolygon(CutAblePolygon): """ always in axis real direction """ - # backward dependancy relative to axis + # backward dependency relative to axis if last.backward: self.backward = self.side == last.side @@ -475,7 +475,7 @@ class RoofPolygon(CutAblePolygon): v1 = -self._axis.v if last.side == self.side: - # contigous, v0 node <- next + # contiguous, v0 node <- next # half angle between segments if self.side == 'LEFT': @@ -1006,7 +1006,7 @@ class RoofGenerator(CutAbleGenerator): # on node basis along axis # bi-direction Radial around node # from left and right to center - # contigous -> same + # contiguous -> same # T: and (x % 2 == 1) # First one take precedence over others # others inherit from side @@ -1018,7 +1018,7 @@ class RoofGenerator(CutAbleGenerator): # 2 # r\ l # - # X: rigth one r left one l (x % 2 == 0) + # X: right one or left one l (x % 2 == 0) # inherits from side # # l 3 lb l = left @@ -1051,7 +1051,7 @@ class RoofGenerator(CutAbleGenerator): l_bind = left r_bind = right - # simple case: 2 contigous segments + # simple case: 2 contiguous segments if nb_segs == 2: s = node.last s.right.bind(r_bind, ccw=False) @@ -1060,7 +1060,7 @@ class RoofGenerator(CutAbleGenerator): # More than 2 segments, uneven distribution if nb_segs % 2 == 1: - # find wich child does take precedence + # find which child does take precedence # first one on rootline (arbitrary) center = (nb_segs - 1) / 2 else: @@ -1078,7 +1078,7 @@ class RoofGenerator(CutAbleGenerator): # skip axis if i > 0: if i < center: - # right contigous with last + # right contiguous with last s.right.bind(r_bind, ccw=False) # next bind to left @@ -1100,7 +1100,7 @@ class RoofGenerator(CutAbleGenerator): for i, s in enumerate(reversed(node.segs)): # skip axis if i < nb_segs - center - 1: - # left contigous with last + # left contiguous with last s.left.bind(l_bind, ccw=True) # next bind to right l_bind = s.right @@ -1257,12 +1257,12 @@ class RoofGenerator(CutAbleGenerator): if s1.seg.constraint_type == 'SLOPE': # 3 cases: - # s0 is root contigous -> sides are same - # s2 is root contigous -> sides are same + # s0 is root contiguous -> sides are same + # s2 is root contiguous -> sides are same # back to back -> sides are not same if s0.reversed: - # contigous right / right + # contiguous right / right # 2 cases # right is backward # right is forward @@ -1284,7 +1284,7 @@ class RoofGenerator(CutAbleGenerator): else: main.rotate_next_slope(-a0) elif s2.reversed: - # contigous left / left + # contiguous left / left # 2 cases # left is backward # left is forward @@ -1455,7 +1455,7 @@ class RoofGenerator(CutAbleGenerator): for pan in pans: self.pans.extend([pan.left, pan.right]) - # merge contigous with 0 angle diff + # merge contiguous with 0 angle diff to_remove = [] for i, pan in enumerate(self.pans): if pan.backward: @@ -2054,9 +2054,9 @@ class RoofGenerator(CutAbleGenerator): p2 = s0.p1 p3 = s1.p1 - # find last neighboor depending on type + # find last neighbor depending on type if s2.type == 'AXIS' or 'LINK' in s2.type: - # apply only on boundarys + # apply only on boundaries if not s.is_hole: # use last axis if pan.side == 'LEFT': @@ -2079,7 +2079,7 @@ class RoofGenerator(CutAbleGenerator): s2 = s2.offset(offset) s4 = s2.offset(offset + width) - # find next neighboor depending on type + # find next neighbor depending on type if s3.type == 'AXIS' or 'LINK' in s3.type: if not s.is_hole: # use last axis @@ -2245,9 +2245,9 @@ class RoofGenerator(CutAbleGenerator): tri_0, tri_1 = tri_1, tri_0 # tiangular use bottom segment direction - # find last neighboor depending on type + # find last neighbor depending on type if s1.type == 'AXIS' or 'LINK' in s1.type: - # apply only on boundarys + # apply only on boundaries if not s.is_hole: # use last axis if pan.side == 'LEFT': @@ -2266,7 +2266,7 @@ class RoofGenerator(CutAbleGenerator): else: s1 = s1.offset(d.fascia_width) - # find next neighboor depending on type + # find next neighbor depending on type if s2.type == 'AXIS' or 'LINK' in s2.type: if not s.is_hole: # use last axis @@ -2378,9 +2378,9 @@ class RoofGenerator(CutAbleGenerator): f = len(verts) # tiangular use segment direction - # find last neighboor depending on type + # find last neighbor depending on type if s1.type == 'AXIS' or 'LINK' in s1.type: - # apply only on boundarys + # apply only on boundaries if not s.is_hole: # use last axis if pan.side == 'LEFT': @@ -2399,7 +2399,7 @@ class RoofGenerator(CutAbleGenerator): else: s1 = s1.offset(d.gutter_dist + d.gutter_width) - # find next neighboor depending on type + # find next neighbor depending on type if s2.type == 'AXIS' or 'LINK' in s2.type: if not s.is_hole: # use last axis @@ -4732,7 +4732,7 @@ class archipack_roof_cutter_segment(ArchipackCutterPart, PropertyGroup): items=( ('SIDE', 'Side', 'Side with bargeboard', 0), ('BOTTOM', 'Bottom', 'Bottom with gutter', 1), - ('LINK', 'Side link', 'Side witout decoration', 2), + ('LINK', 'Side link', 'Side without decoration', 2), ('AXIS', 'Top', 'Top part with hip and beam', 3) # ('LINK_VALLEY', 'Side valley', 'Side with valley', 3), # ('LINK_HIP', 'Side hip', 'Side with hip', 4) @@ -5269,10 +5269,10 @@ class ArchipackThrottleHandler(): self.start_timer(context) return True - # allready a timer running + # already a timer running self.stop_timer(context) - # prevent race conditions when allready in update mode + # prevent race conditions when already in update mode if self.is_updating: return False diff --git a/archipack/archipack_slab.py b/archipack/archipack_slab.py index 9059f269..a6cc9bf6 100644 --- a/archipack/archipack_slab.py +++ b/archipack/archipack_slab.py @@ -841,12 +841,12 @@ class archipack_slab(ArchipackObject, Manipulable, PropertyGroup): if (idx + 1 == next_idx) or (next_idx == 0 and i + 1 == self.n_parts): # shared: should move last point # and apply to next segments - # this is overriden for common segs + # this is overridden for common segs # but translate non common ones dp = seg.p1 - w.segs[idx].p1 w.translate(idx, dp) - # shared: transfert type too + # shared: transfer type too if "C_" in part.type: d.parts[idx].type = 'C_WALL' w.segs[idx] = CurvedSlab(seg.c, seg.r, seg.a0, seg.da) @@ -1250,7 +1250,7 @@ class archipack_slab_cutter_segment(ArchipackCutterPart, PropertyGroup): items=( ('DEFAULT', 'Side', 'Side with rake', 0), ('BOTTOM', 'Bottom', 'Bottom with gutter', 1), - ('LINK', 'Side link', 'Side witout decoration', 2), + ('LINK', 'Side link', 'Side without decoration', 2), ('AXIS', 'Top', 'Top part with hip and beam', 3) # ('LINK_VALLEY', 'Side valley', 'Side with valley', 3), # ('LINK_HIP', 'Side hip', 'Side with hip', 4) diff --git a/archipack/archipack_stair.py b/archipack/archipack_stair.py index 1de90a96..94a8da7c 100644 --- a/archipack/archipack_stair.py +++ b/archipack/archipack_stair.py @@ -468,7 +468,7 @@ class CurvedStair(Stair, Arc): self.l_shape = left_shape self.r_shape = right_shape self.edges_multiples = round(abs(da), 6) > double_limit - # left arc, tangeant at start and end + # left arc, tangent at start and end self.l_arc, self.l_t0, self.l_t1, self.l_tc = self.set_offset(-left_offset, left_shape) self.r_arc, self.r_t0, self.r_t1, self.r_tc = self.set_offset(right_offset, right_shape) diff --git a/archipack/archipack_wall2.py b/archipack/archipack_wall2.py index 92172eb1..5f464a02 100644 --- a/archipack/archipack_wall2.py +++ b/archipack/archipack_wall2.py @@ -432,7 +432,7 @@ def update_t_part(self, context): # 1 No parents at all # 2 o has parent # 3 w has parent - # 4 o and w share same parent allready + # 4 o and w share same parent already # 5 o and w dosent share parent link_to_parent = False diff --git a/archipack/archipack_window.py b/archipack/archipack_window.py index 3524fbbf..54d057e7 100644 --- a/archipack/archipack_window.py +++ b/archipack/archipack_window.py @@ -1317,7 +1317,7 @@ class archipack_window(ArchipackObject, Manipulable, PropertyGroup): props.angle_y = self.angle_y props.enable_glass = self.enable_glass props.update(context) - # location y + frame width. frame depends on choosen profile (fixed or not) + # location y + frame width. frame depends on chosen profile (fixed or not) # update linked childs location too child.location = Vector((origin[panel].x, origin[panel].y + location_y + self.frame_y, self.altitude + offset.y)) @@ -1997,7 +1997,7 @@ class ARCHIPACK_OT_window_draw(ArchpackDrawTool, Operator): ('LEFTCLICK, RET, SPACE, ENTER', 'Create a window'), ('BACKSPACE, CTRL+Z', 'undo last'), ('C', 'Choose another window'), - ('SHIFT', 'Make independant copy'), + ('SHIFT', 'Make independent copy'), ('RIGHTCLICK or ESC', 'exit') ]) self.feedback.enable() diff --git a/archipack/panel.py b/archipack/panel.py index 4a472362..7339cc3a 100644 --- a/archipack/panel.py +++ b/archipack/panel.py @@ -479,7 +479,7 @@ class Panel(): def choose_a_shape_in_tri(self, center, origin, size, basis, pivot): """ - Choose wich shape inside either a tri or a pentagon + Choose which shape inside either a tri or a pentagon """ cx = (0.5 * basis + center.x) - origin.x cy = center.y - origin.y |