sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading legacy snapping configuration

Browse Source
This commit is contained in:
Matthias Kuhn 2016-12-19 22:59:51 +01:00
parent eed4f0f544
commit 326f2e5a82
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/core/qgssnappingconfig.cpp
View File

@ -417,25 +417,17 @@ void QgsSnappingConfig::readLegacySettings()
QString snapMode = mProject->readEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/SnappingMode" ) ); QString snapMode = mProject->readEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/SnappingMode" ) );
QString snapType = mProject->readEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/DefaultSnapType" ), QStringLiteral( "off" ) );
if ( snapType == QLatin1String( "to segment" ) )
mType = Segment;
else if ( snapType == QLatin1String( "to vertex and segment" ) )
mType = VertexAndSegment;
else if ( snapType == QLatin1String( "to vertex" ) )
mType = Vertex;
mTolerance = mProject->readDoubleEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/DefaultSnapTolerance" ), 0 ); mTolerance = mProject->readDoubleEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/DefaultSnapTolerance" ), 0 );
mUnits = static_cast< QgsTolerance::UnitType >( mProject->readNumEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/DefaultSnapToleranceUnit" ), QgsTolerance::ProjectUnits ) ); mUnits = static_cast< QgsTolerance::UnitType >( mProject->readNumEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/DefaultSnapToleranceUnit" ), QgsTolerance::ProjectUnits ) );
mIntersectionSnapping = mProject->readNumEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/IntersectionSnapping" ), 0 ); mIntersectionSnapping = mProject->readNumEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/IntersectionSnapping" ), 0 );
//read snapping settings from project //read snapping settings from project
bool snappingDefinedInProject, ok; QStringList layerIdList = mProject->readListEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/LayerSnappingList" ), QStringList() );
QStringList layerIdList = mProject->readListEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/LayerSnappingList" ), QStringList(), &snappingDefinedInProject ); QStringList enabledList = mProject->readListEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/LayerSnappingEnabledList" ), QStringList() );
QStringList enabledList = mProject->readListEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/LayerSnappingEnabledList" ), QStringList(), &ok ); QStringList toleranceList = mProject->readListEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/LayerSnappingToleranceList" ), QStringList() );
QStringList toleranceList = mProject->readListEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/LayerSnappingToleranceList" ), QStringList(), &ok ); QStringList toleranceUnitList = mProject->readListEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/LayerSnappingToleranceUnitList" ), QStringList() );
QStringList toleranceUnitList = mProject->readListEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/LayerSnappingToleranceUnitList" ), QStringList(), &ok ); QStringList snapToList = mProject->readListEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/LayerSnapToList" ), QStringList() );
QStringList snapToList = mProject->readListEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/LayerSnapToList" ), QStringList(), &ok );
// lists must have the same size, otherwise something is wrong // lists must have the same size, otherwise something is wrong
if ( layerIdList.size() != enabledList.size() || if ( layerIdList.size() != enabledList.size() ||
@ -444,9 +436,6 @@ void QgsSnappingConfig::readLegacySettings()
layerIdList.size() != snapToList.size() ) layerIdList.size() != snapToList.size() )
return; return;
if ( !snappingDefinedInProject )
return; // nothing defined in project - use current layer
// Use snapping information from the project // Use snapping information from the project
if ( snapMode == QLatin1String( "current_layer" ) ) if ( snapMode == QLatin1String( "current_layer" ) )
mMode = ActiveLayer; mMode = ActiveLayer;
@ -475,6 +464,19 @@ void QgsSnappingConfig::readLegacySettings()
mIndividualLayerSettings.insert( vlayer, IndividualLayerSettings( *enabledIt == QLatin1String( "enabled" ), t, tolIt->toDouble(), static_cast<QgsTolerance::UnitType>( tolUnitIt->toInt() ) ) ); mIndividualLayerSettings.insert( vlayer, IndividualLayerSettings( *enabledIt == QLatin1String( "enabled" ), t, tolIt->toDouble(), static_cast<QgsTolerance::UnitType>( tolUnitIt->toInt() ) ) );
} }
QString snapType = mProject->readEntry( QStringLiteral( "Digitizing" ), QStringLiteral( "/DefaultSnapType" ), QStringLiteral( "off" ) );
mEnabled = true;
if ( snapType == QLatin1String( "to segment" ) )
mType = Segment;
else if ( snapType == QLatin1String( "to vertex and segment" ) )
mType = VertexAndSegment;
else if ( snapType == QLatin1String( "to vertex" ) )
mType = Vertex;
else if ( mMode != AdvancedConfiguration ) // Type is off but mode is advanced
{
mEnabled = false;
}
} }
QgsProject* QgsSnappingConfig::project() const QgsProject* QgsSnappingConfig::project() const