diff --git a/lattice2ArrayFilter.py b/lattice2ArrayFilter.py index 5536472..0465bc9 100644 --- a/lattice2ArrayFilter.py +++ b/lattice2ArrayFilter.py @@ -60,9 +60,9 @@ class LatticeArrayFilter(lattice2BaseFeature.LatticeFeature): obj.addProperty("App::PropertyLink","Stencil","Lattice ArrayFilter","Object that defines filtering") - obj.addProperty("App::PropertyLength","WindowFrom","Lattice ArrayFilter","Elements closer to stencil than this vaule are rejected by the filter.") + obj.addProperty("App::PropertyLength","WindowFrom","Lattice ArrayFilter","Elements closer to stencil than this value are rejected by the filter.") obj.WindowFrom = 0.0 - obj.addProperty("App::PropertyLength","WindowTo","Lattice ArrayFilter","Elements farther from stencil than this vaule are rejected by the filter.") + obj.addProperty("App::PropertyLength","WindowTo","Lattice ArrayFilter","Elements farther from stencil than this value are rejected by the filter.") obj.WindowTo = 1.0 obj.addProperty("App::PropertyBool","Invert","Lattice ArrayFilter","Output elements that are rejected by filter, instead") @@ -188,7 +188,7 @@ def makeItemListFromSelection(sel, bMakeString = True): def CreateLatticeArrayFilter(name,mode): sel = FreeCADGui.Selection.getSelectionEx() - # selection order independece logic (lattice object and generic shape stencil can be told apart) + # selection order independence logic (lattice object and generic shape stencil can be told apart) iLtc = 0 #index of lattice object in selection iStc = 1 #index of stencil object in selection for i in range(0,len(sel)): @@ -301,7 +301,7 @@ class GroupCommandLatticeArrayFilter: def GetResources(self): return { 'MenuText': 'Array filter:', - 'ToolTip': 'Array filter: tool to exctract specific elements from lattice2 arrays.'} + 'ToolTip': 'Array filter: tool to extract specific elements from lattice2 arrays.'} def IsActive(self): # optional return bool(App.ActiveDocument) diff --git a/lattice2AttachablePlacement.py b/lattice2AttachablePlacement.py index 11597b4..6009e19 100644 --- a/lattice2AttachablePlacement.py +++ b/lattice2AttachablePlacement.py @@ -235,7 +235,7 @@ class CommandAttachedPlacementSubsequence: "\n\nPlease select an attached placement object, first. Then invoke this tool. Adjust the properties of the created object if necessary." ) else: if len(sel)!=1: - raise SelectionError("PlacementSubsequence", "Please select just one object, an attached placement. You have seleced {num}.".format(num= len(sel))) + raise SelectionError("PlacementSubsequence", "Please select just one object, an attached placement. You have selected {num}.".format(num= len(sel))) cmdCreateAttachedPlacementSubsequence(name= "PlacementSubsequence") except Exception as err: msgError(err) diff --git a/lattice2BaseFeature.py b/lattice2BaseFeature.py index 15fc280..135b73b 100644 --- a/lattice2BaseFeature.py +++ b/lattice2BaseFeature.py @@ -125,7 +125,7 @@ class LatticeFeature(object): # Auto-On an Auto-Off can be modified when recomputing. Force values are going to stay. prop = "ExposePlacement" - obj.addProperty("App::PropertyBool",prop,"Lattice","Makes the placement syncronized to Placement property. This will oftem make this object unmoveable. Not applicable to arrays.") + obj.addProperty("App::PropertyBool",prop,"Lattice","Makes the placement synchronized to Placement property. This will oftem make this object unmoveable. Not applicable to arrays.") self.derivedInit(obj) @@ -366,7 +366,7 @@ def splitSelection(sel): '''splitSelection(sel): splits sel (use getSelectionEx()) into lattices and non-lattices. returns a tuple: (lattices, shapes). lattices is a list, containing all objects that are lattices (placements of arrays of placements). shapes contains all - the rest. The lists conain SelectionObjects, not the actual document objects.''' + the rest. The lists contain SelectionObjects, not the actual document objects.''' lattices = [] shapes = [] for selobj in sel: diff --git a/lattice2BoundBox.py b/lattice2BoundBox.py index 5d6300b..9ba7705 100644 --- a/lattice2BoundBox.py +++ b/lattice2BoundBox.py @@ -179,7 +179,7 @@ class _BoundBox: # rotations, some of first three values will be nonzero, and fourth value will # not be equal to 1. While it's enough to compare absolute value of fourth value # to 1, precision is seriously lost in such comparison, so we are checking if - # fisrt three values are zero instead. + # first three values are zero instead. if abs(Q[0])+abs(Q[1])+abs(Q[2]) < ParaConfusion: orients[i] = None diff --git a/lattice2GeomUtils.py b/lattice2GeomUtils.py index d71c7eb..84badc9 100644 --- a/lattice2GeomUtils.py +++ b/lattice2GeomUtils.py @@ -75,7 +75,7 @@ def makeOrientationFromLocalAxes(ZAx, XAx = None): YAx.normalize() XAx = YAx.cross(ZAx) # force X perpendicular - #hacky way of constucting rotation to a local coordinate system: + #hacky way of constructing rotation to a local coordinate system: # make matrix, m = App.Matrix() m.A = list(XAx)+[0.0]+list(YAx)+[0.0]+list(ZAx)+[0.0]+[0.0]*3+[1.0] @@ -129,7 +129,7 @@ def makeOrientationFromLocalAxesUni(priorityString, XAx = None, YAx = None, ZAx # mainAx, secAx, thirdAx, we can't use '=' operator, because '=' reassigns # the reference, and the variables lose linkage. For that purpose, # _assignVector routine was introuced. It assigns the coordinates of the - # vector, without replacing referenes + # vector, without replacing references #force the axes be perpendicular mainAx.normalize() @@ -160,7 +160,7 @@ def makeOrientationFromLocalAxesUni(priorityString, XAx = None, YAx = None, ZAx if XAx.cross(YAx).dot(ZAx) < 0.0: _assignVector(thirdAx, tmpAx * (-1.0)) - #hacky way of constucting rotation to a local coordinate system: + #hacky way of constructing rotation to a local coordinate system: # make matrix, m = App.Matrix() m.A = list(XAx)+[0.0]+list(YAx)+[0.0]+list(ZAx)+[0.0]+[0.0]*3+[1.0] diff --git a/lattice2PDPattern.py b/lattice2PDPattern.py index e55fb3f..200386e 100644 --- a/lattice2PDPattern.py +++ b/lattice2PDPattern.py @@ -47,7 +47,7 @@ class ScopeError(RuntimeError): class MultiTransformSettings(object): - selfintersections = False #if True, take care of intersections between occurences. If False, optimize assuming occurences do not intersect. + selfintersections = False #if True, take care of intersections between occurrences. If False, optimize assuming occurrences do not intersect. sign_override = +1 #+1 for keep sign, -1 for invert, +2 for force positive, -2 for force negative @@ -160,7 +160,7 @@ def applyFeature(baseshape, feature, transforms, mts): if mts.selfintersections: pass #to fuse the shapes to baseshape one by one else: - actionshapes = [Part.Compound(actionshapes)] #to fuse all at once, saving for computing intersections between the occurences of the feature + actionshapes = [Part.Compound(actionshapes)] #to fuse all at once, saving for computing intersections between the occurrences of the feature for actionshape in actionshapes: assert(sign != 0) @@ -190,7 +190,7 @@ class LatticePDPattern(object): obj.addProperty('App::PropertyEnumeration', 'SignOverride', "Lattice Pattern", "Use it to change Pockets into Pads.") obj.SignOverride = ['keep', 'invert', 'as additive', 'as subtractive'] - obj.addProperty('App::PropertyBool', 'Selfintersections', "Lattice Pattern", "If True, take care of intersections between occurences. If False, you get a slight speed boost.") + obj.addProperty('App::PropertyBool', 'Selfintersections', "Lattice Pattern", "If True, take care of intersections between occurrences. If False, you get a slight speed boost.") obj.addProperty('App::PropertyBool', 'Refine', "PartDesign", "If True, remove redundant edges after this operation.") obj.Refine = getParamPDRefine() diff --git a/lattice2ParaSeries.py b/lattice2ParaSeries.py index b8206d2..8371cce 100644 --- a/lattice2ParaSeries.py +++ b/lattice2ParaSeries.py @@ -107,7 +107,7 @@ class LatticeParaSeries(lattice2BaseFeature.LatticeFeature): obj.addProperty("App::PropertyEnumeration","ParameterType","Lattice ParaSeries","Data type of parameter to vary.") obj.ParameterType = ['float','int','string'] - obj.addProperty("App::PropertyString","ParameterRef","Lattice ParaSeries","Reference to the parameter to vary. Syntax: ObjectName.Property. Examples: 'Box.Height'; 'Sketch.Constaints.myLength'.") + obj.addProperty("App::PropertyString","ParameterRef","Lattice ParaSeries","Reference to the parameter to vary. Syntax: ObjectName.Property. Examples: 'Box.Height'; 'Sketch.Constraints.myLength'.") obj.addProperty("App::PropertyEnumeration","Recomputing","Lattice ParaSeries","Sets recomputing policy.") obj.Recomputing = ["Disabled", "Recompute Once", "Enabled"] diff --git a/lattice2PopulateChildren.py b/lattice2PopulateChildren.py index d65712c..659346c 100644 --- a/lattice2PopulateChildren.py +++ b/lattice2PopulateChildren.py @@ -286,7 +286,7 @@ class _CommandLatticePopulateChildren_Array: infoMessage("Populate with Children: Build Array", "Populate with Children: Build Array command. Creates an array from children packed into a compound.\n\n"+ "Please select a compound, and an array of placements. Then invoke the command. It is also allowed to use another array of placements instead of compound.\n\n"+ - "Compared to plain 'Populate With Children' command, the placements are treated as being relative to the first placement in the array. As a result, the first child always remains wher it was.") + "Compared to plain 'Populate With Children' command, the placements are treated as being relative to the first placement in the array. As a result, the first child always remains where it was.") return cmdPopulate_shapes_nonFromTo("First item") except Exception as err: diff --git a/lattice2ProjectArray.py b/lattice2ProjectArray.py index fdacc1a..507ec2d 100644 --- a/lattice2ProjectArray.py +++ b/lattice2ProjectArray.py @@ -185,7 +185,7 @@ class ViewProviderProjectArray(lattice2BaseFeature.ViewProviderLatticeFeature): def CreateLatticeProjectArray(name): sel = FreeCADGui.Selection.getSelectionEx() - # selection order independece logic (lattice object and generic shape stencil can be told apart) + # selection order independence logic (lattice object and generic shape stencil can be told apart) iLtc = 0 #index of lattice object in selection iStc = 1 #index of stencil object in selection for i in range(0,len(sel)): diff --git a/lattice2Resample.py b/lattice2Resample.py index 1e4e98b..a2ddcd2 100644 --- a/lattice2Resample.py +++ b/lattice2Resample.py @@ -106,7 +106,7 @@ class LatticeResample(lattice2BaseFeature.LatticeFeature): QArrays[iQ].append( Q[iQ] ) prevQ = Q - # constuct function objects + # construct function objects if posIsInterpolate: FX = LIU.InterpolateF(IArray,XArray) FY = LIU.InterpolateF(IArray,YArray) diff --git a/lattice2ShapeInfoFeature.py b/lattice2ShapeInfoFeature.py index be80ad0..ea7c9f0 100644 --- a/lattice2ShapeInfoFeature.py +++ b/lattice2ShapeInfoFeature.py @@ -23,7 +23,7 @@ __title__= "Lattice ShapeInfo feature for FreeCAD" __author__ = "DeepSOIC" -__doc__ = "Shape info feature is for getting info on a shape and exposing it in form of properties, that are useable from expressions." +__doc__ = "Shape info feature is for getting info on a shape and exposing it in form of properties, that are usable from expressions." from lattice2Common import * import lattice2BaseFeature as LBF diff --git a/lattice2ShapeString.py b/lattice2ShapeString.py index b76dfe6..3836678 100644 --- a/lattice2ShapeString.py +++ b/lattice2ShapeString.py @@ -38,7 +38,7 @@ __url__ = "" def findFont(font_file_name): - '''checks for existance of the file in a few locations and returns the full path of the first one found''' + '''checks for existence of the file in a few locations and returns the full path of the first one found''' import os @@ -105,7 +105,7 @@ class LatticeShapeString: self.makeFoolObj(obj) foolObj = self.foolObj - #add Draft ShapeString's properties to document object in posession of our LatticeShapeString + #add Draft ShapeString's properties to document object in possession of our LatticeShapeString for (proptype, propname, group, hint) in foolObj.properties: if propname != "String": #we'll define our own string property obj.addProperty(proptype,propname,"Lattice ShapeString",hint) diff --git a/lattice2SubLink.py b/lattice2SubLink.py index 23f1b33..7e2758d 100644 --- a/lattice2SubLink.py +++ b/lattice2SubLink.py @@ -58,7 +58,7 @@ class LatticeSubLink: self.assureProperties(obj) def assureProperties(self, selfobj): - assureProperty(selfobj, "App::PropertyEnumeration","Looping", ["Single"] + LSS.LOOP_MODES, "Lattice SubLink", "Sets wether to collect just the element, or all similar from array.") + assureProperty(selfobj, "App::PropertyEnumeration","Looping", ["Single"] + LSS.LOOP_MODES, "Lattice SubLink", "Sets whether to collect just the element, or all similar from array.") assureProperty(selfobj, "App::PropertyEnumeration","CompoundTraversal", LSS.TRAVERSAL_MODES, "Lattice SubLink", "Sets how to unpack compounds if Looping is not 'Single'.") assureProperty(selfobj, "App::PropertyLinkSub", "SubLink", sublinkFromApart(screen(selfobj.Object), selfobj.SubNames), "Lattice SubLink", "Mirror of Object+SubNames properties") diff --git a/lattice2Subsequencer.py b/lattice2Subsequencer.py index 80d5977..c40d83e 100644 --- a/lattice2Subsequencer.py +++ b/lattice2Subsequencer.py @@ -88,7 +88,7 @@ element_extractors = { def getIndexesIntoList(element, list_of_shapes): """Finds this element in shapes in list_of_shapes. This is a generator function (to be - used if there are multiple occurences of the element). + used if there are multiple occurrences of the element). [(index_into_list, element_type_string, subelement_index), ...]""" element_type_string = element.ShapeType diff --git a/lattice2SubstituteObject.py b/lattice2SubstituteObject.py index ff0f9e8..57bebc0 100644 --- a/lattice2SubstituteObject.py +++ b/lattice2SubstituteObject.py @@ -105,7 +105,7 @@ class CommandSubstituteObject: except Exception as err: mb = QtGui.QMessageBox() mb.setIcon(mb.Icon.Warning) - mb.setText(translate("Lattice2_SubstituteObject", "An error occured while substituting object:", None)+ u"\n" + mb.setText(translate("Lattice2_SubstituteObject", "An error occurred while substituting object:", None)+ u"\n" + str(err)) mb.setWindowTitle(translate("Lattice2_SubstituteObject","Error", None)) mb.exec_()