From a78e8ffd9582483cc843cc3751e5f8fdbf80a3de Mon Sep 17 00:00:00 2001 From: Kunda Date: Tue, 28 Feb 2017 14:32:33 -0500 Subject: [PATCH] source typo fixes pt3 (only on py3 merged code) --- src/Mod/Raytracing/App/FreeCADpov | 2 +- src/Mod/Raytracing/App/LuxTools.cpp | 2 +- src/Mod/Raytracing/App/PovTools.cpp | 4 ++-- src/Mod/Raytracing/App/resources/FCAnimation.inc | 2 +- src/Mod/Raytracing/App/resources/FCAnimation.ini | 2 +- src/Mod/Raytracing/App/resources/FCSimple.pov | 2 +- src/Mod/Raytracing/Gui/Command.cpp | 2 +- src/Mod/Raytracing/Gui/FreeCADpov | 2 +- src/Mod/Robot/App/Robot6AxisPyImp.cpp | 2 +- src/Mod/Robot/App/Trajectory.cpp | 4 ++-- src/Mod/Robot/App/kdl_cp/README.txt | 2 +- src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp | 6 +++--- src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.hpp | 2 +- src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp | 2 +- src/Mod/Robot/App/kdl_cp/frameacc.hpp | 2 +- src/Mod/Robot/App/kdl_cp/frames.cpp | 4 ++-- src/Mod/Robot/App/kdl_cp/frames.hpp | 4 ++-- src/Mod/Robot/App/kdl_cp/framevel.hpp | 2 +- src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp | 2 +- src/Mod/Robot/App/kdl_cp/trajectory.hpp | 2 +- src/Mod/Robot/App/kdl_cp/tree.hpp | 2 +- src/Mod/Robot/App/kdl_cp/utilities/error.h | 4 ++-- src/Mod/Robot/App/kdl_cp/utilities/error_stack.h | 2 +- src/Mod/Robot/App/kdl_cp/utilities/rall1d.h | 2 +- src/Mod/Robot/App/kdl_cp/utilities/rall2d.h | 2 +- src/Mod/Robot/App/kdl_cp/utilities/utility.cxx | 2 +- src/Mod/Robot/App/kdl_cp/utilities/utility.h | 2 +- src/Mod/Robot/Gui/Command.cpp | 2 +- src/Mod/Robot/Gui/ViewProviderRobotObject.cpp | 2 +- src/Mod/Robot/RobotExample.py | 4 ++-- src/Mod/Sandbox/exportDRAWEXE.py | 2 +- src/Mod/TemplatePyMod/DocumentObject.py | 2 +- 32 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/Mod/Raytracing/App/FreeCADpov b/src/Mod/Raytracing/App/FreeCADpov index 85f46dbe7..cc6d4b4b0 100644 --- a/src/Mod/Raytracing/App/FreeCADpov +++ b/src/Mod/Raytracing/App/FreeCADpov @@ -83,7 +83,7 @@ plane { // checkered floor } -// includes the Part mesh writen from FreeCAD +// includes the Part mesh written from FreeCAD #include "TempPart.inc" object {Part texture { pigment {rgb <0.3,0.8,0.3>} finish {ambient 0.2 reflection 0.2 specular 0.7} } diff --git a/src/Mod/Raytracing/App/LuxTools.cpp b/src/Mod/Raytracing/App/LuxTools.cpp index ccdc5e081..4227f82c1 100644 --- a/src/Mod/Raytracing/App/LuxTools.cpp +++ b/src/Mod/Raytracing/App/LuxTools.cpp @@ -53,7 +53,7 @@ using namespace std; std::string LuxTools::getCamera(const CamDef& Cam) { std::stringstream out; - out << "# declares positon and view direction" << endl + out << "# declares position and view direction" << endl << "# Generated by FreeCAD (http://www.freecadweb.org/)" << endl // writing Camera positions diff --git a/src/Mod/Raytracing/App/PovTools.cpp b/src/Mod/Raytracing/App/PovTools.cpp index e400add36..aad5d23bb 100644 --- a/src/Mod/Raytracing/App/PovTools.cpp +++ b/src/Mod/Raytracing/App/PovTools.cpp @@ -60,7 +60,7 @@ using namespace std; std::string PovTools::getCamera(const CamDef& Cam, int width, int height) { std::stringstream out; - out << "// declares positon and view direction\n" << endl + out << "// declares position and view direction\n" << endl << "// Generated by FreeCAD (http://www.freecadweb.org/)" << endl // writing Camera positions @@ -97,7 +97,7 @@ void PovTools::writeCameraVec(const char* FileName, const std::vector& C { std::stringstream out; std::vector::const_iterator It; - out << "// declares positon and view directions\n" + out << "// declares position and view directions\n" << "// Generated by FreeCAD (http://www.freecadweb.org/)\n\n" << "// Total number of camera positions\n" << "#declare nCamPos = " << CamVec.size() << ";\n\n"; diff --git a/src/Mod/Raytracing/App/resources/FCAnimation.inc b/src/Mod/Raytracing/App/resources/FCAnimation.inc index 04cb2edc8..f16b638fc 100644 --- a/src/Mod/Raytracing/App/resources/FCAnimation.inc +++ b/src/Mod/Raytracing/App/resources/FCAnimation.inc @@ -44,7 +44,7 @@ #debug concat("T=",str(T,5,2)," T0=",str(T0,5,2)," T1=",str(T1,5,2)," T2=",str(T2,5,2)," T1Sin=",str(T1Sin,5,2),"\n") #end - // Current time is allways zero based + // Current time is always zero based #declare T = clock; // Compute Scene number: One scene less than camera positions diff --git a/src/Mod/Raytracing/App/resources/FCAnimation.ini b/src/Mod/Raytracing/App/resources/FCAnimation.ini index 8b598e7d4..81e89148d 100644 --- a/src/Mod/Raytracing/App/resources/FCAnimation.ini +++ b/src/Mod/Raytracing/App/resources/FCAnimation.ini @@ -47,7 +47,7 @@ Final_Frame=1999 ;Subset_Start_Frame=0 ;Subset_End_Frame=29 -; Clock range is allways [0..1] +; Clock range is always [0..1] Initial_Clock=0.0 Final_Clock=1.0 diff --git a/src/Mod/Raytracing/App/resources/FCSimple.pov b/src/Mod/Raytracing/App/resources/FCSimple.pov index a02be1324..e30aecd0a 100644 --- a/src/Mod/Raytracing/App/resources/FCSimple.pov +++ b/src/Mod/Raytracing/App/resources/FCSimple.pov @@ -17,7 +17,7 @@ global_settings { // ---------------------------------------- -// includes the Part mesh writen from FreeCAD +// includes the Part mesh written from FreeCAD #include "TempPart.inc" object {Part texture { pigment {rgb <0.3,0.8,0.3>} finish {ambient 0.2 reflection 0.2 specular 0.7} } diff --git a/src/Mod/Raytracing/Gui/Command.cpp b/src/Mod/Raytracing/Gui/Command.cpp index 8b8fe40fb..f470a5071 100644 --- a/src/Mod/Raytracing/Gui/Command.cpp +++ b/src/Mod/Raytracing/Gui/Command.cpp @@ -81,7 +81,7 @@ CmdRaytracingWriteCamera::CmdRaytracingWriteCamera() sAppModule = "Raytracing"; sGroup = QT_TR_NOOP("Raytracing"); sMenuText = QT_TR_NOOP("Export camera to POV-Ray..."); - sToolTipText = QT_TR_NOOP("Export the camera positon of the active 3D view in POV-Ray format to a file"); + sToolTipText = QT_TR_NOOP("Export the camera position of the active 3D view in POV-Ray format to a file"); sWhatsThis = "Raytracing_WriteCamera"; sStatusTip = sToolTipText; sPixmap = "Raytrace_Camera"; diff --git a/src/Mod/Raytracing/Gui/FreeCADpov b/src/Mod/Raytracing/Gui/FreeCADpov index 85f46dbe7..cc6d4b4b0 100644 --- a/src/Mod/Raytracing/Gui/FreeCADpov +++ b/src/Mod/Raytracing/Gui/FreeCADpov @@ -83,7 +83,7 @@ plane { // checkered floor } -// includes the Part mesh writen from FreeCAD +// includes the Part mesh written from FreeCAD #include "TempPart.inc" object {Part texture { pigment {rgb <0.3,0.8,0.3>} finish {ambient 0.2 reflection 0.2 specular 0.7} } diff --git a/src/Mod/Robot/App/Robot6AxisPyImp.cpp b/src/Mod/Robot/App/Robot6AxisPyImp.cpp index aaf4f5499..d4aea1e95 100644 --- a/src/Mod/Robot/App/Robot6AxisPyImp.cpp +++ b/src/Mod/Robot/App/Robot6AxisPyImp.cpp @@ -154,7 +154,7 @@ void Robot6AxisPy::setTcp(Py::Object value) } else if (PyObject_TypeCheck(*value, &(Base::PlacementPy::Type))) { if(! getRobot6AxisPtr()->setTo(*static_cast(*value)->getPlacementPtr())) - throw Base::Exception("Cant reach Point"); + throw Base::Exception("Can not reach Point"); } else { std::string error = std::string("type must be 'Matrix' or 'Placement', not "); diff --git a/src/Mod/Robot/App/Trajectory.cpp b/src/Mod/Robot/App/Trajectory.cpp index e7310ba05..d1ae52555 100644 --- a/src/Mod/Robot/App/Trajectory.cpp +++ b/src/Mod/Robot/App/Trajectory.cpp @@ -189,7 +189,7 @@ void Trajectory::generateTrajectory(void) } else if (Cont && pcRoundComp) { pcRoundComp->Add(Next); - // end a continous block + // end a continuous block } else if (Cont==false && pcRoundComp) { // add the last one @@ -220,7 +220,7 @@ void Trajectory::generateTrajectory(void) break; } - // add the segment if no continous block is running + // add the segment if no continuous block is running if (!pcRoundComp) pcTrajectory->Add(pcTrak); } diff --git a/src/Mod/Robot/App/kdl_cp/README.txt b/src/Mod/Robot/App/kdl_cp/README.txt index d452912a4..539250675 100644 --- a/src/Mod/Robot/App/kdl_cp/README.txt +++ b/src/Mod/Robot/App/kdl_cp/README.txt @@ -7,7 +7,7 @@ Coding standards : Directories: ============ -utilities: utility classes for KDL, should not be included seperatly +utilities: utility classes for KDL, should not be included separately by a user experimental: preliminary code snippets. diff --git a/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp b/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp index 391949712..b9ae06efa 100644 --- a/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp +++ b/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp @@ -220,8 +220,8 @@ void ChainIdSolver_Vereshchagin::downwards_sweep(const Jacobian& alfa, const Jnt s.PC = s.P * s.C; //u=(Q-Z(R+PC)=sum of external forces along the joint axes, - //R are the forces comming from the children, - //Q is taken zero (do we need to take the previous calculated torques? + //R are the forces coming from the children, + //Q is taken zero (do we need to take the previous calculated torques?) //projection of coriolis and centrepital forces into joint subspace (0 0 Z) s.totalBias = -dot(s.Z, s.R + s.PC); @@ -388,7 +388,7 @@ void ChainIdSolver_Vereshchagin::getJointBiasAcceleration(JntArray& bias_q_dotdo { //this is only force double tmp = results[i + 1].totalBias; - //this is accelleration + //this is acceleration bias_q_dotdot(i) = tmp / results[i + 1].D; //s.totalBias = - dot(s.Z, s.R + s.PC); diff --git a/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.hpp b/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.hpp index fcf69fedd..b4d9f72f5 100644 --- a/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.hpp @@ -76,7 +76,7 @@ public: void getLinkCartesianVelocity(Twists& xDot_base); //Returns cartesian acceleration of links in base coordinates void getLinkCartesianAcceleration(Twists& xDotDot_base); - //Returns cartesian postions of links in link tip coordinates + //Returns cartesian positions of links in link tip coordinates void getLinkPose(Frames& x_local); //Returns cartesian velocities of links in link tip coordinates void getLinkVelocity(Twists& xDot_local); diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp index 842a9c0a6..e6c440f32 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp @@ -72,7 +72,7 @@ public: /** * \brief constructs an ChainIkSolverPos_LMA solver. * - * The default parameters are choosen to be applicable to industrial-size robots + * The default parameters are chosen to be applicable to industrial-size robots * (e.g. 0.5 to 3 meters range in task space), with an accuracy that is more then * sufficient for typical industrial applications. * diff --git a/src/Mod/Robot/App/kdl_cp/frameacc.hpp b/src/Mod/Robot/App/kdl_cp/frameacc.hpp index 4bda4cd3f..fd912c5a2 100644 --- a/src/Mod/Robot/App/kdl_cp/frameacc.hpp +++ b/src/Mod/Robot/App/kdl_cp/frameacc.hpp @@ -4,7 +4,7 @@ * Rall Algebra of (subset of) the classes defined in frames, * i.e. classes that contain a set (value,derivative,2nd derivative) * and define operations on that set - * this classes are usefull for automatic differentiation ( <-> symbolic diff , + * this classes are useful for automatic differentiation ( <-> symbolic diff , * <-> numeric diff). * Defines VectorAcc, RotationAcc, FrameAcc, doubleAcc. * Look at the corresponding classes Vector Rotation Frame Twist and diff --git a/src/Mod/Robot/App/kdl_cp/frames.cpp b/src/Mod/Robot/App/kdl_cp/frames.cpp index 0b42a30d0..67baff97a 100644 --- a/src/Mod/Robot/App/kdl_cp/frames.cpp +++ b/src/Mod/Robot/App/kdl_cp/frames.cpp @@ -341,10 +341,10 @@ Vector Rotation::GetRot() const /** Returns the rotation angle around the equiv. axis * @param axis the rotation axis is returned in this variable - * @param eps : in the case of angle == 0 : rot axis is undefined and choosen + * @param eps : in the case of angle == 0 : rot axis is undefined and chosen * to be the Z-axis * in the case of angle == PI : 2 solutions, positive Z-component - * of the axis is choosen. + * of the axis is chosen. * @result returns the rotation angle (between [0..PI] ) * /todo : * Check corresponding routines in rframes and rrframes diff --git a/src/Mod/Robot/App/kdl_cp/frames.hpp b/src/Mod/Robot/App/kdl_cp/frames.hpp index 9604b4084..def6e76c6 100644 --- a/src/Mod/Robot/App/kdl_cp/frames.hpp +++ b/src/Mod/Robot/App/kdl_cp/frames.hpp @@ -378,10 +378,10 @@ public: /** Returns the rotation angle around the equiv. axis * @param axis the rotation axis is returned in this variable - * @param eps : in the case of angle == 0 : rot axis is undefined and choosen + * @param eps : in the case of angle == 0 : rot axis is undefined and chosen * to be +/- Z-axis * in the case of angle == PI : 2 solutions, positive Z-component - * of the axis is choosen. + * of the axis is chosen. * @result returns the rotation angle (between [0..PI] ) */ double GetRotAngle(Vector& axis,double eps=epsilon) const; diff --git a/src/Mod/Robot/App/kdl_cp/framevel.hpp b/src/Mod/Robot/App/kdl_cp/framevel.hpp index ed9c87c0a..3cfa32a3c 100644 --- a/src/Mod/Robot/App/kdl_cp/framevel.hpp +++ b/src/Mod/Robot/App/kdl_cp/framevel.hpp @@ -3,7 +3,7 @@ * This file contains the definition of classes for a * Rall Algebra of (subset of) the classes defined in frames, * i.e. classes that contain a pair (value,derivative) and define operations on that pair - * this classes are usefull for automatic differentiation ( <-> symbolic diff , <-> numeric diff) + * this classes are useful for automatic differentiation ( <-> symbolic diff , <-> numeric diff) * Defines VectorVel, RotationVel, FrameVel. Look at Frames.h for details on how to work * with Frame objects. * \author diff --git a/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp b/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp index b8a2840dc..1845e9a14 100644 --- a/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp +++ b/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp @@ -56,7 +56,7 @@ namespace KDL { * An interpolation algorithm which rotates a frame over the existing * single rotation axis * formed by start and end rotation. If more than one rotational axis - * exist, an arbitrary one will be choosen, therefore it is not recommended + * exist, an arbitrary one will be chosen, therefore it is not recommended * to try to interpolate a 180 degrees rotation. * @ingroup Motion */ diff --git a/src/Mod/Robot/App/kdl_cp/trajectory.hpp b/src/Mod/Robot/App/kdl_cp/trajectory.hpp index b6a67fc8a..8a3219fbe 100644 --- a/src/Mod/Robot/App/kdl_cp/trajectory.hpp +++ b/src/Mod/Robot/App/kdl_cp/trajectory.hpp @@ -40,7 +40,7 @@ * $Id: trajectory.h,v 1.1.1.1.2.5 2003/07/23 16:44:25 psoetens Exp $ * $Name: $ * \todo - * Peter's remark : should seperate I/O from other routines in the + * Peter's remark : should separate I/O from other routines in the * motion/chain directories * The problem is that the I/O uses virtual inheritance to write * the trajectories/geometries/velocityprofiles/... diff --git a/src/Mod/Robot/App/kdl_cp/tree.hpp b/src/Mod/Robot/App/kdl_cp/tree.hpp index 0ebbe43e0..424eb309f 100644 --- a/src/Mod/Robot/App/kdl_cp/tree.hpp +++ b/src/Mod/Robot/App/kdl_cp/tree.hpp @@ -40,7 +40,7 @@ namespace KDL class TreeElement; #ifdef KDL_USE_NEW_TREE_INTERFACE - //We use smart pointers for managing tree nodes for now becuase + //We use smart pointers for managing tree nodes for now because //c++11 and unique_ptr support is not ubiquitous typedef boost::shared_ptr TreeElementPtr; typedef boost::shared_ptr TreeElementConstPtr; diff --git a/src/Mod/Robot/App/kdl_cp/utilities/error.h b/src/Mod/Robot/App/kdl_cp/utilities/error.h index 6e9bd2e14..481a36d1a 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/error.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/error.h @@ -56,7 +56,7 @@ namespace KDL { class Error { public: /** Returns a description string describing the error. - * the returned pointer only garanteed to exists as long as + * the returned pointer only guaranteed to exists as long as * the Error object exists. */ virtual ~Error() {} @@ -129,7 +129,7 @@ public: virtual const char* Description() const {return "Unexpected identifier, expecting TRANS or ROT";} virtual int GetType() const {return 201;} }; -//! Error_Redundancy indicates an error that occured during solving for redundancy. +//! Error_Redundancy indicates an error that occurred during solving for redundancy. class Error_RedundancyIO:public Error_IO {}; class Error_Redundancy_Illegal_Resolutiontype : public Error_RedundancyIO { public: diff --git a/src/Mod/Robot/App/kdl_cp/utilities/error_stack.h b/src/Mod/Robot/App/kdl_cp/utilities/error_stack.h index 918bc0786..3603fffce 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/error_stack.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/error_stack.h @@ -33,7 +33,7 @@ * ORO_Geometry V0.2 * * \par history - * - changed layout of the comments to accomodate doxygen + * - changed layout of the comments to accommodate doxygen */ #ifndef ERROR_STACK_H #define ERROR_STACK_H diff --git a/src/Mod/Robot/App/kdl_cp/utilities/rall1d.h b/src/Mod/Robot/App/kdl_cp/utilities/rall1d.h index ba2540eb7..3fc5b12e5 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/rall1d.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/rall1d.h @@ -37,7 +37,7 @@ namespace KDL { * - S defines a scalar type that can operate on Rall1d. This is the type that * is used to give back values of Norm() etc. * - * S is usefull when you recurse a Rall1d object into itself to create a 2nd, 3th, 4th,.. + * S is useful when you recurse a Rall1d object into itself to create a 2nd, 3th, 4th,.. * derivatives. (e.g. Rall1d< Rall1d, Rall1d, double> ). * * S is always passed by value. diff --git a/src/Mod/Robot/App/kdl_cp/utilities/rall2d.h b/src/Mod/Robot/App/kdl_cp/utilities/rall2d.h index 9375a865c..ef9067439 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/rall2d.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/rall2d.h @@ -42,7 +42,7 @@ namespace KDL { * - S defines a scalar type that can operate on Rall1d. This is the type that * is used to give back values of Norm() etc. * - * S is usefull when you recurse a Rall1d object into itself to create a 2nd, 3th, 4th,.. + * S is useful when you recurse a Rall1d object into itself to create a 2nd, 3th, 4th,.. * derivatives. (e.g. Rall1d< Rall1d, Rall1d, double> ). * * S is always passed by value. diff --git a/src/Mod/Robot/App/kdl_cp/utilities/utility.cxx b/src/Mod/Robot/App/kdl_cp/utilities/utility.cxx index 713bdac6e..78f2c671b 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/utility.cxx +++ b/src/Mod/Robot/App/kdl_cp/utilities/utility.cxx @@ -4,7 +4,7 @@ * ORO_Geometry V0.2 * * @par history - * - changed layout of the comments to accomodate doxygen + * - changed layout of the comments to accommodate doxygen */ #include "utility.h" diff --git a/src/Mod/Robot/App/kdl_cp/utilities/utility.h b/src/Mod/Robot/App/kdl_cp/utilities/utility.h index a25295e80..d95903a47 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/utility.h +++ b/src/Mod/Robot/App/kdl_cp/utilities/utility.h @@ -16,7 +16,7 @@ * functions and macro definitions. * * \par history - * - changed layout of the comments to accomodate doxygen + * - changed layout of the comments to accommodate doxygen */ diff --git a/src/Mod/Robot/Gui/Command.cpp b/src/Mod/Robot/Gui/Command.cpp index 194d0f650..30efa7bd1 100644 --- a/src/Mod/Robot/Gui/Command.cpp +++ b/src/Mod/Robot/Gui/Command.cpp @@ -73,7 +73,7 @@ void CmdRobotSetHomePos::activated(int) } else { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select one Robot to set home postion")); + QObject::tr("Select one Robot to set home position")); return; } diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp index 573680e5f..ffc97ecf3 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp @@ -193,7 +193,7 @@ void ViewProviderRobotObject::updateData(const App::Property* prop) if (node) pcRobotRoot->addChild(node); pcRobotRoot->addChild(pcTcpRoot); } - // search for the conection points +++++++++++++++++++++++++++++++++++++++++++++++++ + // search for the connection points +++++++++++++++++++++++++++++++++++++++++++++++++ Axis1Node = Axis2Node = Axis3Node = Axis4Node = Axis5Node = Axis6Node = 0; SoSearchAction searchAction; SoPath * path; diff --git a/src/Mod/Robot/RobotExample.py b/src/Mod/Robot/RobotExample.py index 5bf6e98b8..c22111a84 100644 --- a/src/Mod/Robot/RobotExample.py +++ b/src/Mod/Robot/RobotExample.py @@ -35,7 +35,7 @@ print(rob.Axis2) w = Waypoint(Placement(),name="Pt",type="LIN") print(w.Name,w.Type,w.Pos,w.Cont,w.Velocity,w.Base,w.Tool) -# generate more. The Trajectory find allways outomatically a unique name for the waypoints +# generate more. The Trajectory find always outomatically a unique name for the waypoints l = [w] for i in range(5): l.append(Waypoint(Placement(Vector(0,0,i*100),Vector(1,0,0),0),"LIN","Pt")) @@ -61,7 +61,7 @@ App.activeDocument().addObject("Robot::RobotObject","Robot") # Define the visual representation and the kinematic definition (see [[6-Axis Robot]] for details about that) App.activeDocument().Robot.RobotVrmlFile = App.getResourceDir()+"Mod/Robot/Lib/Kuka/kr500_1.wrl" App.activeDocument().Robot.RobotKinematicFile = App.getResourceDir()+"Mod/Robot/Lib/Kuka/kr500_1.csv" -# start positon of the Axis (only that which differ from 0) +# start position of the Axis (only that which differ from 0) App.activeDocument().Robot.Axis2 = -90 App.activeDocument().Robot.Axis3 = 90 diff --git a/src/Mod/Sandbox/exportDRAWEXE.py b/src/Mod/Sandbox/exportDRAWEXE.py index 776a06574..907c5da41 100644 --- a/src/Mod/Sandbox/exportDRAWEXE.py +++ b/src/Mod/Sandbox/exportDRAWEXE.py @@ -161,7 +161,7 @@ def saveShape(csg,filename,shape,name,hasplacement = True,cleanshape=False): sh=shape.copy() sh.Placement=FreeCAD.Placement() # it not yet tested if changing the placement recreated the - # tesselation. but for now we simply do the cleaing once agian + # tesselation. but for now we simply do the cleaing once again # to stay on the safe side if cleanshape: shape = shape.cleaned() diff --git a/src/Mod/TemplatePyMod/DocumentObject.py b/src/Mod/TemplatePyMod/DocumentObject.py index 46658f722..9400e1bd3 100644 --- a/src/Mod/TemplatePyMod/DocumentObject.py +++ b/src/Mod/TemplatePyMod/DocumentObject.py @@ -306,7 +306,7 @@ class Box(DocumentObject): #---------------------------PRIVATE FUNCTIONS------------------------------ #These function won't be present in the object (begin with '_') def _privateFunctionExample(self,attr): - FreeCAD.Console.PrintMessage("The lenght : "+str(attr)+"\n") + FreeCAD.Console.PrintMessage("The length : "+str(attr)+"\n") def _recomputeShape(self): if hasattr(self,"Length") and hasattr(self,"Width") and hasattr(self,"Height"):