sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Slightly larger default renderchecker image in html, and fix divide/0 issue if control image is missing

Browse Source
This commit is contained in:
Larry Shaffer 2014-02-19 15:58:10 -07:00
parent 916706f63e
commit 4915c9e7e6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/qgsrenderchecker.cpp
View File

@ -93,10 +93,10 @@ bool QgsRenderChecker::isKnownAnomaly( QString theDiffImageFile )
QString myAnomalyHash = imageToHash( controlImagePath() + mControlName
+ QDir::separator() + myFile );
QString myHashMessage = QString(
"Checking if anomaly %1 (hash %2)" )
"Checking if anomaly %1 (hash %2)<br>" )
.arg( myFile )
.arg( myAnomalyHash );
myHashMessage += QString( " matches %1 (hash %2)" )
myHashMessage += QString( "&nbsp; matches %1 (hash %2)" )
.arg( theDiffImageFile )
.arg( myImageHash );
//foo CDash
@ -246,8 +246,13 @@ bool QgsRenderChecker::compareImages( QString theTestName,
mReport += "Actual Duration : " + QString::number( mElapsedTime ) + "ms<br>";
// limit image size in page to something reasonable
int imgWidth = qMin( myExpectedImage.width(), 400 );
int imgHeight = myExpectedImage.height() * imgWidth / myExpectedImage.width();
int imgWidth = 420;
int imgHeight = 280;
if ( ! myExpectedImage.isNull() )
{
imgWidth = qMin( myExpectedImage.width(), imgWidth );
imgHeight = myExpectedImage.height() * imgWidth / myExpectedImage.width();
}
QString myImagesString = "</td></tr>"
"<tr><td>Test Result:</td><td>Expected Result:</td><td>Difference (all blue is good, any red is bad)</td></tr>\n"
"<tr><td><img width=" + QString::number( imgWidth ) +