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

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/Commands/RicReloadWellPathFormationNamesFeature.cpp
View File

@@ -31,7 +31,7 @@ CAF_CMD_SOURCE_INIT( RicReloadWellPathFormationNamesFeature, "RicReloadWellPathF
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicReloadWellPathFormationNamesFeature::isCommandEnabled()
bool RicReloadWellPathFormationNamesFeature::isCommandEnabled() const
{
std::vector<RimWellPath*> wellPaths;
caf::SelectionManager::instance()->objectsByType( &wellPaths );
@@ -39,7 +39,7 @@ bool RicReloadWellPathFormationNamesFeature::isCommandEnabled()
std::vector<RimWellPathCollection*> wellPathCollection;
caf::SelectionManager::instance()->objectsByType( &wellPathCollection );
return ( wellPaths.size() > 0 || wellPathCollection.size() > 0 );
return ( !wellPaths.empty() || !wellPathCollection.empty() );
}
//--------------------------------------------------------------------------------------------------
@@ -53,12 +53,12 @@ void RicReloadWellPathFormationNamesFeature::onActionTriggered( bool isChecked )
std::vector<RimWellPathCollection*> wellPathCollections;
caf::SelectionManager::instance()->objectsByType( &wellPathCollections );
if ( wellPaths.size() > 0 )
if ( !wellPaths.empty() )
{
RimWellPathCollection* wellPathCollection = wellPaths[0]->firstAncestorOrThisOfTypeAsserted<RimWellPathCollection>();
wellPathCollection->reloadAllWellPathFormations();
}
else if ( wellPathCollections.size() > 0 )
else if ( !wellPathCollections.empty() )
{
wellPathCollections[0]->reloadAllWellPathFormations();
}