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

Merge pull request #5018 from OPM/bugfix-#4869-create-rangefilter-on-inactive-view

Browse Source 
Bugfix #4869 create rangefilter on inactive view
This commit is contained in:
Jacob Støren 2019-11-08 12:35:24 +01:00 committed by GitHub
commit 4658893850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp
View File

@ -71,28 +71,16 @@ RimCellRangeFilterCollection* RicRangeFilterFeatureImpl::findRangeFilterCollecti
{ {
RimCellRangeFilterCollection* rangeFilterCollection = nullptr; RimCellRangeFilterCollection* rangeFilterCollection = nullptr;
std::vector<RimCellRangeFilter*> selectedRangeFilter; rangeFilterCollection = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimCellRangeFilterCollection>();
caf::SelectionManager::instance()->objectsByType( &selectedRangeFilter );
std::vector<RimCellRangeFilterCollection*> selectedRangeFilterCollection; if ( !rangeFilterCollection )
caf::SelectionManager::instance()->objectsByType( &selectedRangeFilterCollection );
if ( selectedRangeFilterCollection.size() == 1 )
{ {
rangeFilterCollection = selectedRangeFilterCollection[0]; RimGridView* view = RiaApplication::instance()->activeMainOrComparisonGridView();
}
else if ( selectedRangeFilter.size() > 0 )
{
selectedRangeFilter[0]->firstAncestorOrThisOfType( rangeFilterCollection );
}
RimGridView* view = RiaApplication::instance()->activeGridView();
if ( view ) if ( view )
{ {
rangeFilterCollection = view->rangeFilterCollection(); rangeFilterCollection = view->rangeFilterCollection();
} }
}
assert( rangeFilterCollection );
return rangeFilterCollection; return rangeFilterCollection;
} }