reduce raster reprojection debugging noice

jef · jef · commit 0b4ddc5c74fc · 2011-04-20T21:23:47.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15783 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsrasterprojector.cpp b/src/core/qgsrasterprojector.cpp
@@ -295,8 +295,8 @@ void QgsRasterProjector::nextHelper()
 
 void QgsRasterProjector::srcRowCol( int theDestRow, int theDestCol, int *theSrcRow, int *theSrcCol )
 {
-  if ( mApproximate ) approximateSrcRowCol( theDestRow, theDestCol, theSrcRow, theSrcCol);
-  else preciseSrcRowCol( theDestRow, theDestCol, theSrcRow, theSrcCol);
+  if ( mApproximate ) approximateSrcRowCol( theDestRow, theDestCol, theSrcRow, theSrcCol );
+  else preciseSrcRowCol( theDestRow, theDestCol, theSrcRow, theSrcCol );
 }
 
 void QgsRasterProjector::preciseSrcRowCol( int theDestRow, int theDestCol, int *theSrcRow, int *theSrcCol )
@@ -305,9 +305,9 @@ void QgsRasterProjector::preciseSrcRowCol( int theDestRow, int theDestCol, int *
   double x = mDestExtent.xMinimum() + ( theDestCol + 0.5 ) * mDestXRes;
   double y = mDestExtent.yMaximum() - ( theDestRow + 0.5 ) * mDestYRes;
   double z = 0;
-  
+
   mCoordinateTransform.transformInPlace( x, y, z );
-  
+
   // Get source row col
   *theSrcRow = ( int ) floor(( mSrcExtent.yMaximum() - y ) / mSrcXRes );
   *theSrcCol = ( int ) floor(( x - mSrcExtent.xMinimum() ) / mSrcYRes );
@@ -370,7 +370,7 @@ void QgsRasterProjector::insertRows()
     {
       myRow.append( QgsPoint() );
     }
-    QgsDebugMsg( QString( "insert new row at %1" ).arg( 1 + r*2 ) );
+    QgsDebugMsgLevel( QString( "insert new row at %1" ).arg( 1 + r*2 ), 3 );
     mCPMatrix.insert( 1 + r*2,  myRow );
   }
   mCPRows += mCPRows - 1;
@@ -409,7 +409,7 @@ void QgsRasterProjector::calcCP( int theRow, int theCol )
 
 bool QgsRasterProjector::calcRow( int theRow )
 {
-  QgsDebugMsg( QString( "theRow = %1" ).arg( theRow ) );
+  QgsDebugMsgLevel( QString( "theRow = %1" ).arg( theRow ), 3 );
   for ( int i = 0; i < mCPCols; i++ )
   {
     calcCP( theRow, i );

Original file line number	Diff line number	Diff line change
`@@ -295,8 +295,8 @@ void QgsRasterProjector::nextHelper()`
`295`	`295`
`296`	`296`	`void QgsRasterProjector::srcRowCol( int theDestRow, int theDestCol, int theSrcRow, int theSrcCol )`
`297`	`297`	`{`
`298`		`- if ( mApproximate ) approximateSrcRowCol( theDestRow, theDestCol, theSrcRow, theSrcCol);`
`299`		`- else preciseSrcRowCol( theDestRow, theDestCol, theSrcRow, theSrcCol);`
	`298`	`+ if ( mApproximate ) approximateSrcRowCol( theDestRow, theDestCol, theSrcRow, theSrcCol );`
	`299`	`+ else preciseSrcRowCol( theDestRow, theDestCol, theSrcRow, theSrcCol );`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`void QgsRasterProjector::preciseSrcRowCol( int theDestRow, int theDestCol, int theSrcRow, int theSrcCol )`
`@@ -305,9 +305,9 @@ void QgsRasterProjector::preciseSrcRowCol( int theDestRow, int theDestCol, int *`
`305`	`305`	`double x = mDestExtent.xMinimum() + ( theDestCol + 0.5 ) * mDestXRes;`
`306`	`306`	`double y = mDestExtent.yMaximum() - ( theDestRow + 0.5 ) * mDestYRes;`
`307`	`307`	`double z = 0;`
`308`		`-`
	`308`	`+`
`309`	`309`	`mCoordinateTransform.transformInPlace( x, y, z );`
`310`		`-`
	`310`	`+`
`311`	`311`	`// Get source row col`
`312`	`312`	`*theSrcRow = ( int ) floor(( mSrcExtent.yMaximum() - y ) / mSrcXRes );`
`313`	`313`	`*theSrcCol = ( int ) floor(( x - mSrcExtent.xMinimum() ) / mSrcYRes );`
`@@ -370,7 +370,7 @@ void QgsRasterProjector::insertRows()`
`370`	`370`	`{`
`371`	`371`	`myRow.append( QgsPoint() );`
`372`	`372`	`}`
`373`		`- QgsDebugMsg( QString( "insert new row at %1" ).arg( 1 + r*2 ) );`
	`373`	`+ QgsDebugMsgLevel( QString( "insert new row at %1" ).arg( 1 + r*2 ), 3 );`
`374`	`374`	`mCPMatrix.insert( 1 + r*2, myRow );`
`375`	`375`	`}`
`376`	`376`	`mCPRows += mCPRows - 1;`
`@@ -409,7 +409,7 @@ void QgsRasterProjector::calcCP( int theRow, int theCol )`
`409`	`409`
`410`	`410`	`bool QgsRasterProjector::calcRow( int theRow )`
`411`	`411`	`{`
`412`		`- QgsDebugMsg( QString( "theRow = %1" ).arg( theRow ) );`
	`412`	`+ QgsDebugMsgLevel( QString( "theRow = %1" ).arg( theRow ), 3 );`
`413`	`413`	`for ( int i = 0; i < mCPCols; i++ )`
`414`	`414`	`{`
`415`	`415`	`calcCP( theRow, i );`