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

28
ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp
View File

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