Skip to content

Commit 2e7de50

Browse files
3nids3nids
committed
run astyle on src/*
1 parent dccf8c9 commit 2e7de50

File tree

728 files changed

+10813
-10803
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

728 files changed

+10813
-10803
lines changed

‎src/analysis/interpolation/Bezier3D.cc‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "Vector3D.h"
2020
#include "MathUtils.h"
2121

22-
void Bezier3D::calcFirstDer( float t, Vector3D* v )
22+
void Bezier3D::calcFirstDer( float t, Vector3D *v )
2323
{
2424
if ( v && mControlPoly )
2525
{
@@ -35,13 +35,13 @@ void Bezier3D::calcFirstDer( float t, Vector3D* v )
3535
for ( int n = 1; n <= int( mControlPoly->count() - 1 ); n++ )
3636
{
3737
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 );
4141
}
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 ) );
4545
}
4646

4747
else
@@ -50,7 +50,7 @@ void Bezier3D::calcFirstDer( float t, Vector3D* v )
5050
}
5151
}
5252

53-
void Bezier3D::calcPoint( float t, Point3D* p )
53+
void Bezier3D::calcPoint( float t, Point3D *p )
5454
{
5555

5656
if ( p && mControlPoly )
@@ -62,9 +62,9 @@ void Bezier3D::calcPoint( float t, Point3D* p )
6262
for ( int n = 1; n <= int( mControlPoly->count() ); n++ )
6363
{
6464
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 );
6868
}
6969
}
7070

@@ -74,7 +74,7 @@ void Bezier3D::calcPoint( float t, Point3D* p )
7474
}
7575
}
7676

77-
void Bezier3D::calcSecDer( float t, Vector3D* v )
77+
void Bezier3D::calcSecDer( float t, Vector3D *v )
7878
{
7979
if ( v && mControlPoly )
8080
{
@@ -91,9 +91,9 @@ void Bezier3D::calcSecDer( float t, Vector3D* v )
9191
for ( int n = 1; n <= int( nodes - 2 ); n++ )
9292
{
9393
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 );
9797
}
9898
v->setX( v->getX()*MathUtils::faculty( nodes - 1 ) / MathUtils::faculty( nodes - 3 ) );
9999
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
111111
{
112112
if ( mControlPoly )
113113
{
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
115115
for ( int i = 0; i < mControlPoly->count(); i++ )//store the points
116116
{
117117
pointer[i] = ( *mControlPoly )[i];
118118
}
119119

120120
for ( int i = 0; i < mControlPoly->count(); i++ )
121121
{
122-
mControlPoly->insert( i, pointer[( mControlPoly->count()-1 )-i] );
122+
mControlPoly->insert( i, pointer[( mControlPoly->count() - 1 ) - i] );
123123
}
124124
delete [] pointer;
125125
}

‎src/analysis/interpolation/Bezier3D.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,36 +31,36 @@ class ANALYSIS_EXPORT Bezier3D: public ParametricLine
3131
//! Default constructor
3232
Bezier3D();
3333
//! Constructor, par is a pointer to the parent, controlpoly a controlpolygon
34-
Bezier3D( ParametricLine* par, QVector<Point3D*>* controlpoly );
34+
Bezier3D( ParametricLine *par, QVector<Point3D *> *controlpoly );
3535

3636
virtual ~Bezier3D();
3737
//! Do not use this method, since a Bezier curve does not consist of other curves
3838
virtual void add( ParametricLine *pl ) override;
3939
//! Calculates the first derivative and assigns it to v
40-
virtual void calcFirstDer( float t, Vector3D* v ) override;
40+
virtual void calcFirstDer( float t, Vector3D *v ) override;
4141
//! Calculates the second derivative and assigns it to v
42-
virtual void calcSecDer( float t, Vector3D* v ) override;
42+
virtual void calcSecDer( float t, Vector3D *v ) override;
4343
//virtual Point3D calcPoint(float t);
4444
//! Calculates the point on the curve and assigns it to p
45-
virtual void calcPoint( float t, Point3D* p ) override;
45+
virtual void calcPoint( float t, Point3D *p ) override;
4646
//! Changes the order of control points
4747
virtual void changeDirection() override;
4848
//virtual void draw(QPainter* p);
4949
//virtual bool intersects(ParametricLine* pal);
5050
//! Do not use this method, since a Bezier curve does not consist of other curves
5151
virtual void remove( int i ) override;
5252
//! Returns a control point
53-
virtual const Point3D* getControlPoint( int number ) const override;
53+
virtual const Point3D *getControlPoint( int number ) const override;
5454
//! Returns a pointer to the control polygon
55-
virtual const QVector<Point3D*>* getControlPoly() const override;
55+
virtual const QVector<Point3D *> *getControlPoly() const override;
5656
//! Returns the degree of the curve
5757
virtual int getDegree() const override;
5858
//! Returns the parent
59-
virtual ParametricLine* getParent() const override;
59+
virtual ParametricLine *getParent() const override;
6060
//! Sets the parent
61-
virtual void setParent( ParametricLine* par ) override;
61+
virtual void setParent( ParametricLine *par ) override;
6262
//! Sets the control polygon
63-
virtual void setControlPoly( QVector<Point3D*>* cp ) override;
63+
virtual void setControlPoly( QVector<Point3D *> *cp ) override;
6464

6565
};
6666

@@ -71,7 +71,7 @@ inline Bezier3D::Bezier3D() : ParametricLine()//default constructor
7171

7272
}
7373

74-
inline Bezier3D::Bezier3D( ParametricLine* parent, QVector<Point3D*>* controlpoly ) : ParametricLine( parent, controlpoly )
74+
inline Bezier3D::Bezier3D( ParametricLine *parent, QVector<Point3D *> *controlpoly ) : ParametricLine( parent, controlpoly )
7575
{
7676
mDegree = mControlPoly->count() - 1;
7777
}
@@ -97,12 +97,12 @@ inline void Bezier3D::remove( int i )
9797

9898
//-----------------------------------------------setters and getters---------------------------------------------------------------
9999

100-
inline const Point3D* Bezier3D::getControlPoint( int number ) const
100+
inline const Point3D *Bezier3D::getControlPoint( int number ) const
101101
{
102-
return ( *mControlPoly )[number-1];
102+
return ( *mControlPoly )[number - 1];
103103
}
104104

105-
inline const QVector<Point3D*>* Bezier3D::getControlPoly() const
105+
inline const QVector<Point3D *> *Bezier3D::getControlPoly() const
106106
{
107107
return mControlPoly;
108108
}
@@ -112,17 +112,17 @@ inline int Bezier3D::getDegree() const
112112
return mDegree;
113113
}
114114

115-
inline ParametricLine* Bezier3D::getParent() const
115+
inline ParametricLine *Bezier3D::getParent() const
116116
{
117117
return mParent;
118118
}
119119

120-
inline void Bezier3D::setParent( ParametricLine* par )
120+
inline void Bezier3D::setParent( ParametricLine *par )
121121
{
122122
mParent = par;
123123
}
124124

125-
inline void Bezier3D::setControlPoly( QVector<Point3D*>* cp )
125+
inline void Bezier3D::setControlPoly( QVector<Point3D *> *cp )
126126
{
127127
mControlPoly = cp;
128128
mDegree = mControlPoly->count() - 1;

0 commit comments

Comments
 (0)