Set the use of symbology ng and anti aliasing to default for qgis 1.7

timlinux · timlinux · commit c2873ca25e3d · 2011-02-24T20:32:38.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15259 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2375,7 +2375,8 @@ void QgisApp::createOverview()
 
   // moved here to set anti aliasing to both map canvas and overview
   QSettings mySettings;
-  mMapCanvas->enableAntiAliasing( mySettings.value( "/qgis/enable_anti_aliasing", false ).toBool() );
+  // Anti Aliasing enabled by default as of QGIS 1.7
+  mMapCanvas->enableAntiAliasing( mySettings.value( "/qgis/enable_anti_aliasing", true ).toBool() );
   mMapCanvas->useImageToRender( mySettings.value( "/qgis/use_qimage_to_render", false ).toBool() );
 
   int action = mySettings.value( "/qgis/wheel_action", 0 ).toInt();
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -260,10 +260,12 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   cmbTheme->setCurrentIndex( cmbTheme->findText( settings.value( "/Themes", "default" ).toString() ) );
   cmbSize->setCurrentIndex( cmbSize->findText( settings.value( "/IconSize", 24 ).toString() ) );
   //set the state of the checkboxes
-  chkAntiAliasing->setChecked( settings.value( "/qgis/enable_anti_aliasing", false ).toBool() );
+  //Changed to default to true as of QGIS 1.7
+  chkAntiAliasing->setChecked( settings.value( "/qgis/enable_anti_aliasing", true ).toBool() );
   chkUseRenderCaching->setChecked( settings.value( "/qgis/enable_render_caching", false ).toBool() );
 
-  chkUseSymbologyNG->setChecked( settings.value( "/qgis/use_symbology_ng", false ).toBool() );
+  //Changed to default to true as of QGIS 1.7
+  chkUseSymbologyNG->setChecked( settings.value( "/qgis/use_symbology_ng", true ).toBool() );
 
   // Slightly awkard here at the settings value is true to use QImage,
   // but the checkbox is true to use QPixmap
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -150,7 +150,8 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const
 
   //set antialiasing if enabled in options
   QSettings settings;
-  if ( settings.value( "/qgis/enable_anti_aliasing", false ).toBool() )
+  // Changed to enable anti aliased rendering by default as of QGIS 1.7
+  if ( settings.value( "/qgis/enable_anti_aliasing", true ).toBool() )
   {
     painter->setRenderHint( QPainter::Antialiasing );
   }
diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
@@ -459,7 +459,8 @@ void QgsMapRenderer::render( QPainter* painter )
             mypImage->fill( 0 );
             ml->setCacheImage( mypImage ); //no need to delete the old one, maplayer does it for you
             QPainter * mypPainter = new QPainter( ml->cacheImage() );
-            if ( mySettings.value( "/qgis/enable_anti_aliasing", false ).toBool() )
+            // Changed to enable anti aliasing by default in QGIS 1.7
+            if ( mySettings.value( "/qgis/enable_anti_aliasing", true ).toBool() )
             {
               mypPainter->setRenderHint( QPainter::Antialiasing );
             }
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -127,7 +127,8 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
     setCoordinateSystem();
 
     QSettings settings;
-    if ( settings.value( "/qgis/use_symbology_ng", false ).toBool() && hasGeometryType() )
+    //Changed to default to true as of QGIS 1.7
+    if ( settings.value( "/qgis/use_symbology_ng", true ).toBool() && hasGeometryType() )
     {
       // using symbology-ng!
       setUsingRendererV2( true );

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,8 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const`
`150`	`150`
`151`	`151`	`//set antialiasing if enabled in options`
`152`	`152`	`QSettings settings;`
`153`		`- if ( settings.value( "/qgis/enable_anti_aliasing", false ).toBool() )`
	`153`	`+ // Changed to enable anti aliased rendering by default as of QGIS 1.7`
	`154`	`+ if ( settings.value( "/qgis/enable_anti_aliasing", true ).toBool() )`
`154`	`155`	`{`
`155`	`156`	`painter->setRenderHint( QPainter::Antialiasing );`
`156`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,8 @@ void QgsMapRenderer::render( QPainter* painter )`
`459`	`459`	`mypImage->fill( 0 );`
`460`	`460`	`ml->setCacheImage( mypImage ); //no need to delete the old one, maplayer does it for you`
`461`	`461`	`QPainter * mypPainter = new QPainter( ml->cacheImage() );`
`462`		`- if ( mySettings.value( "/qgis/enable_anti_aliasing", false ).toBool() )`
	`462`	`+ // Changed to enable anti aliasing by default in QGIS 1.7`
	`463`	`+ if ( mySettings.value( "/qgis/enable_anti_aliasing", true ).toBool() )`
`463`	`464`	`{`
`464`	`465`	`mypPainter->setRenderHint( QPainter::Antialiasing );`
`465`	`466`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,8 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,`
`127`	`127`	`setCoordinateSystem();`
`128`	`128`
`129`	`129`	`QSettings settings;`
`130`		`- if ( settings.value( "/qgis/use_symbology_ng", false ).toBool() && hasGeometryType() )`
	`130`	`+ //Changed to default to true as of QGIS 1.7`
	`131`	`+ if ( settings.value( "/qgis/use_symbology_ng", true ).toBool() && hasGeometryType() )`
`131`	`132`	`{`
`132`	`133`	`// using symbology-ng!`
`133`	`134`	`setUsingRendererV2( true );`