Skip to content

Commit d32a319

Browse files
olivierdalangolivierdalang
committedMay 15, 2019
prepare commit & coding style
·
ltr-3_40final-3_8_0
1 parent 9029d7e commit d32a319

File tree

5 files changed

+72
-43
lines changed

5 files changed

+72
-43
lines changed
 

‎python/gui/auto_generated/qgsadvanceddigitizingdockwidget.sip.in

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ by implementing filters called from QgsMapToolAdvancedDigitizing.
4242
Parallel
4343
};
4444

45+
enum WidgetSetMode
46+
{
47+
ReturnPressed,
48+
};
49+
4550

4651
class CadConstraint
4752
{
@@ -332,10 +337,12 @@ Updates canvas item that displays constraints on the ma
332337
.. versionadded:: 3.0
333338
%End
334339

335-
void setX( const QString &value );
340+
void setX( const QString &value, WidgetSetMode mode );
336341
%Docstring
337-
Set and lock the X ``value``.
338-
Can be used to set constraints.
342+
Set the X ``value`` on the widget.
343+
Can be used to set constraints by external widgets.
344+
345+
:param mode: What type of interaction to emulate
339346

340347
.. note::
341348

@@ -344,10 +351,12 @@ Can be used to set constraints.
344351
.. versionadded:: 3.8
345352
%End
346353

347-
void setY( const QString &value );
354+
void setY( const QString &value, WidgetSetMode mode );
348355
%Docstring
349-
Set and lock the Y ``value``.
350-
Can be used to set constraints.
356+
Set the Y ``value`` on the widget.
357+
Can be used to set constraints by external widgets.
358+
359+
:param mode: What type of interaction to emulate
351360

352361
.. note::
353362

@@ -356,10 +365,12 @@ Can be used to set constraints.
356365
.. versionadded:: 3.8
357366
%End
358367

359-
void setAngle( const QString &value );
368+
void setAngle( const QString &value, WidgetSetMode mode );
360369
%Docstring
361-
Set and lock the angle ``value``.
362-
Can be used to set constraints.
370+
Set the angle ``value`` on the widget.
371+
Can be used to set constraints by external widgets.
372+
373+
:param mode: What type of interaction to emulate
363374

364375
.. note::
365376

@@ -368,10 +379,12 @@ Can be used to set constraints.
368379
.. versionadded:: 3.8
369380
%End
370381

371-
void setDistance( const QString &value );
382+
void setDistance( const QString &value, WidgetSetMode mode );
372383
%Docstring
373-
Set and lock the distance ``value``.
374-
Can be used to set constraints.
384+
Set the distance ``value`` on the widget.
385+
Can be used to set constraints by external widgets.
386+
387+
:param mode: What type of interaction to emulate
375388

376389
.. note::
377390

@@ -380,6 +393,8 @@ Can be used to set constraints.
380393
.. versionadded:: 3.8
381394
%End
382395

396+
397+
383398
signals:
384399

385400
void pushWarning( const QString &message );

‎src/gui/qgsadvanceddigitizingdockwidget.cpp

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -165,57 +165,69 @@ QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas *
165165
void QgsAdvancedDigitizingDockWidget::setX( const QString &value, WidgetSetMode mode )
166166
{
167167
mXLineEdit->setText( value );
168-
if( mode == WidgetSetMode::ReturnPressed){
168+
if ( mode == WidgetSetMode::ReturnPressed )
169+
{
169170
mXLineEdit->returnPressed();
170171
}
171-
else if ( mode == WidgetSetMode::FocusOut){
172-
QEvent *e = new QEvent(QEvent::FocusOut);
173-
QCoreApplication::postEvent(mXLineEdit, e);
172+
else if ( mode == WidgetSetMode::FocusOut )
173+
{
174+
QEvent *e = new QEvent( QEvent::FocusOut );
175+
QCoreApplication::postEvent( mXLineEdit, e );
174176
}
175-
else if ( mode == WidgetSetMode::TextEdited){
176-
mXLineEdit->textEdited(value);
177+
else if ( mode == WidgetSetMode::TextEdited )
178+
{
179+
mXLineEdit->textEdited( value );
177180
}
178181
}
179182
void QgsAdvancedDigitizingDockWidget::setY( const QString &value, WidgetSetMode mode )
180183
{
181184
mYLineEdit->setText( value );
182-
if( mode == WidgetSetMode::ReturnPressed){
185+
if ( mode == WidgetSetMode::ReturnPressed )
186+
{
183187
mYLineEdit->returnPressed();
184188
}
185-
else if ( mode == WidgetSetMode::FocusOut){
186-
QEvent *e = new QEvent(QEvent::FocusOut);
187-
QCoreApplication::postEvent(mYLineEdit, e);
189+
else if ( mode == WidgetSetMode::FocusOut )
190+
{
191+
QEvent *e = new QEvent( QEvent::FocusOut );
192+
QCoreApplication::postEvent( mYLineEdit, e );
188193
}
189-
else if ( mode == WidgetSetMode::TextEdited){
190-
mYLineEdit->textEdited(value);
194+
else if ( mode == WidgetSetMode::TextEdited )
195+
{
196+
mYLineEdit->textEdited( value );
191197
}
192198
}
193199
void QgsAdvancedDigitizingDockWidget::setAngle( const QString &value, WidgetSetMode mode )
194200
{
195201
mAngleLineEdit->setText( value );
196-
if( mode == WidgetSetMode::ReturnPressed){
202+
if ( mode == WidgetSetMode::ReturnPressed )
203+
{
197204
mAngleLineEdit->returnPressed();
198205
}
199-
else if ( mode == WidgetSetMode::FocusOut){
200-
QEvent *e = new QEvent(QEvent::FocusOut);
201-
QCoreApplication::postEvent(mAngleLineEdit, e);
206+
else if ( mode == WidgetSetMode::FocusOut )
207+
{
208+
QEvent *e = new QEvent( QEvent::FocusOut );
209+
QCoreApplication::postEvent( mAngleLineEdit, e );
202210
}
203-
else if ( mode == WidgetSetMode::TextEdited){
204-
mAngleLineEdit->textEdited(value);
211+
else if ( mode == WidgetSetMode::TextEdited )
212+
{
213+
mAngleLineEdit->textEdited( value );
205214
}
206215
}
207216
void QgsAdvancedDigitizingDockWidget::setDistance( const QString &value, WidgetSetMode mode )
208217
{
209218
mDistanceLineEdit->setText( value );
210-
if( mode == WidgetSetMode::ReturnPressed){
219+
if ( mode == WidgetSetMode::ReturnPressed )
220+
{
211221
mDistanceLineEdit->returnPressed();
212222
}
213-
else if ( mode == WidgetSetMode::FocusOut){
214-
QEvent *e = new QEvent(QEvent::FocusOut);
215-
QCoreApplication::postEvent(mDistanceLineEdit, e);
223+
else if ( mode == WidgetSetMode::FocusOut )
224+
{
225+
QEvent *e = new QEvent( QEvent::FocusOut );
226+
QCoreApplication::postEvent( mDistanceLineEdit, e );
216227
}
217-
else if ( mode == WidgetSetMode::TextEdited){
218-
mDistanceLineEdit->textEdited(value);
228+
else if ( mode == WidgetSetMode::TextEdited )
229+
{
230+
mDistanceLineEdit->textEdited( value );
219231
}
220232
}
221233

‎src/gui/qgsadvanceddigitizingdockwidget.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
7777
/**
7878
* Type of interaction to simulate when editing values from external widget
7979
*/
80-
enum WidgetSetMode {
80+
enum WidgetSetMode
81+
{
8182
ReturnPressed, FocusOut, TextEdited
8283
};
8384

‎src/gui/qgsadvanceddigitizingfloater.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ QgsAdvancedDigitizingFloater::QgsAdvancedDigitizingFloater( QgsMapCanvas *canvas
8585
connect( mDistanceLineEdit, &QLineEdit::textEdited, cadDockWidget, [ = ]() { cadDockWidget->setDistance( mDistanceLineEdit->text(), QgsAdvancedDigitizingDockWidget::WidgetSetMode::TextEdited ); } );
8686

8787
QgsFocusWatcher *xWatcher = new QgsFocusWatcher( mXLineEdit );
88-
connect( xWatcher, &QgsFocusWatcher::focusOut, cadDockWidget, [=](){ cadDockWidget->setX( mXLineEdit->text(), QgsAdvancedDigitizingDockWidget::WidgetSetMode::FocusOut ); } );
88+
connect( xWatcher, &QgsFocusWatcher::focusOut, cadDockWidget, [ = ]() { cadDockWidget->setX( mXLineEdit->text(), QgsAdvancedDigitizingDockWidget::WidgetSetMode::FocusOut ); } );
8989
QgsFocusWatcher *yWatcher = new QgsFocusWatcher( mYLineEdit );
90-
connect( yWatcher, &QgsFocusWatcher::focusOut, cadDockWidget, [=](){ cadDockWidget->setY( mYLineEdit->text(), QgsAdvancedDigitizingDockWidget::WidgetSetMode::FocusOut ); } );
90+
connect( yWatcher, &QgsFocusWatcher::focusOut, cadDockWidget, [ = ]() { cadDockWidget->setY( mYLineEdit->text(), QgsAdvancedDigitizingDockWidget::WidgetSetMode::FocusOut ); } );
9191
QgsFocusWatcher *angleWatcher = new QgsFocusWatcher( mAngleLineEdit );
92-
connect( angleWatcher, &QgsFocusWatcher::focusOut, cadDockWidget, [=](){ cadDockWidget->setAngle( mAngleLineEdit->text(), QgsAdvancedDigitizingDockWidget::WidgetSetMode::FocusOut ); } );
92+
connect( angleWatcher, &QgsFocusWatcher::focusOut, cadDockWidget, [ = ]() { cadDockWidget->setAngle( mAngleLineEdit->text(), QgsAdvancedDigitizingDockWidget::WidgetSetMode::FocusOut ); } );
9393
QgsFocusWatcher *distanceWatcher = new QgsFocusWatcher( mDistanceLineEdit );
94-
connect( distanceWatcher, &QgsFocusWatcher::focusOut, cadDockWidget, [=](){ cadDockWidget->setDistance( mDistanceLineEdit->text(), QgsAdvancedDigitizingDockWidget::WidgetSetMode::FocusOut ); } );
94+
connect( distanceWatcher, &QgsFocusWatcher::focusOut, cadDockWidget, [ = ]() { cadDockWidget->setDistance( mDistanceLineEdit->text(), QgsAdvancedDigitizingDockWidget::WidgetSetMode::FocusOut ); } );
9595

9696
}
9797

‎src/gui/qgsadvanceddigitizingfloater.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class QgsAdvancedDigitizingDockWidget;
3232
* \brief The QgsAdvancedDigitizingFloater class is widget that floats
3333
* next to the mouse pointer, and allow interaction with the AdvancedDigitizing
3434
* feature. It proxies display and actions to QgsMapToolAdvancedDigitizingDockWidget.
35+
* \since QGIS 3.8
3536
*/
3637
class GUI_EXPORT QgsAdvancedDigitizingFloater : public QWidget, private Ui::QgsAdvancedDigitizingFloaterBase
3738
{
@@ -53,9 +54,9 @@ class GUI_EXPORT QgsAdvancedDigitizingFloater : public QWidget, private Ui::QgsA
5354
/**
5455
* Set whether the floater should be active or not.
5556
* Note that the floater may be active but not visible (e.g. if the mouse is not over the canvas).
56-
* \since QGIS 3.8
5757
*
5858
* \param active
59+
* \since QGIS 3.8
5960
*/
6061
void setActive( bool active );
6162

@@ -97,7 +98,7 @@ class GUI_EXPORT QgsAdvancedDigitizingFloater : public QWidget, private Ui::QgsA
9798
bool eventFilter( QObject *obj, QEvent *event ) override SIP_SKIP;
9899

99100
/**
100-
* Move the widget to a new cursor position. A hard-coded offet will be added.
101+
* Move the widget to a new cursor position. A hard-coded offset will be added.
101102
* \param pos position of the cursor
102103
*/
103104
void updatePos( const QPoint &pos );

0 commit comments

Comments
 (0)
Please sign in to comment.