Skip to content

Commit

Permalink
Misc. typos: Please merge right before 0.17 release
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
luzpaz committed Mar 17, 2018
1 parent 2e63ffd commit 8effe4b
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 26 deletions.
2 changes: 1 addition & 1 deletion ChangeLog.txt
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/App/Document.h
Expand Up @@ -276,7 +276,7 @@ class AppExport Document : public App::PropertyContainer
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);
Expand Down
2 changes: 1 addition & 1 deletion src/App/PropertyContainer.cpp
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Gui/ViewProviderOriginFeature.cpp
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Draft/importOCA.py
Expand Up @@ -30,7 +30,7 @@
# \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.

Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions src/Mod/Import/Gui/AppImportGuiPy.cpp
Expand Up @@ -520,7 +520,7 @@ class Module : public Py::ExtensionModule<Module>
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 <TDF_Label> hierarchical_label;
std::vector <TopLoc_Location> hierarchical_loc;
std::vector <App::DocumentObject*> hierarchical_part;
Expand All @@ -533,7 +533,6 @@ class Module : public Py::ExtensionModule<Module>
}
}

// Free Shapes must have absolute placement and not explicit
// Free Shapes must have absolute placement and not explicit
std::vector <TDF_Label> FreeLabels;
std::vector <int> part_id;
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/OpenSCAD/ply/CHANGES
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/App/FaceMaker.cpp
Expand Up @@ -158,7 +158,7 @@ std::unique_ptr<Part::FaceMaker> Part::FaceMaker::ConstructFromType(Base::Type t

void Part::FaceMaker::throwNotImplemented()
{
throw Base::NotImplementedError("Not implemente yet...");
throw Base::NotImplementedError("Not implemented yet...");
}


Expand Down
2 changes: 1 addition & 1 deletion src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp
Expand Up @@ -255,13 +255,13 @@ bool TaskDlgSketchBasedParameters::reject()
Sketcher::SketchObject *pcSketch = static_cast<Sketcher::SketchObject*>(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();
}
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Path/libarea/kurve/kurve.cpp
Expand Up @@ -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;

Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Mod/ReverseEngineering/App/SurfaceTriangulation.h
Expand Up @@ -95,7 +95,7 @@ class PoissonReconstruction
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.)
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.hpp
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Robot/App/kdl_cp/treeiksolverpos_online.hpp
Expand Up @@ -78,14 +78,14 @@ class TreeIkSolverPos_Online: public TreeIkSolverPos {
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();

Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Ship/shipCapacityCurve/Tools.py
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/TechDraw/App/DrawViewCollection.cpp
Expand Up @@ -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<App::DocumentObject*> currViews = Views.getValues();
std::vector<App::DocumentObject*> newViews;
std::vector<App::DocumentObject*>::const_iterator it = currViews.begin();
Expand Down
2 changes: 1 addition & 1 deletion src/Tools/MakeMacBundleRelocatable.py
Expand Up @@ -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:]
Expand Down

0 comments on commit 8effe4b

Please sign in to comment.