diff --git a/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp b/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp index 26e344fee8..29ad82e2b3 100644 --- a/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp +++ b/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp @@ -18,8 +18,8 @@ #include "RiaRegressionTestRunner.h" -#include "RiaGuiApplication.h" #include "RiaGitDiff.h" +#include "RiaGuiApplication.h" #include "RiaImageCompareReporter.h" #include "RiaImageFileCompare.h" #include "RiaLogging.h" @@ -199,7 +199,7 @@ void RiaRegressionTestRunner::runRegressionTest() regressionTestConfigureProject(); - resizeMaximizedPlotWindows(); + resizePlotWindows(); QString fullPathGeneratedFolder = testCaseFolder.absoluteFilePath(generatedFolderName); RicSnapshotAllViewsToFileFeature::exportSnapshotOfAllViewsIntoFolder(fullPathGeneratedFolder); @@ -499,7 +499,7 @@ void RiaRegressionTestRunner::regressionTestConfigureProject() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiaRegressionTestRunner::resizeMaximizedPlotWindows() +void RiaRegressionTestRunner::resizePlotWindows() { RimProject* proj = RiaApplication::instance()->project(); if (!proj) return; @@ -515,20 +515,16 @@ void RiaRegressionTestRunner::resizeMaximizedPlotWindows() { if (viewWindow->isMdiWindow()) { - RimMdiWindowGeometry wndGeo = viewWindow->mdiWindowGeometry(); - if (wndGeo.isMaximized) + QWidget* viewWidget = viewWindow->viewWidget(); + + if (viewWidget) { - QWidget* viewWidget = viewWindow->viewWidget(); - - if (viewWidget) + QMdiSubWindow* mdiWindow = plotMainWindow->findMdiSubWindow(viewWidget); + if (mdiWindow) { - QMdiSubWindow* mdiWindow = plotMainWindow->findMdiSubWindow(viewWidget); - if (mdiWindow) - { - mdiWindow->showNormal(); + mdiWindow->showNormal(); - viewWidget->resize(RiaRegressionTestRunner::regressionDefaultImageSize()); - } + viewWidget->resize(RiaRegressionTestRunner::regressionDefaultImageSize()); } } } @@ -603,8 +599,7 @@ QFileInfoList RiaRegressionTestRunner::subDirectoriesForTestExecution(const QDir for (const auto& s : m_testFilter) { QString trimmed = s.trimmed(); - if ((m_appendAllTestsAfterLastItemInFilter && anyMatchFound) || - baseName.contains(trimmed, Qt::CaseInsensitive)) + if ((m_appendAllTestsAfterLastItemInFilter && anyMatchFound) || baseName.contains(trimmed, Qt::CaseInsensitive)) { foldersMatchingTestFilter.push_back(fi); anyMatchFound = true; diff --git a/ApplicationCode/Application/Tools/RiaRegressionTestRunner.h b/ApplicationCode/Application/Tools/RiaRegressionTestRunner.h index 4a5edf2817..1b19b300dc 100644 --- a/ApplicationCode/Application/Tools/RiaRegressionTestRunner.h +++ b/ApplicationCode/Application/Tools/RiaRegressionTestRunner.h @@ -60,7 +60,7 @@ private: const QDir& testDir); static void removeDirectoryWithContent(QDir& dirToDelete); - static void resizeMaximizedPlotWindows(); + static void resizePlotWindows(); static QSize regressionDefaultImageSize(); static QString diff2htmlHeaderText(const QString& testRootPath); QFileInfoList subDirectoriesForTestExecution(const QDir& directory);