diff --git a/src/App/Document.h b/src/App/Document.h index 22c9ccdef8..a576decd17 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -361,7 +361,7 @@ public: * transactions, meaning that there are other transactions before the given * ID. The Gui component shall ask user if they want to undo multiple steps. * And if the user agrees, call undo(id) to unroll all transaction before - * and including the the one with the give ID. Same applies for redo. + * and including the one with the given ID. Same applies for redo. * * The new transaction ID describe here is fully backward compatible. * Calling the APIs with a default id=0 gives the original behavior. diff --git a/src/App/FreeCADInit.py b/src/App/FreeCADInit.py index e0c001515c..4e0a075b54 100644 --- a/src/App/FreeCADInit.py +++ b/src/App/FreeCADInit.py @@ -24,7 +24,7 @@ # FreeCAD init module # # Gathering all the information to start FreeCAD. -# This is the second of of three init scripts. +# This is the second of three init scripts. # The third one runs when the gui is up, # imports the one and only diff --git a/src/App/LinkBaseExtensionPy.xml b/src/App/LinkBaseExtensionPy.xml index 20d7cbf4c7..0488a12213 100644 --- a/src/App/LinkBaseExtensionPy.xml +++ b/src/App/LinkBaseExtensionPy.xml @@ -35,7 +35,7 @@ depending on the actual extension object underlying this python object. If 'val' is omitted, i.e. calling configLinkProperty(key,...), then -it is assumed the the actually property name is the same as 'key' +it is assumed that the actual property name is the same as 'key' diff --git a/src/Gui/CommandLink.cpp b/src/Gui/CommandLink.cpp index bc11d8cfb7..4bfc0f13df 100644 --- a/src/Gui/CommandLink.cpp +++ b/src/Gui/CommandLink.cpp @@ -423,7 +423,7 @@ static void linkConvert(bool unlink) { replaceObj = link; } - // adjust subname for the the new object + // adjust subname for the new object auto pos = info.subname.rfind('.'); if(pos==std::string::npos && pos) info.subname.clear(); diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h index 331619bc7a..68aef01582 100644 --- a/src/Gui/ViewProvider.h +++ b/src/Gui/ViewProvider.h @@ -187,7 +187,7 @@ public: /** partial rendering setup * * @param subelements: a list of dot separated string refer to the sub element - * @param clear: if true, remove the the subelement from partial rendering. + * @param clear: if true, remove the subelement from partial rendering. * If else, add the subelement for rendering. * * @return Return the number of subelement found diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py index 3178be58a5..5daa637d75 100644 --- a/src/Mod/Arch/ArchComponent.py +++ b/src/Mod/Arch/ArchComponent.py @@ -2128,7 +2128,7 @@ class ComponentTaskPanel: "New Property". ptype: str, optional The name of the property type the new property will be set as. If - not specified, the the property's type will be determined using the + not specified, the property's type will be determined using the idx parameter. """ diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.cpp b/src/Mod/Fem/Gui/TaskFemConstraint.cpp index ad7312f6f6..9376fea761 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraint.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraint.cpp @@ -151,7 +151,7 @@ void TaskFemConstraint::setSelection(QListWidgetItem* item) { ItemName.erase(0, pos + delimiter.length()); // clear existing selection Gui::Selection().clearSelection(); - // highligh the selected item + // highlight the selected item Gui::Selection().addSelection(docName.c_str(), objName.c_str(), ItemName.c_str(), 0, 0, 0); } diff --git a/src/Mod/Mesh/App/Core/CylinderFit.cpp b/src/Mod/Mesh/App/Core/CylinderFit.cpp index 3a9422d649..e4e9b967e4 100644 --- a/src/Mod/Mesh/App/Core/CylinderFit.cpp +++ b/src/Mod/Mesh/App/Core/CylinderFit.cpp @@ -27,21 +27,21 @@ // (X0i,Y0i,Z0i) = (Xc,Yc,Zc) + s(L,M,N) // where s is the distance from (Xc,Yc,Zc) to (X0i,Y0i,Z0i) when (L,M,N) is // of unit length (normalized). -// The distance between a cylinder surface point (Xi,Yi,Zi) and its +// The distance between a cylinder surface point (Xi,Yi,Zi) and its // projection onto the axis (X0i,Y0i,Z0i) is the radius: // (Xi - X0i)^2 + (Yi - Y0i)^2 + (Zi - Z0i)^2 = R^2 -// Also the vector to a cylinder surface point (Xi,Yi,Zi) from its +// Also the vector to a cylinder surface point (Xi,Yi,Zi) from its // projection onto the axis (X0i,Y0i,Z0i) is orthogonal to the axis so we can // write: // (Xi - X0i, Yi - Y0i, Zi - Z0i).(L,M,N) = 0 or // L(Xi - X0i) + M(Yi - Y0i) + N(Zi - Z0i) = 0 -// If we substitute these various equations into each other and further add -// the constraint that L^2 + M^2 + N^2 = 1 then we can arrive at a single +// If we substitute these various equations into each other and further add +// the constraint that L^2 + M^2 + N^2 = 1 then we can arrive at a single // equation for the cylinder surface points: // (Xi - Xc + L*L*(Xc - Xi) + L*M*(Yc - Yi) + L*N*(Zc - Zi))^2 + // (Yi - Yc + M*L*(Xc - Xi) + M*M*(Yc - Yi) + M*N*(Zc - Zi))^2 + // (Zi - Zc + N*L*(Xc - Xi) + N*M*(Yc - Yi) + N*N*(Zc - Zi))^2 - R^2 = 0 -// This equation is what is used in the least squares solution below. Because +// This equation is what is used in the least squares solution below. Because // we are constraining the direction vector to a unit length and also because // we need to stop the axis point from moving along the axis we need to fix one // of the ordinates in the solution. So from our initial approximations for the @@ -58,7 +58,7 @@ #ifndef _PreComp_ # include # include -# include +# include #endif #include "CylinderFit.h" @@ -226,7 +226,7 @@ void CylinderFit::ProjectToCylinder() } } -// Compute approximations for the parameters using all points by computing a +// Compute approximations for the parameters using all points by computing a // line through the points. This doesn't work well if the points are only from // one small surface area. // In that case rather use SetApproximations() with a better estimate. @@ -430,8 +430,8 @@ void CylinderFit::setupNormalEquationMatrices(SolutionD solDir, const std::vecto atpa.setZero(); atpl.setZero(); - // For each point, setup the observation equation coefficients and add their - // contribution into the the normal equation matrices + // For each point, setup the observation equation coefficients and add their + // contribution into the normal equation matrices double a[5], b[3]; double f0, qw; std::vector< Base::Vector3d >::const_iterator vIt = residuals.begin(); @@ -446,7 +446,7 @@ void CylinderFit::setupNormalEquationMatrices(SolutionD solDir, const std::vecto setLowerPart(atpa); } -// Sets up contributions of given observation to the quasi parameteric +// Sets up contributions of given observation to the quasi parameteric // normal equation matrices. Assumes uncorrelated coordinates. // point ... point // residual ... residual for this point computed from previous iteration (zero for first iteration) @@ -456,13 +456,13 @@ void CylinderFit::setupNormalEquationMatrices(SolutionD solDir, const std::vecto // b[3] ... observation partials void CylinderFit::setupObservation(SolutionD solDir, const Base::Vector3f &point, const Base::Vector3d &residual, double a[5], double &f0, double &qw, double b[3]) const { - // This adjustment requires an update of the observation approximations + // This adjustment requires an update of the observation approximations // because the residuals do not have a linear relationship. // New estimates for the observations: double xEstimate = (double)point.x + residual.x; double yEstimate = (double)point.y + residual.y; double zEstimate = (double)point.z + residual.z; - + // intermediate parameters double lambda = _vAxis.x * (xEstimate - _vBase.x) + _vAxis.y * (yEstimate - _vBase.y) + _vAxis.z * (zEstimate - _vBase.z); double x0 = _vBase.x + lambda * _vAxis.x; @@ -493,7 +493,7 @@ void CylinderFit::setupObservation(SolutionD solDir, const Base::Vector3f &point ddzdm = -(_vAxis.y * _vAxis.z / _vAxis.x) * dx00 + _vAxis.z * dy00; ddxdn = -2.0 * _vAxis.z * dx00 - (_vAxis.y * _vAxis.z / _vAxis.x) * dy00 + (_vAxis.x - _vAxis.z * _vAxis.z / _vAxis.x) * dz00; ddydn = -(_vAxis.y * _vAxis.z / _vAxis.x) * dx00 + _vAxis.y * dz00; - ddzdn = (_vAxis.x - _vAxis.z * _vAxis.z / _vAxis.x) * dx00 + _vAxis.y * dy00 + 2.0 * _vAxis.z * dz00; + ddzdn = (_vAxis.x - _vAxis.z * _vAxis.z / _vAxis.x) * dx00 + _vAxis.y * dy00 + 2.0 * _vAxis.z * dz00; a[0] = -b[1]; a[1] = -b[2]; a[2] = 2.0 * (dx * ddxdm + dy * ddydm + dz * ddzdm); @@ -529,10 +529,10 @@ void CylinderFit::setupObservation(SolutionD solDir, const Base::Vector3f &point a[4] = -2.0 * _dRadius; break; } - + // free term f0 = _dRadius * _dRadius - dx * dx - dy * dy - dz * dz + b[0] * residual.x + b[1] * residual.y + b[2] * residual.z; - + // quasi weight (using equal weights for cylinder point coordinate observations) //w[0] = 1.0; //w[1] = 1.0; @@ -618,7 +618,7 @@ bool CylinderFit::computeResiduals(SolutionD solDir, const Eigen::VectorXd &x, s //sigma0 += v.x * w[0] * v.x + v.y * w[1] * v.y + v.z * w[2] * v.z; sigma0 += v.x * v.x + v.y * v.y + v.z * v.z; - + if ((dVx > vConvLimit) || (dVy > vConvLimit) || (dVz > vConvLimit)) vConverged = false; @@ -650,7 +650,7 @@ bool CylinderFit::computeResiduals(SolutionD solDir, const Eigen::VectorXd &x, s // Update the parameters after solving the normal equations bool CylinderFit::updateParameters(SolutionD solDir, const Eigen::VectorXd &x) -{ +{ // Update the parameters used as unknowns in the solution switch (solDir) { diff --git a/src/Mod/Mesh/App/Core/SphereFit.cpp b/src/Mod/Mesh/App/Core/SphereFit.cpp index 0ea17c9ab4..9b54cb007a 100644 --- a/src/Mod/Mesh/App/Core/SphereFit.cpp +++ b/src/Mod/Mesh/App/Core/SphereFit.cpp @@ -25,7 +25,7 @@ #ifndef _PreComp_ # include # include -# include +# include #endif #include "SphereFit.h" @@ -130,8 +130,8 @@ void SphereFit::ProjectToSphere() Base::Vector3f& cPnt = *it; // Compute unit vector from sphere centre to point. - // Because this vector is orthogonal to the sphere's surface at the - // intersection point we can easily compute the projection point on the + // Because this vector is orthogonal to the sphere's surface at the + // intersection point we can easily compute the projection point on the // closest surface point using the radius of the sphere Base::Vector3d diff((double)cPnt.x - _vCenter.x, (double)cPnt.y - _vCenter.y, (double)cPnt.z - _vCenter.z); double length = diff.Length(); @@ -210,7 +210,7 @@ float SphereFit::Fit() // Set up the quasi parameteric normal equations setupNormalEquationMatrices(residuals, atpa, atpl); - + // Solve the equations for the unknown corrections Eigen::LLT< Matrix4x4 > llt(atpa); if (llt.info() != Eigen::Success) @@ -256,8 +256,8 @@ void SphereFit::setupNormalEquationMatrices(const std::vector< Base::Vector3d > atpa.setZero(); atpl.setZero(); - // For each point, setup the observation equation coefficients and add their - // contribution into the the normal equation matrices + // For each point, setup the observation equation coefficients and add their + // contribution into the normal equation matrices double a[4], b[3]; double f0, qw; std::vector< Base::Vector3d >::const_iterator vIt = residuals.begin(); @@ -272,7 +272,7 @@ void SphereFit::setupNormalEquationMatrices(const std::vector< Base::Vector3d > setLowerPart(atpa); } -// Sets up contributions of given observation to the quasi parameteric +// Sets up contributions of given observation to the quasi parameteric // normal equation matrices. Assumes uncorrelated coordinates. // point ... point // residual ... residual for this point computed from previous iteration (zero for first iteration) @@ -282,7 +282,7 @@ void SphereFit::setupNormalEquationMatrices(const std::vector< Base::Vector3d > // b[3] ... observation partials void SphereFit::setupObservation(const Base::Vector3f &point, const Base::Vector3d &residual, double a[4], double &f0, double &qw, double b[3]) const { - // This adjustment requires an update of the observation approximations + // This adjustment requires an update of the observation approximations // because the residuals do not have a linear relationship. // New estimates for the observations: double xEstimate = (double)point.x + residual.x; @@ -393,7 +393,7 @@ bool SphereFit::computeResiduals(const Eigen::VectorXd &x, std::vector< Base::Ve //sigma0 += v.x * w[0] * v.x + v.y * w[1] * v.y + v.z * w[2] * v.z; sigma0 += v.x * v.x + v.y * v.y + v.z * v.z; - + if ((dVx > vConvLimit) || (dVy > vConvLimit) || (dVz > vConvLimit)) vConverged = false; diff --git a/src/Mod/Mesh/App/Core/TrimByPlane.h b/src/Mod/Mesh/App/Core/TrimByPlane.h index 6192365e5a..c868570e8f 100644 --- a/src/Mod/Mesh/App/Core/TrimByPlane.h +++ b/src/Mod/Mesh/App/Core/TrimByPlane.h @@ -29,7 +29,7 @@ namespace MeshCore { /** - * Trim the the facets in 3D with a plane + * Trim the facets in 3D with a plane * \author Werner Mayer */ class MeshExport MeshTrimByPlane diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp index 8b7cb06f98..259542022f 100644 --- a/src/Mod/Part/App/AppPartPy.cpp +++ b/src/Mod/Part/App/AppPartPy.cpp @@ -612,7 +612,7 @@ public: ); add_keyword_method("getShape",&Module::getShape, "getShape(obj,subname=None,mat=None,needSubElement=False,transform=True,retType=0):\n" - "Obtain the the TopoShape of a given object with SubName reference\n\n" + "Obtain the TopoShape of a given object with SubName reference\n\n" "* obj: the input object\n" "* subname: dot separated sub-object reference\n" "* mat: the current transformation matrix\n" diff --git a/src/Mod/Part/App/GeomPlate/BuildPlateSurfacePy.xml b/src/Mod/Part/App/GeomPlate/BuildPlateSurfacePy.xml index 56207b3910..acc63debfb 100644 --- a/src/Mod/Part/App/GeomPlate/BuildPlateSurfacePy.xml +++ b/src/Mod/Part/App/GeomPlate/BuildPlateSurfacePy.xml @@ -58,7 +58,7 @@ - Returns the orientation of the curves in the the array returned by curves2d + Returns the orientation of the curves in the array returned by curves2d diff --git a/src/Mod/Part/App/TopologyPy.cpp b/src/Mod/Part/App/TopologyPy.cpp index 8fc0351617..732d70fb16 100644 --- a/src/Mod/Part/App/TopologyPy.cpp +++ b/src/Mod/Part/App/TopologyPy.cpp @@ -59,7 +59,7 @@ using namespace Part; //=========================================================================== -// TopoShapePyOld - Warpper for the TopoDS classes +// TopoShapePyOld - Wrapper for the TopoDS classes //=========================================================================== //-------------------------------------------------------------------------- diff --git a/src/Mod/PartDesign/App/BodyPy.xml b/src/Mod/PartDesign/App/BodyPy.xml index 8aadafec57..59e9bb5ef8 100644 --- a/src/Mod/PartDesign/App/BodyPy.xml +++ b/src/Mod/PartDesign/App/BodyPy.xml @@ -30,7 +30,7 @@ - Return the the visible feature of this body + Return the visible feature of this body diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp index a6aa794dc1..f3fc3c478b 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp @@ -258,7 +258,7 @@ void TaskDressUpParameters::setSelection(QListWidgetItem* current) { DressUpView->highlightReferences(true); // clear existing selection because only the current item is highlighted, not all selected ones to keep the overview Gui::Selection().clearSelection(); - // highligh the selected item + // highlight the selected item Gui::Selection().addSelection(docName.c_str(), objName.c_str(), subName.c_str(), 0, 0, 0); } } diff --git a/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui b/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui index 841a720bd4..90ccfe95b4 100644 --- a/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui +++ b/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui @@ -254,7 +254,7 @@ - <html><head/><body><p>I checked the path is constrained by the solid. Otherwise the the volume of the solid describes a &quot;keep out&quot; zone.</p></body></html> + <html><head/><body><p>I checked the path is constrained by the solid. Otherwise the volume of the solid describes a &quot;keep out&quot; zone.</p></body></html> Constrained to Inside diff --git a/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui b/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui index ef03bbaf29..22e9362017 100644 --- a/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui +++ b/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui @@ -84,7 +84,7 @@ - <html><head/><body><p>Radius of the fillet on the tag's top edge.</p><p>If the radius is bigger than that which the the tag shape itself supports, the resulting shape will be that of a dome.</p></body></html> + <html><head/><body><p>Radius of the fillet on the tag's top edge.</p><p>If the radius is bigger than that which the tag shape itself supports, the resulting shape will be that of a dome.</p></body></html> diff --git a/src/Mod/Path/PathScripts/PathEngrave.py b/src/Mod/Path/PathScripts/PathEngrave.py index 6496658aaf..ca79b735d6 100644 --- a/src/Mod/Path/PathScripts/PathEngrave.py +++ b/src/Mod/Path/PathScripts/PathEngrave.py @@ -51,7 +51,7 @@ class ObjectEngrave(PathEngraveBase.ObjectOp): self.wires = [] def opFeatures(self, obj): - """opFeatures(obj) ... return all standard features and edges based geomtries""" + """opFeatures(obj) ... return all standard features and edges based geometries""" return ( PathOp.FeatureTool | PathOp.FeatureDepths diff --git a/src/Mod/Path/PathScripts/PathPost.py b/src/Mod/Path/PathScripts/PathPost.py index f185678151..0799573a14 100644 --- a/src/Mod/Path/PathScripts/PathPost.py +++ b/src/Mod/Path/PathScripts/PathPost.py @@ -115,7 +115,7 @@ def processFileNameSubstitutions( j = job.Label filename = filename.replace("%j", j) - # Use the sequnce number if explicitly called + # Use the sequence number if explicitly called if "%S" in filename: j = job.Label filename = filename.replace("%S", str(sequencenumber)) diff --git a/src/Mod/Path/Tools/README.md b/src/Mod/Path/Tools/README.md index 7b869494ca..2c99e3e7c6 100644 --- a/src/Mod/Path/Tools/README.md +++ b/src/Mod/Path/Tools/README.md @@ -10,7 +10,7 @@ practically impossible for `*.fcstd` files. When a tool is instantiated in a job the PDN body is created from the shape and the attributes and constraints are set according to the values from the JSON file. All additional parameters are created as properties on the object. This -provides the the correct shape and dimensions which can be used to generate a point cloud or mesh for advanced +provides the correct shape and dimensions which can be used to generate a point cloud or mesh for advanced algorithms (and potentially simulation). # Tool Libraries diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h index 9bdf35072a..ec9f4cba52 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h @@ -341,7 +341,7 @@ public: // we draw the lines with 36 segments, 8 for each arc and 4 lines // draw the arcs for (int i = 0; i < 8; i++) { - // calculate the x,y positions forming the the arc + // calculate the x,y positions forming the arc double angle = i * M_PI / 16.0; double x_i = -radius * sin(angle); double y_i = -radius * cos(angle); diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp index 430560fb5b..f74ffd80aa 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp @@ -70,7 +70,7 @@ DrawProjGroup::DrawProjGroup() Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); bool autoDist = hGrp->GetBool("AutoDist",true); - + ADD_PROPERTY_TYPE(Source, (nullptr), group, App::Prop_None, "Shape to view"); Source.setScope(App::LinkScope::Global); Source.setAllowExternal(true); @@ -268,7 +268,7 @@ bool DrawProjGroup::checkFit() const { // Base::Console().Message("DPG::checkFit() - %s\n", getNameInDocument()); if (waitingForChildren()) { - //assume everything fits since we don't know what size the chilren are + //assume everything fits since we don't know what size the children are return true; } auto page = findParentPage(); @@ -348,7 +348,7 @@ void DrawProjGroup::getViewArea(DrawProjGroupItem *viewPtrs[10], // Get the child view bounding boxes Base::BoundBox3d bboxes[10]; makeViewBbs(viewPtrs, bboxes, scaled); - + //TODO: note that TLF/TRF/BLF,BRF extend a bit farther than a strict row/col arrangement would suggest. //get widest view in each row/column double col0w = std::max(std::max(bboxes[0].LengthX(), bboxes[3].LengthX()), bboxes[7].LengthX()), @@ -514,7 +514,7 @@ int DrawProjGroup::removeProjection(const char *viewProjType) } return -1; -} +} //removes all DPGI - used when deleting DPG int DrawProjGroup::purgeProjections() @@ -576,7 +576,7 @@ std::pair DrawProjGroup::getDirsFromFront(std::st gp_Ax2 newCS; gp_Dir gNewDir; gp_Dir gNewXDir; - + double angle = M_PI / 2.0; //90* if (viewType == "Right") { diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp index 222e096190..1f98f3ffeb 100644 --- a/src/Mod/TechDraw/App/Geometry.cpp +++ b/src/Mod/TechDraw/App/Geometry.cpp @@ -587,7 +587,7 @@ void BaseGeom::intersectionLL(TechDraw::BaseGeomPtr geom1, // Taken from: TechDraw::GenericPtr gen1 = std::static_pointer_cast(geom1); TechDraw::GenericPtr gen2 = std::static_pointer_cast(geom2); - // we calculate vectors to start points and direction verctors + // we calculate vectors to start points and direction vectors Base::Vector3d startPnt1 = gen1->points.at(0); Base::Vector3d endPnt1 = gen1->points.at(1); Base::Vector3d startPnt2 = gen2->points.at(0); diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp index 3f354e1f0f..aeb2a9c7e0 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp @@ -48,7 +48,7 @@ DlgPrefsTechDrawAnnotationImp::DlgPrefsTechDrawAnnotationImp( QWidget* parent ) ui->setupUi(this); ui->pdsbBalloonKink->setUnit(Base::Unit::Length); ui->pdsbBalloonKink->setMinimum(0); - + // connect the LineGroup the update the tooltip if index changed connect(ui->pcbLineGroup, SIGNAL(currentIndexChanged(int)), this, SLOT(onLineGroupChanged(int))); @@ -98,7 +98,7 @@ void DlgPrefsTechDrawAnnotationImp::loadSettings() for (auto it = lgNames.begin(); it < lgNames.end(); ++it) { ui->pcbLineGroup->addItem(tr((*it).c_str())); } - + ui->cbAutoHoriz->onRestore(); ui->cbPrintCenterMarks->onRestore(); ui->cbPyramidOrtho->onRestore(); @@ -147,7 +147,7 @@ void DlgPrefsTechDrawAnnotationImp::onLineGroupChanged(int index) ui->pcbLineGroup->setToolTip(QObject::tr("Please select a Line Group")); return; } - // get the definition the the selected LineGroup (includes the name) + // get the definition of the selected LineGroup (includes the name) std::string lgRecord = LineGroup::getRecordFromFile(Preferences::lineGroupFile(), index); std::stringstream ss(lgRecord); std::vector lgNames; diff --git a/src/Mod/TechDraw/Templates/zh_CN/landscape/A0_Landscape_CN_CLIP.svg b/src/Mod/TechDraw/Templates/zh_CN/landscape/A0_Landscape_CN_CLIP.svg index 83c1f05aa7..8141517921 100644 --- a/src/Mod/TechDraw/Templates/zh_CN/landscape/A0_Landscape_CN_CLIP.svg +++ b/src/Mod/TechDraw/Templates/zh_CN/landscape/A0_Landscape_CN_CLIP.svg @@ -275,7 +275,7 @@ e"> - + diff --git a/src/Mod/TechDraw/Templates/zh_CN/landscape/A1_Landscape_CN_CLIP.svg b/src/Mod/TechDraw/Templates/zh_CN/landscape/A1_Landscape_CN_CLIP.svg index b5851b0c6b..202ac15f99 100644 --- a/src/Mod/TechDraw/Templates/zh_CN/landscape/A1_Landscape_CN_CLIP.svg +++ b/src/Mod/TechDraw/Templates/zh_CN/landscape/A1_Landscape_CN_CLIP.svg @@ -253,7 +253,7 @@ e"> - + diff --git a/src/Mod/TechDraw/Templates/zh_CN/landscape/A2_Landscape_CN_CLIP.svg b/src/Mod/TechDraw/Templates/zh_CN/landscape/A2_Landscape_CN_CLIP.svg index 1f5e85a5f2..2aef60ed8d 100644 --- a/src/Mod/TechDraw/Templates/zh_CN/landscape/A2_Landscape_CN_CLIP.svg +++ b/src/Mod/TechDraw/Templates/zh_CN/landscape/A2_Landscape_CN_CLIP.svg @@ -233,7 +233,7 @@ nter;fill:#000000;"> - + diff --git a/src/Mod/TechDraw/Templates/zh_CN/landscape/A3_Landscape_CN_CLIP.svg b/src/Mod/TechDraw/Templates/zh_CN/landscape/A3_Landscape_CN_CLIP.svg index ae1b902c2f..be6535d4dc 100644 --- a/src/Mod/TechDraw/Templates/zh_CN/landscape/A3_Landscape_CN_CLIP.svg +++ b/src/Mod/TechDraw/Templates/zh_CN/landscape/A3_Landscape_CN_CLIP.svg @@ -183,7 +183,7 @@ - + diff --git a/src/Mod/TechDraw/Templates/zh_CN/landscape/A4_Landscape_CN_CLIP.svg b/src/Mod/TechDraw/Templates/zh_CN/landscape/A4_Landscape_CN_CLIP.svg index 96da06f6e0..7b21fab3cd 100644 --- a/src/Mod/TechDraw/Templates/zh_CN/landscape/A4_Landscape_CN_CLIP.svg +++ b/src/Mod/TechDraw/Templates/zh_CN/landscape/A4_Landscape_CN_CLIP.svg @@ -166,7 +166,7 @@ - + diff --git a/src/Mod/TechDraw/Templates/zh_CN/portrait/A4_Portrait_CN_CLIP.svg b/src/Mod/TechDraw/Templates/zh_CN/portrait/A4_Portrait_CN_CLIP.svg index 908f381763..434f8b7c50 100644 --- a/src/Mod/TechDraw/Templates/zh_CN/portrait/A4_Portrait_CN_CLIP.svg +++ b/src/Mod/TechDraw/Templates/zh_CN/portrait/A4_Portrait_CN_CLIP.svg @@ -167,7 +167,7 @@ - + diff --git a/src/Tools/fcbt/DistSetup.py b/src/Tools/fcbt/DistSetup.py index 76b357a533..2085caef14 100644 --- a/src/Tools/fcbt/DistSetup.py +++ b/src/Tools/fcbt/DistSetup.py @@ -7,7 +7,7 @@ DistInst = DistName + "_installer.msi" DistDir = "../../DistTemp/" #==================================================================== -# copy intaller file +# copy installer file FileTools.cpfile("../../Install/FreeCAD.msi",DistDir+DistInst)