Fix Travis warnings and missing docs/sip

This commit is contained in:
Nyall Dawson 2016-09-29 08:56:07 +10:00
parent 3dcc69a41a
commit ca7b504e5c
8 changed files with 70 additions and 0 deletions

View File

@ -183,6 +183,7 @@ class QgsPointDistanceRenderer : QgsFeatureRenderer
* @param context destination render context * @param context destination render context
* @param labelShifts displacement for individual label positions * @param labelShifts displacement for individual label positions
* @param group group of clustered features to label * @param group group of clustered features to label
* @note may not be available in Python bindings on some platforms
*/ */
void drawLabels( QPointF centerPoint, QgsSymbolRenderContext& context, const QList<QPointF>& labelShifts, const QgsPointDistanceRenderer::ClusteredGroup& group ); void drawLabels( QPointF centerPoint, QgsSymbolRenderContext& context, const QList<QPointF>& labelShifts, const QgsPointDistanceRenderer::ClusteredGroup& group );

View File

@ -234,6 +234,7 @@
%Include symbology-ng/qgslayerpropertieswidget.sip %Include symbology-ng/qgslayerpropertieswidget.sip
%Include symbology-ng/qgsnullsymbolrendererwidget.sip %Include symbology-ng/qgsnullsymbolrendererwidget.sip
%Include symbology-ng/qgspenstylecombobox.sip %Include symbology-ng/qgspenstylecombobox.sip
%Include symbology-ng/qgspointclusterrendererwidget.sip
%Include symbology-ng/qgspointdisplacementrendererwidget.sip %Include symbology-ng/qgspointdisplacementrendererwidget.sip
%Include symbology-ng/qgsrendererpropertiesdialog.sip %Include symbology-ng/qgsrendererpropertiesdialog.sip
%Include symbology-ng/qgsrendererwidget.sip %Include symbology-ng/qgsrendererwidget.sip

View File

@ -0,0 +1,33 @@
/** \class QgsPointClusterRendererWidget
* \ingroup gui
* A widget which allows configuration of the properties for a QgsPointClusterRenderer.
* \note added in QGIS 3.0
*/
class QgsPointClusterRendererWidget: QgsRendererWidget
{
%TypeHeaderCode
#include <qgspointclusterrendererwidget.h>
%End
public:
/** Returns a new QgsPointClusterRendererWidget.
* @param layer associated vector layer
* @param style style collection
* @param renderer source QgsPointClusterRenderer renderer
* @returns new QgsRendererWidget
*/
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
/** Constructor for QgsPointClusterRendererWidget.
* @param layer associated vector layer
* @param style style collection
* @param renderer source QgsPointClusterRenderer renderer
*/
QgsPointClusterRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
~QgsPointClusterRendererWidget();
QgsFeatureRenderer* renderer();
void setContext( const QgsSymbolWidgetContext& context );
};

View File

@ -350,6 +350,7 @@ QgsRectangle QgsPointDistanceRenderer::searchRect( const QgsPoint& p, double dis
void QgsPointDistanceRenderer::printGroupInfo() const void QgsPointDistanceRenderer::printGroupInfo() const
{ {
#ifdef QGISDEBUG
int nGroups = mClusteredGroups.size(); int nGroups = mClusteredGroups.size();
QgsDebugMsg( "number of displacement groups:" + QString::number( nGroups ) ); QgsDebugMsg( "number of displacement groups:" + QString::number( nGroups ) );
for ( int i = 0; i < nGroups; ++i ) for ( int i = 0; i < nGroups; ++i )
@ -360,6 +361,7 @@ void QgsPointDistanceRenderer::printGroupInfo() const
QgsDebugMsg( FID_TO_STRING( feature.feature.id() ) ); QgsDebugMsg( FID_TO_STRING( feature.feature.id() ) );
} }
} }
#endif
} }
QString QgsPointDistanceRenderer::getLabel( const QgsFeature& feature ) const QString QgsPointDistanceRenderer::getLabel( const QgsFeature& feature ) const

View File

@ -246,6 +246,7 @@ class CORE_EXPORT QgsPointDistanceRenderer: public QgsFeatureRenderer
* @param context destination render context * @param context destination render context
* @param labelShifts displacement for individual label positions * @param labelShifts displacement for individual label positions
* @param group group of clustered features to label * @param group group of clustered features to label
* @note may not be available in Python bindings on some platforms
*/ */
void drawLabels( QPointF centerPoint, QgsSymbolRenderContext& context, const QList<QPointF>& labelShifts, const ClusteredGroup& group ); void drawLabels( QPointF centerPoint, QgsSymbolRenderContext& context, const QList<QPointF>& labelShifts, const ClusteredGroup& group );

View File

@ -23,12 +23,32 @@
class QgsPointClusterRenderer; class QgsPointClusterRenderer;
/** \class QgsPointClusterRendererWidget
* \ingroup gui
* A widget which allows configuration of the properties for a QgsPointClusterRenderer.
* \note added in QGIS 3.0
*/
class GUI_EXPORT QgsPointClusterRendererWidget: public QgsRendererWidget, private Ui::QgsPointClusterRendererWidgetBase class GUI_EXPORT QgsPointClusterRendererWidget: public QgsRendererWidget, private Ui::QgsPointClusterRendererWidgetBase
{ {
Q_OBJECT Q_OBJECT
public: public:
/** Returns a new QgsPointClusterRendererWidget.
* @param layer associated vector layer
* @param style style collection
* @param renderer source QgsPointClusterRenderer renderer
* @returns new QgsRendererWidget
*/
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
/** Constructor for QgsPointClusterRendererWidget.
* @param layer associated vector layer
* @param style style collection
* @param renderer source QgsPointClusterRenderer renderer
*/
QgsPointClusterRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); QgsPointClusterRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
~QgsPointClusterRendererWidget(); ~QgsPointClusterRendererWidget();
QgsFeatureRenderer* renderer() override; QgsFeatureRenderer* renderer() override;

View File

@ -240,7 +240,16 @@ class GUI_EXPORT QgsRendererRulePropsDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
/** Constructor for QgsRendererRulePropsDialog
* @param rule associated rule based renderer rule
* @param layer source vector layer
* @param style style collection
* @param parent parent widget
* @param context symbol widget context
*/
QgsRendererRulePropsDialog( QgsRuleBasedRenderer::Rule* rule, QgsVectorLayer* layer, QgsStyle* style, QWidget* parent = nullptr, const QgsSymbolWidgetContext& context = QgsSymbolWidgetContext() ); QgsRendererRulePropsDialog( QgsRuleBasedRenderer::Rule* rule, QgsVectorLayer* layer, QgsStyle* style, QWidget* parent = nullptr, const QgsSymbolWidgetContext& context = QgsSymbolWidgetContext() );
~QgsRendererRulePropsDialog(); ~QgsRendererRulePropsDialog();
QgsRuleBasedRenderer::Rule* rule() { return mPropsWidget->rule(); } QgsRuleBasedRenderer::Rule* rule() { return mPropsWidget->rule(); }

View File

@ -33,6 +33,9 @@ class GUI_EXPORT QgsSymbolWidgetContext
QgsSymbolWidgetContext(); QgsSymbolWidgetContext();
/** Copy constructor.
* @param other source QgsSymbolWidgetContext
*/
QgsSymbolWidgetContext( const QgsSymbolWidgetContext& other ); QgsSymbolWidgetContext( const QgsSymbolWidgetContext& other );
QgsSymbolWidgetContext& operator=( const QgsSymbolWidgetContext& other ); QgsSymbolWidgetContext& operator=( const QgsSymbolWidgetContext& other );