sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix style.

Browse Source
This commit is contained in:
obrix 2020-03-17 16:02:21 +01:00
parent c291a17d42
commit 6b9fb087c2
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/core/auto_generated/qgssnappingconfig.sip.in
View File

@ -73,7 +73,7 @@ This is a container of advanced configuration (per layer) of the snapping of the
%End
public:
IndividualLayerSettings( bool enabled, SnappingType type, double tolerance, QgsTolerance::UnitType units, double minScale, double maxScale ) /Deprecated/;
IndividualLayerSettings( bool enabled, SnappingType type, double tolerance, QgsTolerance::UnitType units, double minScale, double maxScale ) /Deprecated/;
%Docstring
IndividualLayerSettings
@ -81,6 +81,8 @@ IndividualLayerSettings
:param type:
:param tolerance:
:param units:
:param minScale:
:param maxScale:
.. deprecated:: QGIS 3.12
use the method with SnappingTypeFlag instead.
@ -96,6 +98,7 @@ IndividualLayerSettings
:param units:
:param minScale:
:param maxScale:
.. versionadded:: 3.12
%End

4
src/app/qgssnappinglayertreemodel.cpp
View File

@ -156,7 +156,7 @@ void QgsSnappingLayerDelegate::setEditorData( QWidget *editor, const QModelIndex
w->setCurrentIndex( w->findData( units ) );
}
}
else if ( index.column() == QgsSnappingLayerTreeModel::MinScaleColumn)
else if ( index.column() == QgsSnappingLayerTreeModel::MinScaleColumn )
{
QgsScaleWidget *w = qobject_cast<QgsScaleWidget *>( editor );
if ( w )
@ -214,7 +214,7 @@ void QgsSnappingLayerDelegate::setModelData( QWidget *editor, QAbstractItemModel
model->setData( index, w->value(), Qt::EditRole );
}
}
else if ( index.column() == QgsSnappingLayerTreeModel::MinScaleColumn)
else if ( index.column() == QgsSnappingLayerTreeModel::MinScaleColumn )
{
QgsScaleWidget *w = qobject_cast<QgsScaleWidget *>( editor );
if ( w )

2
src/app/qgssnappingwidget.h
View File

@ -131,7 +131,7 @@ class APP_EXPORT QgsSnappingWidget : public QWidget
DisplayMode mDisplayMode;
//! modeChanged determines if widget are visible or not based on mode
void modeChanged();
void modeChanged( );
QgsProject *mProject = nullptr;
QgsSnappingConfig mConfig;

4
src/app/vertextool/qgsvertextool.cpp
View File

@ -769,7 +769,7 @@ QgsPointLocator::Match QgsVertexTool::snapToEditableLayer( QgsMapMouseEvent *e )
continue;
config.setIndividualLayerSettings( vlayer, QgsSnappingConfig::IndividualLayerSettings(
vlayer == currentVlayer, static_cast<QgsSnappingConfig::SnappingTypeFlag>( QgsSnappingConfig::VertexFlag | QgsSnappingConfig::SegmentFlag ), tol, QgsTolerance::ProjectUnits, 0.0, 0.0 ) );
vlayer == currentVlayer, static_cast<QgsSnappingConfig::SnappingTypeFlag>( QgsSnappingConfig::VertexFlag | QgsSnappingConfig::SegmentFlag ), tol, QgsTolerance::ProjectUnits, 0.0, 0.0 ) );
}
snapUtils->setConfig( config );
@ -796,7 +796,7 @@ QgsPointLocator::Match QgsVertexTool::snapToEditableLayer( QgsMapMouseEvent *e )
continue;
config.setIndividualLayerSettings( vlayer, QgsSnappingConfig::IndividualLayerSettings(
vlayer->isEditable(), static_cast<QgsSnappingConfig::SnappingTypeFlag>( QgsSnappingConfig::VertexFlag | QgsSnappingConfig::SegmentFlag ), tol, QgsTolerance::ProjectUnits, 0.0, 0.0 ) );
vlayer->isEditable(), static_cast<QgsSnappingConfig::SnappingTypeFlag>( QgsSnappingConfig::VertexFlag | QgsSnappingConfig::SegmentFlag ), tol, QgsTolerance::ProjectUnits, 0.0, 0.0 ) );
}
snapUtils->setConfig( config );

4
src/core/qgssnappingconfig.h
View File

@ -120,7 +120,7 @@ class CORE_EXPORT QgsSnappingConfig
* \param maxScale
* \deprecated since QGIS 3.12 use the method with SnappingTypeFlag instead.
*/
Q_DECL_DEPRECATED IndividualLayerSettings( bool enabled, SnappingType type, double tolerance, QgsTolerance::UnitType units, double minScale, double maxScale ) SIP_DEPRECATED;
Q_DECL_DEPRECATED IndividualLayerSettings( bool enabled, SnappingType type, double tolerance, QgsTolerance::UnitType units, double minScale, double maxScale ) SIP_DEPRECATED;
/**
* \brief IndividualLayerSettings
@ -132,7 +132,7 @@ class CORE_EXPORT QgsSnappingConfig
* \param maxScale
* \since QGIS 3.12
*/
IndividualLayerSettings( bool enabled, SnappingTypeFlag type, double tolerance, QgsTolerance::UnitType units, double minScale, double maxScale );
IndividualLayerSettings( bool enabled, SnappingTypeFlag type, double tolerance, QgsTolerance::UnitType units, double minScale, double maxScale );
/**
* Constructs an invalid setting

4
tests/src/core/testqgssnappingutils.cpp
View File

@ -33,7 +33,7 @@ struct FilterExcludePoint : public QgsPointLocator::MatchFilter
{
explicit FilterExcludePoint( const QgsPointXY &p ) : mPoint( p ) {}
bool acceptMatch( const QgsPointLocator::Match &match ) override { return match.point() != mPoint; }
bool acceptMatch( const QgsPointLocator::Match &match ) override { return match.point() != mPoint; }
QgsPointXY mPoint;
};
@ -349,7 +349,7 @@ class TestQgsSnappingUtils : public QObject
QgsSnappingConfig snappingConfig = u.config();
snappingConfig.setEnabled( true );
snappingConfig.setMode( QgsSnappingConfig::AdvancedConfiguration );
QgsSnappingConfig::IndividualLayerSettings layerSettings( true, QgsSnappingConfig::VertexFlag, 0.2, QgsTolerance::ProjectUnits, 0.0, 0.0 );
QgsSnappingConfig::IndividualLayerSettings layerSettings( true, QgsSnappingConfig::VertexFlag, 0.2, QgsTolerance::ProjectUnits, 0.0, 0.0 );
snappingConfig.setIntersectionSnapping( true );
snappingConfig.setIndividualLayerSettings( vCurveZ.get(), layerSettings );
u.setConfig( snappingConfig );