Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into sip-annotated
  • Loading branch information
3nids committed May 1, 2017
2 parents bb1bded + 93971d5 commit 0070029
Show file tree
Hide file tree
Showing 295 changed files with 6,528 additions and 4,532 deletions.
2 changes: 1 addition & 1 deletion .ci/travis/macos/script.sh
Expand Up @@ -35,7 +35,7 @@ gtimeout ${TIMEOUT}s ctest -V -E "$(cat ${DIR}/blacklist.txt | gsed -r '/^(#.*?)

rv=$?

if [ $? -eq 124 ] ; then
if [ $rv -eq 124 ] ; then
echo '\033[0;33mBuild and test timeout. Please restart the build for useful results.\033[0m'
fi

Expand Down
1 change: 0 additions & 1 deletion debian/python-qgis.install.in
Expand Up @@ -5,5 +5,4 @@ usr/lib/python*/*-packages/qgis/gui/*
usr/lib/python*/*-packages/qgis/analysis/*
usr/lib/python*/*-packages/qgis/PyQt/*
usr/lib/python*/*-packages/qgis/testing/*
usr/lib/python*/*-packages/pyspatialite/*
usr/lib/python*/*-packages/qgis/server/*
52 changes: 37 additions & 15 deletions python/analysis/vector/qgsoverlayanalyzer.sip
@@ -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 *
************************************************************************/
20 changes: 0 additions & 20 deletions python/auto_sip.blacklist
Expand Up @@ -7,17 +7,11 @@ core/qgsdbfilterproxymodel.sip
core/qgseditformconfig.sip
core/qgseditorwidgetsetup.sip
core/qgserror.sip
core/qgsexpression.sip
core/qgsexpressioncontext.sip
core/qgsexpressioncontextgenerator.sip
core/qgsfeaturefilterprovider.sip
core/qgsfeatureiterator.sip
core/qgsfeaturerequest.sip
core/qgsfield.sip
core/qgsfieldconstraints.sip
core/qgsfields.sip
core/qgsfieldformatterregistry.sip
core/qgsfieldformatter.sip
core/qgsgeometrysimplifier.sip
core/qgsgeometryvalidator.sip
core/qgsgml.sip
Expand Down Expand Up @@ -64,7 +58,6 @@ core/qgspallabeling.sip
core/qgspathresolver.sip
core/qgspluginlayer.sip
core/qgspluginlayerregistry.sip
core/qgspoint.sip
core/qgspointlocator.sip
core/qgsproject.sip
core/qgsprojectbadlayerhandler.sip
Expand All @@ -85,12 +78,9 @@ core/qgsruntimeprofiler.sip
core/qgsscalecalculator.sip
core/qgsscaleutils.sip
core/qgssimplifymethod.sip
core/qgssnapper.sip
core/qgssnappingutils.sip
core/qgsspatialindex.sip
core/qgssqlstatement.sip
core/qgsstatisticalsummary.sip
core/qgsstringstatisticalsummary.sip
core/qgsstringutils.sip
core/qgstaskmanager.sip
core/qgstolerance.sip
Expand Down Expand Up @@ -269,7 +259,6 @@ gui/qgsblendmodecombobox.sip
gui/qgisinterface.sip
gui/qgsactionmenu.sip
gui/qgsadvanceddigitizingcanvasitem.sip
gui/qgsadvanceddigitizingdockwidget.sip
gui/qgsattributedialog.sip
gui/qgsattributeeditorcontext.sip
gui/qgsattributeform.sip
Expand All @@ -278,18 +267,12 @@ gui/qgsattributeforminterface.sip
gui/qgsattributetypeloaddialog.sip
gui/qgsbrowsertreeview.sip
gui/qgsbusyindicatordialog.sip
gui/qgscollapsiblegroupbox.sip
gui/qgscodeeditor.sip
gui/qgscodeeditorpython.sip
gui/qgscodeeditorsql.sip