Ensemble calc. Show only valid ensembles in drop downs

This commit is contained in:
Bjørn Erik Jensen 2018-06-28 10:45:51 +02:00
parent 533b000184
commit db08061f98
2 changed files with 9 additions and 1 deletions

View File

@ -447,7 +447,14 @@ std::vector<RimSummaryCaseCollection*> RimDerivedEnsembleCaseCollection::allEnse
for (auto group : project->summaryGroups())
{
if (group->isEnsemble()) ensembles.push_back(group);
if (group == this) continue;
if (!group->isEnsemble()) continue;
auto derivedEnsemble = dynamic_cast<const RimDerivedEnsembleCaseCollection*>(group);
if (derivedEnsemble && !derivedEnsemble->isValid()) continue;
ensembles.push_back(group);
}
return ensembles;
}

View File

@ -47,6 +47,7 @@ public:
RimSummaryCaseCollection* ensemble1() const { return m_ensemble1; }
RimSummaryCaseCollection* ensemble2() const { return m_ensemble2; }
DerivedEnsembleOperator op() const { return m_operator(); }
bool isValid() const { return m_ensemble1 != nullptr && m_ensemble2 != nullptr; }
void setEnsemble1(RimSummaryCaseCollection* ensemble);
void setEnsemble2(RimSummaryCaseCollection* ensemble);