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

Apply command data on range filter after default values has been set

Browse Source
This commit is contained in:
Magne Sjaastad 2015-08-23 17:40:00 +02:00
parent 756e793519
commit d2e3b0599a
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/Commands/RicRangeFilterExecImpl.cpp
View File

@ -66,25 +66,44 @@ RimCellRangeFilter* RicRangeFilterExecImpl::createRangeFilter()
if (m_iSlice) if (m_iSlice)
{ {
rangeFilter->cellCountI = 1;
rangeFilter->name = QString("Slice I (%1)").arg(flterIndex); rangeFilter->name = QString("Slice I (%1)").arg(flterIndex);
} }
if (m_jSlice) if (m_jSlice)
{ {
rangeFilter->cellCountJ = 1;
rangeFilter->name = QString("Slice J (%1)").arg(flterIndex); rangeFilter->name = QString("Slice J (%1)").arg(flterIndex);
} }
if (m_kSlice) if (m_kSlice)
{ {
rangeFilter->cellCountK = 1;
rangeFilter->name = QString("Slice K (%1)").arg(flterIndex); rangeFilter->name = QString("Slice K (%1)").arg(flterIndex);
} }
return rangeFilter;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicRangeFilterExecImpl::applyCommandDataOnFilter(RimCellRangeFilter* rangeFilter)
{
if (m_iSlice)
{
rangeFilter->cellCountI = 1;
}
if (m_jSlice)
{
rangeFilter->cellCountJ = 1;
}
if (m_kSlice)
{
rangeFilter->cellCountK = 1;
}
if (m_iSliceStart > -1) rangeFilter->startIndexI = m_iSliceStart; if (m_iSliceStart > -1) rangeFilter->startIndexI = m_iSliceStart;
if (m_jSliceStart > -1) rangeFilter->startIndexJ = m_jSliceStart; if (m_jSliceStart > -1) rangeFilter->startIndexJ = m_jSliceStart;
if (m_kSliceStart > -1) rangeFilter->startIndexK = m_kSliceStart; if (m_kSliceStart > -1) rangeFilter->startIndexK = m_kSliceStart;
return rangeFilter;
} }

1
ApplicationCode/Commands/RicRangeFilterExecImpl.h
View File

@ -49,6 +49,7 @@ public:
protected: protected:
RimCellRangeFilter* createRangeFilter(); RimCellRangeFilter* createRangeFilter();
void applyCommandDataOnFilter(RimCellRangeFilter* filter);
protected: protected:
caf::PdmPointer<RimCellRangeFilterCollection> m_cellRangeFilterCollection; caf::PdmPointer<RimCellRangeFilterCollection> m_cellRangeFilterCollection;

1
ApplicationCode/Commands/RicRangeFilterInsertExec.cpp
View File

@ -63,6 +63,7 @@ void RicRangeFilterInsertExec::redo()
m_cellRangeFilterCollection->rangeFilters.insertAt(index, rangeFilter); m_cellRangeFilterCollection->rangeFilters.insertAt(index, rangeFilter);
rangeFilter->setDefaultValues(); rangeFilter->setDefaultValues();
applyCommandDataOnFilter(rangeFilter);
m_cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED); m_cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED);
m_cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE); m_cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE);

1
ApplicationCode/Commands/RicRangeFilterNewExec.cpp
View File

@ -66,6 +66,7 @@ void RicRangeFilterNewExec::redo()
m_cellRangeFilterCollection->rangeFilters.push_back(rangeFilter); m_cellRangeFilterCollection->rangeFilters.push_back(rangeFilter);
rangeFilter->setDefaultValues(); rangeFilter->setDefaultValues();
applyCommandDataOnFilter(rangeFilter);
m_cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED); m_cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED);
m_cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE); m_cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE);