qgis · Mar 3, 2017
diff --git a/‎src/analysis/interpolation/Bezier3D.cc
Lines changed: 17 additions & 17 deletions b/‎src/analysis/interpolation/Bezier3D.cc
Lines changed: 17 additions & 17 deletions
diff --git a/‎src/analysis/interpolation/Bezier3D.h
Lines changed: 16 additions & 16 deletions b/‎src/analysis/interpolation/Bezier3D.h
Lines changed: 16 additions & 16 deletions
@@ -19,7 +19,7 @@
 #include "Vector3D.h"
 #include "MathUtils.h"
 
-void Bezier3D::calcFirstDer( float t, Vector3D* v )
+void Bezier3D::calcFirstDer( float t, Vector3D *v )
 {
   if ( v && mControlPoly )
   {
@@ -35,13 +35,13 @@ void Bezier3D::calcFirstDer( float t, Vector3D* v )
     for ( int n = 1; n <= int( mControlPoly->count() - 1 ); n++ )
     {
       double bernst = MathUtils::calcBernsteinPoly( mControlPoly->count() - 2, n - 1, t );
-      v->setX( v->getX() + (( *mControlPoly )[n]->getX() - ( *mControlPoly )[n-1]->getX() )*bernst );
-      v->setY( v->getY() + (( *mControlPoly )[n]->getY() - ( *mControlPoly )[n-1]->getY() )*bernst );
-      v->setZ( v->getZ() + (( *mControlPoly )[n]->getZ() - ( *mControlPoly )[n-1]->getZ() )*bernst );
+      v->setX( v->getX() + ( ( *mControlPoly )[n]->getX() - ( *mControlPoly )[n - 1]->getX() )*bernst );
+      v->setY( v->getY() + ( ( *mControlPoly )[n]->getY() - ( *mControlPoly )[n - 1]->getY() )*bernst );
+      v->setZ( v->getZ() + ( ( *mControlPoly )[n]->getZ() - ( *mControlPoly )[n - 1]->getZ() )*bernst );
     }
-    v->setX( v->getX()*( mControlPoly->count() - 1 ) );
-    v->setY( v->getY()*( mControlPoly->count() - 1 ) );
-    v->setZ( v->getZ()*( mControlPoly->count() - 1 ) );
+    v->setX( v->getX() * ( mControlPoly->count() - 1 ) );
+    v->setY( v->getY() * ( mControlPoly->count() - 1 ) );
+    v->setZ( v->getZ() * ( mControlPoly->count() - 1 ) );
   }
 
   else
@@ -50,7 +50,7 @@ void Bezier3D::calcFirstDer( float t, Vector3D* v )
   }
 }
 
-void Bezier3D::calcPoint( float t, Point3D* p )
+void Bezier3D::calcPoint( float t, Point3D *p )
 {
 
   if ( p && mControlPoly )
@@ -62,9 +62,9 @@ void Bezier3D::calcPoint( float t, Point3D* p )
     for ( int n = 1; n <= int( mControlPoly->count() ); n++ )
     {
       double bernst = MathUtils::calcBernsteinPoly( mControlPoly->count() - 1, n - 1, t );
-      p->setX( p->getX() + ( *mControlPoly )[n-1]->getX()*bernst );
-      p->setY( p->getY() + ( *mControlPoly )[n-1]->getY()*bernst );
-      p->setZ( p->getZ() + ( *mControlPoly )[n-1]->getZ()*bernst );
+      p->setX( p->getX() + ( *mControlPoly )[n - 1]->getX()*bernst );
+      p->setY( p->getY() + ( *mControlPoly )[n - 1]->getY()*bernst );
+      p->setZ( p->getZ() + ( *mControlPoly )[n - 1]->getZ()*bernst );
     }
   }
 
@@ -74,7 +74,7 @@ void Bezier3D::calcPoint( float t, Point3D* p )
   }
 }
 
-void Bezier3D::calcSecDer( float t, Vector3D* v )
+void Bezier3D::calcSecDer( float t, Vector3D *v )
 {
   if ( v && mControlPoly )
   {
@@ -91,9 +91,9 @@ void Bezier3D::calcSecDer( float t, Vector3D* v )
     for ( int n = 1; n <= int( nodes - 2 ); n++ )
     {
       double bernst = MathUtils::calcBernsteinPoly( nodes - 3, n - 1, t );
-      v->setX( v->getX() + (( *mControlPoly )[n+1]->getX() - 2*( *mControlPoly )[n]->getX() + ( *mControlPoly )[n-1]->getX() )*bernst );
-      v->setY( v->getY() + (( *mControlPoly )[n+1]->getY() - 2*( *mControlPoly )[n]->getY() + ( *mControlPoly )[n-1]->getY() )*bernst );
-      v->setZ( v->getZ() + (( *mControlPoly )[n+1]->getZ() - 2*( *mControlPoly )[n]->getZ() + ( *mControlPoly )[n-1]->getZ() )*bernst );
+      v->setX( v->getX() + ( ( *mControlPoly )[n + 1]->getX() - 2 * ( *mControlPoly )[n]->getX() + ( *mControlPoly )[n - 1]->getX() )*bernst );
+      v->setY( v->getY() + ( ( *mControlPoly )[n + 1]->getY() - 2 * ( *mControlPoly )[n]->getY() + ( *mControlPoly )[n - 1]->getY() )*bernst );
+      v->setZ( v->getZ() + ( ( *mControlPoly )[n + 1]->getZ() - 2 * ( *mControlPoly )[n]->getZ() + ( *mControlPoly )[n - 1]->getZ() )*bernst );
     }
     v->setX( v->getX()*MathUtils::faculty( nodes - 1 ) / MathUtils::faculty( nodes - 3 ) );
     v->setY( v->getY()*MathUtils::faculty( nodes - 1 ) / MathUtils::faculty( nodes - 3 ) );
@@ -111,15 +111,15 @@ void Bezier3D::changeDirection()//does this work correctly? more testing is need
 {
   if ( mControlPoly )
   {
-    Point3D** pointer = new Point3D*[mControlPoly->count()];//create an array to temporarily store pointer to the control points
+    Point3D **pointer = new Point3D*[mControlPoly->count()];//create an array to temporarily store pointer to the control points
     for ( int i = 0; i < mControlPoly->count(); i++ )//store the points
     {
       pointer[i] = ( *mControlPoly )[i];
     }
 
     for ( int i = 0; i < mControlPoly->count(); i++ )
     {
-      mControlPoly->insert( i, pointer[( mControlPoly->count()-1 )-i] );
+      mControlPoly->insert( i, pointer[( mControlPoly->count() - 1 ) - i] );
     }
     delete [] pointer;
   }
 
@@ -31,36 +31,36 @@ class ANALYSIS_EXPORT Bezier3D: public ParametricLine
     //! Default constructor
     Bezier3D();
     //! Constructor, par is a pointer to the parent, controlpoly a controlpolygon
-    Bezier3D( ParametricLine* par, QVector<Point3D*>* controlpoly );
+    Bezier3D( ParametricLine *par, QVector<Point3D *> *controlpoly );
 
     virtual ~Bezier3D();
     //! Do not use this method, since a Bezier curve does not consist of other curves
     virtual void add( ParametricLine *pl ) override;
     //! Calculates the first derivative and assigns it to v
-    virtual void calcFirstDer( float t, Vector3D* v ) override;
+    virtual void calcFirstDer( float t, Vector3D *v ) override;
     //! Calculates the second derivative and assigns it to v
-    virtual void calcSecDer( float t, Vector3D* v ) override;
+    virtual void calcSecDer( float t, Vector3D *v ) override;
     //virtual Point3D calcPoint(float t);
     //! Calculates the point on the curve and assigns it to p
-    virtual void calcPoint( float t, Point3D* p ) override;
+    virtual void calcPoint( float t, Point3D *p ) override;
     //! Changes the order of control points
     virtual void changeDirection() override;
     //virtual void draw(QPainter* p);
     //virtual bool intersects(ParametricLine* pal);
     //! Do not use this method, since a Bezier curve does not consist of other curves
     virtual void remove( int i ) override;
     //! Returns a control point
-    virtual const Point3D* getControlPoint( int number ) const override;
+    virtual const Point3D *getControlPoint( int number ) const override;
     //! Returns a pointer to the control polygon
-    virtual const QVector<Point3D*>* getControlPoly() const override;
+    virtual const QVector<Point3D *> *getControlPoly() const override;
     //! Returns the degree of the curve
     virtual int getDegree() const override;
     //! Returns the parent
-    virtual ParametricLine* getParent() const override;
+    virtual ParametricLine *getParent() const override;
     //! Sets the parent
-    virtual void setParent( ParametricLine* par ) override;
+    virtual void setParent( ParametricLine *par ) override;
     //! Sets the control polygon
-    virtual void setControlPoly( QVector<Point3D*>* cp ) override;
+    virtual void setControlPoly( QVector<Point3D *> *cp ) override;
 
 };
 
@@ -71,7 +71,7 @@ inline Bezier3D::Bezier3D() : ParametricLine()//default constructor
 
 }
 
-inline Bezier3D::Bezier3D( ParametricLine* parent, QVector<Point3D*>* controlpoly ) : ParametricLine( parent, controlpoly )
+inline Bezier3D::Bezier3D( ParametricLine *parent, QVector<Point3D *> *controlpoly ) : ParametricLine( parent, controlpoly )
 {
   mDegree = mControlPoly->count() - 1;
 }
@@ -97,12 +97,12 @@ inline void Bezier3D::remove( int i )
 
 //-----------------------------------------------setters and getters---------------------------------------------------------------
 
-inline const Point3D* Bezier3D::getControlPoint( int number ) const
+inline const Point3D *Bezier3D::getControlPoint( int number ) const
 {
-  return ( *mControlPoly )[number-1];
+  return ( *mControlPoly )[number - 1];
 }
 
-inline const QVector<Point3D*>* Bezier3D::getControlPoly() const
+inline const QVector<Point3D *> *Bezier3D::getControlPoly() const
 {
   return mControlPoly;
 }
@@ -112,17 +112,17 @@ inline int Bezier3D::getDegree() const
   return mDegree;
 }
 
-inline ParametricLine* Bezier3D::getParent() const
+inline ParametricLine *Bezier3D::getParent() const
 {
   return mParent;
 }
 
-inline void Bezier3D::setParent( ParametricLine* par )
+inline void Bezier3D::setParent( ParametricLine *par )
 {
   mParent = par;
 }
 
-inline void Bezier3D::setControlPoly( QVector<Point3D*>* cp )
+inline void Bezier3D::setControlPoly( QVector<Point3D *> *cp )
 {
   mControlPoly = cp;
   mDegree = mControlPoly->count() - 1;
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#include "Vector3D.h"`
`20`	`20`	`#include "MathUtils.h"`
`21`	`21`
`22`		`-void Bezier3D::calcFirstDer( float t, Vector3D* v )`
	`22`	`+void Bezier3D::calcFirstDer( float t, Vector3D *v )`
`23`	`23`	`{`
`24`	`24`	`if ( v && mControlPoly )`
`25`	`25`	`{`
`@@ -35,13 +35,13 @@ void Bezier3D::calcFirstDer( float t, Vector3D* v )`
`35`	`35`	`for ( int n = 1; n <= int( mControlPoly->count() - 1 ); n++ )`
`36`	`36`	`{`
`37`	`37`	`double bernst = MathUtils::calcBernsteinPoly( mControlPoly->count() - 2, n - 1, t );`
`38`		`- v->setX( v->getX() + (( mControlPoly )[n]->getX() - ( mControlPoly )[n-1]->getX() )*bernst );`
`39`		`- v->setY( v->getY() + (( mControlPoly )[n]->getY() - ( mControlPoly )[n-1]->getY() )*bernst );`
`40`		`- v->setZ( v->getZ() + (( mControlPoly )[n]->getZ() - ( mControlPoly )[n-1]->getZ() )*bernst );`
	`38`	`+ v->setX( v->getX() + ( ( mControlPoly )[n]->getX() - ( mControlPoly )[n - 1]->getX() )*bernst );`
	`39`	`+ v->setY( v->getY() + ( ( mControlPoly )[n]->getY() - ( mControlPoly )[n - 1]->getY() )*bernst );`
	`40`	`+ v->setZ( v->getZ() + ( ( mControlPoly )[n]->getZ() - ( mControlPoly )[n - 1]->getZ() )*bernst );`
`41`	`41`	`}`
`42`		`- v->setX( v->getX()*( mControlPoly->count() - 1 ) );`
`43`		`- v->setY( v->getY()*( mControlPoly->count() - 1 ) );`
`44`		`- v->setZ( v->getZ()*( mControlPoly->count() - 1 ) );`
	`42`	`+ v->setX( v->getX() * ( mControlPoly->count() - 1 ) );`
	`43`	`+ v->setY( v->getY() * ( mControlPoly->count() - 1 ) );`
	`44`	`+ v->setZ( v->getZ() * ( mControlPoly->count() - 1 ) );`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`else`
`@@ -50,7 +50,7 @@ void Bezier3D::calcFirstDer( float t, Vector3D* v )`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`-void Bezier3D::calcPoint( float t, Point3D* p )`
	`53`	`+void Bezier3D::calcPoint( float t, Point3D *p )`
`54`	`54`	`{`
`55`	`55`
`56`	`56`	`if ( p && mControlPoly )`
`@@ -62,9 +62,9 @@ void Bezier3D::calcPoint( float t, Point3D* p )`
`62`	`62`	`for ( int n = 1; n <= int( mControlPoly->count() ); n++ )`
`63`	`63`	`{`
`64`	`64`	`double bernst = MathUtils::calcBernsteinPoly( mControlPoly->count() - 1, n - 1, t );`
`65`		`- p->setX( p->getX() + ( mControlPoly )[n-1]->getX()bernst );`
`66`		`- p->setY( p->getY() + ( mControlPoly )[n-1]->getY()bernst );`
`67`		`- p->setZ( p->getZ() + ( mControlPoly )[n-1]->getZ()bernst );`
	`65`	`+ p->setX( p->getX() + ( mControlPoly )[n - 1]->getX()bernst );`
	`66`	`+ p->setY( p->getY() + ( mControlPoly )[n - 1]->getY()bernst );`
	`67`	`+ p->setZ( p->getZ() + ( mControlPoly )[n - 1]->getZ()bernst );`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`@@ -74,7 +74,7 @@ void Bezier3D::calcPoint( float t, Point3D* p )`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`-void Bezier3D::calcSecDer( float t, Vector3D* v )`
	`77`	`+void Bezier3D::calcSecDer( float t, Vector3D *v )`
`78`	`78`	`{`
`79`	`79`	`if ( v && mControlPoly )`
`80`	`80`	`{`
`@@ -91,9 +91,9 @@ void Bezier3D::calcSecDer( float t, Vector3D* v )`
`91`	`91`	`for ( int n = 1; n <= int( nodes - 2 ); n++ )`
`92`	`92`	`{`
`93`	`93`	`double bernst = MathUtils::calcBernsteinPoly( nodes - 3, n - 1, t );`
`94`		`- v->setX( v->getX() + (( mControlPoly )[n+1]->getX() - 2( mControlPoly )[n]->getX() + ( mControlPoly )[n-1]->getX() )*bernst );`
`95`		`- v->setY( v->getY() + (( mControlPoly )[n+1]->getY() - 2( mControlPoly )[n]->getY() + ( mControlPoly )[n-1]->getY() )*bernst );`
`96`		`- v->setZ( v->getZ() + (( mControlPoly )[n+1]->getZ() - 2( mControlPoly )[n]->getZ() + ( mControlPoly )[n-1]->getZ() )*bernst );`
	`94`	`+ v->setX( v->getX() + ( ( mControlPoly )[n + 1]->getX() - 2 ( mControlPoly )[n]->getX() + ( mControlPoly )[n - 1]->getX() )*bernst );`
	`95`	`+ v->setY( v->getY() + ( ( mControlPoly )[n + 1]->getY() - 2 ( mControlPoly )[n]->getY() + ( mControlPoly )[n - 1]->getY() )*bernst );`
	`96`	`+ v->setZ( v->getZ() + ( ( mControlPoly )[n + 1]->getZ() - 2 ( mControlPoly )[n]->getZ() + ( mControlPoly )[n - 1]->getZ() )*bernst );`
`97`	`97`	`}`
`98`	`98`	`v->setX( v->getX()*MathUtils::faculty( nodes - 1 ) / MathUtils::faculty( nodes - 3 ) );`
`99`	`99`	`v->setY( v->getY()*MathUtils::faculty( nodes - 1 ) / MathUtils::faculty( nodes - 3 ) );`
`@@ -111,15 +111,15 @@ void Bezier3D::changeDirection()//does this work correctly? more testing is need`
`111`	`111`	`{`
`112`	`112`	`if ( mControlPoly )`
`113`	`113`	`{`
`114`		`- Point3D** pointer = new Point3D*[mControlPoly->count()];//create an array to temporarily store pointer to the control points`
	`114`	`+ Point3D *pointer = new Point3D[mControlPoly->count()];//create an array to temporarily store pointer to the control points`
`115`	`115`	`for ( int i = 0; i < mControlPoly->count(); i++ )//store the points`
`116`	`116`	`{`
`117`	`117`	`pointer[i] = ( *mControlPoly )[i];`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`for ( int i = 0; i < mControlPoly->count(); i++ )`
`121`	`121`	`{`
`122`		`- mControlPoly->insert( i, pointer[( mControlPoly->count()-1 )-i] );`
	`122`	`+ mControlPoly->insert( i, pointer[( mControlPoly->count() - 1 ) - i] );`
`123`	`123`	`}`
`124`	`124`	`delete [] pointer;`
`125`	`125`	`}`