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

#2913 Make sure only one grid summary case is created per egrid loaded.

Browse Source 
* If you open two of the same eclipse case, you will still have two grid summary cases
* But if you open multiple summary cases of the same eclipse case the additional summary cases are file summary cases.
This commit is contained in:
Gaute Lindkvist 2018-05-15 16:12:12 +02:00
parent 0c9470fdf0
commit d1a706de55
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@ -182,13 +182,12 @@ RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromFileName(const
for (RimSummaryCase* summaryCase : m_cases) for (RimSummaryCase* summaryCase : m_cases)
{ {
RimFileSummaryCase* fileSummaryCase = dynamic_cast<RimFileSummaryCase*>(summaryCase); if (summaryCase)
if (fileSummaryCase)
{ {
QFileInfo summaryFileInfo(fileSummaryCase->summaryHeaderFilename()); QFileInfo summaryFileInfo(summaryCase->summaryHeaderFilename());
if (incomingFileInfo == summaryFileInfo) if (incomingFileInfo == summaryFileInfo)
{ {
return fileSummaryCase; return summaryCase;
} }
} }
} }
@ -197,13 +196,12 @@ RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromFileName(const
{ {
for (RimSummaryCase* summaryCase : collection->allSummaryCases()) for (RimSummaryCase* summaryCase : collection->allSummaryCases())
{ {
RimFileSummaryCase* fileSummaryCase = dynamic_cast<RimFileSummaryCase*>(summaryCase); if (summaryCase)
if (fileSummaryCase)
{ {
QFileInfo summaryFileInfo(fileSummaryCase->summaryHeaderFilename()); QFileInfo summaryFileInfo(summaryCase->summaryHeaderFilename());
if (incomingFileInfo == summaryFileInfo) if (incomingFileInfo == summaryFileInfo)
{ {
return fileSummaryCase; return summaryCase;
} }
} }
} }
@ -432,7 +430,9 @@ std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::createSummaryCasesFro
eclCase = project->eclipseCaseFromGridFileName(gridCaseFile); eclCase = project->eclipseCaseFromGridFileName(gridCaseFile);
} }
if (eclCase) RimGridSummaryCase* existingGridSummaryCase = dynamic_cast<RimGridSummaryCase*>(findSummaryCaseFromFileName(fileInfo.summaryFileName()));
if (eclCase && !existingGridSummaryCase)
{ {
RimGridSummaryCase* newSumCase = new RimGridSummaryCase(); RimGridSummaryCase* newSumCase = new RimGridSummaryCase();