diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 50b65b3764..0b9e87aef1 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -1005,8 +1005,7 @@ void RiaApplication::closeProject() terminateProcess(); - RiuSelectionManager::instance()->deleteAllItems(); - caf::SelectionManager::instance()->clearAll(); + RiaApplication::clearAllSelections(); mainWnd->cleanupGuiBeforeProjectClose(); @@ -1591,6 +1590,16 @@ bool RiaApplication::enableDevelopmentFeatures() return environmentVar.toInt() == 1; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RiaApplication::clearAllSelections() +{ + RiuSelectionManager::instance()->deleteAllItems(RiuSelectionManager::RUI_APPLICATION_GLOBAL); + RiuSelectionManager::instance()->deleteAllItems(RiuSelectionManager::RUI_TEMPORARY); + caf::SelectionManager::instance()->clearAll(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Application/RiaApplication.h b/ApplicationCode/Application/RiaApplication.h index 541e5f56b3..4820c0dafc 100644 --- a/ApplicationCode/Application/RiaApplication.h +++ b/ApplicationCode/Application/RiaApplication.h @@ -203,6 +203,7 @@ public: void saveWinGeoAndDockToolBarLayout(); static bool enableDevelopmentFeatures(); + static void clearAllSelections(); private: void onProjectOpenedOrClosed(); diff --git a/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp b/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp index 32ad63e649..8e79d6280c 100644 --- a/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp +++ b/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp @@ -145,9 +145,7 @@ void RicCreateTemporaryLgrFeature::onActionTriggered(bool isChecked) mainGrid->calculateFaults(activeCellInfo); } - RiuSelectionManager::instance()->deleteAllItems(RiuSelectionManager::RUI_APPLICATION_GLOBAL); - RiuSelectionManager::instance()->deleteAllItems(RiuSelectionManager::RUI_TEMPORARY); - caf::SelectionManager::instance()->clearAll(); + RiaApplication::clearAllSelections(); deleteAllCachedData(eclipseCase); RiaApplication::instance()->project()->mainPlotCollection()->deleteAllCachedData(); diff --git a/ApplicationCode/Commands/RicReloadCaseFeature.cpp b/ApplicationCode/Commands/RicReloadCaseFeature.cpp index d48c1589e3..1c9ae9328c 100644 --- a/ApplicationCode/Commands/RicReloadCaseFeature.cpp +++ b/ApplicationCode/Commands/RicReloadCaseFeature.cpp @@ -19,6 +19,8 @@ #include "RicReloadCaseFeature.h" +#include "RiaApplication.h" + #include "RimEclipseCase.h" #include "RiuSelectionManager.h" @@ -56,8 +58,7 @@ void RicReloadCaseFeature::onActionTriggered(bool isChecked) std::vector selectedEclipseCases; caf::SelectionManager::instance()->objectsByType(&selectedEclipseCases); - RiuSelectionManager::instance()->deleteAllItems(); - caf::SelectionManager::instance()->clearAll(); + RiaApplication::clearAllSelections(); for (RimEclipseCase* selectedCase : selectedEclipseCases) {