Skip to content

Commit 00b2d24

Browse files
committed
sipiy gui symbology
1 parent 5867414 commit 00b2d24

File tree

60 files changed

+2302
-903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2302
-903
lines changed

python/auto_sip.blacklist

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -41,38 +41,6 @@ core/composer/qgspaperitem.sip
4141
core/composer/qgsscalebarstyle.sip
4242
core/composer/qgssingleboxscalebarstyle.sip
4343
core/composer/qgsticksscalebarstyle.sip
44-
gui/symbology-ng/qgs25drendererwidget.sip
45-
gui/symbology-ng/qgsarrowsymbollayerwidget.sip
46-
gui/symbology-ng/qgsbrushstylecombobox.sip
47-
gui/symbology-ng/qgscategorizedsymbolrendererwidget.sip
48-
gui/symbology-ng/qgscptcitycolorrampdialog.sip
49-
gui/symbology-ng/qgsdashspacedialog.sip
50-
gui/symbology-ng/qgsellipsesymbollayerwidget.sip
51-
gui/symbology-ng/qgsgraduatedhistogramwidget.sip
52-
gui/symbology-ng/qgsgraduatedsymbolrendererwidget.sip
53-
gui/symbology-ng/qgsheatmaprendererwidget.sip
54-
gui/symbology-ng/qgsinvertedpolygonrendererwidget.sip
55-
gui/symbology-ng/qgslayerpropertieswidget.sip
56-
gui/symbology-ng/qgsnullsymbolrendererwidget.sip
57-
gui/symbology-ng/qgspenstylecombobox.sip
58-
gui/symbology-ng/qgspointclusterrendererwidget.sip
59-
gui/symbology-ng/qgspointdisplacementrendererwidget.sip
60-
gui/symbology-ng/qgsrendererpropertiesdialog.sip
61-
gui/symbology-ng/qgsrendererwidget.sip
62-
gui/symbology-ng/qgsrulebasedrendererwidget.sip
63-
gui/symbology-ng/qgssinglesymbolrendererwidget.sip
64-
gui/symbology-ng/qgssmartgroupeditordialog.sip
65-
gui/symbology-ng/qgsstyleexportimportdialog.sip
66-
gui/symbology-ng/qgsstylegroupselectiondialog.sip
67-
gui/symbology-ng/qgsstylemanagerdialog.sip
68-
gui/symbology-ng/qgsstylesavedialog.sip
69-
gui/symbology-ng/qgssvgselectorwidget.sip
70-
gui/symbology-ng/qgssymbollayerwidget.sip
71-
gui/symbology-ng/qgssymbollevelsdialog.sip
72-
gui/symbology-ng/qgssymbolslistwidget.sip
73-
gui/symbology-ng/qgssymbolselectordialog.sip
74-
gui/symbology-ng/qgssymbolwidgetcontext.sip
75-
gui/symbology-ng/qgsvectorfieldsymbollayerwidget.sip
7644
analysis/vector/qgsgeometryanalyzer.sip
7745
analysis/vector/qgsgeometrysnapper.sip
7846
analysis/vector/qgspointsample.sip

python/core/qgslogger.sip

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,12 @@ Logs the message passed in to the logfile defined in QGIS_LOG_FILE if any. *
8989

9090
};
9191

92-
class QgsScopeLogger // clazy:exclude=rule-of-three
92+
class QgsScopeLogger
9393
{
94+
95+
%TypeHeaderCode
96+
#include "qgslogger.h"
97+
%End
9498
public:
9599
QgsScopeLogger( const char *file, const char *func, int line );
96100
~QgsScopeLogger();

python/gui/qgstextpreview.sip

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,16 @@ class QgsTextPreview : QLabel
5454

5555
void setScale( double scale );
5656
%Docstring
57-
Sets the scale to use for previewing format sizes in map units.
58-
\param scale preview map scale
57+
Sets the ``scale`` to use for previewing format sizes in map units.
58+
The scale value indicates the scale denominator, e.g. 1000.0 for a 1:1000 map.
5959
.. seealso:: scale()
6060
.. seealso:: setMapUnits()
6161
%End
6262

6363
double scale() const;
6464
%Docstring
6565
Returns the scale used for previewing format sizes in map units.
66+
The scale value indicates the scale denominator, e.g. 1000.0 for a 1:1000 map.
6667
.. seealso:: setScale()
6768
.. seealso:: mapUnits()
6869
:rtype: float
Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,50 @@
1-
/***************************************************************************
2-
qgs25drendererwidget.sip - Qgs25DRendererWidget
3-
4-
---------------------
5-
begin : 14.1.2016
6-
copyright : (C) 2016 by Matthias Kuhn
7-
email : matthias@opengis.ch
8-
***************************************************************************
9-
* *
10-
* This program is free software; you can redistribute it and/or modify *
11-
* it under the terms of the GNU General Public License as published by *
12-
* the Free Software Foundation; either version 2 of the License, or *
13-
* (at your option) any later version. *
14-
* *
15-
***************************************************************************/
16-
17-
class Qgs25DRendererWidget : QgsRendererWidget
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/symbology-ng/qgs25drendererwidget.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
class Qgs25DRendererWidget : QgsRendererWidget, protected Ui::Qgs25DRendererWidgetBase
1812
{
13+
1914
%TypeHeaderCode
2015
#include "qgs25drendererwidget.h"
2116
%End
2217
public:
23-
/** Static creation method
24-
* @param layer the layer where this renderer is applied
25-
* @param style
26-
* @param renderer the mask renderer (will take ownership)
27-
*/
18+
2819
static QgsRendererWidget *create( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer /Transfer/ ) /Factory/;
20+
%Docstring
21+
Static creation method
22+
\param layer the layer where this renderer is applied
23+
\param style
24+
\param renderer the mask renderer (will not take ownership)
25+
:rtype: QgsRendererWidget
26+
%End
2927

30-
/** Constructor
31-
* @param layer the layer where this renderer is applied
32-
* @param style
33-
* @param renderer the mask renderer (will take ownership)
34-
*/
3528
Qgs25DRendererWidget( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer /Transfer/ );
29+
%Docstring
30+
Constructor
31+
\param layer the layer where this renderer is applied
32+
\param style
33+
\param renderer the mask renderer (will not take ownership)
34+
%End
35+
36+
virtual QgsFeatureRenderer *renderer();
3637

37-
QgsFeatureRenderer *renderer();
3838

3939
private:
40-
void apply();
40+
virtual void apply() ;
4141

4242
};
43+
44+
/************************************************************************
45+
* This file has been generated automatically from *
46+
* *
47+
* src/gui/symbology-ng/qgs25drendererwidget.h *
48+
* *
49+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
50+
************************************************************************/
Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,44 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/symbology-ng/qgsarrowsymbollayerwidget.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
111
class QgsArrowSymbolLayerWidget: QgsSymbolLayerWidget
212
{
13+
314
%TypeHeaderCode
4-
#include <qgsarrowsymbollayerwidget.h>
15+
#include "qgsarrowsymbollayerwidget.h"
516
%End
617
public:
7-
/** Constructor
8-
* @param layer the layer where this symbol layer is applied
9-
* @param parent the parent widget
10-
*/
18+
1119
QgsArrowSymbolLayerWidget( const QgsVectorLayer *layer, QWidget *parent /TransferThis/ = 0 );
20+
%Docstring
21+
Constructor
22+
\param layer the layer where this symbol layer is applied
23+
\param parent the parent widget
24+
%End
1225

13-
/** Static creation method
14-
* @param layer the layer where this symbol layer is applied
15-
*/
1626
static QgsSymbolLayerWidget *create( const QgsVectorLayer *layer ) /Factory/;
27+
%Docstring
28+
Static creation method
29+
\param layer the layer where this symbol layer is applied
30+
:rtype: QgsSymbolLayerWidget
31+
%End
1732

18-
/** Set the symbol layer */
1933
virtual void setSymbolLayer( QgsSymbolLayer *layer );
20-
/** Get the current symbol layer */
2134
virtual QgsSymbolLayer *symbolLayer();
35+
2236
};
37+
38+
/************************************************************************
39+
* This file has been generated automatically from *
40+
* *
41+
* src/gui/symbology-ng/qgsarrowsymbollayerwidget.h *
42+
* *
43+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
44+
************************************************************************/
Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,41 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/symbology-ng/qgsbrushstylecombobox.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
111
class QgsBrushStyleComboBox : QComboBox
212
{
13+
314
%TypeHeaderCode
4-
#include <qgsbrushstylecombobox.h>
15+
#include "qgsbrushstylecombobox.h"
516
%End
6-
717
public:
8-
QgsBrushStyleComboBox( QWidget *parent /TransferThis/ = NULL );
18+
QgsBrushStyleComboBox( QWidget *parent /TransferThis/ = 0 );
919

1020
Qt::BrushStyle brushStyle() const;
21+
%Docstring
22+
:rtype: Qt.BrushStyle
23+
%End
1124

1225
void setBrushStyle( Qt::BrushStyle style );
1326

1427
protected:
1528
QIcon iconForBrush( Qt::BrushStyle style );
29+
%Docstring
30+
:rtype: QIcon
31+
%End
1632

1733
};
34+
35+
/************************************************************************
36+
* This file has been generated automatically from *
37+
* *
38+
* src/gui/symbology-ng/qgsbrushstylecombobox.h *
39+
* *
40+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
41+
************************************************************************/

0 commit comments

Comments
 (0)