sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix sip error

Browse Source
This commit is contained in:
Juergen E. Fischer 2012-09-03 23:49:46 +02:00
parent c3d56b6dc8
commit 9e9d1ce84f
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
python/core/qgsdistancearea.sip
View File

@ -6,33 +6,29 @@ class QgsDistanceArea
%End %End
public: public:
//! Constructor //! Constructor
QgsDistanceArea(); QgsDistanceArea();
//! Destructor //! Destructor
~QgsDistanceArea(); ~QgsDistanceArea();
//! Copy constructor
QgsDistanceArea(const QgsDistanceArea & origDA );
//! Assignment operator //! Copy constructor
operator=(const QgsDistanceArea & origDA ); QgsDistanceArea( const QgsDistanceArea &origDA );
//! sets whether coordinates must be projected to ellipsoid before measuring //! sets whether coordinates must be projected to ellipsoid before measuring
void setEllipsoidalMode(bool flag); void setEllipsoidalMode( bool flag );
void setProjectionsEnabled(bool flag) /Deprecated/; void setProjectionsEnabled(bool flag) /Deprecated/;
//! returns projections enabled flag //! returns projections enabled flag
bool ellipsoidalEnabled(); bool ellipsoidalEnabled() const;
bool hasCrsTransformEnabled() /Deprecated/; bool hasCrsTransformEnabled() /Deprecated/;
//! sets source spatial reference system (by QGIS CRS) //! sets source spatial reference system (by QGIS CRS)
void setSourceCrs(long srsid); void setSourceCrs( long srsid );
//! sets source spatial reference system (by EpsgCrsId) //! sets source spatial reference system (by EpsgCrsId)
// @deprecated use setSourceAuthid() // @deprecated use setSourceAuthid()
void setSourceEpsgCrsId(long epsgId) /Deprecated/; void setSourceEpsgCrsId( long epsgId ) /Deprecated/;
//! sets source spatial reference system by authid //! sets source spatial reference system by authid
void setSourceAuthId( QString authid ); void setSourceAuthId( QString authid );
@ -43,39 +39,39 @@ class QgsDistanceArea
bool geographic(); bool geographic();
//! sets ellipsoid by its acronym //! sets ellipsoid by its acronym
bool setEllipsoid(const QString& ellipsoid); bool setEllipsoid( const QString& ellipsoid );
//! Sets ellipsoid by supplied radii //! Sets ellipsoid by supplied radii
// Inverse flattening is calculated with invf = a/(a-b) // Inverse flattening is calculated with invf = a/(a-b)
bool setEllipsoid( double semiMajor, double semiMinor ); bool setEllipsoid( double semiMajor, double semiMinor );
//! returns ellipsoid's acronym //! returns ellipsoid's acronym
const QString& ellipsoid(); const QString& ellipsoid();
//! returns ellipsoid's semi major axis //! returns ellipsoid's semi major axis
double ellipsoidSemiMajor(); double ellipsoidSemiMajor();
//! returns ellipsoid's semi minor axis //! returns ellipsoid's semi minor axis
double ellipsoidSemiMinor(); double ellipsoidSemiMinor();
//! returns ellipsoid's inverse flattening //! returns ellipsoid's inverse flattening
double ellipsoidInverseFlattening(); double ellipsoidInverseFlattening();
//! general measurement (line distance or polygon area)
double measure(QgsGeometry* geometry);
//! measurement perimater of polygon //! general measurement (line distance or polygon area)
double measurePerimeter(QgsGeometry* geometry); double measure( QgsGeometry* geometry );
//! measures line with more segments //! measures perimeter of polygon
double measureLine(const QList<QgsPoint>& points); double measurePerimeter( QgsGeometry* geometry );
//! measures line
double measureLine( const QList<QgsPoint>& points );
//! measures line with one segment //! measures line with one segment
double measureLine(const QgsPoint& p1, const QgsPoint& p2); double measureLine( const QgsPoint& p1, const QgsPoint& p2 );
//! measures polygon area //! measures polygon area
double measurePolygon(const QList<QgsPoint>& points); double measurePolygon( const QList<QgsPoint>& points );
//! compute bearing - in radians //! 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 ); static QString textUnit( double value, int decimals, QGis::UnitType u, bool isArea, bool keepBaseUnit = false );

1
src/core/qgsdistancearea.h
View File

@ -58,6 +58,7 @@ class CORE_EXPORT QgsDistanceArea
void setSourceCrs( long srsid ); void setSourceCrs( long srsid );
//! sets source spatial reference system (by EpsgCrsId) //! sets source spatial reference system (by EpsgCrsId)
// @deprecated use setSourceAuthid()
Q_DECL_DEPRECATED void setSourceEpsgCrsId( long epsgId ); Q_DECL_DEPRECATED void setSourceEpsgCrsId( long epsgId );
//! sets source spatial reference system by authid //! sets source spatial reference system by authid