Skip to content

Commit bb3a418

Browse files
Gustry3nids
Gustry
authored and
3nids
committed
sipify qgsoverlayanalyzer and qgsnewmemorylayer
1 parent fe2f111 commit bb3a418

File tree

4 files changed

+89
-30
lines changed

4 files changed

+89
-30
lines changed

‎python/analysis/vector/qgsoverlayanalyzer.sip‎

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,46 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/analysis/vector/qgsoverlayanalyzer.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
112

2-
/** \ingroup analysis
3-
* The Qgis class provides vector overlay analysis functions
4-
*/
513

614
class QgsOverlayAnalyzer
715
{
8-
%TypeHeaderCode
9-
#include <qgsoverlayanalyzer.h>
16+
%Docstring
17+
The QGis class provides vector overlay analysis functions
1018
%End
1119

20+
%TypeHeaderCode
21+
#include "qgsoverlayanalyzer.h"
22+
%End
1223
public:
1324

14-
/** Perform an intersection on two input vector layers and write output to a new shape file
15-
@param layerA input vector layer
16-
@param layerB input vector layer
17-
@param shapefileName path to the output shp
18-
@param onlySelectedFeatures if true, only selected features are considered, else all the features
19-
@param p progress dialog (or 0 if no progress dialog is to be shown)
20-
*/
21-
bool intersection( QgsVectorLayer* layerA, QgsVectorLayer* layerB,
22-
const QString& shapefileName, bool onlySelectedFeatures = false,
23-
QProgressDialog* p = 0 );
25+
bool intersection( QgsVectorLayer *layerA, QgsVectorLayer *layerB,
26+
const QString &shapefileName, bool onlySelectedFeatures = false,
27+
QProgressDialog *p = 0 );
28+
%Docstring
29+
Perform an intersection on two input vector layers and write output to a new shape file
30+
\param layerA input vector layer
31+
\param layerB input vector layer
32+
\param shapefileName path to the output shp
33+
\param onlySelectedFeatures if true, only selected features are considered, else all the features
34+
\param p progress dialog (or 0 if no progress dialog is to be shown)
35+
:rtype: bool
36+
%End
37+
2438
};
39+
40+
/************************************************************************
41+
* This file has been generated automatically from *
42+
* *
43+
* src/analysis/vector/qgsoverlayanalyzer.h *
44+
* *
45+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
46+
************************************************************************/

‎python/auto_sip.blacklist‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ gui/qgsmessagebar.sip
356356
gui/qgsmessagebaritem.sip
357357
gui/qgsmessageviewer.sip
358358
gui/qgsnewhttpconnection.sip
359-
gui/qgsnewmemorylayerdialog.sip
360359
gui/qgsnewnamedialog.sip
361360
gui/qgsnewvectorlayerdialog.sip
362361
gui/qgsnewgeopackagelayerdialog.sip
@@ -505,7 +504,6 @@ gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip
505504
gui/layertree/qgslayertreeview.sip
506505
analysis/vector/qgsgeometryanalyzer.sip
507506
analysis/vector/qgsgeometrysnapper.sip
508-
analysis/vector/qgsoverlayanalyzer.sip
509507
analysis/vector/qgspointsample.sip
510508
analysis/vector/qgstransectsample.sip
511509
analysis/vector/qgszonalstatistics.sip

‎python/gui/qgsnewmemorylayerdialog.sip‎

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,66 @@
1-
class QgsNewMemoryLayerDialog : QDialog
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsnewmemorylayerdialog.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
class QgsNewMemoryLayerDialog: QDialog
213
{
14+
315
%TypeHeaderCode
4-
#include <qgsnewmemorylayerdialog.h>
16+
#include "qgsnewmemorylayerdialog.h"
517
%End
6-
718
public:
819

9-
/** Runs the dialoag and creates a new memory layer
10-
* @param parent parent widget
11-
* @returns new memory layer
12-
*/
13-
static QgsVectorLayer* runAndCreateLayer( QWidget* parent = 0 );
20+
static QgsVectorLayer *runAndCreateLayer( QWidget *parent = 0, const QgsCoordinateReferenceSystem &defaultCrs = QgsCoordinateReferenceSystem() );
21+
%Docstring
22+
Runs the dialog and creates a new memory layer
23+
\param parent parent widget
24+
\param defaultCrs default layer CRS to show in dialog
25+
:return: new memory layer
26+
:rtype: QgsVectorLayer
27+
%End
1428

15-
QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags );
29+
QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
1630
~QgsNewMemoryLayerDialog();
1731

18-
/** Returns the selected geometry type*/
1932
QgsWkbTypes::Type selectedType() const;
33+
%Docstring
34+
Returns the selected geometry type
35+
:rtype: QgsWkbTypes.Type
36+
%End
2037

2138
void setCrs( const QgsCoordinateReferenceSystem &crs );
39+
%Docstring
40+
Sets the ``crs`` value for the new layer in the dialog.
41+
.. versionadded:: 3.0
42+
.. seealso:: crs()
43+
%End
44+
2245
QgsCoordinateReferenceSystem crs() const;
46+
%Docstring
47+
Returns the selected CRS for the new layer.
48+
.. seealso:: setCrs()
49+
:rtype: QgsCoordinateReferenceSystem
50+
%End
2351

24-
/** Returns the layer name*/
2552
QString layerName() const;
53+
%Docstring
54+
Returns the layer name
55+
:rtype: str
56+
%End
2657

2758
};
59+
60+
/************************************************************************
61+
* This file has been generated automatically from *
62+
* *
63+
* src/gui/qgsnewmemorylayerdialog.h *
64+
* *
65+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
66+
************************************************************************/

‎src/gui/qgsnewmemorylayerdialog.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ class GUI_EXPORT QgsNewMemoryLayerDialog: public QDialog, private Ui::QgsNewMemo
3333

3434
public:
3535

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

43-
QgsNewMemoryLayerDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
43+
QgsNewMemoryLayerDialog( QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
4444
~QgsNewMemoryLayerDialog();
4545

4646
//! Returns the selected geometry type

0 commit comments

Comments
 (0)