[QGIS Commit] r12514 - in trunk/qgis/src: app core

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-12-19 06:10:11 -0500 (Sat, 19 Dec 2009)
New Revision: 12514

Modified:
   trunk/qgis/src/app/qgsoptions.cpp
   trunk/qgis/src/core/qgstolerance.cpp
Log:
Use 10px as a default vertex search radius. (should be a more sensitive tolerance than 10 map units)


Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp	2009-12-19 11:08:38 UTC (rev 12513)
+++ trunk/qgis/src/app/qgsoptions.cpp	2009-12-19 11:10:11 UTC (rev 12514)
@@ -248,7 +248,7 @@
     index = mDefaultSnappingToleranceComboBox->findText( tr( "pixels" ) );
   }
   mDefaultSnappingToleranceComboBox->setCurrentIndex( index );
-  if ( settings.value( "/qgis/digitizing/search_radius_vertex_edit_unit", 0 ).toInt() == QgsTolerance::MapUnits )
+  if ( settings.value( "/qgis/digitizing/search_radius_vertex_edit_unit", QgsTolerance::Pixels ).toInt() == QgsTolerance::MapUnits )
   {
     index = mSearchRadiusVertexEditComboBox->findText( tr( "map units" ) );
   }
@@ -256,7 +256,7 @@
   {
     index = mSearchRadiusVertexEditComboBox->findText( tr( "pixels" ) );
   }
-  mSearchRadiusVertexEditComboBox->setCurrentIndex( settings.value( "/qgis/digitizing/search_radius_vertex_edit_unit", 0 ).toInt() );
+  mSearchRadiusVertexEditComboBox->setCurrentIndex( index );
 
   //vertex marker
   mMarkersOnlyForSelectedCheckBox->setChecked( settings.value( "/qgis/digitizing/marker_only_for_selected", false ).toBool() );

Modified: trunk/qgis/src/core/qgstolerance.cpp
===================================================================
--- trunk/qgis/src/core/qgstolerance.cpp	2009-12-19 11:08:38 UTC (rev 12513)
+++ trunk/qgis/src/core/qgstolerance.cpp	2009-12-19 11:10:11 UTC (rev 12514)
@@ -35,7 +35,7 @@
 {
   QSettings settings;
   double tolerance = settings.value( "/qgis/digitizing/search_radius_vertex_edit", 10 ).toDouble();
-  UnitType units = ( QgsTolerance::UnitType ) settings.value( "/qgis/digitizing/search_radius_vertex_edit_unit", 0 ).toInt();
+  UnitType units = ( QgsTolerance::UnitType ) settings.value( "/qgis/digitizing/search_radius_vertex_edit_unit", QgsTolerance::Pixels ).toInt();
   return toleranceInMapUnits( tolerance, layer, renderer, units );
 }