Skip to content

Commit 0f2a49d

Browse files
committedJun 3, 2017
Remove Point3D
... in favor of QgsPoint Reference qgis/qgis4.0_api#71
1 parent bf9021a commit 0f2a49d

Some content is hidden

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

44 files changed

+619
-808
lines changed
 

‎python/analysis/analysis.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
%Include interpolation/Node.sip
2424
%Include interpolation/NormVecDecorator.sip
2525
%Include interpolation/ParametricLine.sip
26-
%Include interpolation/Point3D.sip
2726
%Include interpolation/TriangleInterpolator.sip
2827
%Include interpolation/Triangulation.sip
2928
%Include interpolation/TriDecorator.sip

‎python/analysis/interpolation/Bezier3D.sip

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Bezier3D : ParametricLine
88
/** Default constructor*/
99
Bezier3D();
1010
/** Constructor, par is a pointer to the parent, controlpoly a controlpolygon*/
11-
Bezier3D( ParametricLine *par, QVector<Point3D*> *controlpoly );
11+
Bezier3D( ParametricLine *par, QVector<QgsPoint*> *controlpoly );
1212
/** Destructor*/
1313
virtual ~Bezier3D();
1414
/** Do not use this method, since a Bezier curve does not consist of other curves*/
@@ -17,26 +17,26 @@ class Bezier3D : ParametricLine
1717
virtual void calcFirstDer( float t, Vector3D *v );
1818
/** Calculates the second derivative and assigns it to v*/
1919
virtual void calcSecDer( float t, Vector3D *v );
20-
//virtual Point3D calcPoint(float t);
20+
//virtual QgsPoint calcPoint(float t);
2121
/** Calculates the point on the curve and assigns it to p*/
22-
virtual void calcPoint( float t, Point3D *p );
22+
virtual void calcPoint( float t, QgsPoint *p );
2323
/** Changes the order of control points*/
2424
virtual void changeDirection();
2525
//virtual void draw(QPainter *p);
2626
//virtual bool intersects(ParametricLine *pal);
2727
/** Do not use this method, since a Bezier curve does not consist of other curves*/
2828
virtual void remove( int i );
2929
/** Returns a control point*/
30-
virtual const Point3D *getControlPoint( int number ) const;
30+
virtual const QgsPoint *getControlPoint( int number ) const;
3131
/** Returns a pointer to the control polygon*/
32-
virtual const QVector<Point3D*> *getControlPoly() const;
32+
virtual const QVector<QgsPoint*> *getControlPoly() const;
3333
/** Returns the degree of the curve*/
3434
virtual int getDegree() const;
3535
/** Returns the parent*/
3636
virtual ParametricLine *getParent() const;
3737
/** Sets the parent*/
3838
virtual void setParent( ParametricLine *par );
3939
/** Sets the control polygon*/
40-
virtual void setControlPoly( QVector<Point3D*> *cp );
40+
virtual void setControlPoly( QVector<QgsPoint*> *cp );
4141

4242
};

0 commit comments

Comments
 (0)
Please sign in to comment.