suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #569 from luzpaz/typos-pt3

Browse Source 
source typo fixes pt3 (only on py3 merged code)
This commit is contained in:
wwmayer 2017-03-01 09:05:59 +01:00 committed by GitHub
commit 8b86bfb2ce
32 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Raytracing/App/FreeCADpov
View File

@ -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} }

2
src/Mod/Raytracing/App/LuxTools.cpp
View File

@ -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

4
src/Mod/Raytracing/App/PovTools.cpp
View File

@ -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<CamDef>& C
{
std::stringstream out;
std::vector<CamDef>::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";

2
src/Mod/Raytracing/App/resources/FCAnimation.inc
View File

@ -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

2
src/Mod/Raytracing/App/resources/FCAnimation.ini
View File

@ -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

2
src/Mod/Raytracing/App/resources/FCSimple.pov
View File

@ -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} }

2
src/Mod/Raytracing/Gui/Command.cpp
View File

@ -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";

2
src/Mod/Raytracing/Gui/FreeCADpov
View File

@ -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} }

2
src/Mod/Robot/App/Robot6AxisPyImp.cpp
View File

@ -154,7 +154,7 @@ void Robot6AxisPy::setTcp(Py::Object value)
}
else if (PyObject_TypeCheck(*value, &(Base::PlacementPy::Type))) {
if(! getRobot6AxisPtr()->setTo(*static_cast<Base::PlacementPy*>(*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 ");

4
src/Mod/Robot/App/Trajectory.cpp
View File

@ -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);
}

2
src/Mod/Robot/App/kdl_cp/README.txt
View File

@ -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.

6
src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.cpp
View File

@ -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);

2
src/Mod/Robot/App/kdl_cp/chainidsolver_vereshchagin.hpp
View File

@ -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);

2
src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp
View File

@ -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.
*

2
src/Mod/Robot/App/kdl_cp/frameacc.hpp
View File

@ -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

4
src/Mod/Robot/App/kdl_cp/frames.cpp
View File

@ -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

4
src/Mod/Robot/App/kdl_cp/frames.hpp
View File

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

2
src/Mod/Robot/App/kdl_cp/framevel.hpp
View File

@ -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

2
src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp
View File

@ -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
*/

2
src/Mod/Robot/App/kdl_cp/trajectory.hpp
View File

@ -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/...

2
src/Mod/Robot/App/kdl_cp/tree.hpp
View File

@ -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<TreeElement> TreeElementPtr;
typedef boost::shared_ptr<const TreeElement> TreeElementConstPtr;

4
src/Mod/Robot/App/kdl_cp/utilities/error.h
View File

@ -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:

2
src/Mod/Robot/App/kdl_cp/utilities/error_stack.h
View File

@ -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

2
src/Mod/Robot/App/kdl_cp/utilities/rall1d.h
View File

@ -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<double>, Rall1d<double>, double> ).
*
* S is always passed by value.

2
src/Mod/Robot/App/kdl_cp/utilities/rall2d.h
View File

@ -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<double>, Rall1d<double>, double> ).
*
* S is always passed by value.

2
src/Mod/Robot/App/kdl_cp/utilities/utility.cxx
View File

@ -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"

2
src/Mod/Robot/App/kdl_cp/utilities/utility.h
View File

@ -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
*/

2
src/Mod/Robot/Gui/Command.cpp
View File

@ -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;
}

2
src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
View File

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

4
src/Mod/Robot/RobotExample.py
View File

@ -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

2
src/Mod/Sandbox/exportDRAWEXE.py
View File

@ -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()

2
src/Mod/TemplatePyMod/DocumentObject.py
View File

@ -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"):