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

6
ApplicationLibCode/Commands/RicCloseSummaryCaseInCollectionFeature.cpp
View File

@@ -53,7 +53,7 @@ void RicCloseSummaryCaseInCollectionFeature::setupActionLook( QAction* actionToS
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicCloseSummaryCaseInCollectionFeature::isCommandEnabled()
bool RicCloseSummaryCaseInCollectionFeature::isCommandEnabled() const
{
std::vector<RimSummaryCaseMainCollection*> summaryCaseMainCollections;
caf::SelectionManager::instance()->objectsByType( &summaryCaseMainCollections );
@@ -67,7 +67,7 @@ bool RicCloseSummaryCaseInCollectionFeature::isCommandEnabled()
{ return dynamic_cast<RimDerivedEnsembleCaseCollection*>( coll ) != nullptr; } ),
summaryCaseCollections.end() );
return ( summaryCaseMainCollections.size() > 0 || summaryCaseCollections.size() > 0 );
return ( !summaryCaseMainCollections.empty() || !summaryCaseCollections.empty() );
}
//--------------------------------------------------------------------------------------------------
@@ -78,7 +78,7 @@ void RicCloseSummaryCaseInCollectionFeature::onActionTriggered( bool isChecked )
std::vector<RimSummaryCaseMainCollection*> summaryCaseMainCollections;
caf::SelectionManager::instance()->objectsByType( &summaryCaseMainCollections );
if ( summaryCaseMainCollections.size() > 0 )
if ( !summaryCaseMainCollections.empty() )
{
std::vector<RimSummaryCase*> allSummaryCases = summaryCaseMainCollections[0]->allSummaryCases();
RicCloseSummaryCaseFeature::deleteSummaryCases( allSummaryCases );