Skip to content

Commit ca7b504

Browse files
committed
Fix Travis warnings and missing docs/sip
1 parent 3dcc69a commit ca7b504

File tree

8 files changed

+70
-0
lines changed

8 files changed

+70
-0
lines changed

python/core/symbology-ng/qgspointdistancerenderer.sip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ class QgsPointDistanceRenderer : QgsFeatureRenderer
183183
* @param context destination render context
184184
* @param labelShifts displacement for individual label positions
185185
* @param group group of clustered features to label
186+
* @note may not be available in Python bindings on some platforms
186187
*/
187188
void drawLabels( QPointF centerPoint, QgsSymbolRenderContext& context, const QList<QPointF>& labelShifts, const QgsPointDistanceRenderer::ClusteredGroup& group );
188189

python/gui/gui.sip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
%Include symbology-ng/qgslayerpropertieswidget.sip
235235
%Include symbology-ng/qgsnullsymbolrendererwidget.sip
236236
%Include symbology-ng/qgspenstylecombobox.sip
237+
%Include symbology-ng/qgspointclusterrendererwidget.sip
237238
%Include symbology-ng/qgspointdisplacementrendererwidget.sip
238239
%Include symbology-ng/qgsrendererpropertiesdialog.sip
239240
%Include symbology-ng/qgsrendererwidget.sip
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/** \class QgsPointClusterRendererWidget
2+
* \ingroup gui
3+
* A widget which allows configuration of the properties for a QgsPointClusterRenderer.
4+
* \note added in QGIS 3.0
5+
*/
6+
7+
class QgsPointClusterRendererWidget: QgsRendererWidget
8+
{
9+
%TypeHeaderCode
10+
#include <qgspointclusterrendererwidget.h>
11+
%End
12+
public:
13+
14+
/** Returns a new QgsPointClusterRendererWidget.
15+
* @param layer associated vector layer
16+
* @param style style collection
17+
* @param renderer source QgsPointClusterRenderer renderer
18+
* @returns new QgsRendererWidget
19+
*/
20+
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
21+
22+
/** Constructor for QgsPointClusterRendererWidget.
23+
* @param layer associated vector layer
24+
* @param style style collection
25+
* @param renderer source QgsPointClusterRenderer renderer
26+
*/
27+
QgsPointClusterRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
28+
29+
~QgsPointClusterRendererWidget();
30+
31+
QgsFeatureRenderer* renderer();
32+
void setContext( const QgsSymbolWidgetContext& context );
33+
};

src/core/symbology-ng/qgspointdistancerenderer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@ QgsRectangle QgsPointDistanceRenderer::searchRect( const QgsPoint& p, double dis
350350

351351
void QgsPointDistanceRenderer::printGroupInfo() const
352352
{
353+
#ifdef QGISDEBUG
353354
int nGroups = mClusteredGroups.size();
354355
QgsDebugMsg( "number of displacement groups:" + QString::number( nGroups ) );
355356
for ( int i = 0; i < nGroups; ++i )
@@ -360,6 +361,7 @@ void QgsPointDistanceRenderer::printGroupInfo() const
360361
QgsDebugMsg( FID_TO_STRING( feature.feature.id() ) );
361362
}
362363
}
364+
#endif
363365
}
364366

365367
QString QgsPointDistanceRenderer::getLabel( const QgsFeature& feature ) const

src/core/symbology-ng/qgspointdistancerenderer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ class CORE_EXPORT QgsPointDistanceRenderer: public QgsFeatureRenderer
246246
* @param context destination render context
247247
* @param labelShifts displacement for individual label positions
248248
* @param group group of clustered features to label
249+
* @note may not be available in Python bindings on some platforms
249250
*/
250251
void drawLabels( QPointF centerPoint, QgsSymbolRenderContext& context, const QList<QPointF>& labelShifts, const ClusteredGroup& group );
251252

src/gui/symbology-ng/qgspointclusterrendererwidget.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,32 @@
2323

2424
class QgsPointClusterRenderer;
2525

26+
/** \class QgsPointClusterRendererWidget
27+
* \ingroup gui
28+
* A widget which allows configuration of the properties for a QgsPointClusterRenderer.
29+
* \note added in QGIS 3.0
30+
*/
31+
2632
class GUI_EXPORT QgsPointClusterRendererWidget: public QgsRendererWidget, private Ui::QgsPointClusterRendererWidgetBase
2733
{
2834
Q_OBJECT
2935
public:
36+
37+
/** Returns a new QgsPointClusterRendererWidget.
38+
* @param layer associated vector layer
39+
* @param style style collection
40+
* @param renderer source QgsPointClusterRenderer renderer
41+
* @returns new QgsRendererWidget
42+
*/
3043
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
44+
45+
/** Constructor for QgsPointClusterRendererWidget.
46+
* @param layer associated vector layer
47+
* @param style style collection
48+
* @param renderer source QgsPointClusterRenderer renderer
49+
*/
3150
QgsPointClusterRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
51+
3252
~QgsPointClusterRendererWidget();
3353

3454
QgsFeatureRenderer* renderer() override;

src/gui/symbology-ng/qgsrulebasedrendererwidget.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,16 @@ class GUI_EXPORT QgsRendererRulePropsDialog : public QDialog
240240
Q_OBJECT
241241

242242
public:
243+
244+
/** Constructor for QgsRendererRulePropsDialog
245+
* @param rule associated rule based renderer rule
246+
* @param layer source vector layer
247+
* @param style style collection
248+
* @param parent parent widget
249+
* @param context symbol widget context
250+
*/
243251
QgsRendererRulePropsDialog( QgsRuleBasedRenderer::Rule* rule, QgsVectorLayer* layer, QgsStyle* style, QWidget* parent = nullptr, const QgsSymbolWidgetContext& context = QgsSymbolWidgetContext() );
252+
244253
~QgsRendererRulePropsDialog();
245254

246255
QgsRuleBasedRenderer::Rule* rule() { return mPropsWidget->rule(); }

src/gui/symbology-ng/qgssymbolwidgetcontext.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ class GUI_EXPORT QgsSymbolWidgetContext
3333

3434
QgsSymbolWidgetContext();
3535

36+
/** Copy constructor.
37+
* @param other source QgsSymbolWidgetContext
38+
*/
3639
QgsSymbolWidgetContext( const QgsSymbolWidgetContext& other );
3740

3841
QgsSymbolWidgetContext& operator=( const QgsSymbolWidgetContext& other );

0 commit comments

Comments
 (0)