Skip to content
Permalink
Browse files

fix sip error

  • Loading branch information
jef-n committed Sep 3, 2012
1 parent c3d56b6 commit 9e9d1ce84faad2bcf2b3c6ccafa603d4427b2a6f
Showing with 27 additions and 30 deletions.
  1. +26 −30 python/core/qgsdistancearea.sip
  2. +1 −0 src/core/qgsdistancearea.h
@@ -6,33 +6,29 @@ class QgsDistanceArea
%End

public:

//! Constructor
QgsDistanceArea();

//! Destructor
~QgsDistanceArea();

//! Copy constructor
QgsDistanceArea(const QgsDistanceArea & origDA );

//! Assignment operator
operator=(const QgsDistanceArea & origDA );
//! Copy constructor
QgsDistanceArea( const QgsDistanceArea &origDA );

//! sets whether coordinates must be projected to ellipsoid before measuring
void setEllipsoidalMode(bool flag);
void setEllipsoidalMode( bool flag );
void setProjectionsEnabled(bool flag) /Deprecated/;

//! returns projections enabled flag
bool ellipsoidalEnabled();
bool ellipsoidalEnabled() const;
bool hasCrsTransformEnabled() /Deprecated/;

//! sets source spatial reference system (by QGIS CRS)
void setSourceCrs(long srsid);
void setSourceCrs( long srsid );

//! sets source spatial reference system (by EpsgCrsId)
// @deprecated use setSourceAuthid()
void setSourceEpsgCrsId(long epsgId) /Deprecated/;
void setSourceEpsgCrsId( long epsgId ) /Deprecated/;

//! sets source spatial reference system by authid
void setSourceAuthId( QString authid );
@@ -43,39 +39,39 @@ class QgsDistanceArea
bool geographic();

//! sets ellipsoid by its acronym
bool setEllipsoid(const QString& ellipsoid);
bool setEllipsoid( const QString& ellipsoid );

//! Sets ellipsoid by supplied radii
// Inverse flattening is calculated with invf = a/(a-b)
bool setEllipsoid( double semiMajor, double semiMinor );

//! returns ellipsoid's acronym
const QString& ellipsoid();

//! returns ellipsoid's semi major axis
double ellipsoidSemiMajor();
//! returns ellipsoid's semi minor axis
double ellipsoidSemiMinor();
//! returns ellipsoid's inverse flattening
double ellipsoidInverseFlattening();

//! general measurement (line distance or polygon area)
double measure(QgsGeometry* geometry);

//! measurement perimater of polygon
double measurePerimeter(QgsGeometry* geometry);
//! measures line with more segments
double measureLine(const QList<QgsPoint>& points);
double measure( QgsGeometry* geometry );

//! measures perimeter of polygon
double measurePerimeter( QgsGeometry* geometry );

//! measures line
double measureLine( const QList<QgsPoint>& points );

//! measures line with one segment
double measureLine(const QgsPoint& p1, const QgsPoint& p2);
double measureLine( const QgsPoint& p1, const QgsPoint& p2 );

//! measures polygon area
double measurePolygon(const QList<QgsPoint>& points);
double measurePolygon( const QList<QgsPoint>& points );

//! compute bearing - in radians
double bearing(const QgsPoint& p1, const QgsPoint& p2);
double bearing( const QgsPoint& p1, const QgsPoint& p2 );

static QString textUnit( double value, int decimals, QGis::UnitType u, bool isArea, bool keepBaseUnit = false );

@@ -58,6 +58,7 @@ class CORE_EXPORT QgsDistanceArea
void setSourceCrs( long srsid );

//! sets source spatial reference system (by EpsgCrsId)
// @deprecated use setSourceAuthid()
Q_DECL_DEPRECATED void setSourceEpsgCrsId( long epsgId );

//! sets source spatial reference system by authid

0 comments on commit 9e9d1ce

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