raster interfaces stats fixes

blazek · blazek · commit 2fdd82f4b854 · 2012-07-01T11:02:29.000+02:00
diff --git a/src/core/raster/qgsrasterinterface.cpp b/src/core/raster/qgsrasterinterface.cpp
@@ -15,6 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <typeinfo>
+
 #include <QByteArray>
 #include <QTime>
 
@@ -23,7 +25,7 @@
 
 QgsRasterInterface::QgsRasterInterface( QgsRasterInterface * input )
     : mInput( input )
-    , mTimeMinSize( 300 ) // dont forget resampling!
+    , mStatsOn( false )
 {
 }
 
@@ -51,31 +53,46 @@ void * QgsRasterInterface::block( int bandNo, QgsRectangle  const & extent, int
   time.start();
   void * b =  readBlock( bandNo, extent, width, height );
 
-  if ( width > mTimeMinSize && height > mTimeMinSize )
+  if ( mStatsOn )
   {
     if ( mTime.size() <= bandNo )
     {
       mTime.resize( bandNo + 1 );
     }
     // QTime counts only in miliseconds
-    mTime[bandNo] = time.elapsed();
+    // We are adding time until next clear, this way the time may be collected
+    // for the whole QgsRasterLayer::draw() for example, not just for a single part
+    mTime[bandNo] += time.elapsed();
     QgsDebugMsg( QString( "bandNo = %2 time = %3" ).arg( bandNo ).arg( mTime[bandNo] ) );
   }
   return b;
 }
 
-double QgsRasterInterface::time( )
+void QgsRasterInterface::setStatsOn( bool on )
 {
-  // We can only count give total time, because we have to subtract time of previous
+  if ( on )
+  {
+    mTime.clear();
+  }
+  if ( mInput ) mInput->setStatsOn( on );
+  mStatsOn = on;
+}
+
+double QgsRasterInterface::time( bool cumulative )
+{
+  // We can calculate total time only, because we have to subtract time of previous
   // interface(s) and we dont know how to assign bands to each other
   double t = 0;
   for ( int i = 1; i < mTime.size(); i++ )
   {
     t += mTime[i];
   }
+  if ( cumulative ) return t;
+
   if ( mInput )
   {
-    t -= mInput->time();
+    QgsDebugMsgLevel( QString( "%1 cumulative time = %2  time = %3" ).arg( typeid( *( this ) ).name() ).arg( t ).arg( t -  mInput->time( true ) ), 3 );
+    t -= mInput->time( true );
   }
   return t;
 }
diff --git a/src/core/raster/qgsrasterinterface.h b/src/core/raster/qgsrasterinterface.h
@@ -147,11 +147,14 @@ class CORE_EXPORT QgsRasterInterface
      */
     QImage * createImage( int width, int height, QImage::Format format );
 
-    /** Clear last rendering time */
-    void clearTime() { mTime.clear(); if ( mInput ) mInput->clearTime(); }
+    /** Switch on (and clear old statistics) or off collection of statistics */
+    void setStatsOn( bool on );
 
-    /** Last total time (for allbands) consumed by this interface for call to block() */
-    double time();
+    /** Last total time (for allbands) consumed by this interface for call to block()
+     * If cumulative is true, the result includes also time spent in all preceding
+     * interfaces. If cumulative is false, only time consumed by this interface is
+     * returned. */
+    double time( bool cumulative = false );
 
   protected:
     // QgsRasterInterface used as input
@@ -161,8 +164,8 @@ class CORE_EXPORT QgsRasterInterface
     // Last rendering cumulative (this and all preceding interfaces) times, from index 1
     QVector<double> mTime;
 
-    // Minimum block size to record time (to ignore thumbnails etc)
-    int mTimeMinSize;
+    // Collect statistics
+    int mStatsOn;
 };
 
 #endif
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -832,13 +832,24 @@ void QgsRasterLayer::draw( QPainter * theQPainter,
     projector->setCRS( theRasterViewPort->mSrcCRS, theRasterViewPort->mDestCRS );
   }
 
+#ifdef QGISDEBUG
+  // Collect stats only for larger sizes to avoid confusion (small time values)
+  // after thumbnail render e.g. 120 is current thumbnail size
+  // TODO: consider another way to switch stats on/off or storing of last significant
+  //       stats somehow
+  if ( theRasterViewPort->drawableAreaXDim > 120 && theRasterViewPort->drawableAreaYDim > 120 )
+  {
+    mPipe.setStatsOn( true );
+  }
+#endif
+
   // Drawer to pipe?
-  mPipe.clearTime();
   QgsRasterDrawer drawer( mPipe.last() );
   drawer.draw( theQPainter, theRasterViewPort, theQgsMapToPixel );
 
-  // Print time stats
 #ifdef QGISDEBUG
+  mPipe.setStatsOn( false );
+  // Print time stats
   QgsDebugMsg( QString( "interface                  bands  time" ) );
   for ( int i = 0; i < mPipe.size(); i++ )
   {
diff --git a/src/core/raster/qgsrasterpipe.h b/src/core/raster/qgsrasterpipe.h
@@ -87,8 +87,8 @@ class CORE_EXPORT QgsRasterPipe
     QgsRasterResampleFilter * resampleFilter() const;
     QgsRasterProjector * projector() const;
 
-    /** Clear last rendering time */
-    void clearTime() { if ( last() ) last()->clearTime(); }
+    /** Set on/off collection of statistics */
+    void setStatsOn( bool on ) { if ( last() ) last()->setStatsOn( on ); }
 
   private:
     /** Get known parent type_info of interface parent */

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`* *`
`16`	`16`	`***************************************************************************/`
`17`	`17`
	`18`	`+#include <typeinfo>`
	`19`	`+`
`18`	`20`	`#include <QByteArray>`
`19`	`21`	`#include <QTime>`
`20`	`22`
`@@ -23,7 +25,7 @@`
`23`	`25`
`24`	`26`	`QgsRasterInterface::QgsRasterInterface( QgsRasterInterface * input )`
`25`	`27`	`: mInput( input )`
`26`		`- , mTimeMinSize( 300 ) // dont forget resampling!`
	`28`	`+ , mStatsOn( false )`
`27`	`29`	`{`
`28`	`30`	`}`
`29`	`31`
`@@ -51,31 +53,46 @@ void * QgsRasterInterface::block( int bandNo, QgsRectangle const & extent, int`
`51`	`53`	`time.start();`
`52`	`54`	`void * b = readBlock( bandNo, extent, width, height );`
`53`	`55`
`54`		`- if ( width > mTimeMinSize && height > mTimeMinSize )`
	`56`	`+ if ( mStatsOn )`
`55`	`57`	`{`
`56`	`58`	`if ( mTime.size() <= bandNo )`
`57`	`59`	`{`
`58`	`60`	`mTime.resize( bandNo + 1 );`
`59`	`61`	`}`
`60`	`62`	`// QTime counts only in miliseconds`
`61`		`- mTime[bandNo] = time.elapsed();`
	`63`	`+ // We are adding time until next clear, this way the time may be collected`
	`64`	`+ // for the whole QgsRasterLayer::draw() for example, not just for a single part`
	`65`	`+ mTime[bandNo] += time.elapsed();`
`62`	`66`	`QgsDebugMsg( QString( "bandNo = %2 time = %3" ).arg( bandNo ).arg( mTime[bandNo] ) );`
`63`	`67`	`}`
`64`	`68`	`return b;`
`65`	`69`	`}`
`66`	`70`
`67`		`-double QgsRasterInterface::time( )`
	`71`	`+void QgsRasterInterface::setStatsOn( bool on )`
`68`	`72`	`{`
`69`		`- // We can only count give total time, because we have to subtract time of previous`
	`73`	`+ if ( on )`
	`74`	`+ {`
	`75`	`+ mTime.clear();`
	`76`	`+ }`
	`77`	`+ if ( mInput ) mInput->setStatsOn( on );`
	`78`	`+ mStatsOn = on;`
	`79`	`+}`
	`80`	`+`
	`81`	`+double QgsRasterInterface::time( bool cumulative )`
	`82`	`+{`
	`83`	`+ // We can calculate total time only, because we have to subtract time of previous`
`70`	`84`	`// interface(s) and we dont know how to assign bands to each other`
`71`	`85`	`double t = 0;`
`72`	`86`	`for ( int i = 1; i < mTime.size(); i++ )`
`73`	`87`	`{`
`74`	`88`	`t += mTime[i];`
`75`	`89`	`}`
	`90`	`+ if ( cumulative ) return t;`
	`91`	`+`
`76`	`92`	`if ( mInput )`
`77`	`93`	`{`
`78`		`- t -= mInput->time();`
	`94`	`+ QgsDebugMsgLevel( QString( "%1 cumulative time = %2 time = %3" ).arg( typeid( *( this ) ).name() ).arg( t ).arg( t - mInput->time( true ) ), 3 );`
	`95`	`+ t -= mInput->time( true );`
`79`	`96`	`}`
`80`	`97`	`return t;`
`81`	`98`	`}`