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

Major modularization adjustments

Browse Source 
Use uiField() when issuing setUi....() commands
Use PdmChildArrayField instead of PdmPointersFielc
Use PdmChildField instead of PdmField to pdm pointer objects
Use PdmChildArrayField instead of PdmField< std::list< caf::PdmPointer<
type > > >
Use PdmObjectHandle instead of PdmObject
Replaced parentFields(std::vector)  with parentField()
Use PdmUiPropertyViewDialog instead of PdmUiPropertyDialog
This commit is contained in:
Magne Sjaastad
2015-07-31 18:58:23 +02:00
parent d56cde087f
commit 737936d846
85 changed files with 710 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
View File

@@ -42,7 +42,7 @@ RimCellRangeFilterCollection::RimCellRangeFilterCollection()
CAF_PDM_InitFieldNoDefault(&rangeFilters, "RangeFilters", "Range Filters", "", "", "");
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");
isActive.setUiHidden(true);
isActive.capability<caf::PdmUiFieldHandle>()->setUiHidden(true);
}
//--------------------------------------------------------------------------------------------------
@@ -50,11 +50,7 @@ RimCellRangeFilterCollection::RimCellRangeFilterCollection()
//--------------------------------------------------------------------------------------------------
RimCellRangeFilterCollection::~RimCellRangeFilterCollection()
{
std::list< caf::PdmPointer< RimCellRangeFilter > >::const_iterator it;
for (it = rangeFilters.v().begin(); it != rangeFilters.v().end(); ++it)
{
delete it->p();
}
rangeFilters.deleteAllChildObjects();
}
//--------------------------------------------------------------------------------------------------
@@ -74,10 +70,9 @@ void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter*
{
CVF_ASSERT(cellRangeFilter);
std::list< caf::PdmPointer<RimCellRangeFilter> >::const_iterator it;
for (it = rangeFilters.v().begin(); it != rangeFilters.v().end(); it++)
for (size_t i = 0; i < rangeFilters.size(); i++)
{
RimCellRangeFilter* rangeFilter = *it;
RimCellRangeFilter* rangeFilter = rangeFilters[i];
if (rangeFilter && rangeFilter->isActive() && static_cast<size_t>(rangeFilter->gridIndex()) == gridIndex)
{
@@ -168,7 +163,7 @@ RimCellRangeFilter* RimCellRangeFilterCollection::createAndAppendRangeFilter()
rangeFilter->setParentContainer(this);
rangeFilter->setDefaultValues();
rangeFilters.v().push_back(rangeFilter);
rangeFilters.push_back(rangeFilter);
rangeFilter->name = QString("New Filter (%1)").arg(rangeFilters().size());
@@ -195,10 +190,9 @@ RimEclipseView* RimCellRangeFilterCollection::eclipseView() const
//--------------------------------------------------------------------------------------------------
void RimCellRangeFilterCollection::initAfterRead()
{
std::list< caf::PdmPointer<RimCellRangeFilter> >::iterator it;
for (it = rangeFilters.v().begin(); it != rangeFilters.v().end(); it++)
for (size_t i = 0; i < rangeFilters.size(); i++)
{
RimCellRangeFilter* rangeFilter = *it;
RimCellRangeFilter* rangeFilter = rangeFilters[i];
rangeFilter->setParentContainer(this);
rangeFilter->updateIconState();
}
@@ -211,7 +205,15 @@ void RimCellRangeFilterCollection::initAfterRead()
//--------------------------------------------------------------------------------------------------
void RimCellRangeFilterCollection::remove(RimCellRangeFilter* rangeFilter)
{
rangeFilters.v().remove(rangeFilter);
// MODTODO Verify that we only have one instance of a filter in a collection
for (size_t i = 0; i < rangeFilters.size(); i++)
{
if (rangeFilters[i] == rangeFilter)
{
rangeFilters.erase(i);
return;
}
}
}
//--------------------------------------------------------------------------------------------------
@@ -221,10 +223,9 @@ bool RimCellRangeFilterCollection::hasActiveFilters() const
{
if (!isActive()) return false;
std::list< caf::PdmPointer< RimCellRangeFilter > >::const_iterator it;
for (it = rangeFilters.v().begin(); it != rangeFilters.v().end(); ++it)
for (size_t i = 0; i < rangeFilters.size(); i++)
{
if ((*it)->isActive()) return true;
if (rangeFilters[i]->isActive()) return true;
}
return false;
@@ -245,10 +246,9 @@ bool RimCellRangeFilterCollection::hasActiveIncludeFilters() const
{
if (!isActive) return false;
std::list< caf::PdmPointer< RimCellRangeFilter > >::const_iterator it;
for (it = rangeFilters.v().begin(); it != rangeFilters.v().end(); ++it)
for (size_t i = 0; i < rangeFilters.size(); i++)
{
if ((*it)->isActive() && (*it)->filterMode() == RimCellFilter::INCLUDE) return true;
if (rangeFilters[i]->isActive() && rangeFilters[i]->filterMode() == RimCellFilter::INCLUDE) return true;
}
return false;