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

#2162 Context menu: Move IJK-slice features to command

Browse Source
This commit is contained in:
Rebecca Cox
2017-11-29 09:03:22 +01:00
parent e89d2c0717
commit 48b165e2aa
6 changed files with 174 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp
View File

@@ -18,16 +18,19 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RicRangeFilterFeatureImpl.h"
#include "RicRangeFilterNewExec.h"
#include "RiaApplication.h"
#include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h"
#include "RimView.h"
#include "RimViewController.h"
#include "cafSelectionManager.h"
#include <vector>
#include "RimView.h"
#include "RimViewController.h"
//--------------------------------------------------------------------------------------------------
///
@@ -66,7 +69,7 @@ RicRangeFilterNewExec* RicRangeFilterFeatureImpl::createRangeFilterExecCommand()
//--------------------------------------------------------------------------------------------------
RimCellRangeFilterCollection* RicRangeFilterFeatureImpl::findRangeFilterCollection()
{
RimCellRangeFilterCollection* rangeFilterCollection = NULL;
RimCellRangeFilterCollection* rangeFilterCollection = nullptr;
std::vector<RimCellRangeFilter*> selectedRangeFilter;
caf::SelectionManager::instance()->objectsByType(&selectedRangeFilter);
@@ -83,10 +86,13 @@ RimCellRangeFilterCollection* RicRangeFilterFeatureImpl::findRangeFilterCollecti
selectedRangeFilter[0]->firstAncestorOrThisOfType(rangeFilterCollection);
}
RimView* view = RiaApplication::instance()->activeReservoirView();
if (view)
{
rangeFilterCollection = view->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;
}