diff --git a/src/Gui/ViewProviderOriginGroupExtension.cpp b/src/Gui/ViewProviderOriginGroupExtension.cpp index 4735ccc363..02577a0253 100644 --- a/src/Gui/ViewProviderOriginGroupExtension.cpp +++ b/src/Gui/ViewProviderOriginGroupExtension.cpp @@ -115,19 +115,19 @@ void ViewProviderOriginGroupExtension::extensionUpdateData( const App::Property* void ViewProviderOriginGroupExtension::slotChangedObjectApp ( const App::DocumentObject& obj) { auto* group = getExtendedViewProvider()->getObject()->getExtensionByType(); - if ( group && group->hasObject (&obj, /*recusive=*/ true ) ) { + if ( group && group->hasObject (&obj, /*recursive=*/ true ) ) { updateOriginSize (); } } void ViewProviderOriginGroupExtension::slotChangedObjectGui ( const Gui::ViewProviderDocumentObject& vp) { if ( !vp.isDerivedFrom ( Gui::ViewProviderOriginFeature::getClassTypeId () )) { - // Ignore origins to avoid infinite recursion (not likely in a well-formed focument, + // Ignore origins to avoid infinite recursion (not likely in a well-formed document, // but may happen in documents designed in old versions of assembly branch ) auto* group = getExtendedViewProvider()->getObject()->getExtensionByType(); App::DocumentObject *obj = vp.getObject (); - if ( group && obj && group->hasObject (obj, /*recusive=*/ true ) ) { + if ( group && obj && group->hasObject (obj, /*recursive=*/ true ) ) { updateOriginSize (); } } diff --git a/src/Mod/Mesh/App/Core/Simplify.h b/src/Mod/Mesh/App/Core/Simplify.h index 8843944b87..d2b819fc43 100644 --- a/src/Mod/Mesh/App/Core/Simplify.h +++ b/src/Mod/Mesh/App/Core/Simplify.h @@ -17,15 +17,15 @@ typedef Base::Vector3f vec3f; -class SymetricMatrix { +class SymmetricMatrix { public: // Constructor - SymetricMatrix(double c=0) { for (std::size_t i=0;i<10;++i ) m[i] = c; } + SymmetricMatrix(double c=0) { for (std::size_t i=0;i<10;++i ) m[i] = c; } - SymetricMatrix(double m11, double m12, double m13, double m14, + SymmetricMatrix(double m11, double m12, double m13, double m14, double m22, double m23, double m24, double m33, double m34, double m44) { @@ -37,7 +37,7 @@ public: // Make plane - SymetricMatrix(double a,double b,double c,double d) + SymmetricMatrix(double a,double b,double c,double d) { m[0] = a*a; m[1] = a*b; m[2] = a*c; m[3] = a*d; m[4] = b*b; m[5] = b*c; m[6] = b*d; @@ -58,15 +58,15 @@ public: return det; } - const SymetricMatrix operator+(const SymetricMatrix& n) const + const SymmetricMatrix operator+(const SymmetricMatrix& n) const { - return SymetricMatrix( m[0]+n[0], m[1]+n[1], m[2]+n[2], m[3]+n[3], - m[4]+n[4], m[5]+n[5], m[6]+n[6], + return SymmetricMatrix( m[0]+n[0], m[1]+n[1], m[2]+n[2], m[3]+n[3] + m[4]+n[4], m[5]+n[5], m[6]+n[6], m[ 7]+n[ 7], m[ 8]+n[8 ], m[ 9]+n[9 ]); } - SymetricMatrix& operator+=(const SymetricMatrix& n) + SymmetricMatrix& operator+=(const SymmetricMatrix& n) { m[0]+=n[0]; m[1]+=n[1]; m[2]+=n[2]; m[3]+=n[3]; m[4]+=n[4]; m[5]+=n[5]; m[6]+=n[6]; m[7]+=n[7]; @@ -82,7 +82,7 @@ class Simplify { public: struct Triangle { int v[3];double err[4];int deleted,dirty;vec3f n; }; - struct Vertex { vec3f p;int tstart,tcount;SymetricMatrix q;int border;}; + struct Vertex { vec3f p;int tstart,tcount;SymmetricMatrix q;int border;}; struct Ref { int tid,tvertex; }; std::vector triangles; std::vector vertices; @@ -93,7 +93,7 @@ public: private: // Helper functions - double vertex_error(SymetricMatrix q, double x, double y, double z); + double vertex_error(SymmetricMatrix q, double x, double y, double z); double calculate_error(int id_v1, int id_v2, vec3f &p_result); bool flipped(vec3f p,int i0,int i1,Vertex &v0,Vertex &v1,std::vector &deleted); void update_triangles(int i0,Vertex &v,std::vector &deleted,int &deleted_triangles); @@ -324,7 +324,7 @@ void Simplify::update_mesh(int iteration) if (iteration == 0) { for (std::size_t i=0;i