From c23ac3c8aec1efb7485555336f0977630d2e691b Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 24 Apr 2017 09:39:54 +0200 Subject: [PATCH] #1384 Regression test : Add resize of plot windows --- .../Application/RiaApplication.cpp | 33 ++++++++++++++++++- ApplicationCode/Application/RiaApplication.h | 2 ++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index fde2ee8733..65dac59957 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -2381,6 +2381,8 @@ void RiaApplication::runRegressionTest(const QString& testRootPath) regressionTestConfigureProject(); + resizeMaximizedPlotWindows(); + QString fullPathGeneratedFolder = testCaseFolder.absoluteFilePath(generatedFolderName); saveSnapshotForAllViews(fullPathGeneratedFolder); @@ -2416,6 +2418,36 @@ void RiaApplication::runRegressionTest(const QString& testRootPath) m_runningRegressionTests = false; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RiaApplication::resizeMaximizedPlotWindows() +{ + std::vector viewWindows; + for (auto viewWindow : viewWindows) + { + if (viewWindow->isMdiWindow()) + { + RimMdiWindowGeometry wndGeo = viewWindow->mdiWindowGeometry(); + if (wndGeo.isMaximized) + { + QWidget* viewWidget = viewWindow->viewWidget(); + + if (viewWidget) + { + QMdiSubWindow* mdiWindow = m_mainPlotWindow->findMdiSubWindow(viewWidget); + if (mdiWindow) + { + mdiWindow->showNormal(); + + viewWidget->resize(RiaApplication::regressionDefaultImageSize()); + } + } + } + } + } +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -2810,7 +2842,6 @@ void RiaApplication::executeRegressionTests(const QString& regressionTestPath) } } - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Application/RiaApplication.h b/ApplicationCode/Application/RiaApplication.h index 6fe2a450e4..79de925275 100644 --- a/ApplicationCode/Application/RiaApplication.h +++ b/ApplicationCode/Application/RiaApplication.h @@ -213,9 +213,11 @@ private: void storeTreeViewState(); + void resizeMaximizedPlotWindows(); void updateRegressionTest(const QString& testRootPath); void regressionTestConfigureProject(); static QSize regressionDefaultImageSize(); + private slots: void slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus); void slotUpdateScheduledDisplayModels();