OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 07:00:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactors selection handling for improved code clarity

Browse Source 
Modernize the interface to selection system. Create and return data instead of populating incoming parameters.
This commit is contained in:
Magne Sjaastad committed 2025-04-09 07:21:54 +02:00
1 parent 380f559f0d
commit ae8446073b
136 files changed
+357 -870
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Commands/FractureCommands/RicDeleteOptionItemFeature.cpp
+4 -4
View File
@@ -32,8 +32,8 @@ CAF_CMD_SOURCE_INIT( RicDeleteOptionItemFeature, "RicDeleteOptionItemFeature" );
//--------------------------------------------------------------------------------------------------
void RicDeleteOptionItemFeature::onActionTriggered( bool isChecked )
{
std::vector<RicCreateMultipleFracturesOptionItemUi*> optionItems;
caf::SelectionManager::instance()->objectsByType( &optionItems, caf::SelectionManager::FIRST_LEVEL );
const auto optionItems =
caf::SelectionManager::instance()->objectsByType<RicCreateMultipleFracturesOptionItemUi>( caf::SelectionManager::FIRST_LEVEL );
if ( !optionItems.empty() )
{
@@ -62,8 +62,8 @@ void RicDeleteOptionItemFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
bool RicDeleteOptionItemFeature::isCommandEnabled() const
{
std::vector<RicCreateMultipleFracturesOptionItemUi*> optionItems;
caf::SelectionManager::instance()->objectsByType( &optionItems, caf::SelectionManager::FIRST_LEVEL );
const auto optionItems =
caf::SelectionManager::instance()->objectsByType<RicCreateMultipleFracturesOptionItemUi>( caf::SelectionManager::FIRST_LEVEL );
return !optionItems.empty();
}
ApplicationLibCode/Commands/FractureCommands/RicNewOptionItemFeature.cpp
+2 -2
View File
@@ -49,8 +49,8 @@ void RicNewOptionItemFeature::onActionTriggered( bool isChecked )
RicCreateMultipleFracturesOptionItemUi* selectedOptionItem = nullptr;
{
std::vector<RicCreateMultipleFracturesOptionItemUi*> optionItems;
caf::SelectionManager::instance()->objectsByType( &optionItems, caf::SelectionManager::FIRST_LEVEL );
const auto optionItems =
caf::SelectionManager::instance()->objectsByType<RicCreateMultipleFracturesOptionItemUi>( caf::SelectionManager::FIRST_LEVEL );
if ( !optionItems.empty() )
{
selectedOptionItem = optionItems.front();
ApplicationLibCode/Commands/FractureCommands/RicNewStimPlanModelFeature.cpp
+1 -2
View File
@@ -137,8 +137,7 @@ bool RicNewStimPlanModelFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
RimStimPlanModelCollection* RicNewStimPlanModelFeature::selectedStimPlanModelCollection()
{
std::vector<caf::PdmUiItem*> selectedItems;
caf::SelectionManager::instance()->selectedItems( selectedItems );
const auto selectedItems = caf::SelectionManager::instance()->selectedItems();
if ( selectedItems.size() != 1u ) return nullptr;
caf::PdmUiItem* pdmUiItem = selectedItems.front();
ApplicationLibCode/Commands/FractureCommands/RicNewWellPathFractureFeature.cpp
+4 -6
View File
@@ -145,13 +145,12 @@ bool RicNewWellPathFractureFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
RimWellPathFractureCollection* RicNewWellPathFractureFeature::selectedWellPathFractureCollection()
{
std::vector<caf::PdmUiItem*> allSelectedItems;
caf::SelectionManager::instance()->selectedItems( allSelectedItems );
if ( allSelectedItems.size() != 1u ) return nullptr;
const auto selectedItems = caf::SelectionManager::instance()->selectedItems();
if ( selectedItems.size() != 1u ) return nullptr;
RimWellPathFractureCollection* objToFind = nullptr;
caf::PdmUiItem* pdmUiItem = allSelectedItems.front();
caf::PdmUiItem* pdmUiItem = selectedItems.front();
caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>( pdmUiItem );
if ( objHandle )
@@ -161,8 +160,7 @@ RimWellPathFractureCollection* RicNewWellPathFractureFeature::selectedWellPathFr
if ( objToFind == nullptr )
{
std::vector<RimWellPath*> wellPaths;
caf::SelectionManager::instance()->objectsByType( &wellPaths );
auto wellPaths = caf::SelectionManager::instance()->objectsByType<RimWellPath>();
if ( !wellPaths.empty() )
{
return wellPaths[0]->fractureCollection();