Skip to content

Commit d3bc0e3

Browse files
committedMay 2, 2017
[sip] mass introduction of annotations into headers
1 parent b249d48 commit d3bc0e3

File tree

243 files changed

+724
-505
lines changed

Some content is hidden

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

243 files changed

+724
-505
lines changed
 

‎src/analysis/interpolation/NormVecDecorator.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define NORMVECDECORATOR_H
1919

2020
#include "TriDecorator.h"
21+
#include "qgis.h"
2122
#include <TriangleInterpolator.h>
2223
#include <MathUtils.h>
2324
#include "qgslogger.h"
@@ -52,7 +53,7 @@ class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
5253
//! Returns a pointer to the normal vector for the point with the number n
5354
Vector3D *getNormal( int n ) const;
5455
//! Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normally taken from 'mNormVec', except if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise
55-
bool getTriangle( double x, double y, Point3D *p1, Vector3D *v1, Point3D *p2, Vector3D *v2, Point3D *p3, Vector3D *v3 );
56+
bool getTriangle( double x, double y, Point3D *p1 SIP_OUT, Vector3D *v1 SIP_OUT, Point3D *p2 SIP_OUT, Vector3D *v2 SIP_OUT, Point3D *p3 SIP_OUT, Vector3D *v3 SIP_OUT );
5657

5758
/** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the PointStates of the triangle points (state1, state2, state3)
5859
* \note not available in Python bindings

‎src/analysis/interpolation/Triangulation.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define TRIANGULATION_H
1919

2020
#include <QList>
21+
#include "qgis.h"
2122
#include <qpainter.h>
2223
#include <TriangleInterpolator.h>
2324
#include "qgis_analysis.h"
@@ -42,7 +43,7 @@ class ANALYSIS_EXPORT Triangulation
4243
* Adds a line (e.g. a break-, structure- or an isoline) to the triangulation.
4344
* The class takes ownership of the line object and its points
4445
*/
45-
virtual void addLine( Line3D *line, bool breakline ) = 0;
46+
virtual void addLine( Line3D *line SIP_TRANSFER, bool breakline ) = 0;
4647

4748
/**
4849
* Adds a point to the triangulation
@@ -71,10 +72,10 @@ class ANALYSIS_EXPORT Triangulation
7172
/** Finds out in which triangle the point with coordinates x and y is and
7273
* assigns the numbers of the vertices to 'n1', 'n2' and 'n3' and the vertices to 'p1', 'p2' and 'p3'
7374
*/
74-
virtual bool getTriangle( double x, double y, Point3D *p1, int *n1, Point3D *p2, int *n2, Point3D *p3, int *n3 ) = 0;
75+
virtual bool getTriangle( double x, double y, Point3D *p1, int *n1 SIP_OUT, Point3D *p2 SIP_OUT, int *n2 SIP_OUT, Point3D *p3 SIP_OUT, int *n3 SIP_OUT ) = 0;
7576

7677
//! Finds out, in which triangle the point with coordinates x and y is and assigns the points at the vertices to 'p1', 'p2' and 'p3
77-
virtual bool getTriangle( double x, double y, Point3D *p1, Point3D *p2, Point3D *p3 ) = 0;
78+
virtual bool getTriangle( double x, double y, Point3D *p1 SIP_OUT, Point3D *p2 SIP_OUT, Point3D *p3 SIP_OUT ) = 0;
7879

7980
//! Returns the number of the point opposite to the triangle points p1, p2 (which have to be on a halfedge)
8081
virtual int getOppositePoint( int p1, int p2 ) = 0;

0 commit comments

Comments
 (0)
Please sign in to comment.