mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-25 22:50:25 -05:00
Refactors selection handling for improved code clarity
Modernize the interface to selection system. Create and return data instead of populating incoming parameters.
This commit is contained in:
1 parent
380f559f0d
commit
ae8446073b
136 files changed
+357
-870
No files matched your search
@@ -34,10 +34,8 @@ CAF_CMD_SOURCE_INIT( RicReloadFormationNamesFeature, "RicReloadFormationNamesFea
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RicReloadFormationNamesFeature::isCommandEnabled() const
|
||||
{
|
||||
std::vector<RimFormationNames*> selectedFormationNamesObjs;
|
||||
caf::SelectionManager::instance()->objectsByType( &selectedFormationNamesObjs );
|
||||
std::vector<RimFormationNamesCollection*> selectedFormationNamesCollObjs;
|
||||
caf::SelectionManager::instance()->objectsByType( &selectedFormationNamesCollObjs );
|
||||
const auto selectedFormationNamesObjs = caf::SelectionManager::instance()->objectsByType<RimFormationNames>();
|
||||
const auto selectedFormationNamesCollObjs = caf::SelectionManager::instance()->objectsByType<RimFormationNamesCollection>();
|
||||
|
||||
return ( !selectedFormationNamesObjs.empty() || !selectedFormationNamesCollObjs.empty() );
|
||||
}
|
||||
@@ -47,9 +45,7 @@ bool RicReloadFormationNamesFeature::isCommandEnabled() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RicReloadFormationNamesFeature::onActionTriggered( bool isChecked )
|
||||
{
|
||||
std::vector<RimFormationNamesCollection*> selectedFormationNamesCollObjs;
|
||||
caf::SelectionManager::instance()->objectsByType( &selectedFormationNamesCollObjs );
|
||||
|
||||
const auto selectedFormationNamesCollObjs = caf::SelectionManager::instance()->objectsByType<RimFormationNamesCollection>();
|
||||
if ( !selectedFormationNamesCollObjs.empty() )
|
||||
{
|
||||
selectedFormationNamesCollObjs[0]->readAllFormationNames();
|
||||
@@ -61,8 +57,7 @@ void RicReloadFormationNamesFeature::onActionTriggered( bool isChecked )
|
||||
return;
|
||||
}
|
||||
|
||||
std::vector<RimFormationNames*> selectedFormationNamesObjs;
|
||||
caf::SelectionManager::instance()->objectsByType( &selectedFormationNamesObjs );
|
||||
const auto selectedFormationNamesObjs = caf::SelectionManager::instance()->objectsByType<RimFormationNames>();
|
||||
for ( RimFormationNames* fnames : selectedFormationNamesObjs )
|
||||
{
|
||||
QString errorMessage;
|
||||
|
||||
Reference in new issue
Block a user