OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3587 Clear all selections as part of delete of temporary LGRs

Browse Source
This commit is contained in:
Magne Sjaastad 2018-10-30 14:02:22 +01:00
parent 9cddc02066
commit 715003f58e
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/Application/RiaApplication.cpp
View File

@ -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();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/Application/RiaApplication.h
View File

@ -203,6 +203,7 @@ public:
void saveWinGeoAndDockToolBarLayout();
static bool enableDevelopmentFeatures();
static void clearAllSelections();
private:
void onProjectOpenedOrClosed();

4
ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp
View File

@ -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();

5
ApplicationCode/Commands/RicReloadCaseFeature.cpp
View File

@ -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<RimEclipseCase*> selectedEclipseCases;
caf::SelectionManager::instance()->objectsByType(&selectedEclipseCases);
RiuSelectionManager::instance()->deleteAllItems();
caf::SelectionManager::instance()->clearAll();
RiaApplication::clearAllSelections();
for (RimEclipseCase* selectedCase : selectedEclipseCases)
{