diff --git a/cMake/FindOpenCV.cmake b/cMake/FindOpenCV.cmake index 2bdc2faeb..8b06b1381 100644 --- a/cMake/FindOpenCV.cmake +++ b/cMake/FindOpenCV.cmake @@ -1,7 +1,7 @@ # - Try to find OpenCV library installation # See http://sourceforge.net/projects/opencvlibrary/ # -# The follwoing variables are optionally searched for defaults +# The following variables are optionally searched for defaults # OpenCV_ROOT_DIR: Base directory of OpenCv tree to use. # OpenCV_FIND_REQUIRED_COMPONENTS : FIND_PACKAGE(OpenCV COMPONENTS ..) # compatible interface. typically CV CXCORE CVAUX HIGHGUI CVCAM .. etc. diff --git a/cMake/FindWix.cmake b/cMake/FindWix.cmake index 54e76c4ce..cd022909d 100644 --- a/cMake/FindWix.cmake +++ b/cMake/FindWix.cmake @@ -1,7 +1,7 @@ # - Try to find Windows Installer XML # See http://wix.sourceforge.net # -# The follwoing variables are optionally searched for defaults +# The following variables are optionally searched for defaults # WIX_ROOT_DIR: Base directory of WIX2 tree to use. # # The following are set after configuration is done: diff --git a/src/Gui/Stylesheets/Dark-blue.qss b/src/Gui/Stylesheets/Dark-blue.qss index 5eef1ba6f..7c20c56de 100644 --- a/src/Gui/Stylesheets/Dark-blue.qss +++ b/src/Gui/Stylesheets/Dark-blue.qss @@ -644,7 +644,7 @@ QDockWidget QListView, QDockWidget QTableView { margin: 6px; border: 1px solid #505050; /* same as regular QTreeView, QListView and QTableView */ - min-height: 40px; /* neccesary in some areas of FreeCAD */ + min-height: 40px; /* necessary in some areas of FreeCAD */ } /* Buttons to scroll tabs if there is not space to show all of them: */ @@ -1666,7 +1666,7 @@ QTreeView::indicator { border-radius:2px; } -/* fix for QTreeView::indicator loosing its margin */ +/* fix for QTreeView::indicator losing its margin */ QTreeView::indicator { margin: 3px; } @@ -1680,8 +1680,8 @@ QListWidget::indicator:checked:selected, QListWidget::indicator:indeterminate:selected, QTreeView::indicator:checked:selected, QTreeView::indicator:indeterminate:selected { - background-color: #7cabf9; /* slighly lighter than default */ - border-color: #2053c0; /* slighly darker than default */ + background-color: #7cabf9; /* slightly lighter than default */ + border-color: #2053c0; /* slightly darker than default */ } QListWidget::indicator:pressed, @@ -2082,7 +2082,7 @@ QTableView > QWidget > QDateTimeEdit:read-only { EXPERIMENTAL ==================================================================================================*/ -/* Fix for preventing elements in different rows to accidentaly overlap */ +/* Fix for preventing elements in different rows to accidentally overlap */ QDialog QGroupBox QFrame { margin: 2px 0px; } diff --git a/src/Gui/Stylesheets/Dark-green.qss b/src/Gui/Stylesheets/Dark-green.qss index ed43b0978..8104d834e 100644 --- a/src/Gui/Stylesheets/Dark-green.qss +++ b/src/Gui/Stylesheets/Dark-green.qss @@ -644,7 +644,7 @@ QDockWidget QListView, QDockWidget QTableView { margin: 6px; border: 1px solid #505050; /* same as regular QTreeView, QListView and QTableView */ - min-height: 40px; /* neccesary in some areas of FreeCAD */ + min-height: 40px; /* necessary in some areas of FreeCAD */ } /* Buttons to scroll tabs if there is not space to show all of them: */ @@ -1666,7 +1666,7 @@ QTreeView::indicator { border-radius:2px; } -/* fix for QTreeView::indicator loosing its margin */ +/* fix for QTreeView::indicator losing its margin */ QTreeView::indicator { margin: 3px; } @@ -1680,8 +1680,8 @@ QListWidget::indicator:checked:selected, QListWidget::indicator:indeterminate:selected, QTreeView::indicator:checked:selected, QTreeView::indicator:indeterminate:selected { - background-color: #a5c61a; /* slighly lighter than default */ - border-color: #74831d; /* slighly darker than default */ + background-color: #a5c61a; /* slightly lighter than default */ + border-color: #74831d; /* slightly darker than default */ } QListWidget::indicator:pressed, @@ -2082,7 +2082,7 @@ QTableView > QWidget > QDateTimeEdit:read-only { EXPERIMENTAL ==================================================================================================*/ -/* Fix for preventing elements in different rows to accidentaly overlap */ +/* Fix for preventing elements in different rows to accidentally overlap */ QDialog QGroupBox QFrame { margin: 2px 0px; } diff --git a/src/Gui/Stylesheets/Dark-orange.qss b/src/Gui/Stylesheets/Dark-orange.qss index af94aca98..7e067c5d6 100644 --- a/src/Gui/Stylesheets/Dark-orange.qss +++ b/src/Gui/Stylesheets/Dark-orange.qss @@ -644,7 +644,7 @@ QDockWidget QListView, QDockWidget QTableView { margin: 6px; border: 1px solid #505050; /* same as regular QTreeView, QListView and QTableView */ - min-height: 40px; /* neccesary in some areas of FreeCAD */ + min-height: 40px; /* necessary in some areas of FreeCAD */ } /* Buttons to scroll tabs if there is not space to show all of them: */ @@ -1666,7 +1666,7 @@ QTreeView::indicator { border-radius:2px; } -/* fix for QTreeView::indicator loosing its margin */ +/* fix for QTreeView::indicator losing its margin */ QTreeView::indicator { margin: 3px; } @@ -1680,8 +1680,8 @@ QListWidget::indicator:checked:selected, QListWidget::indicator:indeterminate:selected, QTreeView::indicator:checked:selected, QTreeView::indicator:indeterminate:selected { - background-color: #e3b64d; /* slighly lighter than default */ - border-color: #b28416; /* slighly darker than default */ + background-color: #e3b64d; /* slightly lighter than default */ + border-color: #b28416; /* slightly darker than default */ } QListWidget::indicator:pressed, @@ -2082,7 +2082,7 @@ QTableView > QWidget > QDateTimeEdit:read-only { EXPERIMENTAL ==================================================================================================*/ -/* Fix for preventing elements in different rows to accidentaly overlap */ +/* Fix for preventing elements in different rows to accidentally overlap */ QDialog QGroupBox QFrame { margin: 2px 0px; } diff --git a/src/Gui/Stylesheets/Light-blue.qss b/src/Gui/Stylesheets/Light-blue.qss index b1fa5145a..5d8ce30ce 100644 --- a/src/Gui/Stylesheets/Light-blue.qss +++ b/src/Gui/Stylesheets/Light-blue.qss @@ -643,7 +643,7 @@ QDockWidget QListView, QDockWidget QTableView { margin: 6px; border: 1px solid #c3c3c3; /* same as regular QTreeView, QListView and QTableView */ - min-height: 40px; /* neccesary in some areas of FreeCAD */ + min-height: 40px; /* necessary in some areas of FreeCAD */ } /* Buttons to scroll tabs if there is not space to show all of them: */ @@ -1664,7 +1664,7 @@ QTreeView::indicator { border-radius:2px; } -/* fix for QTreeView::indicator loosing its margin */ +/* fix for QTreeView::indicator losing its margin */ QTreeView::indicator { margin: 3px; } @@ -1678,8 +1678,8 @@ QListWidget::indicator:checked:selected, QListWidget::indicator:indeterminate:selected, QTreeView::indicator:checked:selected, QTreeView::indicator:indeterminate:selected { - background-color: #7cabf9; /* slighly lighter than default */ - border-color: #2053c0; /* slighly darker than default */ + background-color: #7cabf9; /* slightly lighter than default */ + border-color: #2053c0; /* slightly darker than default */ } QListWidget::indicator:pressed, @@ -2080,7 +2080,7 @@ QTableView > QWidget > QDateTimeEdit:read-only { EXPERIMENTAL ==================================================================================================*/ -/* Fix for preventing elements in different rows to accidentaly overlap */ +/* Fix for preventing elements in different rows to accidentally overlap */ QDialog QGroupBox QFrame { margin: 2px 0px; } diff --git a/src/Gui/Stylesheets/Light-green.qss b/src/Gui/Stylesheets/Light-green.qss index bab864d55..74f7eb509 100644 --- a/src/Gui/Stylesheets/Light-green.qss +++ b/src/Gui/Stylesheets/Light-green.qss @@ -643,7 +643,7 @@ QDockWidget QListView, QDockWidget QTableView { margin: 6px; border: 1px solid #c3c3c3; /* same as regular QTreeView, QListView and QTableView */ - min-height: 40px; /* neccesary in some areas of FreeCAD */ + min-height: 40px; /* necessary in some areas of FreeCAD */ } /* Buttons to scroll tabs if there is not space to show all of them: */ @@ -1664,7 +1664,7 @@ QTreeView::indicator { border-radius:2px; } -/* fix for QTreeView::indicator loosing its margin */ +/* fix for QTreeView::indicator losing its margin */ QTreeView::indicator { margin: 3px; } @@ -1678,8 +1678,8 @@ QListWidget::indicator:checked:selected, QListWidget::indicator:indeterminate:selected, QTreeView::indicator:checked:selected, QTreeView::indicator:indeterminate:selected { - background-color: #a5c61a; /* slighly lighter than default */ - border-color: #74831d; /* slighly darker than default */ + background-color: #a5c61a; /* slightly lighter than default */ + border-color: #74831d; /* slightly darker than default */ } QListWidget::indicator:pressed, @@ -2080,7 +2080,7 @@ QTableView > QWidget > QDateTimeEdit:read-only { EXPERIMENTAL ==================================================================================================*/ -/* Fix for preventing elements in different rows to accidentaly overlap */ +/* Fix for preventing elements in different rows to accidentally overlap */ QDialog QGroupBox QFrame { margin: 2px 0px; } diff --git a/src/Gui/Stylesheets/Light-orange.qss b/src/Gui/Stylesheets/Light-orange.qss index 482a6c2af..f805b425c 100644 --- a/src/Gui/Stylesheets/Light-orange.qss +++ b/src/Gui/Stylesheets/Light-orange.qss @@ -643,7 +643,7 @@ QDockWidget QListView, QDockWidget QTableView { margin: 6px; border: 1px solid #c3c3c3; /* same as regular QTreeView, QListView and QTableView */ - min-height: 40px; /* neccesary in some areas of FreeCAD */ + min-height: 40px; /* necessary in some areas of FreeCAD */ } /* Buttons to scroll tabs if there is not space to show all of them: */ @@ -1664,7 +1664,7 @@ QTreeView::indicator { border-radius:2px; } -/* fix for QTreeView::indicator loosing its margin */ +/* fix for QTreeView::indicator losing its margin */ QTreeView::indicator { margin: 3px; } @@ -1678,8 +1678,8 @@ QListWidget::indicator:checked:selected, QListWidget::indicator:indeterminate:selected, QTreeView::indicator:checked:selected, QTreeView::indicator:indeterminate:selected { - background-color: #e3b64d; /* slighly lighter than default */ - border-color: #b28416; /* slighly darker than default */ + background-color: #e3b64d; /* slightly lighter than default */ + border-color: #b28416; /* slightly darker than default */ } QListWidget::indicator:pressed, @@ -2080,7 +2080,7 @@ QTableView > QWidget > QDateTimeEdit:read-only { EXPERIMENTAL ==================================================================================================*/ -/* Fix for preventing elements in different rows to accidentaly overlap */ +/* Fix for preventing elements in different rows to accidentally overlap */ QDialog QGroupBox QFrame { margin: 2px 0px; } diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index b9d3a0471..d340d0e86 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -528,7 +528,7 @@ def loadSvgPatterns(): FreeCAD.svgpatterns.update(p) def svgpatterns(): - """svgpatterns(): returns a dictionnary with installed SVG patterns""" + """svgpatterns(): returns a dictionary with installed SVG patterns""" if hasattr(FreeCAD,"svgpatterns"): return FreeCAD.svgpatterns else: @@ -1940,7 +1940,7 @@ def getSVG(obj,scale=1,linewidth=0.35,fontsize=12,fillstyle="shape color",direct rot -=180 if rot < -90: rot += 180 - #be carefull with the sweep flag + #be careful with the sweep flag flag_large_arc = (((e.ParameterRange[1] - \ e.ParameterRange[0]) / math.pi) % 2) > 1 #flag_sweep = (c.Axis * drawing_plane_normal >= 0) \ @@ -3006,7 +3006,7 @@ def upgrade(objects,delete=False,force=None): force a certain way of upgrading. It can be: makeCompound, closeGroupWires, makeSolid, closeWire, turnToParts, makeFusion, makeShell, makeFaces, draftify, joinFaces, makeSketchFace, makeWires - Returns a dictionnary containing two lists, a list of new objects and a list + Returns a dictionary containing two lists, a list of new objects and a list of objects to be deleted""" import Part, DraftGeomUtils @@ -3366,7 +3366,7 @@ def downgrade(objects,delete=False,force=None): The force attribute can be used to force a certain way of downgrading. It can be: explode, shapify, subtr, splitFaces, cut2, getWire, splitWires, splitCompounds. - Returns a dictionnary containing two lists, a list of new objects and a list + Returns a dictionary containing two lists, a list of new objects and a list of objects to be deleted""" import Part, DraftGeomUtils diff --git a/src/Mod/Draft/DraftGeomUtils.py b/src/Mod/Draft/DraftGeomUtils.py index aa0aa324f..a7c21c126 100755 --- a/src/Mod/Draft/DraftGeomUtils.py +++ b/src/Mod/Draft/DraftGeomUtils.py @@ -1683,7 +1683,7 @@ def fillet(lEdges,r,chamfer=False): Returns a list of sorted edges describing a round corner''' def getCurveType(edge,existingCurveType = None): - '''Builds or completes a dictionnary containing edges with keys "Arc" and "Line"''' + '''Builds or completes a dictionary containing edges with keys "Arc" and "Line"''' if not existingCurveType : existingCurveType = { 'Line' : [], 'Arc' : [] } if issubclass(type(edge.Curve),Part.LineSegment) : @@ -2541,7 +2541,7 @@ def circleFrom3CircleTangents(circle1, circle2, circle3): # @todo Calc. the intersection points (max. 8) of 4 lines (trough each inversion pole and the radical center) with the circle. # This gives us all the tangent points. else: - # Some circles are inside each other or an error has occured. + # Some circles are inside each other or an error has occurred. return None else: diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index 8b84dfd99..ece8bdac2 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -3976,7 +3976,7 @@ class Edit(Modifier): self.editing == len(pts)-1: #last pole knot = 0 changep = 1 - if knot is not None: # we need to modify the oposite pole + if knot is not None: # we need to modify the opposite pole segment = knot / self.obj.Degree -1 cont=self.obj.Continuity[segment] if \ len(self.obj.Continuity) > segment else 0 @@ -4223,7 +4223,7 @@ class Edit(Modifier): msg(translate("draft", "Endpoint of BezCurve can't be smoothed\n"),'warning') return segment = knot // deg #segment index - newcont=self.obj.Continuity[:] #dont edit a property inplace !!! + newcont=self.obj.Continuity[:] #don't edit a property inplace !!! if not self.obj.Closed and (len(self.obj.Continuity) == segment -1 or \ segment == 0) : pass # open curve elif len(self.obj.Continuity) >= segment or \ diff --git a/src/Mod/Draft/Resources/icons/Draft_Snap.svg b/src/Mod/Draft/Resources/icons/Draft_Snap.svg index 0ba219ba1..114b6b4ae 100644 --- a/src/Mod/Draft/Resources/icons/Draft_Snap.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap.svg @@ -258,14 +258,14 @@ - perpindicular + perpendicular point line dot circle - The perpindicular symbol above and to the left of a dot at the midpoint of a line + The perpendicular symbol above and to the left of a dot at the midpoint of a line diff --git a/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg b/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg index 02f75c5fb..065aae864 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg +++ b/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg @@ -154,10 +154,10 @@ [agryson] Alexander Gryson - Perpindicular symbol + Perpendicular symbol - perpindicular + perpendicular diff --git a/src/Mod/Draft/Resources/ui/preferences-svg.ui b/src/Mod/Draft/Resources/ui/preferences-svg.ui index 68d3cf832..f7dc70ccf 100644 --- a/src/Mod/Draft/Resources/ui/preferences-svg.ui +++ b/src/Mod/Draft/Resources/ui/preferences-svg.ui @@ -44,7 +44,7 @@ - This is the method choosed for importing SVG object color into FreeCAD. + This is the method chosen for importing SVG object color into FreeCAD. 0 diff --git a/src/Mod/Draft/importAirfoilDAT.py b/src/Mod/Draft/importAirfoilDAT.py index 0e384e6ba..f93da786c 100644 --- a/src/Mod/Draft/importAirfoilDAT.py +++ b/src/Mod/Draft/importAirfoilDAT.py @@ -85,7 +85,7 @@ def process(doc,filename): - # Collect the data for the upper and the lower side seperately if possible + # Collect the data for the upper and the lower side separately if possible for lin in afile: curdat = regex.match(lin) if curdat != None: diff --git a/src/Mod/Draft/importSVG.py b/src/Mod/Draft/importSVG.py index 74ecff8c2..42ffdc0e0 100644 --- a/src/Mod/Draft/importSVG.py +++ b/src/Mod/Draft/importSVG.py @@ -240,7 +240,7 @@ def getcolor(color): def transformCopyShape(shape,m): """apply transformation matrix m on given shape -since OCCT 6.8.0 transformShape can be used to apply certian non-orthogonal +since OCCT 6.8.0 transformShape can be used to apply certain non-orthogonal transformations on shapes. This way a conversion to BSplines in transformGeometry can be avoided.""" if abs(m.A11**2+m.A12**2 -m.A21**2-m.A22**2) < 1e-8 and \ @@ -1160,7 +1160,7 @@ def decodeName(name): return decodedName def getContents(filename,tag,stringmode=False): - "gets the contents of all the occurences of the given tag in the given file" + "gets the contents of all the occurrences of the given tag in the given file" result = {} if stringmode: contents = filename diff --git a/src/Mod/Idf/Idf.py b/src/Mod/Idf/Idf.py index ea1636c9b..e9fd4926e 100644 --- a/src/Mod/Idf/Idf.py +++ b/src/Mod/Idf/Idf.py @@ -383,7 +383,7 @@ def place_steps(doc,placement,board_thickness): model_file.writelines(str(place_item[0])+" "+str(place_item[2])+"\n") model_file.close() -def toQuaternion(heading, attitude,bank): # rotation heading=arround Y, attitude =arround Z, bank attitude =arround X +def toQuaternion(heading, attitude,bank): # rotation heading=around Y, attitude =around Z, bank attitude =around X """toQuaternion(heading, attitude,bank)->FreeCAD.Base.Rotation(Quternion)""" c1 = cos(heading/2) s1 = sin(heading/2) diff --git a/src/Mod/Image/Gui/Command.cpp b/src/Mod/Image/Gui/Command.cpp index 0c30f771e..94b66b581 100644 --- a/src/Mod/Image/Gui/Command.cpp +++ b/src/Mod/Image/Gui/Command.cpp @@ -121,8 +121,8 @@ void CmdCreateImagePlane::activated(int iMsg) QImage impQ(s); if (impQ.isNull()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Error open image"), - QObject::tr("Could not load the choosen image")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Error opening image"), + QObject::tr("Could not load the chosen image")); return; } diff --git a/src/Mod/OpenSCAD/OpenSCAD2Dgeom.py b/src/Mod/OpenSCAD/OpenSCAD2Dgeom.py index ae755c5e3..dd2d77b85 100644 --- a/src/Mod/OpenSCAD/OpenSCAD2Dgeom.py +++ b/src/Mod/OpenSCAD/OpenSCAD2Dgeom.py @@ -312,13 +312,13 @@ def endpointdistancedebuglist(debuglist): def edgestowires(edgelist,eps=0.001): '''takes list of edges and returns a list of wires''' import Part, Draft - # todo remove double edges + # TODO remove double edges wirelist=[] #for path in findConnectedEdges(edgelist,eps=eps): for path,debug in zip(*findConnectedEdges(edgelist,eps=eps,debug=True)): maxd,mind,outerd = endpointdistancedebuglist(debug) assert(maxd <= eps*2) # Assume the input to be broken - if maxd < eps*2 and maxd > 0.000001: #OCC wont like it if maxd > 0.02: + if maxd < eps*2 and maxd > 0.000001: # OCC won't like it if maxd > 0.02: print('endpointdistance max:%f min:%f, ends:%f' %(maxd,mind,outerd)) if True: diff --git a/src/Mod/OpenSCAD/exportCSG.py b/src/Mod/OpenSCAD/exportCSG.py index 02ca79504..d40787d8c 100644 --- a/src/Mod/OpenSCAD/exportCSG.py +++ b/src/Mod/OpenSCAD/exportCSG.py @@ -142,7 +142,7 @@ def process_object(csg,ob): import math f = str(ob.Polygon) # r = str(ob.Length/2.0/math.sin(math.pi/ob.Polygon)) - r = str(ob.Circumradius) #length seems to be the outer radius + r = str(ob.Circumradius) # length seems to be the outer radius h = str(ob.Height.Value) mm = check_multmatrix(csg,ob,0,0,-float(h)/2) csg.write("cylinder($fn = "+f+", "+fafs+", h = "+h+", r1 = "+r+\ @@ -199,7 +199,7 @@ def process_object(csg,ob): elif ob.Base.Name.startswith('this_is_a_bad_idea'): pass else: - pass #There should be a fallback solution + pass # There should be a fallback solution elif ob.TypeId == "Part::Cut" : print("Cut") @@ -243,13 +243,13 @@ def process_object(csg,ob): if mm == 1 : csg.write("}\n") def export(exportList,filename): - "called when freecad exports a file" + "called when FreeCAD exports a file" # process Objects print("\nStart Export 0.1d\n") print("Open Output File") csg = pythonopen(filename,'w') - print("Write Inital Output") + print("Write Initial Output") # Not sure if comments as per scad are allowed in csg file csg.write("// CSG file generated from FreeCAD %s\n" % \ '.'.join(FreeCAD.Version()[0:3])) diff --git a/src/Mod/OpenSCAD/importCSG.py b/src/Mod/OpenSCAD/importCSG.py index 27e50461d..3b3b5e332 100644 --- a/src/Mod/OpenSCAD/importCSG.py +++ b/src/Mod/OpenSCAD/importCSG.py @@ -220,7 +220,7 @@ def p_anymodifier(p): ''' #just return the plain modifier for now #has to be changed when the modifiers are inplemented - #please note that disabled objects usualy are stript of the CSG ouput during compilation + #please note that disabled objects usually are stript of the CSG ouput during compilation p[0] = p[1] def p_statementwithmod(p): @@ -1140,7 +1140,7 @@ def p_projection_action(p) : if printverbose: print('Projection') if p[3]['cut']=='true' : planedim=1e9 # large but finite - #inifinite planes look bad in the GUI + #infinite planes look bad in the GUI planename='xy_plane_used_for_project_cut' obj=doc.addObject('Part::MultiCommon','projection_cut') plane = doc.getObject(planename) diff --git a/src/Mod/OpenSCAD/ply/yacc.py b/src/Mod/OpenSCAD/ply/yacc.py index f70439ea5..9343ba3c3 100644 --- a/src/Mod/OpenSCAD/ply/yacc.py +++ b/src/Mod/OpenSCAD/ply/yacc.py @@ -32,7 +32,7 @@ # ----------------------------------------------------------------------------- # # This implements an LR parser that is constructed from grammar rules defined -# as Python functions. The grammer is specified by supplying the BNF inside +# as Python functions. The grammar is specified by supplying the BNF inside # Python documentation strings. The inspiration for this technique was borrowed # from John Aycock's Spark parsing system. PLY might be viewed as cross between # Spark and the GNU bison utility. @@ -1341,7 +1341,7 @@ class Grammar(object): self.Precedence = { } # Precedence rules for each terminal. Contains tuples of the # form ('right',level) or ('nonassoc', level) or ('left',level) - self.UsedPrecedence = { } # Precedence rules that were actually used by the grammer. + self.UsedPrecedence = { } # Precedence rules that were actually used by the grammar. # This is only used to provide error checking and to generate # a warning about unused precedence rules. diff --git a/src/Mod/OpenSCAD/prototype.py b/src/Mod/OpenSCAD/prototype.py index ee4335c13..516035975 100644 --- a/src/Mod/OpenSCAD/prototype.py +++ b/src/Mod/OpenSCAD/prototype.py @@ -38,11 +38,11 @@ def openscadmesh(doc,scadstr,objname): print(scadstr) class Node: - #fnmin=12 # maximal fn for implicit polygon renderfing + #fnmin=12 # maximal fn for implicit polygon rendering fnmin= FreeCAD.ParamGet(\ "User parameter:BaseApp/Preferences/Mod/OpenSCAD").\ GetInt('useMaxFN') - planedim=1e10 #size of the sqaure used as x-y-plane + planedim=1e10 #size of the square used as x-y-plane def __init__(self,name,arguments=None,children=None,): pass self.name=name @@ -58,7 +58,7 @@ class Node: return str1+')' def __nonzero__(self): - '''a Node is not obsolent if doesn't have children. Only if as neither name children or + '''a Node is not obsolete if doesn't have children. Only if as neither name children or arguments''' return bool(self.name or self.arguments or self.children) @@ -67,7 +67,7 @@ class Node: return len(self.children) def __getitem__(self,key): - '''dirct access to the children''' + '''direct access to the children''' return self.children.__getitem__(key) def rlen(self,checkmultmarix=False): @@ -365,8 +365,8 @@ class Node: elif extension in ['dxf']: layera = self.arguments.get('layer') featname='import_dxf_%s_%s'%(objname,layera) - # reusing an allready imported object does not work if the - #shape in not yet calculated + # reusing an already imported object does not work if the + # shape in not yet calculated import importDXF global dxfcache layers=dxfcache.get(id(doc),[]) @@ -405,7 +405,7 @@ class Node: if obj: #handle origin and scale if scale is not None and scale !=1: if origin is not None and any([c != 0 for c in origin]): - raise(NotImplementedError)# order of transformations unkown + raise(NotImplementedError)# order of transformations unknown child = obj m1=FreeCAD.Matrix() m1.scale(scale,scale,scale) diff --git a/src/Mod/OpenSCAD/replaceobj.py b/src/Mod/OpenSCAD/replaceobj.py index cb99404a9..37022e326 100644 --- a/src/Mod/OpenSCAD/replaceobj.py +++ b/src/Mod/OpenSCAD/replaceobj.py @@ -50,7 +50,7 @@ def replaceobj(parent,oldchild,newchild): parent.touch() def replaceobjfromselection(objs): - # The Parent can be ommited as long as one object is orphaned + # The Parent can be omitted as long as one object is orphaned if len(objs)==2: InListLength= tuple((len(obj.InList)) for obj in objs) if InListLength == (0,1): diff --git a/src/Mod/Path/App/AppPathPy.cpp b/src/Mod/Path/App/AppPathPy.cpp index d2c10f97f..dc2ca1c84 100644 --- a/src/Mod/Path/App/AppPathPy.cpp +++ b/src/Mod/Path/App/AppPathPy.cpp @@ -128,7 +128,7 @@ public: ); add_keyword_method("sortWires",&Module::sortWires, "sortWires(shapes, start=Vector(), " PARAM_PY_ARGS_DOC(ARG,AREA_PARAMS_SORT) ", key=value...)\n" - "\nReturns (wires,end), where 'wires' is sorted accross Z value and with optimized travel distance,\n" + "\nReturns (wires,end), where 'wires' is sorted across Z value and with optimized travel distance,\n" "and 'end' is the ending position of the whole wires\n" "\n* shapes: input shape list\n" "\n* start (Vector()): optional start position.\n" diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index 006849e55..60544222b 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -90,7 +90,7 @@ CAreaConfig::CAreaConfig(const CAreaParams &p, bool noFitArcs) PARAM_FOREACH(AREA_CONF_SAVE_AND_APPLY,AREA_PARAMS_CAREA) - // Arc fitting is lossy. we shall reduce the number of unecessary fit + // Arc fitting is lossy. We shall reduce the number of unnecessary fit if(noFitArcs) CArea::set_fit_arcs(false); diff --git a/src/Mod/Path/App/AreaParams.h b/src/Mod/Path/App/AreaParams.h index 8dc4be2d2..d440b0867 100644 --- a/src/Mod/Path/App/AreaParams.h +++ b/src/Mod/Path/App/AreaParams.h @@ -83,7 +83,7 @@ ((double,clipper_clean_distance,CleanDistance,0.0,\ "Clean polygon smaller than this distance. See https://goo.gl/jox3JY"))\ ((double,accuracy,Accuracy,0.01,"Arc fitting accuracy"))\ - ((double,units,Unit,1.0,"Scaling factor for convertion to inch"))\ + ((double,units,Unit,1.0,"Scaling factor for conversion to inch"))\ ((short,min_arc_points,MinArcPoints,4,"Minimum segments for arc discretization"))\ ((short,max_arc_points,MaxArcPoints,100,"Maximum segments for arc discretization"))\ ((double,clipper_scale,ClipperScale,10000.0,\ @@ -123,7 +123,7 @@ "'Absolute' means the absolute Z height to start section.\n"\ "'BoundBox' means relative Z height to the bounding box of all the children shape. Only\n"\ "positive value is allowed, which specifies the offset below the top Z of the bounding box.\n"\ - "Note that OCC has trouble getting the minimumi bounding box of some solids, particually\n"\ + "Note that OCC has trouble getting the minimumi bounding box of some solids, particularly\n"\ "those with non-planar surface.\n"\ "'Workplane' means relative to workplane.",\ (Absolute)(BoundBox)(Workplane))) diff --git a/src/Mod/Path/App/ParamsHelper.h b/src/Mod/Path/App/ParamsHelper.h index 0d59116ba..04dc5237f 100644 --- a/src/Mod/Path/App/ParamsHelper.h +++ b/src/Mod/Path/App/ParamsHelper.h @@ -29,7 +29,7 @@ * \section Motivation * * For an application like FreeCAD, there are often cases where the same set of - * parameters are refered in dozons of different places. The macros here is + * parameters are referred in dozons of different places. The macros here is * designed to help managing those parameters, so that you can define groups of * parameters once, and refer them everywhere in groups with simple macro calls for * all kinds of purposes. Any changing, adding and removing of parameters in the @@ -44,7 +44,7 @@ * * \section Debugging * - * Extensive use of macros has one noticable disadvantage, though. If some thing + * Extensive use of macros has one noticeable disadvantage, though. If some thing * goes wrong, the compiler error message is kind of cryptic. If so, first * double check your macro definition of the parameter is correctly, not missing * or having extra parathesis or comma. Then, you can use the CMake @@ -145,7 +145,7 @@ * * See struct AreaDoc for an example of doc string generation. * - * Each field of the parameter can be refered to with various + * Each field of the parameter can be referred to with various * \ref ParamAccessor "various accessor macros", and can be easily * \ref ParamStringizer "stringified". * @@ -154,14 +154,14 @@ * And #PARAM_FIELD_STR to stringify. * * Here \a _param is the parameter definition described above in the form of a - * Boost.PP tuple, and is usally supplied by various \ref ParamLooper "looper macros" + * Boost.PP tuple, and is usually supplied by various \ref ParamLooper "looper macros" * * You can of course directly use various Boost.PP sequence looper to pass * aditional arguments to the operation macro. See #PARAM_PY_DICT_SET_VALUE for * an example of using tuple, and the more complex example #PARAM_ENUM_CONVERT * * Note that when generating comma separated list, the first and last comma are - * conveniently ommited, so that the macros can be mixed with others intuitively + * conveniently omited, so that the macros can be mixed with others intuitively */ #include diff --git a/src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui b/src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui index d628b7e3d..85575a6c0 100644 --- a/src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui @@ -111,7 +111,7 @@ - <html><head/><body><p>Determines the incision length of the bone to be inserted into the profile.</p><p><span style=" font-weight:600; font-style:italic;">adaptive</span> ... the lenght is adapted to cover the corner based on the angle of it's edges, taking the current tool radius into account (default)</p><p><span style=" font-weight:600; font-style:italic;">fixed</span> ... is the same as adaptive for straight angles. For T-bones it's the radius of the tool (R) and for dogbones it's R * (2/√2 - 1).</p><p><span style=" font-weight:600; font-style:italic;">custom</span> ... let's you sepcify a custom (fixed) length below</p></body></html> + <html><head/><body><p>Determines the incision length of the bone to be inserted into the profile.</p><p><span style=" font-weight:600; font-style:italic;">adaptive</span> ... the length is adapted to cover the corner based on the angle of it's edges, taking the current tool radius into account (default)</p><p><span style=" font-weight:600; font-style:italic;">fixed</span> ... is the same as adaptive for straight angles. For T-bones it's the radius of the tool (R) and for dogbones it's R * (2/√2 - 1).</p><p><span style=" font-weight:600; font-style:italic;">custom</span> ... let's you sepcify a custom (fixed) length below</p></body></html> 2 diff --git a/src/Mod/Path/PathScripts/PathKurveUtils.py b/src/Mod/Path/PathScripts/PathKurveUtils.py index 52fdbe217..f355c4f2a 100644 --- a/src/Mod/Path/PathScripts/PathKurveUtils.py +++ b/src/Mod/Path/PathScripts/PathKurveUtils.py @@ -288,7 +288,7 @@ def make_smaller(curve, start=None, finish=None, end_beyond=False): '''The following procedures are copied almost directly from heekscnc kurve_funcs.py. They depend on nc directory existing below PathScripts -and have not been throughly optimized, understood, or tested for FreeCAD.''' +and have not been thoroughly optimized, understood, or tested for FreeCAD.''' def profile2(curve, direction="on", radius=1.0, vertfeed=0.0, diff --git a/src/Mod/Path/PathScripts/PathUtils.py b/src/Mod/Path/PathScripts/PathUtils.py index e76bca614..2f70c1049 100644 --- a/src/Mod/Path/PathScripts/PathUtils.py +++ b/src/Mod/Path/PathScripts/PathUtils.py @@ -880,7 +880,7 @@ class depth_params: def __fixed_steps(self, start, stop, size): '''returns a list of depths beginning with the bottom (included), ending with the top (not included). - all steps are of size 'size' except the one at the bottom wich can be + all steps are of size 'size' except the one at the bottom which can be smaller.''' fullsteps = int((start - stop) / size) diff --git a/src/Mod/Path/PathScripts/dynapath_post.py b/src/Mod/Path/PathScripts/dynapath_post.py index c2a919e66..eac2efcfd 100644 --- a/src/Mod/Path/PathScripts/dynapath_post.py +++ b/src/Mod/Path/PathScripts/dynapath_post.py @@ -121,7 +121,7 @@ def export(objectslist,filename,argstring): gcode = "" #Find the machine. - #The user my have overriden post processor defaults in the GUI. Make sure we're using the current values in the Machine Def. + #The user my have overridden post processor defaults in the GUI. Make sure we're using the current values in the Machine Def. myMachine = None for pathobj in objectslist: if hasattr(pathobj,"MachineName"): diff --git a/src/Mod/Path/PathScripts/linuxcnc_post.py b/src/Mod/Path/PathScripts/linuxcnc_post.py index b8b5f73a4..8789c483e 100644 --- a/src/Mod/Path/PathScripts/linuxcnc_post.py +++ b/src/Mod/Path/PathScripts/linuxcnc_post.py @@ -125,7 +125,7 @@ def export(objectslist, filename, argstring): gcode = "" # Find the machine. - # The user my have overriden post processor defaults in the GUI. Make + # The user my have overridden post processor defaults in the GUI. Make # sure we're using the current values in the Machine Def. myMachine = None for pathobj in objectslist: diff --git a/src/Mod/Path/PathScripts/nc/attach.py b/src/Mod/Path/PathScripts/nc/attach.py index d6636438b..15e04cbbb 100644 --- a/src/Mod/Path/PathScripts/nc/attach.py +++ b/src/Mod/Path/PathScripts/nc/attach.py @@ -42,7 +42,7 @@ class Creator(recreator.Redirector): path.append(ocl.Line(ocl.Point(self.x, self.y, self.z), ocl.Point(self.x, self.y, self.z))) self.setPdcfIfNotSet() if (self.z>self.minz): - self.pdcf.setZ(self.z) # Adjust Z if we have gotten a higher limit (Fix pocketing loosing steps when using attach?) + self.pdcf.setZ(self.z) # Adjust Z if we have gotten a higher limit (Fix pocketing losing steps when using attach?) else: self.pdcf.setZ(self.minz/units) # Else use minz self.pdcf.setPath(path) @@ -56,7 +56,7 @@ class Creator(recreator.Redirector): self.setPdcfIfNotSet() if (self.z>self.minz): - self.pdcf.setZ(self.z) # Adjust Z if we have gotten a higher limit (Fix pocketing loosing steps when using attach?) + self.pdcf.setZ(self.z) # Adjust Z if we have gotten a higher limit (Fix pocketing losing steps when using attach?) else: self.pdcf.setZ(self.minz/units) # Else use minz diff --git a/src/Mod/Path/PathScripts/nc/emc2tap.py b/src/Mod/Path/PathScripts/nc/emc2tap.py index 4bf4023dd..d7a9b84ee 100755 --- a/src/Mod/Path/PathScripts/nc/emc2tap.py +++ b/src/Mod/Path/PathScripts/nc/emc2tap.py @@ -26,7 +26,7 @@ class CreatorEMC2tap(emc2.CreatorEMC2): def tap(self, x=None, y=None, z=None, zretract=None, depth=None, standoff=None, dwell_bottom=None, pitch=None, stoppos=None, spin_in=None, spin_out=None, tap_mode=None, direction=None): # mystery parameters: # zretract=None, dwell_bottom=None,pitch=None, stoppos=None, spin_in=None, spin_out=None): - # I dont see how to map these to EMC Gcode + # I don't see how to map these to EMC Gcode if (standoff == None): # This is a bad thing. All the drilling cycles need a retraction (and starting) height. diff --git a/src/Mod/Path/PathScripts/nc/heiden.py b/src/Mod/Path/PathScripts/nc/heiden.py index aadec66d6..657e282db 100644 --- a/src/Mod/Path/PathScripts/nc/heiden.py +++ b/src/Mod/Path/PathScripts/nc/heiden.py @@ -855,7 +855,7 @@ class Creator(nc.Creator): def tap(self, x=None, y=None, z=None, zretract=None, depth=None, standoff=None, dwell_bottom=None, pitch=None, stoppos=None, spin_in=None, spin_out=None, tap_mode=None, direction=None): # mystery parameters: # zretract=None, dwell_bottom=None,pitch=None, stoppos=None, spin_in=None, spin_out=None): - # I dont see how to map these to EMC Gcode + # I don't see how to map these to EMC Gcode if (standoff == None): # This is a bad thing. All the drilling cycles need a retraction (and starting) height. diff --git a/src/Mod/Path/PathScripts/phillips_post.py b/src/Mod/Path/PathScripts/phillips_post.py index 8b1223b83..f121516fd 100644 --- a/src/Mod/Path/PathScripts/phillips_post.py +++ b/src/Mod/Path/PathScripts/phillips_post.py @@ -189,7 +189,7 @@ SPINDLE_DECIMALS = 0 # The header is divided into two parts, one is dynamic, the other is a static GCode header. # If the current selection and the current time should be included in the header, # it has to be generated at execution time, and thus it cannot be held in constant values. -# The last linefeed should be ommitted, it is inserted automatically +# The last linefeed should be omitted, it is inserted automatically # linenumbers are inserted automatically if LINENUMBERS is True # if you don't want to use this header you have to provide a minimal function # def mkHeader(selection): diff --git a/src/Mod/Path/PathTests/PathTestUtils.py b/src/Mod/Path/PathTests/PathTestUtils.py index 6cfb35f98..f515b5302 100644 --- a/src/Mod/Path/PathTests/PathTestUtils.py +++ b/src/Mod/Path/PathTests/PathTestUtils.py @@ -31,7 +31,7 @@ from FreeCAD import Vector from PathScripts.PathGeom import Side class PathTestBase(unittest.TestCase): - """Base test class with some addtional asserts.""" + """Base test class with some additional asserts.""" def assertRoughly(self, f1, f2): """Verify that two float values are approximately the same.""" diff --git a/src/Mod/Path/libarea/Arc.cpp b/src/Mod/Path/libarea/Arc.cpp index d1e0498ca..e5c2e216f 100644 --- a/src/Mod/Path/libarea/Arc.cpp +++ b/src/Mod/Path/libarea/Arc.cpp @@ -65,7 +65,7 @@ Point CArc::MidParam(double param)const { } //segments - number of segments per full revolution! -//d_angle - determines the direction and the ammount of the arc to draw +//d_angle - determines the direction and the amount of the arc to draw void CArc::GetSegments(void(*callbackfunc)(const double *p), double pixels_per_mm)const { if(m_s == m_e) diff --git a/src/Mod/Path/libarea/Area.cpp b/src/Mod/Path/libarea/Area.cpp index a4e5bf29d..f30d4f45c 100644 --- a/src/Mod/Path/libarea/Area.cpp +++ b/src/Mod/Path/libarea/Area.cpp @@ -808,11 +808,11 @@ void CArea::InsideCurves(const CCurve& curve, std::list &curves_inside)c std::list pts; CurveIntersections(curve, pts); - //2.seperate curve2 in multiple curves between these intersections. + //2.separate curve2 in multiple curves between these intersections. std::list separate_curves; curve.ExtractSeparateCurves(pts, separate_curves); - //3. if the midpoint of a seperate curve lies in a1, then we return it. + //3. if the midpoint of a separate curve lies in a1, then we return it. for(std::list::iterator It = separate_curves.begin(); It != separate_curves.end(); It++) { CCurve &curve = *It; diff --git a/src/Mod/Path/libarea/clipper.cpp b/src/Mod/Path/libarea/clipper.cpp index 8237520e1..eff46a2b6 100644 --- a/src/Mod/Path/libarea/clipper.cpp +++ b/src/Mod/Path/libarea/clipper.cpp @@ -1516,7 +1516,7 @@ void Clipper::DisposeOutRec(PolyOutList::size_type index) void Clipper::SetWindingCount(TEdge &edge) { TEdge *e = edge.PrevInAEL; - //find the edge of the same polytype that immediately preceeds 'edge' in AEL + //find the edge of the same polytype that immediately precedes 'edge' in AEL while (e && ((e->PolyTyp != edge.PolyTyp) || (e->WindDelta == 0))) e = e->PrevInAEL; if (!e) { diff --git a/src/Mod/Path/libarea/clipper.hpp b/src/Mod/Path/libarea/clipper.hpp index b88bffd79..a882c4c0c 100644 --- a/src/Mod/Path/libarea/clipper.hpp +++ b/src/Mod/Path/libarea/clipper.hpp @@ -40,7 +40,7 @@ //improve performance but coordinate values are limited to the range +/- 46340 //#define use_int32 -//use_xyz: adds a Z member to IntPoint. Adds a minor cost to perfomance. +//use_xyz: adds a Z member to IntPoint. Adds a minor cost to performance. //#define use_xyz //use_lines: Enables line clipping. Adds a very minor cost to performance. diff --git a/src/Mod/Path/libarea/kurve/Finite.cpp b/src/Mod/Path/libarea/kurve/Finite.cpp index cb53c0146..464a4c6f5 100644 --- a/src/Mod/Path/libarea/kurve/Finite.cpp +++ b/src/Mod/Path/libarea/kurve/Finite.cpp @@ -510,7 +510,7 @@ namespace geoff_geometry { // Triangle3d methods bool Triangle3d::Intof(const Line& l, Point3d& intof)const { // returns intersection triangle to line in intof - // funtion returns true for intersection, false for no intersection + // function returns true for intersection, false for no intersection // method based on Möller & Trumbore(1997) (Barycentric coordinates) // based on incorrect Pseudo code from "Geometric Tools for Computer Graphics" p.487 if(box.outside(l.box) == true) return false; diff --git a/src/Mod/Path/libarea/kurve/Matrix.cpp b/src/Mod/Path/libarea/kurve/Matrix.cpp index ef033d2d4..7de02058d 100644 --- a/src/Mod/Path/libarea/kurve/Matrix.cpp +++ b/src/Mod/Path/libarea/kurve/Matrix.cpp @@ -546,7 +546,7 @@ namespace geoff_geometry { void Vector3d::arbitrary_axes(Vector3d& x, Vector3d& y){ // arbitrary axis algorithm - acad method of generating an arbitrary but - // consistant set of axes from a single normal ( z ) + // consistent set of axes from a single normal ( z ) // arbitrary x & y axes if ( ( fabs ( this->getx() ) < 1.0/64.0 ) && (fabs(this->gety()) < 1.0/64.0)) diff --git a/src/Mod/Path/libarea/kurve/offset.cpp b/src/Mod/Path/libarea/kurve/offset.cpp index 163d71ec1..9be457f7a 100644 --- a/src/Mod/Path/libarea/kurve/offset.cpp +++ b/src/Mod/Path/libarea/kurve/offset.cpp @@ -186,7 +186,7 @@ namespace geoff_geometry { sp0.dir = k.Get(kinVertex, sp0.p0, sp0.pc); sp0.ID = k.GetSpanID(kinVertex++); if (kinVertex == 1) { - ko.Start(sp0.p0); // start point mustn't dissappear for this simple method + ko.Start(sp0.p0); // start point mustn't disappear for this simple method ko.AddSpanID(sp0.ID); } if (kinVertex <= k.nSpans()) { // any more? diff --git a/src/Mod/Plot/plotAxes/TaskPanel.py b/src/Mod/Plot/plotAxes/TaskPanel.py index 4548f66f6..08256181b 100644 --- a/src/Mod/Plot/plotAxes/TaskPanel.py +++ b/src/Mod/Plot/plotAxes/TaskPanel.py @@ -325,7 +325,7 @@ class TaskPanel: def onRemove(self): """Executed when axes must be deleted.""" - # Ensure taht we can work + # Ensure that we can work plt = Plot.getPlot() if not plt: self.updateUI() diff --git a/src/Mod/Plot/plotSeries/TaskPanel.py b/src/Mod/Plot/plotSeries/TaskPanel.py index 0fc357fe4..163786442 100644 --- a/src/Mod/Plot/plotSeries/TaskPanel.py +++ b/src/Mod/Plot/plotSeries/TaskPanel.py @@ -291,7 +291,7 @@ class TaskPanel: self.skip = False def onColor(self): - """ Executed when color pallete is requested. """ + """ Executed when color palette is requested. """ plt = Plot.getPlot() if not plt: self.updateUI() diff --git a/src/Mod/Ship/TankInstance.py b/src/Mod/Ship/TankInstance.py index 325a58934..5708d97b8 100644 --- a/src/Mod/Ship/TankInstance.py +++ b/src/Mod/Ship/TankInstance.py @@ -157,7 +157,7 @@ class Tank: """Return the fluid volume center of gravity, provided the volume of fluid inside the tank. - The returned center of gravity is refered to the untransformed ship. + The returned center of gravity is referred to the untransformed ship. Keyword arguments: fp -- Part::FeaturePython object affected. diff --git a/src/Mod/Ship/shipAreasCurve/PlotAux.py b/src/Mod/Ship/shipAreasCurve/PlotAux.py index 5601be828..ad5fbf2de 100644 --- a/src/Mod/Ship/shipAreasCurve/PlotAux.py +++ b/src/Mod/Ship/shipAreasCurve/PlotAux.py @@ -34,7 +34,7 @@ class Plot(object): @param x X coordinates. @param y Transversal computed areas. @param disp Ship displacement. - @param xcb Bouyancy center length. + @param xcb Buoyancy center length. @param ship Active ship instance. """ self.plot(x, y, disp, xcb, ship) @@ -45,7 +45,7 @@ class Plot(object): @param x X coordinates. @param y Transversal areas. @param disp Ship displacement. - @param xcb Bouyancy center length. + @param xcb Buoyancy center length. @param ship Active ship instance. @return True if error happens. """ diff --git a/src/Mod/Ship/shipCreateShip/Tools.py b/src/Mod/Ship/shipCreateShip/Tools.py index 58403689c..8a6fdd70c 100644 --- a/src/Mod/Ship/shipCreateShip/Tools.py +++ b/src/Mod/Ship/shipCreateShip/Tools.py @@ -44,7 +44,7 @@ def createShip(solids, L, B, T): solids = Gui.ActiveDocument.ActiveObject.Object.Shape.Solids - Regarding the Lenght, Breadth, and Draft, it is strongly recommended to use + Regarding the Length, Breadth, and Draft, it is strongly recommended to use Units.parseQuantity method, e.g. The following obfuscated code snippet build such variables: diff --git a/src/Mod/Ship/shipHydrostatics/Tools.py b/src/Mod/Ship/shipHydrostatics/Tools.py index e6b663a75..1eb898860 100644 --- a/src/Mod/Ship/shipHydrostatics/Tools.py +++ b/src/Mod/Ship/shipHydrostatics/Tools.py @@ -231,7 +231,7 @@ def displacement(ship, draft=None, B -- Bouyance application point, i.e. Center of mass of the underwater side Cb -- Block coefficient - The Bouyance center is refered to the original ship position. + The Bouyance center is referred to the original ship position. """ if draft is None: draft = ship.Draft @@ -363,7 +363,7 @@ def floatingArea(ship, draft=None, if draft is None: draft = ship.Draft - # We wanna intersect the whole ship with the free surface, so in this case + # We want to intersect the whole ship with the free surface, so in this case # we must not use the underwater side (or the tool will fail) shape, _ = placeShipShape(ship.Shape.copy(), draft, roll, trim) diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp index b3d188131..a6e50b96a 100644 --- a/src/Mod/Spreadsheet/App/Sheet.cpp +++ b/src/Mod/Spreadsheet/App/Sheet.cpp @@ -711,7 +711,7 @@ void Sheet::recomputeCell(CellAddress p) if (cell) cell->setException(e.what()); - // Mark as erronous + // Mark as erroneous cellErrors.insert(p); } @@ -800,7 +800,7 @@ DocumentObjectExecReturn *Sheet::execute(void) while (i != VertexList.end()) { Cell * cell = cells.getValue(i->first); - // Mark as erronous + // Mark as erroneous cellErrors.insert(i->first); if (cell) @@ -1164,7 +1164,7 @@ std::string Sheet::getAddressFromAlias(const std::string &alias) const } /** - * @brief Determine whether a given alias candiate is valid or not. + * @brief Determine whether a given alias candidate is valid or not. * * A candidate is valid is the string is syntactically correct, * and the alias does not conflict with an existing property. diff --git a/src/Mod/Spreadsheet/App/Spreadsheet_legacy.py b/src/Mod/Spreadsheet/App/Spreadsheet_legacy.py index 7ae105edd..b6245c175 100644 --- a/src/Mod/Spreadsheet/App/Spreadsheet_legacy.py +++ b/src/Mod/Spreadsheet/App/Spreadsheet_legacy.py @@ -102,7 +102,7 @@ class MathParser: denominator = self.parseParenthesis() if denominator == 0: raise ZeroDivisionError( - "Division by 0 kills baby whales (occured at index " + + "Division by 0 kills baby whales (occurred at index " + str(div_index) + ")") values.append(1.0 / denominator) @@ -1007,7 +1007,7 @@ def makeSpreadsheetController(spreadsheet,cell=None,direction=None): def makeSpreadsheetPropertyController(spreadsheet,object=None,prop=None,cell=None): """makeSpreadsheetPropertyController(spreadsheet,[object,prop,cell]): adds a - property controller, targetting the given object if any, to the given spreadsheet. + property controller, targeting the given object if any, to the given spreadsheet. You can give a property (such as "Length" or "Proxy.Length") and a cell address (such as "B6").""" obj = FreeCAD.ActiveDocument.addObject("App::FeaturePython","PropertyController") diff --git a/src/Mod/Spreadsheet/TestSpreadsheet.py b/src/Mod/Spreadsheet/TestSpreadsheet.py index 1a702fac3..b7d14704a 100644 --- a/src/Mod/Spreadsheet/TestSpreadsheet.py +++ b/src/Mod/Spreadsheet/TestSpreadsheet.py @@ -736,7 +736,7 @@ class SpreadsheetCases(unittest.TestCase): self.assertIn('Up-to-date',sketch.State) def testCrossDocumentLinks(self): - """ Expressions accross files are not saved (bug #2442) """ + """ Expressions across files are not saved (bug #2442) """ # Create a box box = self.doc.addObject('Part::Box', 'Box') diff --git a/src/Mod/Spreadsheet/importXLSX.py b/src/Mod/Spreadsheet/importXLSX.py index 7930f4aaa..880b6241e 100644 --- a/src/Mod/Spreadsheet/importXLSX.py +++ b/src/Mod/Spreadsheet/importXLSX.py @@ -339,7 +339,7 @@ def handleCells(cellList, actCellSheet, sList): if refType: cellType = getText(refType.childNodes) else: - cellType = 'n' # fix me some cells dont have t and s attributes + cellType = 'n' # FIXME: some cells don't have t and s attributes #print("reference: ", ref, ' Cell type: ', cellType) diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp index d17a8c019..cbc001c44 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp @@ -171,7 +171,7 @@ DrawProjGroup::~DrawProjGroup() void DrawProjGroup::onChanged(const App::Property* prop) { - //TODO: For some reason, when the projection type is changed, the isometric views show change appropriately, but the orthographic ones dont... Or vice-versa. WF: why would you change from 1st to 3rd in mid drawing? + //TODO: For some reason, when the projection type is changed, the isometric views show change appropriately, but the orthographic ones don't... Or vice-versa. WF: why would you change from 1st to 3rd in mid drawing? //if group hasn't been added to page yet, can't scale or distribute projItems TechDraw::DrawPage *page = getPage(); if (!isRestoring() && page) { @@ -280,7 +280,7 @@ Base::BoundBox3d DrawProjGroup::getBoundingBox() const bb.ScaleX(1. / part->Scale.getValue()); bb.ScaleY(1. / part->Scale.getValue()); - // X and Y of dependant views are relative to the anchorView + // X and Y of dependent views are relative to the anchorView if (part != anchorView) { bb.MoveX(part->X.getValue()); bb.MoveY(part->Y.getValue()); diff --git a/src/Mod/TechDraw/App/EdgeWalker.cpp b/src/Mod/TechDraw/App/EdgeWalker.cpp index bd6c3b6e9..30fa9a1b4 100644 --- a/src/Mod/TechDraw/App/EdgeWalker.cpp +++ b/src/Mod/TechDraw/App/EdgeWalker.cpp @@ -594,7 +594,7 @@ std::vector embedItem::sortIncidenceList (std::vectorgetDocument()->getObject(msg.pObjectName); if(obj) { std::string str = msg.pSubName; - // If it's a subfeature, dont select feature + // If it's a subfeature, don't select feature if (!str.empty()) { if (TechDraw::DrawUtil::getGeomTypeFromName(str) == "Face" || TechDraw::DrawUtil::getGeomTypeFromName(str) == "Edge" ||