diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 6219d5ec1a..f5b107bc87 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -1401,6 +1401,8 @@ void RiaApplication::runRegressionTest(const QString& testRootPath) } m_commandQueueLock.unlock(); + regressionTestSetFixedSizeForAllViews(); + saveSnapshotForAllViews(generatedFolderName); QDir baseDir(testCaseFolder.filePath(baseFolderName)); @@ -1776,7 +1778,8 @@ void RiaApplication::executeRegressionTests(const QString& regressionTestPath) if (mainWnd) { mainWnd->hideAllDockWindows(); - + + mainWnd->setDefaultWindowSize(); runRegressionTest(regressionTestPath); mainWnd->loadWinGeoAndDockToolBarLayout(); @@ -1784,3 +1787,34 @@ void RiaApplication::executeRegressionTests(const QString& regressionTestPath) } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RiaApplication::regressionTestSetFixedSizeForAllViews() +{ + RiuMainWindow* mainWnd = RiuMainWindow::instance(); + if (!mainWnd) return; + + if (m_project.isNull()) return; + + std::vector projectCases; + m_project->allCases(projectCases); + + for (size_t i = 0; i < projectCases.size(); i++) + { + RimCase* ri = projectCases[i]; + if (!ri) continue; + + for (size_t j = 0; j < ri->reservoirViews().size(); j++) + { + RimReservoirView* riv = ri->reservoirViews()[j]; + + if (riv && riv->viewer()) + { + // This size is set to match the regression test reference images + riv->viewer()->setFixedSize(1000, 745); + } + } + } +} + diff --git a/ApplicationCode/Application/RiaApplication.h b/ApplicationCode/Application/RiaApplication.h index 4c3c0d5aca..bcc305ceba 100644 --- a/ApplicationCode/Application/RiaApplication.h +++ b/ApplicationCode/Application/RiaApplication.h @@ -105,6 +105,7 @@ public: void saveSnapshotForAllViews(const QString& snapshotFolderName); void runRegressionTest(const QString& testRootPath); void updateRegressionTest(const QString& testRootPath ); + void regressionTestSetFixedSizeForAllViews(); void processNonGuiEvents(); diff --git a/ApplicationCode/Application/RiaImageFileCompare.cpp b/ApplicationCode/Application/RiaImageFileCompare.cpp index d184e97c4a..4b1cde4108 100644 --- a/ApplicationCode/Application/RiaImageFileCompare.cpp +++ b/ApplicationCode/Application/RiaImageFileCompare.cpp @@ -71,9 +71,15 @@ bool RiaImageFileCompare::runComparison(QString imgFileName, QString refFileName } - //QString args = QString("-fuzz 2% -lowlight-color white -metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName)); - QString args = QString("-lowlight-color white -metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName)); - QString completeCommand = QString("\"%1\" %2").arg(m_compareExecutable).arg(args); + //QString args = QString("-fuzz 2% -lowlight-color white -metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName)); + // The ImageMagick compare tool on RedHat 5 does not support the lowlight-color options + // Use GCC version as a crude mechanism for disabling use of this option on RedHat5 +#if (__GNUC__ == 4 && __GNUC_MINOR__ <= 1) + QString args = QString("-metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName)); +#else + QString args = QString("-lowlight-color white -metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName)); +#endif + QString completeCommand = QString("\"%1\" %2").arg(m_compareExecutable).arg(args); // Launch process and wait QProcess proc; diff --git a/ApplicationCode/RiaMain.cpp b/ApplicationCode/RiaMain.cpp index b930b3449f..6e3fd89be4 100644 --- a/ApplicationCode/RiaMain.cpp +++ b/ApplicationCode/RiaMain.cpp @@ -30,11 +30,7 @@ int main(int argc, char *argv[]) RiuMainWindow window; QString platform = cvf::System::is64Bit() ? "(64bit)" : "(32bit)"; window.setWindowTitle("ResInsight " + platform); -#ifdef CVF_LINUX - window.resize(1000, 806); -#else - window.resize(1000, 800); -#endif + window.setDefaultWindowSize(); window.show(); if (app.parseArguments()) diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index cc57642a2f..95804ce993 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -1760,3 +1760,11 @@ void RiuMainWindow::slotExecutePaintEventPerformanceTest() setResultInfo(resultInfo); } } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RiuMainWindow::setDefaultWindowSize() +{ + resize(1000, 810); +} diff --git a/ApplicationCode/UserInterface/RiuMainWindow.h b/ApplicationCode/UserInterface/RiuMainWindow.h index 0f30717413..25e96c77cc 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.h +++ b/ApplicationCode/UserInterface/RiuMainWindow.h @@ -93,6 +93,8 @@ public: void selectedCases(std::vector& cases); + void setDefaultWindowSize(); + protected: virtual void closeEvent(QCloseEvent* event);