[QGIS Commit] r13691 - in branches/threading-branch/src: app ui

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-06-08 12:43:28 -0400 (Tue, 08 Jun 2010)
New Revision: 13691

Modified:
   branches/threading-branch/src/app/qgisapp.cpp
   branches/threading-branch/src/app/qgsoptions.cpp
   branches/threading-branch/src/ui/qgsoptionsbase.ui
Log:
Make threading configurable in options dialog.


Modified: branches/threading-branch/src/app/qgisapp.cpp
===================================================================
--- branches/threading-branch/src/app/qgisapp.cpp	2010-06-08 14:11:48 UTC (rev 13690)
+++ branches/threading-branch/src/app/qgisapp.cpp	2010-06-08 16:43:28 UTC (rev 13691)
@@ -2100,9 +2100,10 @@
 
   // moved here to set anti aliasing to both map canvas and overview
   QSettings mySettings;
+  mMapCanvas->mapRenderer()->setCachingEnabled( mySettings.value( "/qgis/enable_render_caching", false ).toBool() );
+  mMapCanvas->mapRenderer()->setThreadingEnabled( mySettings.value( "/qgis/enable_threaded_rendering", false ).toBool() );
   mMapCanvas->enableAntiAliasing( mySettings.value( "/qgis/enable_anti_aliasing", false ).toBool() );
-  mMapCanvas->useImageToRender( mySettings.value( "/qgis/use_qimage_to_render", false ).toBool() );
-  mMapCanvas->mapRenderer()->setCachingEnabled( mySettings.value( "/qgis/enable_render_caching", false ).toBool() );
+  mMapCanvas->useImageToRender( mySettings.value( "/qgis/use_qimage_to_render", false ).toBool() ); // also does a refresh
 
   int action = mySettings.value( "/qgis/wheel_action", 0 ).toInt();
   double zoomFactor = mySettings.value( "/qgis/zoom_factor", 2 ).toDouble();
@@ -5082,9 +5083,10 @@
     setTheme( optionsDialog->theme() );
 
     QSettings mySettings;
+    mMapCanvas->mapRenderer()->setCachingEnabled( mySettings.value( "/qgis/enable_render_caching", false ).toBool() );
+    mMapCanvas->mapRenderer()->setThreadingEnabled( mySettings.value( "/qgis/enable_threaded_rendering", false ).toBool() );
     mMapCanvas->enableAntiAliasing( mySettings.value( "/qgis/enable_anti_aliasing" ).toBool() );
-    mMapCanvas->useImageToRender( mySettings.value( "/qgis/use_qimage_to_render" ).toBool() );
-    mMapCanvas->mapRenderer()->setCachingEnabled( mySettings.value( "/qgis/enable_render_caching", false ).toBool() );
+    mMapCanvas->useImageToRender( mySettings.value( "/qgis/use_qimage_to_render" ).toBool() ); // also does a refresh
 
     int action = mySettings.value( "/qgis/wheel_action", 0 ).toInt();
     double zoomFactor = mySettings.value( "/qgis/zoom_factor", 2 ).toDouble();

Modified: branches/threading-branch/src/app/qgsoptions.cpp
===================================================================
--- branches/threading-branch/src/app/qgsoptions.cpp	2010-06-08 14:11:48 UTC (rev 13690)
+++ branches/threading-branch/src/app/qgsoptions.cpp	2010-06-08 16:43:28 UTC (rev 13691)
@@ -222,6 +222,7 @@
   //set the state of the checkboxes
   chkAntiAliasing->setChecked( settings.value( "/qgis/enable_anti_aliasing", false ).toBool() );
   chkUseRenderCaching->setChecked( settings.value( "/qgis/enable_render_caching", false ).toBool() );
+  chkUseThreadedRendering->setChecked( settings.value( "/qgis/enable_threaded_rendering", false ).toBool() );
 
   chkUseSymbologyNG->setChecked( settings.value( "/qgis/use_symbology_ng", false ).toBool() );
 
@@ -492,6 +493,7 @@
   settings.setValue( "/qgis/new_layers_visible", chkAddedVisibility->isChecked() );
   settings.setValue( "/qgis/enable_anti_aliasing", chkAntiAliasing->isChecked() );
   settings.setValue( "/qgis/enable_render_caching", chkUseRenderCaching->isChecked() );
+  settings.setValue( "/qgis/enable_threaded_rendering", chkUseThreadedRendering->isChecked() );
   settings.setValue( "/qgis/use_qimage_to_render", !( chkUseQPixmap->isChecked() ) );
   settings.setValue( "/qgis/use_symbology_ng", chkUseSymbologyNG->isChecked() );
   settings.setValue( "qgis/capitaliseLayerName", capitaliseCheckBox->isChecked() );

Modified: branches/threading-branch/src/ui/qgsoptionsbase.ui
===================================================================
--- branches/threading-branch/src/ui/qgsoptionsbase.ui	2010-06-08 14:11:48 UTC (rev 13690)
+++ branches/threading-branch/src/ui/qgsoptionsbase.ui	2010-06-08 16:43:28 UTC (rev 13691)
@@ -509,14 +509,21 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0" colspan="2">
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="chkUseThreadedRendering">
+            <property name="text">
+             <string>Use threading to speed up rendering on computers with multiple CPUs</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
            <widget class="QLabel" name="textLabel3">
             <property name="text">
              <string>&lt;b&gt;Note:&lt;/b&gt; Use zero to prevent display updates until all features have been rendered</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0" colspan="2">
+          <item row="3" column="0">
            <widget class="QCheckBox" name="chkUseRenderCaching">
             <property name="text">
              <string>Use render caching where possible to speed up redraws</string>
@@ -1603,7 +1610,6 @@
   <tabstop>cbxAddPostgisDC</tabstop>
   <tabstop>chkAddedVisibility</tabstop>
   <tabstop>spinBoxUpdateThreshold</tabstop>
-  <tabstop>chkUseRenderCaching</tabstop>
   <tabstop>chkAntiAliasing</tabstop>
   <tabstop>chkUseQPixmap</tabstop>
   <tabstop>mBtnAddSVGPath</tabstop>