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

Removed wrong usage of owner()

Browse Source
This commit is contained in:
Jacob Støren 2015-08-14 13:21:04 +02:00
parent d371da246f
commit 930760eb47
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/Commands/RicRangeFilterHelper.cpp
View File

@ -43,7 +43,6 @@ RicRangeFilterNewExec* RicRangeFilterHelper::createRangeFilterExecCommand()
RimCellRangeFilterCollection* rangeFilterCollection = findRangeFilterCollection();
RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection);
assert(rangeFilterCollection);
return filterExec;
}
@ -54,22 +53,26 @@ RicRangeFilterNewExec* RicRangeFilterHelper::createRangeFilterExecCommand()
RimCellRangeFilterCollection* RicRangeFilterHelper::findRangeFilterCollection()
{
RimCellRangeFilterCollection* rangeFilterCollection = NULL;
std::vector<RimCellRangeFilter*> selectedRangeFilter;
caf::SelectionManager::instance()->objectsByType(&selectedRangeFilter);
std::vector<RimCellRangeFilterCollection*> selectedRangeFilterCollection;
caf::SelectionManager::instance()->objectsByType(&selectedRangeFilterCollection);
if (selectedRangeFilterCollection.size() == 1)
{
rangeFilterCollection = selectedRangeFilterCollection[0];
}
else if (selectedRangeFilter.size() > 0)
{
rangeFilterCollection = dynamic_cast<RimCellRangeFilterCollection*>(selectedRangeFilter[0]->owner());
selectedRangeFilter[0]->firstAncestorOfType(rangeFilterCollection);
}
assert(rangeFilterCollection);
// TODO : When a menu is created in the 3D view, add code to find collection based on a RimView
// See RiuViewerCommands
return rangeFilterCollection;
}