#1887 Curve Creator: Make the new SummaryCurveCollection operational

This commit is contained in:
Rebecca Cox
2017-09-14 13:56:50 +02:00
parent 1ec9e72ce2
commit 0044fb9e50
8 changed files with 345 additions and 113 deletions

View File

@@ -37,6 +37,7 @@
#include "RimSummaryCase.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"
#include "RimSummaryCurveFilter.h"
#include "RimSummaryPlotCollection.h"
@@ -156,6 +157,8 @@ bool RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilterImpl(const QStr
RimSummaryCurve* summaryCurve = dynamic_cast<RimSummaryCurve*>(objHandle);
if (summaryCurve)
{
//TODO: When removing curve filter functionality, move this to summaryCurveCollection
//loop and update "if (parentCollection)"-block
summaryCurve->setSummaryCase(newSumCase);
summaryCurve->updateConnectedEditors();
@@ -178,6 +181,22 @@ bool RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilterImpl(const QStr
curveFilter->updateConnectedEditors();
}
for (caf::PdmObjectHandle* objHandle : referringObjects)
{
RimSummaryCurve* summaryCurve = dynamic_cast<RimSummaryCurve*>(objHandle);
if (summaryCurve)
{
RimSummaryCurveCollection* parentCollection = nullptr;
summaryCurve->firstAncestorOrThisOfType(parentCollection);
if (parentCollection)
{
parentCollection->loadDataAndUpdate();
parentCollection->updateConnectedEditors();
break;
}
}
}
sumCaseColl->removeCase(existingFileSummaryCase);
delete existingFileSummaryCase;