OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-27 05:37:21 -05: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 09:26:33 +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
ApplicationLibCode/Commands/RicCloseObservedDataFeature.cpp
+2 -2
View File
@@ -97,7 +97,7 @@ void RicCloseObservedDataFeature::deleteObservedRmuRftData( const std::vector<Ri
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicCloseObservedDataFeature::isCommandEnabled()
bool RicCloseObservedDataFeature::isCommandEnabled() const
{
std::vector<RimObservedSummaryData*> summarySelection;
caf::SelectionManager::instance()->objectsByType( &summarySelection );
@@ -105,7 +105,7 @@ bool RicCloseObservedDataFeature::isCommandEnabled()
std::vector<RimObservedFmuRftData*> fmuRftSelection;
caf::SelectionManager::instance()->objectsByType( &fmuRftSelection );
if ( summarySelection.size() == 0 && fmuRftSelection.size() == 0 )
if ( summarySelection.empty() && fmuRftSelection.empty() )
{
return false;
}