diff --git a/ChangeLog.txt b/ChangeLog.txt index 16f468e5b2..b459e6d706 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,4 @@ -Changelog you find now here: -http://www.freecadweb.org/tracker/changelog_page.php +Note: Future changelog now located at: http://www.freecadweb.org/tracker/changelog_page.php Version: 0.14 * Python path messed up after installation @@ -906,7 +905,7 @@ Version: V0.1B50 Date: Fri Apr 04 22:10:24 2003 +++++++++++++++++++++++++++++++ * some work on the Linux port Version: V0.1B49 Date: Thu Apr 03 22:45:35 2003 +++++++++++++++++++++++++++++++ - * Master redisign of the window system, not yet full working + * Master redesign of the window system, not yet full working Version: V0.1B48 Date: Sun Mar 30 15:06:23 2003 +++++++++++++++++++++++++++++++ * Big patch from Werner about: @@ -952,10 +951,10 @@ Version: V0.1B39 Date: Mon Mar 03 12:32:14 2003 +++++++++++++++++++++++++++++++ Version: V0.1B38 Date: Thu Feb 27 22:19:35 2003 +++++++++++++++++++++++++++++++ * fix of memory leack in CmdBar (werner) - * start rebulding FCCommand framework + * start rebuilding FCCommand framework Version: V0.1B37 Date: Tue Feb 25 20:29:19 2003 +++++++++++++++++++++++++++++++ - * massiv improved costomize dialog (werner) + * massively improved customize dialog (werner) - sorting position of toolbars Version: V0.1B36 Date: Sat Feb 22 18:12:19 2003 +++++++++++++++++++++++++++++++ diff --git a/src/App/Application.cpp b/src/App/Application.cpp index 0d07124a79..9f72b685c8 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -1015,7 +1015,7 @@ void Application::destruct(void) _pcSysParamMngr = 0; _pcUserParamMngr = 0; - // not initialized or doubel destruct! + // not initialized or double destruct! assert(_pcSingleton); delete _pcSingleton; diff --git a/src/App/Expression.cpp b/src/App/Expression.cpp index ccde68680d..88eb3fbc33 100644 --- a/src/App/Expression.cpp +++ b/src/App/Expression.cpp @@ -1876,7 +1876,7 @@ std::vector > tokenize(const std::string &st * returned expression. If the parser fails for some reason, and exception is thrown. * * @param owner The DocumentObject that will own the expression. - * @param buffer The sting buffer to parse. + * @param buffer The string buffer to parse. * * @returns A pointer to an expression. * diff --git a/src/App/ExtensionContainer.cpp b/src/App/ExtensionContainer.cpp index 8950db6d78..627719a931 100644 --- a/src/App/ExtensionContainer.cpp +++ b/src/App/ExtensionContainer.cpp @@ -288,7 +288,7 @@ void ExtensionContainer::onChanged(const Property* prop) { void ExtensionContainer::Save(Base::Writer& writer) const { //Note: save extensions must be called first to ensure that the extension element is always the - // very first inside the object element. That is needed as extension eleent works together with + // very first inside the object element. This is needed since extension element works together with // an object attribute, and if another element would be read first the object attributes would be // cleared. saveExtensions(writer); diff --git a/src/Base/BoundBoxPyImp.cpp b/src/Base/BoundBoxPyImp.cpp index e602f8b583..b5730e3596 100644 --- a/src/Base/BoundBoxPyImp.cpp +++ b/src/Base/BoundBoxPyImp.cpp @@ -574,7 +574,7 @@ Py::Float BoundBoxPy::getZLength(void) const Py::Float BoundBoxPy::getDiagonalLength(void) const { if (!getBoundBoxPtr()->IsValid()) - throw Py::FloatingPointError("Cannot deterine diagonal length of invalid bounding box"); + throw Py::FloatingPointError("Cannot determine diagonal length of invalid bounding box"); return Py::Float(getBoundBoxPtr()->CalcDiagonalLength()); } diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp index b3fad42e94..927a4e101b 100644 --- a/src/Base/Interpreter.cpp +++ b/src/Base/Interpreter.cpp @@ -486,7 +486,7 @@ const char* InterpreterSingleton::init(int argc,char *argv[]) Py_SetProgramName(argv[0]); #endif // There is a serious bug in VS from 2010 until 2013 where the file descriptor for stdin, stdout or stderr - // returns a valid value for GUI applications (i.e. subsytem = Windows) where it shouldn't. + // returns a valid value for GUI applications (i.e. subsystem = Windows) where it shouldn't. // This causes Python to fail during initialization. // A workaround is to use freopen on stdin, stdout and stderr. See the class Redirection inside main() // https://bugs.python.org/issue17797#msg197474 diff --git a/src/Gui/Application.h b/src/Gui/Application.h index 2d9dcc5823..6feef81112 100644 --- a/src/Gui/Application.h +++ b/src/Gui/Application.h @@ -79,7 +79,7 @@ public: void detachView(Gui::BaseView* pcView); /// get called if a view gets activated, this manage the whole activation scheme void viewActivated(Gui::MDIView* pcView); - /// call update to all docuemnts an all views (costly!) + /// call update to all documents and all views (costly!) void onUpdate(void); /// call update to all views of the active document void updateActive(void); diff --git a/src/Gui/Selection.h b/src/Gui/Selection.h index bb79394559..bb09aafc97 100644 --- a/src/Gui/Selection.h +++ b/src/Gui/Selection.h @@ -103,7 +103,7 @@ public: // 'explicit instantiation of 'class Base::Subject' // in namespace 'Gui' (which does not enclose namespace 'Base') // -// It seems that this costruct is not longer needed for gcc4.4 and even leads to +// It seems that this construct is not longer needed for gcc4.4 and even leads to // errors under Mac OS X. Thus, we check for version between 4.1 and 4.4. // It seems that for Mac OS X this can be completely ignored diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h index 385456231c..eafb38f5a8 100644 --- a/src/Gui/View3DInventorViewer.h +++ b/src/Gui/View3DInventorViewer.h @@ -101,7 +101,7 @@ public: /** @name Anti-Aliasing modes of the rendered 3D scene * Specifies Anti-Aliasing (AA) method * - Smoothing enables OpenGL line and vertex smoothing (basically depreciated) - * - MSAA is hardware multi sampling (with 2, 4 or 8 passes), a quite commom and efficient AA technique + * - MSAA is hardware multi sampling (with 2, 4 or 8 passes), a quite common and efficient AA technique */ //@{ enum AntiAliasing { diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py index ff25f40fad..8656192038 100644 --- a/src/Mod/Arch/ArchComponent.py +++ b/src/Mod/Arch/ArchComponent.py @@ -95,7 +95,7 @@ else: def convertOldComponents(objs=[]): """converts Arch Objects with a Role property to the new IfcRole. - if no object is given, all object sof the active document are converted""" + if no object is given, all objects of the active document are converted""" if not objs: objs = FreeCAD.ActiveDocument.Objects if not isinstance(objs,list): diff --git a/src/Mod/Arch/Dice3DS/dom3ds.py b/src/Mod/Arch/Dice3DS/dom3ds.py index 84e140a17e..e866be7aeb 100644 --- a/src/Mod/Arch/Dice3DS/dom3ds.py +++ b/src/Mod/Arch/Dice3DS/dom3ds.py @@ -1743,7 +1743,7 @@ def read_3ds_mem(membuf,check_magic=True,tight=False,recover=True): recover=True) buffer: is an image of the 3DS file in memory. It could be - a string, an mmaped file, or something else. + a string, a mapped file, or something else. check_magic: If true, this function checks that the top level chunk is the 3DS magic chunk (0x4D4D), and raises an exception diff --git a/src/Mod/Cam/App/cutting_tools.cpp b/src/Mod/Cam/App/cutting_tools.cpp index 1aae9fa25a..4674a7b54c 100644 --- a/src/Mod/Cam/App/cutting_tools.cpp +++ b/src/Mod/Cam/App/cutting_tools.cpp @@ -828,7 +828,7 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) // // // outfile << projectedPoint.X() <<","< finalPointscorrected; // finalPointscorrected.clear(); diff --git a/src/Mod/Fem/femcommands/commands.py b/src/Mod/Fem/femcommands/commands.py index a3f89eac42..4349216157 100644 --- a/src/Mod/Fem/femcommands/commands.py +++ b/src/Mod/Fem/femcommands/commands.py @@ -708,7 +708,7 @@ class _CommandFemSolverZ88(CommandManager): FreeCADGui.doCommand("FemGui.getActiveAnalysis().addObject(ObjectsFem.makeSolverZ88(FreeCAD.ActiveDocument))") -# the sting in add command will be the page name on FreeCAD wiki +# the string in add command will be the page name on FreeCAD wiki FreeCADGui.addCommand('FEM_Analysis', _CommandFemAnalysis()) FreeCADGui.addCommand('FEM_ConstraintBodyHeatSource', _CommandFemConstraintBodyHeatSource()) FreeCADGui.addCommand('FEM_ConstraintElectrostaticPotential', _CommandFemConstraintElectrostaticPotential()) diff --git a/src/Mod/Fem/feminout/importZ88O2Results.py b/src/Mod/Fem/feminout/importZ88O2Results.py index 3b5d3a6872..d4a91bcdcc 100644 --- a/src/Mod/Fem/feminout/importZ88O2Results.py +++ b/src/Mod/Fem/feminout/importZ88O2Results.py @@ -114,7 +114,7 @@ def import_z88_disp(filename, analysis=None, result_name_prefix=None): def read_z88_disp(z88_disp_input): ''' read a z88 disp file and extract the nodes and elements - z88 Displacment output file is z88o2.txt + z88 Displacement output file is z88o2.txt works with Z88OS14 ''' nodes = {} diff --git a/src/Mod/Fem/femtest/testtools.py b/src/Mod/Fem/femtest/testtools.py index 1d39497862..9a7443eea6 100644 --- a/src/Mod/Fem/femtest/testtools.py +++ b/src/Mod/Fem/femtest/testtools.py @@ -96,7 +96,8 @@ def compare_files(file_name1, file_name2): file1 = open(file_name1, 'r') f1 = file1.readlines() file1.close() - # workaraound for compare geos of elmer test and temporary file path (not only names change, path changes with operating system) + # workaround to compare geos of elmer test and temporary file path + # (not only names change, path changes with operating system) lf1 = [l for l in f1 if not (l.startswith('Merge "') or l.startswith('Save "') or l.startswith('// '))] lf1 = force_unix_line_ends(lf1) file2 = open(file_name2, 'r') diff --git a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp index 6bfd94328d..b115af21a5 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp +++ b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp @@ -203,19 +203,19 @@ void LscmRelax::relax(double weight) K_g_triplets.push_back(trip(row_pos * 2 + 1, col_pos * 2, K_m(j * 2 + 1, k * 2))); K_g_triplets.push_back(trip(row_pos * 2 + 1, col_pos * 2 + 1, K_m(j * 2 + 1, k * 2 + 1))); K_g_triplets.push_back(trip(row_pos * 2, col_pos * 2 + 1, K_m(j * 2, k * 2 + 1))); - // we don't have to fill all because the matrix is symetric. + // we don't have to fill all because the matrix is symmetric. } } } // FIXING SOME PINS: // - if there are no pins (or only one pin) selected solve the system without the nullspace solution. - // - if there are some pins selected, delete all colums, rows that refer to this pins + // - if there are some pins selected, delete all columns, rows that refer to this pins // set the diagonal element of these pins to 1 + the rhs to zero // (? is it possible to fix in the inner of the face? for sure for fem, but lscm could have some problems) // (we also need some extra variables to see if the pins come from user) // fixing some points - // allthough only internal forces are applied there has to be locked + // although only internal forces are applied there has to be locked // at least 3 degrees of freedom to stop the mesh from pure rotation and pure translation // std::vector fixed_dof; // fixed_dof.push_back(this->triangles(0, 0) * 2); //x0 @@ -539,7 +539,7 @@ void LscmRelax::set_q_l_m() void LscmRelax::set_fixed_pins() { // if less then one fixed pin is set find two by an automated algorithm and align them to y = 0 - // if more then two pins are choosen find a leastsquare-plane and project the points on it + // if more then two pins are chosen find a leastsquare-plane and project the points on it // insert the points in the flat-vertices vector if (this->fixed_pins.size() == 0) this->fixed_pins.push_back(0); diff --git a/src/Mod/OpenSCAD/expandplacements.py b/src/Mod/OpenSCAD/expandplacements.py index c452528b1b..b121f7e56a 100644 --- a/src/Mod/OpenSCAD/expandplacements.py +++ b/src/Mod/OpenSCAD/expandplacements.py @@ -25,8 +25,8 @@ __author__ = "Sebastian Hoogen" __url__ = ["http://www.freecadweb.org"] ''' -This Script includes python functions to shift all placements down the -feature tree to the most baisc objects +This Script includes python functions to shift all placements down the +feature tree to the most basic objects ''' import FreeCAD diff --git a/src/Mod/OpenSCAD/exportCSG.py b/src/Mod/OpenSCAD/exportCSG.py index d40787d8c5..f73aa6c10d 100644 --- a/src/Mod/OpenSCAD/exportCSG.py +++ b/src/Mod/OpenSCAD/exportCSG.py @@ -68,7 +68,7 @@ def check_multmatrix(csg,ob,x,y,z): return 2 # center = true and no mm else: m = ob.Placement.toMatrix() - # adjust position for center displacments + # adjust position for center displacements csg.write("multmatrix([["+str(m.A11)+", "+str(m.A12)+", "+str(m.A13)+",\ "+str(m.A14)+"], ["\ +str(m.A21)+", "+str(m.A22)+", "+str(m.A23)+", "+str(m.A24)+"], ["\ diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index 270714ffb5..60f0ee16d0 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -1768,7 +1768,7 @@ TopoDS_Shape Area::getShape(int index) { FC_TIME_INIT(t); - // do offset first, then pocket the inner most offseted shape + // do offset first, then pocket the inner most offsetted shape std::list > areas; makeOffset(areas,PARAM_FIELDS(AREA_MY,AREA_PARAMS_OFFSET)); diff --git a/src/Mod/Path/App/Area.h b/src/Mod/Path/App/Area.h index fbfd81b5bb..08a671663d 100644 --- a/src/Mod/Path/App/Area.h +++ b/src/Mod/Path/App/Area.h @@ -145,10 +145,10 @@ protected: * Mainly for checking if there is any faces for auto fill*/ void addToBuild(CArea &area, const TopoDS_Shape &shape); - /** Called internally to obtain the combained children shapes */ + /** Called internally to obtain the combined children shapes */ TopoDS_Shape toShape(CArea &area, short fill, int reorient=0); - /** Obtain a list of offseted areas + /** Obtain a list of offsetted areas * * See #AREA_PARAMS_OFFSET for description of the arguments. */ @@ -259,7 +259,7 @@ public: /** Clean internal caches * - * The combained shapes is cached internally to make other operation more + * The combined shapes is cached internally to make other operation more * efficient, such as makeOffset() and makePocket() * * \arg \c deleteShapes: if true, delete all children shapes. diff --git a/src/Mod/Path/App/ParamsHelper.h b/src/Mod/Path/App/ParamsHelper.h index 9fc2e47c3f..bcb0fed0fd 100644 --- a/src/Mod/Path/App/ParamsHelper.h +++ b/src/Mod/Path/App/ParamsHelper.h @@ -102,7 +102,7 @@ * parameters are defined, short, long, double, bool, enum, enum2. * \enum2 type is the same as \enum with additional information to be able to * map to a user defined C enum type. To add more types, search this file for - * keyword \a _short, and supply all relavant macros. It's quite trivial + * keyword \a _short, and supply all relevant macros. It's quite trivial * actually. * * - \c arg is the argument name. It is intended to be used as function argument. diff --git a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py index 9970559aa9..79b1928fba 100644 --- a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py +++ b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py @@ -522,7 +522,7 @@ class PathData: return self.baseWire is not None def findZLimits(self, edges): - # not considering arcs and spheres in Z direction, find the highes and lowest Z values + # not considering arcs and spheres in Z direction, find the highest and lowest Z values minZ = 99999999999 maxZ = -99999999999 for e in edges: diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.cpp b/src/Mod/Sketcher/App/PropertyConstraintList.cpp index 61e59dec10..6967d7aea4 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.cpp +++ b/src/Mod/Sketcher/App/PropertyConstraintList.cpp @@ -151,7 +151,7 @@ void PropertyConstraintList::setValue(const Constraint* lValue) if (renamed.size() > 0) signalConstraintsRenamed(renamed); - /* Collect infor about removals */ + /* Collect info about removals */ for (unsigned int i = start; i < _lValueList.size(); i++) { valueMap.erase(_lValueList[i]->tag); removed.insert(makePath(i, _lValueList[i])); diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index 57765dbde7..2787c7819b 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -4288,7 +4288,7 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m return false; } - // we succeeded with the multiplicity modification, so aligment geometry may be invalid/inconsistent for the new bspline + // we succeeded with the multiplicity modification, so alignment geometry may be invalid/inconsistent for the new bspline std::vector delGeoId; @@ -4344,7 +4344,7 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m newConstr->InternalAlignmentIndex = prevpole[(*it)->InternalAlignmentIndex]; newcVals.push_back(newConstr); } - else { // it is an internal aligment geometry that is no longer valid => delete it and the pole circle + else { // it is an internal alignment geometry that is no longer valid => delete it and the pole circle delGeoId.push_back((*it)->First); } } @@ -4355,7 +4355,7 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m newConstr->InternalAlignmentIndex = prevknot[(*it)->InternalAlignmentIndex]; newcVals.push_back(newConstr); } - else { // it is an internal aligment geometry that is no longer valid => delete it and the knot point + else { // it is an internal alignment geometry that is no longer valid => delete it and the knot point delGeoId.push_back((*it)->First); } } @@ -6065,8 +6065,8 @@ int SketchObject::port_reversedExternalArcs(bool justAnalyze) /// ///Arguments: /// cstr - pointer to a constraint to be locked/unlocked -/// bForce - specifies whether to ignore tha already locked constraint or not. -/// bLock - specufies whether to lock the constraint or not (if bForce is +/// bForce - specifies whether to ignore the already locked constraint or not. +/// bLock - specifies whether to lock the constraint or not (if bForce is /// true, the constraint gets unlocked, otherwise nothing is done at all). /// ///Return values: diff --git a/src/Mod/Sketcher/App/SketchPyImp.cpp b/src/Mod/Sketcher/App/SketchPyImp.cpp index eb6311d8a6..01252f5554 100644 --- a/src/Mod/Sketcher/App/SketchPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchPyImp.cpp @@ -58,7 +58,7 @@ int SketchPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) return 0; } -// +++ methodes implementer ++++++++++++++++++++++++++++++++++++++++++++++++ +// +++ methods implementer ++++++++++++++++++++++++++++++++++++++++++++++++ PyObject* SketchPy::solve(PyObject *args) { diff --git a/src/Mod/Sketcher/App/planegcs/Constraints.cpp b/src/Mod/Sketcher/App/planegcs/Constraints.cpp index f17b89161a..3689497084 100644 --- a/src/Mod/Sketcher/App/planegcs/Constraints.cpp +++ b/src/Mod/Sketcher/App/planegcs/Constraints.cpp @@ -1564,7 +1564,7 @@ void ConstraintCurveValue::errorgrad(double *err, double *grad, double *param) if (grad) *grad = err_vec.dy; } else { - assert(false/*this constraint is neighter X nor Y. Nothing to do..*/); + assert(false/*this constraint is neither X nor Y. Nothing to do..*/); } } diff --git a/src/Mod/Sketcher/SketcherExample.py b/src/Mod/Sketcher/SketcherExample.py index ca8fbb40df..da99250cd9 100644 --- a/src/Mod/Sketcher/SketcherExample.py +++ b/src/Mod/Sketcher/SketcherExample.py @@ -1,4 +1,4 @@ -# Example hwo to use the basic sketcher tools +# Example how to use the basic sketcher tools from Sketcher import * from Part import * from FreeCAD import * diff --git a/src/Mod/TechDraw/App/Cube.cpp b/src/Mod/TechDraw/App/Cube.cpp index bfe11309ff..28a92ff366 100644 --- a/src/Mod/TechDraw/App/Cube.cpp +++ b/src/Mod/TechDraw/App/Cube.cpp @@ -94,7 +94,7 @@ void Cube::initialize(Base::Vector3d r, Base::Vector3d rr, Base::Vector3d l, Bas // rotate/spin the subject inside the glass cube // effectively, rotate/spin the cube in reverse of the apparent subject movement -//TODO: there is a problem with calculaion of view rotation vector when the axis of rotation is +//TODO: there is a problem with calculation of view rotation vector when the axis of rotation is // +/-Y. There is hack code here to handle it, but there should be a more elegant solution // subject CW about Right diff --git a/src/Tools/generateBase/generateDS.py b/src/Tools/generateBase/generateDS.py index dfee3e9912..744e461c06 100644 --- a/src/Tools/generateBase/generateDS.py +++ b/src/Tools/generateBase/generateDS.py @@ -187,7 +187,7 @@ class XschemaElement: self.mixed = 0 self.base = None self.mixedExtensionError = 0 - # Attribute definitions for the currect element. + # Attribute definitions for the correct element. self.attributeDefs = {} # Attribute definitions for the current attributeGroup, if there is one. self.attributeGroup = None @@ -3025,7 +3025,7 @@ def generateSubclasses(root, subclassFilename, behaviorFilename, baseUrl = None if behaviorFilename: try: - # Add the currect working directory to the path so that + # Add the correct working directory to the path so that # we use the user/developers local copy. sys.path.insert(0, '.') import xmlbehavior_sub as xmlbehavior