Some cleanups in composer map and disable a recent change in composer that may lead to segfaults on some systems

mhugent · mhugent · commit 1fff70e8b5d6 · 2009-09-30T11:45:19.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11736 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -303,6 +303,7 @@ void QgsComposer::open( void )
 void QgsComposer::paintEvent( QPaintEvent* event )
 {
   QMainWindow::paintEvent( event );
+#if 0 //MH: disabled for now as there are segfaults on some systems
   //The cached content of the composer maps need to be recreated it is the first paint event of the composer after reading from XML file.
   //Otherwise the resolution of the composer map is not suitable for screen
   if ( mFirstPaint )
@@ -313,12 +314,13 @@ void QgsComposer::paintEvent( QPaintEvent* event )
       QgsComposerMap* cm = dynamic_cast<QgsComposerMap*>( it.key() );
       if ( cm )
       {
+        mFirstPaint = false;
         cm->cache();
         cm->update();
       }
     }
-    mFirstPaint = false;
   }
+#endif //0
 }
 
 void QgsComposer::activate()
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -252,8 +252,6 @@ void QgsComposerMap::paint( QPainter* painter, const QStyleOptionGraphicsItem* i
 
 
   painter->restore();
-
-  mLastScaleFactorX =  currentScaleFactorX;
 }
 
 void QgsComposerMap::updateCachedImage( void )
@@ -542,12 +540,6 @@ bool QgsComposerMap::writeXML( QDomElement& elem, QDomDocument & doc ) const
   }
   composerMapElem.appendChild( layerSetElem );
 
-#if 0
-  // why is saving the map changing anything about the cache?
-  mCacheUpdated = false;
-  mNumCachedLayers = 0;
-#endif
-
   elem.appendChild( composerMapElem );
   return _writeXML( composerMapElem, doc );
 }
diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
@@ -181,12 +181,6 @@ class CORE_EXPORT QgsComposerMap : /*public QWidget, private Ui::QgsComposerMapB
     /** \brief set to true if in state of drawing. Concurrent requests to draw method are returned if set to true */
     bool mDrawing;
 
-    /**Store last scale factor to avoid unnecessary repaints in case preview mode is 'Render'*/
-    double mLastScaleFactorX;
-
-    /**Store the last map extent to decide if cache needs to be updatet*/
-    QgsRectangle mCachedMapExtent;
-
     /**Offset in x direction for showing map cache image*/
     double mXOffset;
     /**Offset in y direction for showing map cache image*/

Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,7 @@ void QgsComposer::open( void )`
`303`	`303`	`void QgsComposer::paintEvent( QPaintEvent* event )`
`304`	`304`	`{`
`305`	`305`	`QMainWindow::paintEvent( event );`
	`306`	`+#if 0 //MH: disabled for now as there are segfaults on some systems`
`306`	`307`	`//The cached content of the composer maps need to be recreated it is the first paint event of the composer after reading from XML file.`
`307`	`308`	`//Otherwise the resolution of the composer map is not suitable for screen`
`308`	`309`	`if ( mFirstPaint )`
`@@ -313,12 +314,13 @@ void QgsComposer::paintEvent( QPaintEvent* event )`
`313`	`314`	`QgsComposerMap* cm = dynamic_cast<QgsComposerMap*>( it.key() );`
`314`	`315`	`if ( cm )`
`315`	`316`	`{`
	`317`	`+ mFirstPaint = false;`
`316`	`318`	`cm->cache();`
`317`	`319`	`cm->update();`
`318`	`320`	`}`
`319`	`321`	`}`
`320`		`- mFirstPaint = false;`
`321`	`322`	`}`
	`323`	`+#endif //0`
`322`	`324`	`}`
`323`	`325`
`324`	`326`	`void QgsComposer::activate()`
Original file line number	Diff line number	Diff line change
`@@ -252,8 +252,6 @@ void QgsComposerMap::paint( QPainter* painter, const QStyleOptionGraphicsItem* i`
`252`	`252`
`253`	`253`
`254`	`254`	`painter->restore();`
`255`		`-`
`256`		`- mLastScaleFactorX = currentScaleFactorX;`
`257`	`255`	`}`
`258`	`256`
`259`	`257`	`void QgsComposerMap::updateCachedImage( void )`
`@@ -542,12 +540,6 @@ bool QgsComposerMap::writeXML( QDomElement& elem, QDomDocument & doc ) const`
`542`	`540`	`}`
`543`	`541`	`composerMapElem.appendChild( layerSetElem );`
`544`	`542`
`545`		`-#if 0`
`546`		`- // why is saving the map changing anything about the cache?`
`547`		`- mCacheUpdated = false;`
`548`		`- mNumCachedLayers = 0;`
`549`		`-#endif`
`550`		`-`
`551`	`543`	`elem.appendChild( composerMapElem );`
`552`	`544`	`return _writeXML( composerMapElem, doc );`
`553`	`545`	`}`