mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#4869 Fixed range filter commands on inactive view
This commit is contained in:
parent
e78b0d4204
commit
ea28cb5733
@ -70,29 +70,17 @@ RicRangeFilterNewExec* RicRangeFilterFeatureImpl::createRangeFilterExecCommand()
|
||||
RimCellRangeFilterCollection* RicRangeFilterFeatureImpl::findRangeFilterCollection()
|
||||
{
|
||||
RimCellRangeFilterCollection* rangeFilterCollection = nullptr;
|
||||
|
||||
rangeFilterCollection = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimCellRangeFilterCollection>();
|
||||
|
||||
std::vector<RimCellRangeFilter*> selectedRangeFilter;
|
||||
caf::SelectionManager::instance()->objectsByType( &selectedRangeFilter );
|
||||
|
||||
std::vector<RimCellRangeFilterCollection*> selectedRangeFilterCollection;
|
||||
caf::SelectionManager::instance()->objectsByType( &selectedRangeFilterCollection );
|
||||
|
||||
if ( selectedRangeFilterCollection.size() == 1 )
|
||||
if ( !rangeFilterCollection )
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user