When loading a project, also read source cases from a grid case group with one or more attached view(s)

p4#: 21467
This commit is contained in:
Magne Sjaastad
2013-04-29 11:07:57 +02:00
parent 9367a3cb65
commit 37ff2b2b73

View File

@@ -289,9 +289,9 @@ bool RiaApplication::loadProject(const QString& projectFileName)
casesToLoad.push_back(m_project->reservoirs()[cIdx]); casesToLoad.push_back(m_project->reservoirs()[cIdx]);
} }
// Add all statistics cases as well
for (size_t cgIdx = 0; cgIdx < m_project->caseGroups().size(); ++cgIdx) for (size_t cgIdx = 0; cgIdx < m_project->caseGroups().size(); ++cgIdx)
{ {
// Add all statistics cases as well
if (m_project->caseGroups[cgIdx]->statisticsCaseCollection()) if (m_project->caseGroups[cgIdx]->statisticsCaseCollection())
{ {
caf::PdmPointersField<RimCase*> & statCases = m_project->caseGroups[cgIdx]->statisticsCaseCollection()->reservoirs(); caf::PdmPointersField<RimCase*> & statCases = m_project->caseGroups[cgIdx]->statisticsCaseCollection()->reservoirs();
@@ -300,8 +300,23 @@ bool RiaApplication::loadProject(const QString& projectFileName)
casesToLoad.push_back(statCases[scIdx]); casesToLoad.push_back(statCases[scIdx]);
} }
} }
// Add all source cases in a case group with a view attached
if (m_project->caseGroups[cgIdx]->caseCollection())
{
caf::PdmPointersField<RimCase*> & sourceCases = m_project->caseGroups[cgIdx]->caseCollection()->reservoirs();
for (size_t scIdx = 0; scIdx < sourceCases.size(); ++scIdx)
{
if (sourceCases[scIdx]->reservoirViews().size() > 0)
{
casesToLoad.push_back(sourceCases[scIdx]);
}
}
}
} }
caf::ProgressInfo caseProgress(casesToLoad.size() , "Reading Cases"); caf::ProgressInfo caseProgress(casesToLoad.size() , "Reading Cases");
for (size_t cIdx = 0; cIdx < casesToLoad.size(); ++cIdx) for (size_t cIdx = 0; cIdx < casesToLoad.size(); ++cIdx)