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

Improved capabilities for new filter execute command

Browse Source
This commit is contained in:
Magne Sjaastad 2015-08-06 16:17:23 +02:00
parent d606f60c1c
commit 30b510fe3a
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/Commands/RicRangeFilterNewExec.cpp
View File

@ -20,6 +20,7 @@
#include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h"
#include "RimView.h"
//--------------------------------------------------------------------------------------------------
@ -28,9 +29,9 @@
RicRangeFilterNewExec::RicRangeFilterNewExec(caf::NotificationCenter* notificationCenter)
: CmdExecuteCommand(notificationCenter)
{
m_filterI = false;
m_filterJ = false;
m_filterK = false;
m_iSlice = -1;
m_jSlice = -1;
m_kSlice = -1;
}
//--------------------------------------------------------------------------------------------------
@ -49,21 +50,28 @@ void RicRangeFilterNewExec::redo()
assert(cellRangeFilterCollection);
RimCellRangeFilter* newFilter = cellRangeFilterCollection->createAndAppendRangeFilter();
if (m_filterI)
if (m_iSlice)
{
newFilter->cellCountI = 1;
}
if (m_filterJ)
if (m_jSlice)
{
newFilter->cellCountJ = 1;
}
if (m_filterK)
if (m_kSlice)
{
newFilter->cellCountK = 1;
}
if (m_iSliceStart > -1) newFilter->startIndexI = m_iSliceStart;
if (m_jSliceStart > -1) newFilter->startIndexJ = m_jSliceStart;
if (m_kSliceStart > -1) newFilter->startIndexK = m_kSliceStart;
cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED);
cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE);
caf::PdmUiFieldHandle::updateConnectedUiEditors(cellRangeFilterCollection->parentField());
}

10
ApplicationCode/Commands/RicRangeFilterNewExec.h
View File

@ -38,9 +38,13 @@ public:
public:
caf::PdmPointer<RimCellRangeFilterCollection> cellRangeFilterCollection;
bool m_filterI;
bool m_filterJ;
bool m_filterK;
bool m_iSlice;
bool m_jSlice;
bool m_kSlice;
int m_iSliceStart;
int m_jSliceStart;
int m_kSliceStart;
};