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

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-12-20 18:54:13 -0500 (Sun, 20 Dec 2009)
New Revision: 12558

Modified:
   trunk/qgis/src/app/qgsoptions.cpp
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
Use cross by default as editing vertex marker: semi-transparent circle markers take way too long time to render.
Also make the markers smaller by default for better readability.


Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp	2009-12-20 23:34:38 UTC (rev 12557)
+++ trunk/qgis/src/app/qgsoptions.cpp	2009-12-20 23:54:13 UTC (rev 12558)
@@ -265,7 +265,7 @@
   mMarkerStyleComboBox->addItem( tr( "Cross" ) );
   mMarkerStyleComboBox->addItem( tr( "None" ) );
 
-  QString markerStyle = settings.value( "/qgis/digitizing/marker_style", "SemiTransparentCircle" ).toString();
+  QString markerStyle = settings.value( "/qgis/digitizing/marker_style", "Cross" ).toString();
   if ( markerStyle == "SemiTransparentCircle" )
   {
     mMarkerStyleComboBox->setCurrentIndex( mMarkerStyleComboBox->findText( tr( "Semi transparent circle" ) ) );
@@ -278,7 +278,7 @@
   {
     mMarkerStyleComboBox->setCurrentIndex( mMarkerStyleComboBox->findText( tr( "None" ) ) );
   }
-  mMarkerSizeSpinBox->setValue( settings.value( "/qgis/digitizing/marker_size", 7 ).toInt() );
+  mMarkerSizeSpinBox->setValue( settings.value( "/qgis/digitizing/marker_size", 3 ).toInt() );
 
   chkDisableAttributeValuesDlg->setChecked( settings.value( "/qgis/digitizing/disable_enter_attribute_values_dialog", false ).toBool() );
 

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2009-12-20 23:34:38 UTC (rev 12557)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2009-12-20 23:54:13 UTC (rev 12558)
@@ -3812,7 +3812,7 @@
 QgsVectorLayer::VertexMarkerType QgsVectorLayer::currentVertexMarkerType()
 {
   QSettings settings;
-  QString markerTypeString = settings.value( "/qgis/digitizing/marker_style", "SemiTransparentCircle" ).toString();
+  QString markerTypeString = settings.value( "/qgis/digitizing/marker_style", "Cross" ).toString();
   if ( markerTypeString == "Cross" )
   {
     return QgsVectorLayer::Cross;
@@ -3830,7 +3830,7 @@
 int QgsVectorLayer::currentVertexMarkerSize()
 {
   QSettings settings;
-  return settings.value( "/qgis/digitizing/marker_size", 7 ).toInt();
+  return settings.value( "/qgis/digitizing/marker_size", 3 ).toInt();
 }
 
 void QgsVectorLayer::drawFeature( QgsRenderContext &renderContext,