Less debug noise

nyalldawson · nyalldawson · commit e9f024b05c4e · 2020-05-04T05:38:48.000+10:00
diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp
@@ -58,7 +58,7 @@ QgsDataSourceUri::QgsDataSourceUri( const QString &u )
 
     if ( i == uri.length() || uri[i] != '=' )
     {
-      QgsDebugMsg( QStringLiteral( "= expected after parameter name, skipping text '%1'" ).arg( pname ) );
+      // no "=", so likely not a parameter name
       continue;
     }
 
diff --git a/src/core/qgsmultirenderchecker.cpp b/src/core/qgsmultirenderchecker.cpp
@@ -47,10 +47,12 @@ bool QgsMultiRenderChecker::runTest( const QString &testName, unsigned int misma
 
   QVector<QgsDartMeasurement> dartMeasurements;
 
-  const auto constSubDirs = subDirs;
-  for ( const QString &suffix : constSubDirs )
+  for ( const QString &suffix : qgis::as_const( subDirs ) )
   {
-    qDebug() << "Checking subdir " << suffix;
+    if ( subDirs.count() > 1 )
+    {
+      qDebug() << "Checking subdir " << suffix;
+    }
     bool result;
     QgsRenderChecker checker;
     checker.enableDashBuffering( true );
diff --git a/src/core/qgsrenderchecker.cpp b/src/core/qgsrenderchecker.cpp
@@ -287,10 +287,6 @@ bool QgsRenderChecker::compareImages( const QString &testName,
   maskImagePath += QLatin1String( "_mask.png" );
   const QImage maskImage( maskImagePath );
   const bool hasMask = !maskImage.isNull();
-  if ( hasMask )
-  {
-    qDebug( "QgsRenderChecker using mask image" );
-  }
 
   //
   // Set pixel count score and target
@@ -358,10 +354,13 @@ bool QgsRenderChecker::compareImages( const QString &testName,
   // Put the same info to debug too
   //
 
-  qDebug( "Expected size: %dw x %dh", myExpectedImage.width(), myExpectedImage.height() );
-  qDebug( "Actual   size: %dw x %dh", myResultImage.width(), myResultImage.height() );
-  if ( hasMask )
-    qDebug( "Mask size: %dw x %dh", maskImage.width(), maskImage.height() );
+  if ( myExpectedImage.width() != myResultImage.width() || myExpectedImage.height() != myResultImage.height() )
+  {
+    qDebug( "Expected size: %dw x %dh", myExpectedImage.width(), myExpectedImage.height() );
+    qDebug( "Actual   size: %dw x %dh", myResultImage.width(), myResultImage.height() );
+    if ( hasMask )
+      qDebug( "Mask size: %dw x %dh", maskImage.width(), maskImage.height() );
+  }
 
   if ( mMatchTarget != myPixelCount )
   {
@@ -464,7 +463,10 @@ bool QgsRenderChecker::compareImages( const QString &testName,
   //
   // Send match result to debug
   //
-  qDebug( "%d/%d pixels mismatched (%d allowed)", mMismatchCount, mMatchTarget, mismatchCount );
+  if ( mMismatchCount > mismatchCount )
+  {
+    qDebug( "%d/%d pixels mismatched (%d allowed)", mMismatchCount, mMatchTarget, mismatchCount );
+  }
 
   //
   // Send match result to report

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ QgsDataSourceUri::QgsDataSourceUri( const QString &u )`
`58`	`58`
`59`	`59`	`if ( i == uri.length() \|\| uri[i] != '=' )`
`60`	`60`	`{`
`61`		`- QgsDebugMsg( QStringLiteral( "= expected after parameter name, skipping text '%1'" ).arg( pname ) );`
	`61`	`+ // no "=", so likely not a parameter name`
`62`	`62`	`continue;`
`63`	`63`	`}`
`64`	`64`