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

#916 If possible, hide plots when importing 3D case, and hide 3D windows when importing summary case

Browse Source
This commit is contained in:
Magne Sjaastad 2016-10-24 16:01:19 +02:00
parent 81686707ec
commit b091333daa
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/Application/RiaApplication.cpp
View File

@ -822,6 +822,8 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
RimEclipseCaseCollection* analysisModels = m_project->activeOilField() ? m_project->activeOilField()->analysisModels() : NULL;
if (analysisModels == NULL) return false;
RiuMainWindow::instance()->show();
analysisModels->cases.push_back(rimResultReservoir);
RimEclipseView* riv = rimResultReservoir->createAndAddReservoirView();
@ -842,6 +844,11 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
RimSummaryCaseCollection* sumCaseColl = m_project->activeOilField() ? m_project->activeOilField()->summaryCaseCollection() : NULL;
if(sumCaseColl)
{
if (sumCaseColl->summaryCaseCount() == 0 && m_mainPlotWindow)
{
m_mainPlotWindow->hide();
}
RimSummaryCase* newSumCase = sumCaseColl->createAndAddSummaryCaseFromEclipseResultCase(rimResultReservoir);
if (newSumCase)
{
@ -849,8 +856,6 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
if (m_preferences->autoCreatePlotsOnImport())
{
getOrCreateAndShowMainPlotWindow();
RimMainPlotCollection* mainPlotColl = m_project->mainPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
@ -1875,6 +1880,15 @@ bool RiaApplication::openFile(const QString& fileName)
if (loadingSucceded)
{
getOrCreateAndShowMainPlotWindow();
std::vector<RimCase*> cases;
m_project->allCases(cases);
if (cases.size() == 0)
{
RiuMainWindow::instance()->close();
}
m_project->updateConnectedEditors();
}
}

10
ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
View File

@ -28,6 +28,8 @@
#include "RimSummaryCaseCollection.h"
#include "RimSummaryPlotCollection.h"
#include "RiuMainWindow.h"
#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
#include <QAction>
@ -68,6 +70,14 @@ void RicImportSummaryCaseFeature::onActionTriggered(bool isChecked)
}
app->getOrCreateAndShowMainPlotWindow();
std::vector<RimCase*> cases;
app->project()->allCases(cases);
if (cases.size() == 0)
{
RiuMainWindow::instance()->close();
}
}
//--------------------------------------------------------------------------------------------------