Skip to content

Commit

Permalink
Some style adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
obrix committed Apr 7, 2020
1 parent cfc1989 commit 563e396
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 22 deletions.
4 changes: 2 additions & 2 deletions python/core/auto_generated/qgssnappingconfig.sip.in
View file
Expand Up @@ -54,8 +54,8 @@ This is a container for configuration of the snapping of the project
enum ScaleDependencyMode
{
Disabled,
ScaleDependentGlobal,
ScaleDependentPerLayer
Global,
PerLayer
};

static const QString snappingTypeFlagToString( SnappingTypeFlag type );
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgssnappinglayertreemodel.cpp
View file
Expand Up @@ -238,7 +238,7 @@ QgsSnappingLayerTreeModel::QgsSnappingLayerTreeModel( QgsProject *project, QgsMa
, mProject( project )
, mCanvas( canvas )
, mIndividualLayerSettings( project->snappingConfig().individualLayerSettings() )
, mEnableMinMaxColumn( project->snappingConfig().scaleDependencyMode() == QgsSnappingConfig::ScaleDependentPerLayer )
, mEnableMinMaxColumn( project->snappingConfig().scaleDependencyMode() == QgsSnappingConfig::PerLayer )

{
connect( project, &QgsProject::snappingConfigChanged, this, &QgsSnappingLayerTreeModel::onSnappingSettingsChanged );
Expand Down Expand Up @@ -369,7 +369,7 @@ void QgsSnappingLayerTreeModel::onSnappingSettingsChanged()
}
}

mEnableMinMaxColumn = ( mProject->snappingConfig().scaleDependencyMode() == QgsSnappingConfig::ScaleDependentPerLayer );
mEnableMinMaxColumn = ( mProject->snappingConfig().scaleDependencyMode() == QgsSnappingConfig::PerLayer );
hasRowchanged( mLayerTreeModel->rootGroup(), oldSettings, wasMinMaxEnabled != mEnableMinMaxColumn );
}

Expand Down
19 changes: 10 additions & 9 deletions src/app/qgssnappingwidget.cpp
View file
Expand Up @@ -451,11 +451,11 @@ void QgsSnappingWidget::projectSnapSettingsChanged()
{
mSnappingScaleModeButton->setDefaultAction( mDefaultSnappingScaleAct );
}
else if ( config.scaleDependencyMode() == QgsSnappingConfig::ScaleDependentGlobal )
else if ( config.scaleDependencyMode() == QgsSnappingConfig::Global )
{
mSnappingScaleModeButton->setDefaultAction( mGlobalSnappingScaleAct );
}
else if ( config.scaleDependencyMode() == QgsSnappingConfig::ScaleDependentPerLayer )
else if ( config.scaleDependencyMode() == QgsSnappingConfig::PerLayer )
{
mSnappingScaleModeButton->setDefaultAction( mPerLayerSnappingScaleAct );
}
Expand Down Expand Up @@ -490,8 +490,8 @@ void QgsSnappingWidget::toggleSnappingWidgets( bool enabled )
mTypeButton->setEnabled( enabled );
mToleranceSpinBox->setEnabled( enabled );
mSnappingScaleModeButton->setEnabled( enabled );
mMinScaleWidget->setEnabled( enabled && mConfig.scaleDependencyMode() == QgsSnappingConfig::ScaleDependentGlobal );
mMaxScaleWidget->setEnabled( enabled && mConfig.scaleDependencyMode() == QgsSnappingConfig::ScaleDependentGlobal );
mMinScaleWidget->setEnabled( enabled && mConfig.scaleDependencyMode() == QgsSnappingConfig::Global );
mMaxScaleWidget->setEnabled( enabled && mConfig.scaleDependencyMode() == QgsSnappingConfig::Global );
mUnitsComboBox->setEnabled( enabled );

if ( mEditAdvancedConfigAction )
Expand Down Expand Up @@ -613,22 +613,23 @@ void QgsSnappingWidget::typeButtonTriggered( QAction *action )
void QgsSnappingWidget::snappingScaleModeTriggered( QAction *action )
{
mSnappingScaleModeButton->setDefaultAction( action );
QgsSnappingConfig::ScaleDependencyMode mode;
QgsSnappingConfig::ScaleDependencyMode mode = mConfig.scaleDependencyMode();

if ( action == mDefaultSnappingScaleAct )
{
mode = QgsSnappingConfig::Disabled;
}
else if ( action == mGlobalSnappingScaleAct )
{
mode = QgsSnappingConfig::ScaleDependentGlobal;
mode = QgsSnappingConfig::Global;
}
else if ( action == mPerLayerSnappingScaleAct )
{
mode = QgsSnappingConfig::ScaleDependentPerLayer;
mode = QgsSnappingConfig::PerLayer;
}

mMinScaleWidget->setEnabled( mode == QgsSnappingConfig::ScaleDependentGlobal );
mMaxScaleWidget->setEnabled( mode == QgsSnappingConfig::ScaleDependentGlobal );
mMinScaleWidget->setEnabled( mode == QgsSnappingConfig::Global );
mMaxScaleWidget->setEnabled( mode == QgsSnappingConfig::Global );
mConfig.setScaleDependencyMode( mode );
mProject->setSnappingConfig( mConfig );
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgssnappingconfig.h
View file
Expand Up @@ -83,8 +83,8 @@ class CORE_EXPORT QgsSnappingConfig
enum ScaleDependencyMode
{
Disabled = 0,
ScaleDependentGlobal,
ScaleDependentPerLayer
Global = 1,
PerLayer = 2
};

/**
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgssnappingutils.cpp
View file
Expand Up @@ -306,8 +306,8 @@ QgsPointLocator::Match QgsSnappingUtils::snapToMap( const QgsPointXY &pointMap,
//If limit to scale is disabled, snapping activated on all layer
//If no per layer config is set use the global one, otherwise use the layer config
if ( mSnappingConfig.scaleDependencyMode() == QgsSnappingConfig::Disabled
|| ( mSnappingConfig.scaleDependencyMode() == QgsSnappingConfig::ScaleDependentGlobal && inRangeGlobal )
|| ( mSnappingConfig.scaleDependencyMode() == QgsSnappingConfig::ScaleDependentPerLayer && inRangeLayer ) )
|| ( mSnappingConfig.scaleDependencyMode() == QgsSnappingConfig::Global && inRangeGlobal )
|| ( mSnappingConfig.scaleDependencyMode() == QgsSnappingConfig::PerLayer && inRangeLayer ) )
{
double tolerance = QgsTolerance::toleranceInProjectUnits( layerConfig.tolerance, layerConfig.layer, mMapSettings, layerConfig.unit );
layers << qMakePair( layerConfig.layer, _areaOfInterest( pointMap, tolerance ) );
Expand Down
10 changes: 5 additions & 5 deletions tests/src/core/testqgssnappingutils.cpp
View file
Expand Up @@ -481,7 +481,7 @@ class TestQgsSnappingUtils : public QObject
QVERIFY( m.hasVertex() );
QCOMPARE( m.point(), QgsPointXY( 1, 0 ) );

snappingConfig.setScaleDependencyMode( QgsSnappingConfig::ScaleDependentGlobal );
snappingConfig.setScaleDependencyMode( QgsSnappingConfig::Global );
snappingConfig.setMinScale( 0.0 );
snappingConfig.setMaxScale( 0.0 );
u.setConfig( snappingConfig );
Expand All @@ -491,7 +491,7 @@ class TestQgsSnappingUtils : public QObject
QVERIFY( m1.isValid() );
QVERIFY( m1.hasVertex() );

snappingConfig.setScaleDependencyMode( QgsSnappingConfig::ScaleDependentGlobal );
snappingConfig.setScaleDependencyMode( QgsSnappingConfig::Global );
snappingConfig.setMinScale( 1000.0 );
snappingConfig.setMaxScale( 10000.0 );
u.setConfig( snappingConfig );
Expand All @@ -501,7 +501,7 @@ class TestQgsSnappingUtils : public QObject
QVERIFY( m2.isValid() == false );
QVERIFY( m2.hasVertex() == false );

snappingConfig.setScaleDependencyMode( QgsSnappingConfig::ScaleDependentGlobal );
snappingConfig.setScaleDependencyMode( QgsSnappingConfig::Global );
snappingConfig.setMinScale( 1000.0 );
snappingConfig.setMaxScale( 100000.0 );
u.setConfig( snappingConfig );
Expand All @@ -511,7 +511,7 @@ class TestQgsSnappingUtils : public QObject
QVERIFY( m3.isValid() );
QVERIFY( m3.hasVertex() );

snappingConfig.setScaleDependencyMode( QgsSnappingConfig::ScaleDependentPerLayer );
snappingConfig.setScaleDependencyMode( QgsSnappingConfig::PerLayer );
snappingConfig.setIndividualLayerSettings( mVL, QgsSnappingConfig::IndividualLayerSettings( true, QgsSnappingConfig::VertexFlag, 10, QgsTolerance::Pixels, 1000.0, 10000.0 ) );
u.setConfig( snappingConfig );

Expand All @@ -520,7 +520,7 @@ class TestQgsSnappingUtils : public QObject
QVERIFY( m4.isValid() == false );
QVERIFY( m4.hasVertex() == false );

snappingConfig.setScaleDependencyMode( QgsSnappingConfig::ScaleDependentPerLayer );
snappingConfig.setScaleDependencyMode( QgsSnappingConfig::PerLayer );
snappingConfig.setIndividualLayerSettings( mVL, QgsSnappingConfig::IndividualLayerSettings( true, QgsSnappingConfig::VertexFlag, 10, QgsTolerance::Pixels, 1000.0, 100000.0 ) );
u.setConfig( snappingConfig );

Expand Down

0 comments on commit 563e396

Please sign in to comment.