Skip to content
Permalink
Browse files

Prepare commit converts single line doxygen block format

Flips single line doxygen comments to use the proper single line
format:

/*!< comment */   to   //!< Comment

and

/** comment */    to   //! Comment
  • Loading branch information
nyalldawson committed Oct 24, 2016
1 parent 3ef8e6a commit 1367fd09fc5595518b6c2a28dbddc3f28863a836
Showing 557 changed files with 4,682 additions and 4,674 deletions.
@@ -28,6 +28,14 @@
# Also fix doxygen comments
s#^(\s*)/\*[*!]\s*([^\s*].*)\s*$#$1/** \u$2\n#;

# Convert single line doxygent blocks:
# /*!< comment */ to //!< comment
# /** comment */ to //! comment
s#\/\*[!\*](?!\*)(<*)\h*(.*?)\h*\*\/\h*$#//!$1 $2#;

# Uppercase initial character in //!< comment
s#\/\/!<\s*(.)(.*)#//!< \u$1$2#;

if( /^\s*#include/ ) {
push @inc, $_ unless exists $inc{$_};
$inc{$_}=1;
@@ -27,38 +27,38 @@ class ANALYSIS_EXPORT Bezier3D: public ParametricLine
protected:

public:
/** Default constructor*/
//! Default constructor
Bezier3D();
/** Constructor, par is a pointer to the parent, controlpoly a controlpolygon*/
//! Constructor, par is a pointer to the parent, controlpoly a controlpolygon
Bezier3D( ParametricLine* par, QVector<Point3D*>* controlpoly );
/** Destructor*/
//! Destructor
virtual ~Bezier3D();
/** Do not use this method, since a Bezier curve does not consist of other curves*/
//! 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*/
//! Calculates the first derivative and assigns it to v
virtual void calcFirstDer( float t, Vector3D* v ) override;
/** Calculates the second derivative and assigns it to v*/
//! Calculates the second derivative and assigns it to v
virtual void calcSecDer( float t, Vector3D* v ) override;
//virtual Point3D calcPoint(float t);
/** Calculates the point on the curve and assigns it to p*/
//! Calculates the point on the curve and assigns it to p
virtual void calcPoint( float t, Point3D* p ) override;
/** Changes the order of control points*/
//! 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*/
//! 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*/
//! Returns a control point
virtual const Point3D* getControlPoint( int number ) const override;
/** Returns a pointer to the control polygon*/
//! Returns a pointer to the control polygon
virtual const QVector<Point3D*>* getControlPoly() const override;
/** Returns the degree of the curve*/
//! Returns the degree of the curve
virtual int getDegree() const override;
/** Returns the parent*/
//! Returns the parent
virtual ParametricLine* getParent() const override;
/** Sets the parent*/
//! Sets the parent
virtual void setParent( ParametricLine* par ) override;
/** Sets the control polygon*/
//! Sets the control polygon
virtual void setControlPoly( QVector<Point3D*>* cp ) override;

};
@@ -27,15 +27,15 @@ class NormVecDecorator;
class ANALYSIS_EXPORT CloughTocherInterpolator : public TriangleInterpolator
{
protected:
/** Association with a triangulation object*/
//! Association with a triangulation object
NormVecDecorator* mTIN;
/** Tolerance of the barycentric coordinates at the borders of the triangles (to prevent errors because of very small negativ baricentric coordinates)*/
//! Tolerance of the barycentric coordinates at the borders of the triangles (to prevent errors because of very small negativ baricentric coordinates)
double mEdgeTolerance;
/** First point of the triangle in x-,y-,z-coordinates*/
//! First point of the triangle in x-,y-,z-coordinates
Point3D point1;
/** Second point of the triangle in x-,y-,z-coordinates*/
//! Second point of the triangle in x-,y-,z-coordinates
Point3D point2;
/** Third point of the triangle in x-,y-,z-coordinates*/
//! Third point of the triangle in x-,y-,z-coordinates
Point3D point3;
Point3D cp1;
Point3D cp2;
@@ -53,39 +53,39 @@ class ANALYSIS_EXPORT CloughTocherInterpolator : public TriangleInterpolator
Point3D cp14;
Point3D cp15;
Point3D cp16;
/** Derivative in x-direction at point1*/
//! Derivative in x-direction at point1
double der1X;
/** Derivative in y-direction at point1*/
//! Derivative in y-direction at point1
double der1Y;
/** Derivative in x-direction at point2*/
//! Derivative in x-direction at point2
double der2X;
/** Derivative in y-direction at point2*/
//! Derivative in y-direction at point2
double der2Y;
/** Derivative in x-direction at point3*/
//! Derivative in x-direction at point3
double der3X;
/** Derivative in y-direction at point3*/
//! Derivative in y-direction at point3
double der3Y;
/** Stores point1 of the last run*/
//! Stores point1 of the last run
Point3D lpoint1;
/** Stores point2 of the last run*/
//! Stores point2 of the last run
Point3D lpoint2;
/** Stores point3 of the last run*/
//! Stores point3 of the last run
Point3D lpoint3;
/** Finds out, in which triangle the point with the coordinates x and y is*/
//! Finds out, in which triangle the point with the coordinates x and y is
void init( double x, double y );
/** Calculates the Bernsteinpolynomials to calculate the Beziertriangle. 'n' is three in the cubical case, 'i', 'j', 'k' are the indices of the controllpoint and 'u', 'v', 'w' are the barycentric coordinates of the point*/
//! Calculates the Bernsteinpolynomials to calculate the Beziertriangle. 'n' is three in the cubical case, 'i', 'j', 'k' are the indices of the controllpoint and 'u', 'v', 'w' are the barycentric coordinates of the point
double calcBernsteinPoly( int n, int i, int j, int k, double u, double v, double w );

public:
/** Standard constructor*/
//! Standard constructor
CloughTocherInterpolator();
/** Constructor with a pointer to the triangulation as argument*/
//! Constructor with a pointer to the triangulation as argument
CloughTocherInterpolator( NormVecDecorator* tin );
/** Destructor*/
//! Destructor
virtual ~CloughTocherInterpolator();
/** Calculates the normal vector and assigns it to vec (not implemented at the moment)*/
//! Calculates the normal vector and assigns it to vec (not implemented at the moment)
virtual bool calcNormVec( double x, double y, Vector3D* result ) override;
/** Performs a linear interpolation in a triangle and assigns the x-,y- and z-coordinates to point*/
//! Performs a linear interpolation in a triangle and assigns the x-,y- and z-coordinates to point
virtual bool calcPoint( double x, double y, Point3D* result ) override;
virtual void setTriangulation( NormVecDecorator* tin );
};

0 comments on commit 1367fd0

Please sign in to comment.
You can’t perform that action at this time.