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

(#395) Removed obsolete code from property filter collection

Browse Source
This commit is contained in:
Magne Sjaastad 2015-08-27 15:16:47 +02:00
parent 609ee78400
commit eaa5cc90a8
3 changed files with 5 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp
View File

@ -41,7 +41,6 @@ RimEclipsePropertyFilterCollection::RimEclipsePropertyFilterCollection()
CAF_PDM_InitField(&active, "Active", true, "Active", "", "", "");
active.uiCapability()->setUiHidden(true);
}
//--------------------------------------------------------------------------------------------------
@ -52,29 +51,15 @@ RimEclipsePropertyFilterCollection::~RimEclipsePropertyFilterCollection()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipsePropertyFilterCollection::setReservoirView(RimEclipseView* reservoirView)
{
m_reservoirView = reservoirView;
for (size_t i = 0; i < propertyFilters.size(); i++)
{
RimEclipsePropertyFilter* propertyFilter = propertyFilters[i];
propertyFilter->resultDefinition->setReservoirView(m_reservoirView.p());
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseView* RimEclipsePropertyFilterCollection::reservoirView()
{
CVF_ASSERT(!m_reservoirView.isNull());
return m_reservoirView;
RimEclipseView* eclipseView = NULL;
firstAnchestorOrThisOfType(eclipseView);
return eclipseView;
}
//--------------------------------------------------------------------------------------------------
@ -92,28 +77,6 @@ void RimEclipsePropertyFilterCollection::fieldChangedByUi(const caf::PdmFieldHan
view->scheduleCreateDisplayModelAndRedraw();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipsePropertyFilter* RimEclipsePropertyFilterCollection::createAndAppendPropertyFilter()
{
RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter();
propertyFilter->resultDefinition->setReservoirView(m_reservoirView.p());
propertyFilters.push_back(propertyFilter);
propertyFilter->resultDefinition->setResultVariable(m_reservoirView->cellResult->resultVariable());
propertyFilter->resultDefinition->setPorosityModel(m_reservoirView->cellResult->porosityModel());
propertyFilter->resultDefinition->setResultType(m_reservoirView->cellResult->resultType());
propertyFilter->resultDefinition->loadResult();
propertyFilter->setToDefaultValues();
propertyFilter->updateFilterName();
return propertyFilter;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -134,14 +97,6 @@ void RimEclipsePropertyFilterCollection::initAfterRead()
this->updateUiIconFromToggleField();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipsePropertyFilterCollection::remove(RimEclipsePropertyFilter* propertyFilter)
{
propertyFilters.removeChildObject(propertyFilter);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -174,7 +129,6 @@ bool RimEclipsePropertyFilterCollection::hasActiveDynamicFilters() const
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

10
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.h
View File

@ -33,20 +33,15 @@ public:
RimEclipsePropertyFilterCollection();
virtual ~RimEclipsePropertyFilterCollection();
// Fields:
caf::PdmField<bool> active;
caf::PdmChildArrayField<RimEclipsePropertyFilter*> propertyFilters;
// Methods
RimEclipsePropertyFilter* createAndAppendPropertyFilter();
void remove(RimEclipsePropertyFilter* propertyFilter);
bool hasActiveFilters() const;
bool hasActiveDynamicFilters() const;
void setReservoirView(RimEclipseView* reservoirView);
RimEclipseView* reservoirView();
RimEclipseView* reservoirView();
void loadAndInitializePropertyFilters();
@ -58,7 +53,4 @@ public:
protected:
// Overridden methods
virtual void initAfterRead();
private:
caf::PdmPointer<RimEclipseView> m_reservoirView;
};

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -104,7 +104,6 @@ RimEclipseView::RimEclipseView()
CAF_PDM_InitFieldNoDefault(&propertyFilterCollection, "PropertyFilters", "Property Filters", "", "", "");
propertyFilterCollection = new RimEclipsePropertyFilterCollection();
propertyFilterCollection.uiCapability()->setUiHidden(true);
propertyFilterCollection->setReservoirView(this);
// Visualization fields
CAF_PDM_InitField(&showMainGrid, "ShowMainGrid", true, "Show Main Grid", "", "", "");
@ -706,7 +705,6 @@ void RimEclipseView::initAfterRead()
this->faultResultSettings()->setReservoirView(this);
this->cellResult()->setReservoirView(this);
this->cellEdgeResult()->setReservoirView(this);
this->propertyFilterCollection()->setReservoirView(this);
this->updateUiIconFromToggleField();
}