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

Simplified property filters and removed m_parentContainer

Browse Source
This commit is contained in:
Magne Sjaastad
2015-08-11 22:49:04 +02:00
parent fb88414fec
commit eefa1c0ca8
5 changed files with 11 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/Commands/RicEclipsePropertyFilter.cpp
View File

@@ -56,10 +56,10 @@ std::vector<RimEclipsePropertyFilterCollection*> RicEclipsePropertyFilter::selec
//--------------------------------------------------------------------------------------------------
void RicEclipsePropertyFilter::addPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection)
{
RimEclipsePropertyFilter* propertyFilter = createPropertyFilter(propertyFilterCollection);
CVF_ASSERT(propertyFilter);
RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter();
propertyFilterCollection->propertyFilters.push_back(propertyFilter);
setDefaults(propertyFilter);
propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED);
propertyFilterCollection->updateConnectedEditors();
@@ -70,30 +70,15 @@ void RicEclipsePropertyFilter::addPropertyFilter(RimEclipsePropertyFilterCollect
//--------------------------------------------------------------------------------------------------
void RicEclipsePropertyFilter::insertPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection, size_t index)
{
RimEclipsePropertyFilter* propertyFilter = createPropertyFilter(propertyFilterCollection);
CVF_ASSERT(propertyFilter);
RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter();
propertyFilterCollection->propertyFilters.insertAt(index, propertyFilter);
setDefaults(propertyFilter);
propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED);
propertyFilterCollection->updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipsePropertyFilter* RicEclipsePropertyFilter::createPropertyFilter( RimEclipsePropertyFilterCollection* propertyFilterCollection )
{
CVF_ASSERT(propertyFilterCollection);
RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter();
propertyFilter->setParentContainer(propertyFilterCollection);
setDefaults(propertyFilter);
return propertyFilter;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/Commands/RicEclipsePropertyFilter.h
View File

@@ -37,7 +37,6 @@ public:
static void insertPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection, size_t index);
private:
static RimEclipsePropertyFilter* createPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection);
static void setDefaults(RimEclipsePropertyFilter* propertyFilter);
};