Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into sip-annotated
- Loading branch information
Showing
295 changed files
with
6,528 additions
and
4,532 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,46 @@ | ||
| /************************************************************************ | ||
| * This file has been generated automatically from * | ||
| * * | ||
| * src/analysis/vector/qgsoverlayanalyzer.h * | ||
| * * | ||
| * Do not edit manually ! Edit header and run scripts/sipify.pl again * | ||
| ************************************************************************/ | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| /** \ingroup analysis | ||
| * The Qgis class provides vector overlay analysis functions | ||
| */ | ||
|
|
||
| class QgsOverlayAnalyzer | ||
| { | ||
| %TypeHeaderCode | ||
| #include <qgsoverlayanalyzer.h> | ||
| %Docstring | ||
| The QGis class provides vector overlay analysis functions | ||
| %End | ||
|
|
||
| %TypeHeaderCode | ||
| #include "qgsoverlayanalyzer.h" | ||
| %End | ||
| public: | ||
|
|
||
| /** Perform an intersection on two input vector layers and write output to a new shape file | ||
| @param layerA input vector layer | ||
| @param layerB input vector layer | ||
| @param shapefileName path to the output shp | ||
| @param onlySelectedFeatures if true, only selected features are considered, else all the features | ||
| @param p progress dialog (or 0 if no progress dialog is to be shown) | ||
| */ | ||
| bool intersection( QgsVectorLayer* layerA, QgsVectorLayer* layerB, | ||
| const QString& shapefileName, bool onlySelectedFeatures = false, | ||
| QProgressDialog* p = 0 ); | ||
| bool intersection( QgsVectorLayer *layerA, QgsVectorLayer *layerB, | ||
| const QString &shapefileName, bool onlySelectedFeatures = false, | ||
| QProgressDialog *p = 0 ); | ||
| %Docstring | ||
| Perform an intersection on two input vector layers and write output to a new shape file | ||
| \param layerA input vector layer | ||
| \param layerB input vector layer | ||
| \param shapefileName path to the output shp | ||
| \param onlySelectedFeatures if true, only selected features are considered, else all the features | ||
| \param p progress dialog (or 0 if no progress dialog is to be shown) | ||
| :rtype: bool | ||
| %End | ||
|
|
||
| }; | ||
|
|
||
| /************************************************************************ | ||
| * This file has been generated automatically from * | ||
| * * | ||
| * src/analysis/vector/qgsoverlayanalyzer.h * | ||
| * * | ||
| * Do not edit manually ! Edit header and run scripts/sipify.pl again * | ||
| ************************************************************************/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.