#1728 Remove curve filter curves for chosen case(s)

This commit is contained in:
Unknown 2017-09-06 08:36:52 +02:00 committed by Rebecca Cox
parent f09ec5a7c9
commit a910697f6a
5 changed files with 33 additions and 3 deletions

View File

@ -58,7 +58,6 @@ bool RicCloseSummaryCaseCollectionFeature::isCommandEnabled()
return (summaryCaseCollections.size() > 0);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@ -490,6 +490,30 @@ std::vector<RimSummaryCurve*> RimSummaryCurveFilter::curves()
return myCurves;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveFilter::removeCurvesAssosiatedWithCase(RimSummaryCase* summaryCase)
{
std::vector<RimSummaryCurve*> summaryCurvesToDelete;
for (RimSummaryCurve* summaryCurve : m_curves)
{
if (!summaryCurve) continue;
if (!summaryCurve->summaryCase()) continue;
if (summaryCurve->summaryCase() == summaryCase)
{
summaryCurvesToDelete.push_back(summaryCurve);
}
}
for (RimSummaryCurve* summaryCurve : summaryCurvesToDelete)
{
m_curves.removeChildObject(summaryCurve);
delete summaryCurve;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@ -67,6 +67,7 @@ public:
RimSummaryCurve* findRimCurveFromQwtCurve(const QwtPlotCurve* qwtCurve) const;
std::set<std::string> unitNames();
std::vector<RimSummaryCurve*> curves();
void removeCurvesAssosiatedWithCase(RimSummaryCase* summaryCase);
void updateCaseNameHasChanged();

View File

@ -776,8 +776,14 @@ void RimSummaryPlot::removeCurve(RimSummaryCurve* curve)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::removeCurveAssosiatedWithCase(RimSummaryCase* summaryCase)
void RimSummaryPlot::removeCurvesAssosiatedWithCase(RimSummaryCase* summaryCase)
{
for (RimSummaryCurveFilter* summaryCurveFilter : m_curveFilters)
{
if (!summaryCurveFilter) continue;
summaryCurveFilter->removeCurvesAssosiatedWithCase(summaryCase);
}
std::vector<RimSummaryCurve*> summaryCurvesToDelete;
for (RimSummaryCurve* summaryCurve : m_summaryCurves)

View File

@ -60,7 +60,7 @@ public:
void addCurve(RimSummaryCurve* curve);
void addCurveFilter(RimSummaryCurveFilter* curveFilter);
void removeCurveAssosiatedWithCase(RimSummaryCase* summaryCase);
void removeCurvesAssosiatedWithCase(RimSummaryCase* summaryCase);
void addGridTimeHistoryCurve(RimGridTimeHistoryCurve* curve);