From b45bc4889d390eb50022a49a58c6af80f4a328f5 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Fri, 16 Mar 2018 15:45:00 -0400 Subject: [PATCH] Misc. typos: Please merge right before 0.17 release I'm still finding typos in the source code. I propose that you keep this PR open prior ro relaese and then merge so that if I find other typos in the meantime they will be part this release. --- ChangeLog.txt | 2 +- src/App/Document.h | 2 +- src/App/PropertyContainer.cpp | 2 +- src/Gui/ViewProviderOriginFeature.cpp | 2 +- src/Mod/Draft/importOCA.py | 2 +- src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp | 2 +- src/Mod/Import/Gui/AppImportGuiPy.cpp | 3 +-- src/Mod/OpenSCAD/ply/CHANGES | 4 ++-- src/Mod/Part/App/FaceMaker.cpp | 2 +- src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp | 2 +- src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp | 6 +++--- src/Mod/Path/libarea/kurve/kurve.cpp | 4 ++-- src/Mod/ReverseEngineering/App/SurfaceTriangulation.h | 2 +- src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp | 2 +- src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.hpp | 4 ++-- src/Mod/Robot/App/kdl_cp/treeiksolverpos_online.hpp | 4 ++-- src/Mod/Ship/shipCapacityCurve/Tools.py | 2 +- src/Mod/TechDraw/App/DrawViewCollection.cpp | 2 +- src/Tools/MakeMacBundleRelocatable.py | 2 +- 19 files changed, 25 insertions(+), 26 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 1ab51adc23..cd2edf5fcb 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -608,7 +608,7 @@ Version: V0.1B109 Date: Mon Jan 24 11:13:15 2005 +++++++++++++++++++++++++++++++ - SetStatus and GetStatus switch on or off the observer Version: V0.1B108 Date: Sat Jan 15 14:24:52 2005 +++++++++++++++++++++++++++++++ - * Moved HtmlView to HelpView * Reimplementaion + * Moved HtmlView to HelpView * Reimplementation * Added class FileChooser ( line edit with button on its right side to browse) * Merged pref. page "Help viewer" and "Online Help" to one page * TextEdit class with completion diff --git a/src/App/Document.h b/src/App/Document.h index 515e580545..7f3235675b 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -276,7 +276,7 @@ public: void setUndoMode(int iMode); /// switch the level of Undo/Redo int getUndoMode(void) const; - /// switch the tranaction mode + /// switch the transaction mode void setTransactionMode(int iMode); /// Open a new command Undo/Redo, an UTF-8 name can be specified void openTransaction(const char* name=0); diff --git a/src/App/PropertyContainer.cpp b/src/App/PropertyContainer.cpp index 5186b32fcd..877fbc575d 100644 --- a/src/App/PropertyContainer.cpp +++ b/src/App/PropertyContainer.cpp @@ -48,7 +48,7 @@ TYPESYSTEM_SOURCE(App::PropertyContainer,Base::Persistence); //************************************************************************** // Construction/Destruction -// here the implemataion! description should take place in the header file! +// Here's the implementation! Description should take place in the header file! PropertyContainer::PropertyContainer() { propertyData.parentPropertyData = 0; diff --git a/src/Gui/ViewProviderOriginFeature.cpp b/src/Gui/ViewProviderOriginFeature.cpp index 05fb1a890b..3b28561e71 100644 --- a/src/Gui/ViewProviderOriginFeature.cpp +++ b/src/Gui/ViewProviderOriginFeature.cpp @@ -116,7 +116,7 @@ void ViewProviderOriginFeature::attach(App::DocumentObject* pcObject) highlight->documentName = getObject()->getDocument()->getName(); highlight->style = SoFCSelection::EMISSIVE_DIFFUSE; - // Style for normal (visiable) lines + // Style for normal (visible) lines SoDrawStyle* style = new SoDrawStyle (); style->lineWidth = 2.0f; highlight->addChild ( style ); diff --git a/src/Mod/Draft/importOCA.py b/src/Mod/Draft/importOCA.py index f8cb5769e3..fdd6b9b54a 100644 --- a/src/Mod/Draft/importOCA.py +++ b/src/Mod/Draft/importOCA.py @@ -30,7 +30,7 @@ __url__ = ["http://www.freecadweb.org"] # \ingroup DRAFT # \brief OCA (Open CAD Format) file import & export # -# This module provides support for importing and exporting to the OCA format fron GCAD3D. +# This module provides support for importing and exporting to the OCA format from GCAD3D. # Warning, this file format is today practically obsolete and this module is not # maintained anymore. diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp index 4f6357cd4a..28578e8479 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp @@ -546,7 +546,7 @@ void ViewProviderFemPostObject::onChanged(const App::Property* prop) { } bool ViewProviderFemPostObject::doubleClicked(void) { - // work around for a problme in VTK implementation: https://forum.freecadweb.org/viewtopic.php?t=10587&start=130#p125688 + // work around for a problem in VTK implementation: https://forum.freecadweb.org/viewtopic.php?t=10587&start=130#p125688 // check if backlight is enabled ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); bool isBackLightEnabled = hGrp->GetBool("EnableBacklight", false); diff --git a/src/Mod/Import/Gui/AppImportGuiPy.cpp b/src/Mod/Import/Gui/AppImportGuiPy.cpp index 7f7a87ae60..b83092d9ed 100644 --- a/src/Mod/Import/Gui/AppImportGuiPy.cpp +++ b/src/Mod/Import/Gui/AppImportGuiPy.cpp @@ -520,7 +520,7 @@ private: keepExplicitPlacement = Standard_True; Import::ExportOCAF ocaf(hDoc, keepExplicitPlacement); - // That stuff is exporting a list of selected oject into FreeCAD Tree + // That stuff is exporting a list of selected objects into FreeCAD Tree std::vector hierarchical_label; std::vector hierarchical_loc; std::vector hierarchical_part; @@ -533,7 +533,6 @@ private: } } - // Free Shapes must have absolute placement and not explicit // Free Shapes must have absolute placement and not explicit std::vector FreeLabels; std::vector part_id; diff --git a/src/Mod/OpenSCAD/ply/CHANGES b/src/Mod/OpenSCAD/ply/CHANGES index 34bf50f982..c3340b460d 100644 --- a/src/Mod/OpenSCAD/ply/CHANGES +++ b/src/Mod/OpenSCAD/ply/CHANGES @@ -134,7 +134,7 @@ Version 3.0 to specify a logging object for the 'parser.out' output. 01/09/09: beazley - *HUGE* refactoring of the the ply.yacc() implementation. The high-level + *HUGE* refactoring of the ply.yacc() implementation. The high-level user interface is backwards compatible, but the internals are completely reorganized into classes. No more global variables. The internals are also more extensible. For example, you can use the classes to @@ -174,7 +174,7 @@ Version 3.0 directly. Preparation for Python 3.0 support. 11/04/08: beazley - Fixed a bug with referring to symbols on the the parsing stack using negative + Fixed a bug with referring to symbols on the parsing stack using negative indices. 05/29/08: beazley diff --git a/src/Mod/Part/App/FaceMaker.cpp b/src/Mod/Part/App/FaceMaker.cpp index b2ce2eb904..a42e6fb0c4 100644 --- a/src/Mod/Part/App/FaceMaker.cpp +++ b/src/Mod/Part/App/FaceMaker.cpp @@ -158,7 +158,7 @@ std::unique_ptr Part::FaceMaker::ConstructFromType(Base::Type t void Part::FaceMaker::throwNotImplemented() { - throw Base::NotImplementedError("Not implemente yet..."); + throw Base::NotImplementedError("Not implemented yet..."); } diff --git a/src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp b/src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp index fbe08bfd1d..5ce247fa55 100644 --- a/src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp @@ -164,7 +164,7 @@ bool TaskDlgFeatureParameters::reject() // if abort command deleted the object make the previous feature visible again if (!Gui::Application::Instance->getViewProvider(feature)) { - // Make the tip or the previous feature visiable again with preference to the previous one + // Make the tip or the previous feature visible again with preference to the previous one // TODO: ViewProvider::onDelete has the same code. May be this one is excess? if (previous && Gui::Application::Instance->getViewProvider(previous)) { Gui::Application::Instance->getViewProvider(previous)->show(); diff --git a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp index 90f85d70bb..228226ced8 100644 --- a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp @@ -255,13 +255,13 @@ bool TaskDlgSketchBasedParameters::reject() Sketcher::SketchObject *pcSketch = static_cast(pcSketchBased->Profile.getValue()); bool rv; - // rv should be true anyway but to be on the safe side dur to thurver changes better respect it. + // rv should be true anyway but to be on the safe side due to further changes better respect it. rv = TaskDlgFeatureParameters::reject(); // if abort command deleted the object the sketch is visible again. - // The the previous one feature already should be made visiable + // The previous one feature already should be made visible if (!Gui::Application::Instance->getViewProvider(pcSketchBased)) { - // Make the sketch visiable + // Make the sketch visible if (pcSketch && Gui::Application::Instance->getViewProvider(pcSketch)) Gui::Application::Instance->getViewProvider(pcSketch)->show(); } diff --git a/src/Mod/Path/libarea/kurve/kurve.cpp b/src/Mod/Path/libarea/kurve/kurve.cpp index 1688cda56b..66cb3d413c 100644 --- a/src/Mod/Path/libarea/kurve/kurve.cpp +++ b/src/Mod/Path/libarea/kurve/kurve.cpp @@ -917,7 +917,7 @@ return; } Point Kurve::Near(const Point& p, int& nearSpanNumber)const { - // finds the nearest span on kurve to the the given point, nearSpanNumber is the spannumber + // finds the nearest span on kurve to the given point, nearSpanNumber is the spannumber double minDist = 1.0e100; Point pNear, pn; @@ -939,7 +939,7 @@ return; Point Kurve::NearToVertex(const Point& p, int& nearSpanNumber)const { - // finds the nearest span endpoint on kurve to the the given point, nearSpanNumber is the spannumber + // finds the nearest span endpoint on kurve to the given point, nearSpanNumber is the spannumber double minDistSquared = 1.0e100; Point pn; diff --git a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h index e075ae9c82..09a46e1a5a 100644 --- a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h +++ b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h @@ -95,7 +95,7 @@ public: inline void setDepth (int depth) { this->depth = depth; } - /** \brief Set the the depth at which a block Gauss-Seidel solver is used to solve the Laplacian equation + /** \brief Set the depth at which a block Gauss-Seidel solver is used to solve the Laplacian equation * \note Using this parameter helps reduce the memory overhead at the cost of a small increase in * reconstruction time. (In practice, we have found that for reconstructions of depth 9 or higher a subdivide * depth of 7 or 8 can greatly reduce the memory usage.) diff --git a/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp b/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp index 3fad6fe263..a130620aeb 100644 --- a/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp +++ b/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp @@ -91,7 +91,7 @@ void ChainIdSolver_Vereshchagin::initial_upwards_sweep(const JntArray &q, const //Put Z in the joint root reference frame: s.Z = s.F * s.Z; - //The total velocity of the segment expressed in the the segments reference frame (tip) + //The total velocity of the segment expressed in the segments reference frame (tip) if (i != 0) { s.v = s.F.Inverse(results[i].v) + vj; // recursive velocity of each link in segment frame diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.hpp index bdc81099c4..6308880342 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.hpp @@ -39,10 +39,10 @@ namespace KDL * KDL::Chain. It uses a svd-calculation based on householders * rotations. * - * In case of a redundant robot this solver optimizes the the following criterium: + * In case of a redundant robot this solver optimizes the following criterium: * g=0.5*sum(weight*(Desired_joint_positions - actual_joint_positions))^2 as described in * A. Liegeois. Automatic supervisory control of the configuration and - * behavior of multibody mechnisms. IEEE Transactions on Systems, Man, and + * behavior of multibody mechanisms. IEEE Transactions on Systems, Man, and * Cybernetics, 7(12):868–871, 1977 * * @ingroup KinematicFamily diff --git a/src/Mod/Robot/App/kdl_cp/treeiksolverpos_online.hpp b/src/Mod/Robot/App/kdl_cp/treeiksolverpos_online.hpp index 7826eb4b33..a9172a3620 100644 --- a/src/Mod/Robot/App/kdl_cp/treeiksolverpos_online.hpp +++ b/src/Mod/Robot/App/kdl_cp/treeiksolverpos_online.hpp @@ -78,14 +78,14 @@ public: private: /** * Scales the class member KDL::JntArray q_dot_, if one (or more) joint velocity exceeds the maximum value. - * Scaling is done propotional to the biggest overshoot among all joint velocities. + * Scaling is done proportional to the biggest overshoot among all joint velocities. */ void enforceJointVelLimits(); /** * Scales translational and rotational velocity vectors of the class member KDL::Twist twist_, * if at least one of both exceeds the maximum value/length. - * Scaling is done propotional to the biggest overshoot among both velocities. + * Scaling is done proportional to the biggest overshoot among both velocities. */ void enforceCartVelLimits(); diff --git a/src/Mod/Ship/shipCapacityCurve/Tools.py b/src/Mod/Ship/shipCapacityCurve/Tools.py index e73c442892..4817180cfc 100644 --- a/src/Mod/Ship/shipCapacityCurve/Tools.py +++ b/src/Mod/Ship/shipCapacityCurve/Tools.py @@ -38,7 +38,7 @@ def tankCapacityCurve(tank, n): Returned value: List of computed points. Each point contains the filling level percentage - (interval [0, 1]), the the filling level (0 for the bottom of the tank), and + (interval [0, 1]), the filling level (0 for the bottom of the tank), and the volume. """ bbox = tank.Shape.BoundBox diff --git a/src/Mod/TechDraw/App/DrawViewCollection.cpp b/src/Mod/TechDraw/App/DrawViewCollection.cpp index 72fa21f9cf..cdbaffd5ec 100644 --- a/src/Mod/TechDraw/App/DrawViewCollection.cpp +++ b/src/Mod/TechDraw/App/DrawViewCollection.cpp @@ -66,7 +66,7 @@ int DrawViewCollection::addView(DrawView *view) int DrawViewCollection::removeView(DrawView *view) { - // Remove the view from the the collection + // Remove the view from the collection const std::vector currViews = Views.getValues(); std::vector newViews; std::vector::const_iterator it = currViews.begin(); diff --git a/src/Tools/MakeMacBundleRelocatable.py b/src/Tools/MakeMacBundleRelocatable.py index 13cafea7a7..e6c7b52e00 100755 --- a/src/Tools/MakeMacBundleRelocatable.py +++ b/src/Tools/MakeMacBundleRelocatable.py @@ -113,7 +113,7 @@ def list_install_names(path_macho): lines = output.split("\t") libs = [] - #first line is the the filename, and if it is a library, the second line + #first line is the filename, and if it is a library, the second line #is the install name of it if path_macho.endswith(os.path.basename(lines[1].split(" (")[0])): lines = lines[2:]