[QGIS Commit] r9049 - branches/advanced_printing_branch/src/app/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-08-12 11:10:32 -0400 (Tue, 12 Aug 2008)
New Revision: 9049

Modified:
   branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp
   branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp
   branches/advanced_printing_branch/src/app/composer/qgscomposerview.cpp
Log:
Disabled loading from xml directly to cache mode because of crashes on Qt 4.4.0 and 4.4.1

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp	2008-08-12 12:13:42 UTC (rev 9048)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp	2008-08-12 15:10:32 UTC (rev 9049)
@@ -382,6 +382,9 @@
       return false;
     }
 
+  mPreviewMode = Rectangle;
+  
+#if 0 //leads to frequent crashes on Qt 4.4.0/4.4.1
   //previewMode
   QString previewMode = itemElem.attribute("previewMode");
   if(previewMode == "Cache")
@@ -396,6 +399,7 @@
     {
       mPreviewMode = Rectangle;
     }
+#endif //0
 
   //extent
   QDomNodeList extentNodeList = itemElem.elementsByTagName("Extent");

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp	2008-08-12 12:13:42 UTC (rev 9048)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp	2008-08-12 15:10:32 UTC (rev 9049)
@@ -288,6 +288,10 @@
       return;
     }
 
+  mUpdatePreviewButton->setEnabled(false); //prevent crashes because of many button clicks
+
   mComposerMap->setCacheUpdated(false);
   mComposerMap->update();
+
+  mUpdatePreviewButton->setEnabled(true);
 }

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposerview.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerview.cpp	2008-08-12 12:13:42 UTC (rev 9048)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerview.cpp	2008-08-12 15:10:32 UTC (rev 9049)
@@ -400,5 +400,3 @@
   emit itemRemoved(item);
 }
 
-
-