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

#846 Store window state for mainwindows in project and moved features into ApplicationCommands

Browse Source
This commit is contained in:
Magne Sjaastad
2016-10-04 14:23:34 +02:00
parent 1080de473a
commit 2d5295cf74
16 changed files with 102 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -335,7 +335,7 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
m_project->fileName = projectFileName;
m_project->readFile();
// Apply any modifiactions to the loaded project before we go ahead and load actual data
// Apply any modifications to the loaded project before we go ahead and load actual data
if (projectModifier)
{
projectModifier->applyModificationsToProject(m_project);
@@ -366,6 +366,25 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
return true;
}
if (m_project->show3DWindow())
{
RiuMainWindow::instance()->show();
}
else
{
RiuMainWindow::instance()->close();
}
if (m_project->showPlotWindow())
{
RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
}
else if (mainPlotWindow())
{
mainPlotWindow()->close();
}
///////
// Load the external data, and initialize stuff that needs specific ordering