#1840 Summary case: Delete a summary collection with or without its contents

This commit is contained in:
Rebecca Cox
2017-09-08 15:26:13 +02:00
parent 788ac2c8a8
commit c60465b380
14 changed files with 273 additions and 68 deletions

View File

@@ -51,13 +51,7 @@ bool RicReloadSummaryCaseFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicReloadSummaryCaseFeature::onActionTriggered(bool isChecked)
{
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
RimMainPlotCollection* mainPlotColl = project->mainPlotCollection();
CVF_ASSERT(mainPlotColl);
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection();
CVF_ASSERT(summaryPlotColl);
std::vector<RimSummaryCase*> caseSelection = selectedSummaryCases();
@@ -104,10 +98,8 @@ std::vector<RimSummaryCase*> RicReloadSummaryCaseFeature::selectedSummaryCases()
for (auto collection : collectionSelection)
{
for (size_t i = 0; i < collection->summaryCaseCount(); i++)
{
caseSelection.push_back(collection->summaryCase(i));
}
std::vector<RimSummaryCase*> summaryCaseCollection = collection->allSummaryCases();
caseSelection.insert(caseSelection.end(), summaryCaseCollection.begin(), summaryCaseCollection.end());
}
return caseSelection;