qgis_threaded_render.v1.diff

src/core/qgsvectorlayer.cpp (working copy)
646	646	return ptr;
647	647	}
648	648
	649	void QgsVectorLayer::run( )
	650	{
	651	draw( mRenderContext );
	652	}
	653
649	654	bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
650	655	{
651	656	//set update threshold before each draw to make sure the current setting is picked up

src/core/raster/qgsrasterlayer.cpp (working copy)
1343	1343	return mDataProvider;
1344	1344	}
1345	1345
	1346	void QgsRasterLayer::run( )
	1347	{
	1348	draw( mRenderContext );
	1349	}
	1350
1346	1351	bool QgsRasterLayer::draw( QgsRenderContext& rendererContext )
1347	1352	{
1348	1353	QgsDebugMsg( "entered. (renderContext)" );

         /** Returns the data provider in a const-correct manner */
         const QgsRasterDataProvider* dataProvider() const;
         /** Render the layer in a thread.
          * @note Added in QGIS 1.4
          */
         void run();
         /** \brief This is called when the view on the raster layer needs to be redrawn */
         bool draw( QgsRenderContext& rendererContext );

       return mLayerExtent;
+    }
     void  QgsMapLayer::setRenderContext( QgsRenderContext theContext )
+    {
       mRenderContext = theContext;
+    }
     void QgsMapLayer::run( )
+    {
       return ;
+    }
     bool QgsMapLayer::draw( QgsRenderContext& rendererContext )
+    {
       return false;

                              QgsSnappingResult > & snappingResults,
                              QgsSnapper::SnappingType snap_to );
         /** Draw the layer in its own thread
          * @note - added in QGIS 1.4
          */
         void run();
         /** Draws the layer
          *  @return FALSE if an error occurred during drawing
          */

     #include <QObject>
     #include <QUndoStack>
     #include <QImage>
     #include <QThread>
     #include "qgsrectangle.h"
     class QgsRenderContext;
     class QgsCoordinateReferenceSystem;
     class QDomNode;
-...
     class QKeyEvent;
     class QPainter;
     #include "qgsrendercontext.h"
     /** \ingroup core
      * Base class for all map layer types.
      * This is the base class for all map layer types (vector, raster).
      */
     class CORE_EXPORT QgsMapLayer : public QObject
     class CORE_EXPORT QgsMapLayer : public QThread
+    {
         Q_OBJECT
         Q_OBJECT;
       public:
         /** Layers enum defining the types of layers that can be added to a map */
-...
          */
         QString const & name() const;
         /** Render this layer onto the paint device
          * specified in mRenderContext in a separate thread.
+         *
          * @note Added in QGIS 1.4
          */
         virtual void run();
         /** Set the render context onto which the layer will
          * be drawn when the thread is started.
          * @see run()
          * @note Added in QGIS 1.4
          */
         void setRenderContext( QgsRenderContext theContext );
         /** This is the method that does the actual work of
          * drawing the layer onto a paint device.
          * @param QgsRenderContext - describes the extents,
          * resolution etc. that should be used when rendering the
          * layer.
          * @note From QGIS 1.4 onwards for threaded drawing you should rather
          * use setRenderContext and then call run() rather than call this
          * method which may be deprecated in the future.
          */
         virtual bool draw( QgsRenderContext& rendererContext );
-...
          * @note This property was added in QGIS 1.4 **/
         QImage * mpCacheImage;
       protected:
         /** Render context defining the scale etc and paint device
          * onto which the layer should be rendered when run is called. */
         QgsRenderContext mRenderContext;
     };
     #endif

QGIS » QGIS Application