Enable backbuffering / incremental drawing features only on supported platforms

m-kuhn · mhugent · commit 02f06f99686a · 2012-08-09T11:21:22.000+02:00
Correct typo
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -76,8 +76,9 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   connect( spinFontSize, SIGNAL( valueChanged( const QString& ) ), this, SLOT( fontSizeChanged( const QString& ) ) );
 
   connect( chkUseStandardDeviation, SIGNAL( stateChanged( int ) ), this, SLOT( toggleStandardDeviation( int ) ) );
-
+#ifdef Q_WS_X11
   connect( chkEnableBackbuffer, SIGNAL( stateChanged( int ) ), this, SLOT( toggleEnableBackbuffer( int ) ) );
+#endif
 
   connect( this, SIGNAL( accepted() ), this, SLOT( saveOptions() ) );
 
@@ -229,10 +230,19 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   if ( index == -1 ) index = 1;
   cmbScanZipInBrowser->setCurrentIndex( index );
 
-  // Set the enable backbuffer state
+  // Set the enable backbuffer state for X11 (linux) systems only
+  // TODO: remove this when threading is implemented
 #ifdef Q_WS_X11
   chkEnableBackbuffer->setChecked( settings.value( "/Map/enableBackbuffer" ).toBool() );
   toggleEnableBackbuffer( chkEnableBackbuffer->checkState() );
+#elif Q_WS_MAC
+  chkEnableBackbuffer->setChecked( true );
+  chkEnableBackbuffer->setEnabled( false );
+  labelUpdateThreshold->setEnabled( false );
+  spinBoxUpdateThreshold->setEnabled( false );
+#else // Q_WS_WIN32
+  chkEnableBackbuffer->setChecked( true );
+  chkEnableBackbuffer->setEnabled( false );
 #endif
 
   // set the display update threshold
diff --git a/src/app/qgsoptions.h b/src/app/qgsoptions.h
@@ -74,9 +74,11 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
 
     void toggleStandardDeviation( int );
 
+#ifdef Q_WS_X11
     //! Slot to change backbuffering. This is handled when the user changes
     // the value of the checkbox
     void toggleEnableBackbuffer( int );
+#endif
 
     /**
      * Return the desired state of newly added layers. If a layer
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -734,8 +734,10 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
         break;
       }
 #ifndef Q_WS_MAC //MH: disable this on Mac for now to avoid problems with resizing
+#ifdef Q_WS_X11
       if ( !mEnableBackbuffer ) // do not handle events, as we're already inside a paint event
       {
+#endif // Q_WS_X11
         if ( mUpdateThreshold > 0 && 0 == featureCount % mUpdateThreshold )
         {
           emit screenUpdateRequested();
@@ -747,8 +749,10 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
           // emit drawingProgress( featureCount, totalFeatures );
           qApp->processEvents();
         }
+#ifdef Q_WS_X11
       }
-#endif //Q_WS_MAC
+#endif // Q_WS_X11
+#endif // Q_WS_MAC
 
       bool sel = mSelectedFeatureIds.contains( fet.id() );
       bool drawMarker = ( mEditable && ( !vertexMarkerOnlyForSelection || sel ) );
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -377,10 +377,11 @@ void QgsMapCanvas::refresh()
   bool enableBackbufferSetting = 0;
 #endif
 
-  //disable the update that leads to the resize crash
+#ifdef Q_WS_X11
+#ifndef ANDROID
+  // disable the update that leads to the resize crash on X11 systems
   if ( viewport() )
   {
-#ifndef ANDROID
     if ( enableBackbufferSetting != mBackbufferEnabled )
     {
       qDebug() << "Enable back buffering: " << enableBackbufferSetting;
@@ -394,8 +395,9 @@ void QgsMapCanvas::refresh()
       }
       mBackbufferEnabled = enableBackbufferSetting;
     }
-#endif //ANDROID
   }
+#endif // ANDROID
+#endif // Q_WS_X11
 
   mDrawing = true;
 
diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -977,7 +977,7 @@
               <item row="2" column="0">
                <widget class="QCheckBox" name="chkEnableBackbuffer">
                 <property name="text">
-                 <string>Enable back buffer (Better graphics performance at the cost loosing the possibiliti to cancel rendering and incremental feature drawing)</string>
+                 <string>Enable back buffer (Better graphics performance at the cost of loosing the possibility to cancel rendering and incremental feature drawing)</string>
                 </property>
                </widget>
               </item>

Original file line number	Diff line number	Diff line change
`@@ -734,8 +734,10 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab`
`734`	`734`	`break;`
`735`	`735`	`}`
`736`	`736`	`#ifndef Q_WS_MAC //MH: disable this on Mac for now to avoid problems with resizing`
	`737`	`+#ifdef Q_WS_X11`
`737`	`738`	`if ( !mEnableBackbuffer ) // do not handle events, as we're already inside a paint event`
`738`	`739`	`{`
	`740`	`+#endif // Q_WS_X11`
`739`	`741`	`if ( mUpdateThreshold > 0 && 0 == featureCount % mUpdateThreshold )`
`740`	`742`	`{`
`741`	`743`	`emit screenUpdateRequested();`
`@@ -747,8 +749,10 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab`
`747`	`749`	`// emit drawingProgress( featureCount, totalFeatures );`
`748`	`750`	`qApp->processEvents();`
`749`	`751`	`}`
	`752`	`+#ifdef Q_WS_X11`
`750`	`753`	`}`
`751`		`-#endif //Q_WS_MAC`
	`754`	`+#endif // Q_WS_X11`
	`755`	`+#endif // Q_WS_MAC`
`752`	`756`
`753`	`757`	`bool sel = mSelectedFeatureIds.contains( fet.id() );`
`754`	`758`	`bool drawMarker = ( mEditable && ( !vertexMarkerOnlyForSelection \|\| sel ) );`
Original file line number	Diff line number	Diff line change
`@@ -377,10 +377,11 @@ void QgsMapCanvas::refresh()`
`377`	`377`	`bool enableBackbufferSetting = 0;`
`378`	`378`	`#endif`
`379`	`379`
`380`		`- //disable the update that leads to the resize crash`
	`380`	`+#ifdef Q_WS_X11`
	`381`	`+#ifndef ANDROID`
	`382`	`+ // disable the update that leads to the resize crash on X11 systems`
`381`	`383`	`if ( viewport() )`
`382`	`384`	`{`
`383`		`-#ifndef ANDROID`
`384`	`385`	`if ( enableBackbufferSetting != mBackbufferEnabled )`
`385`	`386`	`{`
`386`	`387`	`qDebug() << "Enable back buffering: " << enableBackbufferSetting;`
`@@ -394,8 +395,9 @@ void QgsMapCanvas::refresh()`
`394`	`395`	`}`
`395`	`396`	`mBackbufferEnabled = enableBackbufferSetting;`
`396`	`397`	`}`
`397`		`-#endif //ANDROID`
`398`	`398`	`}`
	`399`	`+#endif // ANDROID`
	`400`	`+#endif // Q_WS_X11`
`399`	`401`
`400`	`402`	`mDrawing = true;`
`401`	`403`