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

#2894 Summary cases. Moved code to more appropriate location

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-05-11 09:52:46 +02:00
parent ca30c58a77
commit 4e9dfafe02
3 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/Application/RiaApplication.cpp
View File

@ -1914,21 +1914,6 @@ bool RiaApplication::openFile(const QString& fileName)
{
getOrCreateAndShowMainPlotWindow();
const auto& cases = m_project->allSummaryCases();
RiuPlotMainWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow && !cases.empty())
{
mainPlotWindow->selectAsCurrentItem(cases.back());
mainPlotWindow->updateSummaryPlotToolBar();
}
if (cases.size() == 0)
{
RiuMainWindow::instance()->close();
}
m_project->updateConnectedEditors();
}
}

15
ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
View File

@ -81,21 +81,6 @@ void RicImportSummaryCaseFeature::onActionTriggered(bool isChecked)
{
RiaApplication::instance()->addToRecentFiles(newCase->summaryHeaderFilename());
}
RiuPlotMainWindow* mainPlotWindow = app->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow && !newCases.empty())
{
mainPlotWindow->selectAsCurrentItem(newCases.back());
mainPlotWindow->updateSummaryPlotToolBar();
}
}
std::vector<RimCase*> cases;
app->project()->allCases(cases);
if (cases.size() == 0 && !newCases.empty())
{
RiuMainWindow::instance()->close();
}
}

19
ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp
View File

@ -112,13 +112,32 @@ void RicImportSummaryCasesFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
bool RicImportSummaryCasesFeature::createAndAddSummaryCasesFromFiles(const QStringList& fileNames, std::vector<RimSummaryCase*>* newCases)
{
RiaApplication* app = RiaApplication::instance();
std::vector<RimSummaryCase*> temp;
std::vector<RimSummaryCase*>* cases = newCases ? newCases : &temp;
if (createSummaryCasesFromFiles(fileNames, cases))
{
addSummaryCases(*cases);
RiuPlotMainWindow* mainPlotWindow = app->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow && !cases->empty())
{
mainPlotWindow->selectAsCurrentItem(cases->back());
mainPlotWindow->updateSummaryPlotToolBar();
// Close main window if there are no eclipse cases imported
std::vector<RimCase*> cases;
app->project()->allCases(cases);
if (cases.size() == 0)
{
RiuMainWindow::instance()->close();
}
}
return true;
}
return false;
}