[QGIS Commit] r8421 - in branches/rendercontext-branch/src: app core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-05-12 02:32:11 -0400 (Mon, 12 May 2008)
New Revision: 8421

Modified:
   branches/rendercontext-branch/src/app/qgisapp.cpp
   branches/rendercontext-branch/src/app/qgsoptions.cpp
   branches/rendercontext-branch/src/core/qgsvectorlayer.cpp
Log:
Disable incremental rendering for Mac because of problems with resize

Modified: branches/rendercontext-branch/src/app/qgisapp.cpp
===================================================================
--- branches/rendercontext-branch/src/app/qgisapp.cpp	2008-05-10 16:40:36 UTC (rev 8420)
+++ branches/rendercontext-branch/src/app/qgisapp.cpp	2008-05-12 06:32:11 UTC (rev 8421)
@@ -1137,6 +1137,9 @@
   QFont myFont( "Arial", 9 );
 
   mStopRenderButton = new QPushButton(tr("Stop rendering"), statusBar());
+#ifdef Q_WS_MAC //MH: disable the button on Mac for now to avoid problems with resizing
+  mStopRenderButton->setEnabled(false);
+#endif //Q_WS_MAC
   statusBar()->addWidget(mStopRenderButton, 0, true);
 
   statusBar()->setFont(myFont);
@@ -1179,6 +1182,9 @@
   mRenderSuppressionCBox->setFont(myFont);
   QWhatsThis::add(mRenderSuppressionCBox, tr("When checked, the map layers are rendered in response to map navigation commands and other events. When not checked, no rendering is done. This allows you to add a large number of layers and symbolize them before rendering."));
   QToolTip::add( mRenderSuppressionCBox, tr("Toggle map rendering") );
+#ifdef Q_WS_MAC //MH: disable the button on Mac for now to avoid problems with resizing 
+  mRenderSuppressionCBox->setEnabled(false);
+#endif //Q_WS_MAC
   statusBar()->addWidget(mRenderSuppressionCBox,0,true);
   // On the fly projection status bar icon
   // Changed this to a tool button since a QPushButton is

Modified: branches/rendercontext-branch/src/app/qgsoptions.cpp
===================================================================
--- branches/rendercontext-branch/src/app/qgsoptions.cpp	2008-05-10 16:40:36 UTC (rev 8420)
+++ branches/rendercontext-branch/src/app/qgsoptions.cpp	2008-05-12 06:32:11 UTC (rev 8421)
@@ -172,6 +172,10 @@
   mDefaultSnapModeComboBox->setCurrentIndex(mDefaultSnapModeComboBox->findText(tr(defaultSnapString)));
   mDefaultSnappingToleranceSpinBox->setValue(settings.value("/qgis/digitizing/default_snapping_tolerance", 0).toDouble());
   mSearchRadiusVertexEditSpinBox->setValue(settings.value("/qgis/digitizing/search_radius_vertex_edit", 10).toDouble());
+
+#ifdef Q_WS_MAC //MH: disable incremental update on Mac for now to avoid problems with resizing 
+  groupBox_5->setEnabled(false);
+#endif //Q_WS_MAC
 }
 
 //! Destructor

Modified: branches/rendercontext-branch/src/core/qgsvectorlayer.cpp
===================================================================
--- branches/rendercontext-branch/src/core/qgsvectorlayer.cpp	2008-05-10 16:40:36 UTC (rev 8420)
+++ branches/rendercontext-branch/src/core/qgsvectorlayer.cpp	2008-05-12 06:32:11 UTC (rev 8421)
@@ -763,13 +763,7 @@
 	    break;
 	  }
 
-        // XXX Something in our draw event is triggering an additional draw event when resizing [TE 01/26/06]
-        // XXX Calling this will begin processing the next draw event causing image havoc and recursion crashes.
-        //qApp->processEvents(); //so we can trap for esc press
-        //if (mDrawingCancelled) return;
-        // If update threshold is greater than 0, check to see if
-        // the threshold has been exceeded
-
+#ifndef Q_WS_MAC //MH: disable this on Mac for now to avoid problems with resizing
 	if(mUpdateThreshold > 0 && 0 == featureCount % mUpdateThreshold)
 	  {
 	    emit screenUpdateRequested();
@@ -781,6 +775,7 @@
 	      emit drawingProgress(featureCount, totalFeatures);
 	      qApp->processEvents();
 	  }
+#endif //Q_WS_MAC
 
         if (mEditable)
         {