From 987b8db0b5ab31ea4d5148787495b1ed856cef41 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Tue, 14 Nov 2017 22:01:43 -0500 Subject: [PATCH] More typos, grammar fixes, uniformity --- src/App/ObjectIdentifier.cpp | 2 +- src/App/PropertyStandard.h | 12 ++++++------ src/Gui/View3DInventorExamples.cpp | 4 ++-- src/Mod/Cam/App/cutting_tools.cpp | 2 +- src/Mod/Mesh/App/Core/Simplify.h | 2 +- src/Mod/OpenSCAD/prototype.py | 4 ++-- src/Mod/PartDesign/App/FeaturePipe.cpp | 2 +- .../Robot/App/kdl_cp/chainiksolvervel_pinv_nso.cpp | 2 +- src/Mod/Robot/RobotExample.py | 2 +- src/Mod/Sketcher/App/Sketch.cpp | 4 ++-- src/Mod/Start/Gui/Command.cpp | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/App/ObjectIdentifier.cpp b/src/App/ObjectIdentifier.cpp index 306793dacf..6dead5c6f0 100644 --- a/src/App/ObjectIdentifier.cpp +++ b/src/App/ObjectIdentifier.cpp @@ -742,7 +742,7 @@ void ObjectIdentifier::resolve(ResolveResults &results) const } else { - /* Document name set explicitely? */ + /* Document name set explicitly? */ if (documentName.getString().size() > 0) { /* Yes; then document object must follow */ results.resolvedDocumentObjectName = String(components[0].name, false, false); diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h index 80b86141b0..65271e75fe 100644 --- a/src/App/PropertyStandard.h +++ b/src/App/PropertyStandard.h @@ -210,7 +210,7 @@ private: /** Constraint integer properties * This property fulfills the need of a constraint integer. It holds basically a * state (integer) and a struct of boundaries. If the boundaries - * is not set it act basically like a IntegerProperty and do no checking. + * is not set it acts basically like an IntegerProperty and does no checking. * The constraints struct can be created on the heap or build in. */ class AppExport PropertyIntegerConstraint: public PropertyInteger @@ -259,7 +259,7 @@ public: }; /** setting the boundaries * This sets the constraint struct. It can be dynamically - * allocated or set as an static in the class the property + * allocated or set as a static in the class the property * belongs to: * \code * const Constraints percent = {0,100,1} @@ -393,7 +393,7 @@ private: /** implements a key/value list as property - * The key ought to be ASCII the Value should be treated as UTF8 to be save. + * The key ought to be ASCII the Value should be treated as UTF8 to be saved. */ class AppExport PropertyMap: public Property { @@ -452,7 +452,7 @@ private: * This is the father of all properties handling floats. * Use this type only in rare cases. Mostly you want to * use the more specialized types like e.g. PropertyLenth. - * These properties fulfill also the needs of the unit system. + * These properties also fulfill the needs of the unit system. * See PropertyUnits.h for all properties with units. */ class AppExport PropertyFloat: public Property @@ -461,7 +461,7 @@ class AppExport PropertyFloat: public Property public: /** Value Constructor - * Construct with explicite Values + * Construct with explicit Values */ PropertyFloat(void); @@ -508,7 +508,7 @@ class AppExport PropertyFloatConstraint: public PropertyFloat public: /** Value Constructor - * Construct with explicite Values + * Construct with explicit Values */ PropertyFloatConstraint(void); diff --git a/src/Gui/View3DInventorExamples.cpp b/src/Gui/View3DInventorExamples.cpp index c31b30a682..53cfacebab 100644 --- a/src/Gui/View3DInventorExamples.cpp +++ b/src/Gui/View3DInventorExamples.cpp @@ -334,12 +334,12 @@ unsigned char bitmap[texturewidth*textureheight]; // Parameters: // double cr - real part of the julia set point // double ci - imaginary part of the julia set point -// float zoon - lenth of the square to display (zoom*zoom), center (0,0) +// float zoom - length of the square to display (zoom*zoom), center (0,0) // int width - width of the bitmap // int height - height of the bitmap // int mult - number to multiply each color by. // unsigned char * bmp - pointer to the bitmap -// int n - number of itterations +// int n - number of iterations void julia(double crr, double cii, float zoom, int width, int height, int mult, unsigned char * bmp, int n) diff --git a/src/Mod/Cam/App/cutting_tools.cpp b/src/Mod/Cam/App/cutting_tools.cpp index 1cd49c5aa8..8697391caf 100644 --- a/src/Mod/Cam/App/cutting_tools.cpp +++ b/src/Mod/Cam/App/cutting_tools.cpp @@ -386,7 +386,7 @@ bool cutting_tools::arrangecuts_ZLEVEL() z_level_corrected = z_level; cut(z_level,temp_min, aCutShape,z_level_corrected); if (z_level_corrected != z_level) - std::cout << "Somehow we couldnt cut" << std::endl; + std::cout << "Somehow we couldn't cut" << std::endl; //Jetzt nur das gewünschte Resultat in den vector schieben (von oben nach unten große usw.) Edgesort aCuttingShapeSorter(aCutShape); tempPair.first = z_level_corrected; diff --git a/src/Mod/Mesh/App/Core/Simplify.h b/src/Mod/Mesh/App/Core/Simplify.h index 914a3f5f46..cef4e766cb 100644 --- a/src/Mod/Mesh/App/Core/Simplify.h +++ b/src/Mod/Mesh/App/Core/Simplify.h @@ -181,7 +181,7 @@ void Simplify::simplify_mesh(int target_count, double tolerance_factor, double a deleted0.resize(v0.tcount); // normals temporarily deleted1.resize(v1.tcount); // normals temporarily - // dont remove if flipped + // don't remove if flipped if (flipped(p,i0,i1,v0,v1,deleted0)) continue; if (flipped(p,i1,i0,v1,v0,deleted1)) diff --git a/src/Mod/OpenSCAD/prototype.py b/src/Mod/OpenSCAD/prototype.py index 5160359756..8029c2b944 100644 --- a/src/Mod/OpenSCAD/prototype.py +++ b/src/Mod/OpenSCAD/prototype.py @@ -235,8 +235,8 @@ class Node: obj.ViewObject.Transparency = transp elif namel == 'multmatrix': assert(len(self.children)>0) - m1l=[round(f,12) for f in sum(self.arguments,[])] #Thats the original matrix - m1=FreeCAD.Matrix(*tuple(m1l)) #Thats the original matrix + m1l=[round(f,12) for f in sum(self.arguments,[])] #That's the original matrix + m1=FreeCAD.Matrix(*tuple(m1l)) #That's the original matrix if isspecialorthogonalpython(fcsubmatrix(m1)): #a Placement can represent the transformation if len(self.children) == 1: obj = self.children[0].addtofreecad(doc,fcpar or True) diff --git a/src/Mod/PartDesign/App/FeaturePipe.cpp b/src/Mod/PartDesign/App/FeaturePipe.cpp index 03e71c981f..0af70f71e5 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.cpp +++ b/src/Mod/PartDesign/App/FeaturePipe.cpp @@ -89,7 +89,7 @@ Pipe::Pipe() ADD_PROPERTY_TYPE(AuxillerySpineTangent,(false),"Sweep",App::Prop_None,"Include tangent edges into secondary path"); ADD_PROPERTY_TYPE(AuxilleryCurvelinear, (true), "Sweep", App::Prop_None,"Calculate normal between equidistant points on both spines"); ADD_PROPERTY_TYPE(Mode,(long(0)),"Sweep",App::Prop_None,"Profile mode"); - ADD_PROPERTY_TYPE(Binormal,(Base::Vector3d()),"Sweep",App::Prop_None,"Binormal vector for coresponding orientation mode"); + ADD_PROPERTY_TYPE(Binormal,(Base::Vector3d()),"Sweep",App::Prop_None,"Binormal vector for corresponding orientation mode"); ADD_PROPERTY_TYPE(Transition,(long(0)),"Sweep",App::Prop_None,"Transition mode"); ADD_PROPERTY_TYPE(Transformation,(long(0)),"Sweep",App::Prop_None,"Section transformation mode"); Mode.setEnums(ModeEnums); diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.cpp b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.cpp index f5faab76a2..75d6217161 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.cpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolvervel_pinv_nso.cpp @@ -129,7 +129,7 @@ namespace KDL tmp(i) = weights(i)*(q_in(i) - opt_pos(i)) / A; } - // Calcualte J^-1 * J * Jc^-1 = V*S^-1*U' * U*S*V' * tmp + // Calculate J^-1 * J * Jc^-1 = V*S^-1*U' * U*S*V' * tmp tmp2 = V * Sinv.asDiagonal() * U.transpose() * U * S.asDiagonal() * V.transpose() * tmp; for (i = 0; i < nj; ++i) { diff --git a/src/Mod/Robot/RobotExample.py b/src/Mod/Robot/RobotExample.py index a990086f31..54bbbf86f2 100644 --- a/src/Mod/Robot/RobotExample.py +++ b/src/Mod/Robot/RobotExample.py @@ -101,7 +101,7 @@ from KukaExporter import ExportCompactSub ExportCompactSub(App.activeDocument().Robot,App.activeDocument().Trajectory,tempfile.gettempdir()+'/TestOut.src') -# and thats kind of how its done: +# and that's kind of how its done: for w in App.activeDocument().Trajectory.Trajectory.Waypoints: (A,B,C) = (w.Pos.Rotation.toEuler()) print("LIN {X %.3f,Y %.3f,Z %.3f,A %.3f,B %.3f,C %.3f} ; %s"%(w.Pos.Base.x,w.Pos.Base.y,w.Pos.Base.z,A,B,C,w.Name)) diff --git a/src/Mod/Sketcher/App/Sketch.cpp b/src/Mod/Sketcher/App/Sketch.cpp index 6531f661f5..724f6a85e1 100644 --- a/src/Mod/Sketcher/App/Sketch.cpp +++ b/src/Mod/Sketcher/App/Sketch.cpp @@ -3376,8 +3376,8 @@ TopoShape Sketch::toShape(void) const result = *wires.begin(); else if (wires.size() > 1) { // FIXME: The right way here would be to determine the outer and inner wires and - // generate a face with holes (inner wires have to be taged REVERSE or INNER). - // thats the only way to transport a somewhat more complex sketch... + // generate a face with holes (inner wires have to be tagged REVERSE or INNER). + // that's the only way to transport a somewhat more complex sketch... //result = *wires.begin(); // I think a compound can be used as container because it is just a collection of diff --git a/src/Mod/Start/Gui/Command.cpp b/src/Mod/Start/Gui/Command.cpp index 15ed4f2145..5a61e3b836 100644 --- a/src/Mod/Start/Gui/Command.cpp +++ b/src/Mod/Start/Gui/Command.cpp @@ -41,7 +41,7 @@ CmdStartConstraintAxle::CmdStartConstraintAxle() sAppModule = "Start"; sGroup = QT_TR_NOOP("Start"); sMenuText = QT_TR_NOOP("Constraint Axle..."); - sToolTipText = QT_TR_NOOP("set a axle constraint between two objects"); + sToolTipText = QT_TR_NOOP("Set an axle constraint between two objects"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; sPixmap = "actions/document-new";