Skip to content

Commit

Permalink
sipify qgsoverlayanalyzer and qgsnewmemorylayer
Browse files Browse the repository at this point in the history
  • Loading branch information
Gustry authored and 3nids committed Apr 30, 2017
1 parent fe2f111 commit bb3a418
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 30 deletions.
52 changes: 37 additions & 15 deletions python/analysis/vector/qgsoverlayanalyzer.sip
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 *
************************************************************************/
2 changes: 0 additions & 2 deletions python/auto_sip.blacklist
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ gui/qgsmessagebar.sip
gui/qgsmessagebaritem.sip
gui/qgsmessageviewer.sip
gui/qgsnewhttpconnection.sip
gui/qgsnewmemorylayerdialog.sip
gui/qgsnewnamedialog.sip
gui/qgsnewvectorlayerdialog.sip
gui/qgsnewgeopackagelayerdialog.sip
Expand Down Expand Up @@ -505,7 +504,6 @@ gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip
gui/layertree/qgslayertreeview.sip
analysis/vector/qgsgeometryanalyzer.sip
analysis/vector/qgsgeometrysnapper.sip
analysis/vector/qgsoverlayanalyzer.sip
analysis/vector/qgspointsample.sip
analysis/vector/qgstransectsample.sip
analysis/vector/qgszonalstatistics.sip
Expand Down
61 changes: 50 additions & 11 deletions python/gui/qgsnewmemorylayerdialog.sip
Original file line number Diff line number Diff line change
@@ -1,27 +1,66 @@
class QgsNewMemoryLayerDialog : QDialog
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsnewmemorylayerdialog.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/




class QgsNewMemoryLayerDialog: QDialog
{

%TypeHeaderCode
#include <qgsnewmemorylayerdialog.h>
#include "qgsnewmemorylayerdialog.h"
%End

public:

/** Runs the dialoag and creates a new memory layer
* @param parent parent widget
* @returns new memory layer
*/
static QgsVectorLayer* runAndCreateLayer( QWidget* parent = 0 );
static QgsVectorLayer *runAndCreateLayer( QWidget *parent = 0, const QgsCoordinateReferenceSystem &defaultCrs = QgsCoordinateReferenceSystem() );
%Docstring
Runs the dialog and creates a new memory layer
\param parent parent widget
\param defaultCrs default layer CRS to show in dialog
:return: new memory layer
:rtype: QgsVectorLayer
%End

QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags );
QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
~QgsNewMemoryLayerDialog();

/** Returns the selected geometry type*/
QgsWkbTypes::Type selectedType() const;
%Docstring
Returns the selected geometry type
:rtype: QgsWkbTypes.Type
%End

void setCrs( const QgsCoordinateReferenceSystem &crs );
%Docstring
Sets the ``crs`` value for the new layer in the dialog.
.. versionadded:: 3.0
.. seealso:: crs()
%End

QgsCoordinateReferenceSystem crs() const;
%Docstring
Returns the selected CRS for the new layer.
.. seealso:: setCrs()
:rtype: QgsCoordinateReferenceSystem
%End

/** Returns the layer name*/
QString layerName() const;
%Docstring
Returns the layer name
:rtype: str
%End

};

/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsnewmemorylayerdialog.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions src/gui/qgsnewmemorylayerdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ class GUI_EXPORT QgsNewMemoryLayerDialog: public QDialog, private Ui::QgsNewMemo

public:

/** Runs the dialoag and creates a new memory layer
/** Runs the dialog and creates a new memory layer
* \param parent parent widget
* \param defaultCrs default layer CRS to show in dialog
* \returns new memory layer
*/
static QgsVectorLayer *runAndCreateLayer( QWidget *parent = nullptr, const QgsCoordinateReferenceSystem &defaultCrs = QgsCoordinateReferenceSystem() );

QgsNewMemoryLayerDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
QgsNewMemoryLayerDialog( QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
~QgsNewMemoryLayerDialog();

//! Returns the selected geometry type
Expand Down

0 comments on commit bb3a418

Please sign in to comment.