diff --git a/ApplicationCode/Commands/RicCloseSummaryCaseInCollectionFeature.cpp b/ApplicationCode/Commands/RicCloseSummaryCaseInCollectionFeature.cpp index 9fad686df0..7a6429ee31 100644 --- a/ApplicationCode/Commands/RicCloseSummaryCaseInCollectionFeature.cpp +++ b/ApplicationCode/Commands/RicCloseSummaryCaseInCollectionFeature.cpp @@ -22,6 +22,7 @@ #include "RicCloseSummaryCaseFeature.h" +#include "RimDerivedEnsembleCaseCollection.h" #include "RimMainPlotCollection.h" #include "RimProject.h" #include "RimSummaryCase.h" @@ -62,6 +63,11 @@ bool RicCloseSummaryCaseInCollectionFeature::isCommandEnabled() std::vector summaryCaseCollections; caf::SelectionManager::instance()->objectsByType(&summaryCaseCollections); + summaryCaseCollections.erase(std::remove_if(summaryCaseCollections.begin(), summaryCaseCollections.end(), [](RimSummaryCaseCollection* coll) + { + return dynamic_cast(coll) != nullptr; + }), summaryCaseCollections.end()); + return (summaryCaseMainCollections.size() > 0 || summaryCaseCollections.size() > 0); } diff --git a/ApplicationCode/Commands/RicDeleteItemFeature.cpp b/ApplicationCode/Commands/RicDeleteItemFeature.cpp index 76f2ae9ea3..a963b68c37 100644 --- a/ApplicationCode/Commands/RicDeleteItemFeature.cpp +++ b/ApplicationCode/Commands/RicDeleteItemFeature.cpp @@ -22,6 +22,7 @@ #include "RicDeleteItemExecData.h" #include "RimCellRangeFilter.h" +#include "RimDerivedEnsembleCaseCollection.h" #include "RimEclipseInputProperty.h" #include "RimEclipsePropertyFilter.h" #include "RimEclipseView.h" @@ -121,6 +122,7 @@ bool isDeletable(caf::PdmUiItem* uiItem) if (dynamic_cast(uiItem)) return true; if (dynamic_cast(uiItem)) return true; if (dynamic_cast(uiItem)) return true; + if (dynamic_cast(uiItem)) return true; return false; } diff --git a/ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp b/ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp index 3181e20f48..22451728ae 100644 --- a/ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp +++ b/ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp @@ -21,6 +21,8 @@ #include "RiaApplication.h" #include "RiaSummaryTools.h" + +#include "RimDerivedEnsembleCaseCollection.h" #include "RimMainPlotCollection.h" #include "RimProject.h" #include "RimSummaryCase.h" @@ -65,6 +67,10 @@ bool RicDeleteSummaryCaseCollectionFeature::isCommandEnabled() std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); + selection.erase(std::remove_if(selection.begin(), selection.end(), [](RimSummaryCaseCollection* coll) + { + return dynamic_cast(coll) != nullptr; + }), selection.end()); return (selection.size() > 0); }