Skip to content

Commit c78f940

Browse files
committed
Fix doxygen warnings and failing test
1 parent 2468b27 commit c78f940

File tree

4 files changed

+31
-2
lines changed

4 files changed

+31
-2
lines changed

src/core/qgspropertytransformer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,7 @@ class CORE_EXPORT QgsGenericNumericTransformer : public QgsPropertyTransformer
207207
static QgsGenericNumericTransformer* fromExpression( const QString& expression, QString& baseExpression, QString& fieldName );
208208

209209
/**
210-
* Calculates the size corresponding to a specific value.
211-
* @param value value to calculate size for
210+
* Calculates the size corresponding to a specific \a input value.
212211
* @returns calculated size using size scale transformer's parameters and type
213212
*/
214213
double value( double input ) const;

src/gui/qgspropertyassistantwidget.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ bool QgsPropertyAssistantWidget::computeValuesFromField( const QString& fieldNam
285285
return true;
286286
}
287287

288+
///@cond PRIVATE
288289

289290
//
290291
// QgsPropertySizeAssistantWidget
@@ -524,3 +525,5 @@ QgsGenericNumericTransformer*QgsPropertyGenericNumericAssistantWidget::createTra
524525
exponentSpinBox->value() );
525526
return transformer;
526527
}
528+
529+
///@endcond PRIVATE

src/gui/qgspropertyassistantwidget.h

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,27 @@ class GUI_EXPORT QgsPropertyColorAssistantWidget : public QgsPropertyAbstractTra
100100

101101
///@endcond PRIVATE
102102

103+
104+
105+
/**
106+
* \class QgsPropertyAssistantWidget
107+
* \ingroup gui
108+
* Shows a user-friendly assistant guiding users through the creation of QgsProperty overrides.
109+
* \note added in QGIS 3.0
110+
*/
103111
class GUI_EXPORT QgsPropertyAssistantWidget : public QgsPanelWidget, private Ui::PropertyAssistantBase
104112
{
105113
Q_OBJECT
106114

107115
public:
108116

117+
/**
118+
* Constructor for QgsPropertyAssistantWidget. Aside from a \a parent widget, the constructor accepts a
119+
* corresponding property \a definition from which it customises the displayed options (eg a color based
120+
* property definition will show an assistant to allow creation of color based properties).
121+
* The \a initialState dictates the initial state to show in the widget. A corresponding \a layer
122+
* can also be set to allow population of GUI widgets such as field selectors.
123+
*/
109124
QgsPropertyAssistantWidget( QWidget* parent = nullptr, const QgsPropertyDefinition& definition = QgsPropertyDefinition(),
110125
const QgsProperty& initialState = QgsProperty(),
111126
const QgsVectorLayer* layer = nullptr );
@@ -116,8 +131,16 @@ class GUI_EXPORT QgsPropertyAssistantWidget : public QgsPanelWidget, private Ui:
116131
*/
117132
void registerExpressionContextGenerator( QgsExpressionContextGenerator* generator );
118133

134+
/**
135+
* Updates a \a property in place to corresponding to the current settings shown
136+
* in the widget.
137+
*/
119138
void updateProperty( QgsProperty& property );
120139

140+
/**
141+
* Sets a symbol which can be used for previews inside the widget. If not specified, default
142+
* created symbols will be used instead.
143+
*/
121144
void setSymbol( std::shared_ptr< QgsSymbol > symbol ) { mSymbol = symbol; updatePreview(); }
122145

123146
void setDockMode( bool dockMode ) override;

src/gui/qgspropertyoverridebutton.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ class GUI_EXPORT QgsPropertyOverrideButton: public QToolButton
156156
*/
157157
void registerExpressionContextGenerator( QgsExpressionContextGenerator* generator );
158158

159+
/**
160+
* Sets a symbol which can be used for previews inside the widget or in any dialog created
161+
* by the widget. If not specified, a default created symbol will be used instead.
162+
*/
159163
void setSymbol( std::shared_ptr< QgsSymbol > symbol ) { mSymbol = symbol; }
160164

161165
public slots:

0 commit comments

Comments
 (0)