OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Wired up application logic related to new RiuMainPlotWindow

Browse Source
This commit is contained in:
Magne Sjaastad
2016-06-27 11:07:01 +02:00
parent e92624a862
commit bbf1574feb
12 changed files with 194 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -193,6 +193,8 @@ RiaApplication::RiaApplication(int& argc, char** argv)
m_resViewUpdateTimer = NULL;
m_runningRegressionTests = false;
m_mainPlotWindow = NULL;
}
@@ -687,8 +689,12 @@ bool RiaApplication::closeProject(bool askToSaveIfDirty)
mainWnd->cleanupGuiBeforeProjectClose();
RiuMainPlotWindow* mainPlotWnd = RiuMainPlotWindow::instance();
mainPlotWnd->cleanupGuiBeforeProjectClose();
if (m_mainPlotWindow)
{
m_mainPlotWindow->cleanupGuiBeforeProjectClose();
deleteMainPlotWindow();
}
caf::EffectGenerator::clearEffectCache();
@@ -714,10 +720,9 @@ void RiaApplication::onProjectOpenedOrClosed()
{
mainWnd->initializeGuiNewProjectLoaded();
}
RiuMainPlotWindow* mainPlotWnd = RiuMainPlotWindow::instance();
if (mainPlotWnd)
if (m_mainPlotWindow)
{
mainPlotWnd->initializeGuiNewProjectLoaded();
m_mainPlotWindow->initializeGuiNewProjectLoaded();
}
setWindowCaptionFromAppState();
@@ -1287,6 +1292,54 @@ int RiaApplication::launchUnitTestsWithConsole()
return launchUnitTests();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaApplication::createMainPlotWindow()
{
CVF_ASSERT(m_mainPlotWindow == NULL);
m_mainPlotWindow = new RiuMainPlotWindow;
m_mainPlotWindow->setWindowTitle("Summary Plots for ResInsight");
m_mainPlotWindow->setDefaultWindowSize();
m_mainPlotWindow->loadWinGeoAndDockToolBarLayout();
m_mainPlotWindow->showWindow();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaApplication::deleteMainPlotWindow()
{
m_mainPlotWindow->deleteLater();
processEvents();
m_mainPlotWindow = NULL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuMainPlotWindow* RiaApplication::getOrCreateMainPlotWindow()
{
if (!m_mainPlotWindow)
{
createMainPlotWindow();
}
return m_mainPlotWindow;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuMainPlotWindow* RiaApplication::mainPlotWindow()
{
return m_mainPlotWindow;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

9
ApplicationCode/Application/RiaApplication.h
View File

@@ -43,6 +43,7 @@ class RimProject;
class RimCommandObject;
class RiaProjectModifier;
class RimWellLogPlot;
class RiuMainPlotWindow;
namespace caf
{
@@ -163,6 +164,9 @@ public:
int launchUnitTests();
int launchUnitTestsWithConsole();
RiuMainPlotWindow* getOrCreateMainPlotWindow();
RiuMainPlotWindow* mainPlotWindow();
private:
enum ProjectLoadAction
{
@@ -178,6 +182,9 @@ private:
QImage grabFrameBufferImage();
void clearViewsScheduledForUpdate();
void createMainPlotWindow();
void deleteMainPlotWindow();
private slots:
void slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
@@ -215,4 +222,6 @@ private:
QString m_helpText;
bool m_runningRegressionTests;
RiuMainPlotWindow* m_mainPlotWindow;
};