OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 07:26:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renamed class RimCellPropertyFilterCollection to RimEclipsePropertyFilterCollection

Browse Source
This commit is contained in:
Pål Hagen 2015-06-25 11:48:24 +02:00
parent 1883116c59
commit 9458c818b4
11 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -696,7 +696,7 @@ void RivReservoirViewPartMgr::computeRangeVisibility(RivCellSetEnum geometryType
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVisibility, const RigGridBase* grid, size_t timeStepIndex, void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVisibility, const RigGridBase* grid, size_t timeStepIndex,
const cvf::UByteArray* rangeFilterVisibility, RimCellPropertyFilterCollection* propFilterColl) const cvf::UByteArray* rangeFilterVisibility, RimEclipsePropertyFilterCollection* propFilterColl)
{ {
CVF_ASSERT(cellVisibility != NULL); CVF_ASSERT(cellVisibility != NULL);
CVF_ASSERT(rangeFilterVisibility != NULL); CVF_ASSERT(rangeFilterVisibility != NULL);

4
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
View File

@ -29,7 +29,7 @@
class RimEclipseView; class RimEclipseView;
class RigGridBase; class RigGridBase;
class RimCellRangeFilterCollection; class RimCellRangeFilterCollection;
class RimCellPropertyFilterCollection; class RimEclipsePropertyFilterCollection;
class RigActiveCellInfo; class RigActiveCellInfo;
class RivReservoirViewPartMgr: public cvf::Object class RivReservoirViewPartMgr: public cvf::Object
@ -82,7 +82,7 @@ private:
static void computeNativeVisibility (cvf::UByteArray* cellVisibilities, const RigGridBase* grid, const RigActiveCellInfo* activeCellInfo, const cvf::UByteArray* cellIsInWellStatuses, bool invalidCellsIsVisible, bool inactiveCellsIsVisible, bool activeCellsIsVisible, bool mainGridIsVisible); static void computeNativeVisibility (cvf::UByteArray* cellVisibilities, const RigGridBase* grid, const RigActiveCellInfo* activeCellInfo, const cvf::UByteArray* cellIsInWellStatuses, bool invalidCellsIsVisible, bool inactiveCellsIsVisible, bool activeCellsIsVisible, bool mainGridIsVisible);
void computeRangeVisibility (RivCellSetEnum geometryType, cvf::UByteArray* cellVisibilities, const RigGridBase* grid, const cvf::UByteArray* nativeVisibility, const RimCellRangeFilterCollection* rangeFilterColl); void computeRangeVisibility (RivCellSetEnum geometryType, cvf::UByteArray* cellVisibilities, const RigGridBase* grid, const cvf::UByteArray* nativeVisibility, const RimCellRangeFilterCollection* rangeFilterColl);
static void computePropertyVisibility(cvf::UByteArray* cellVisibilities, const RigGridBase* grid, size_t timeStepIndex, const cvf::UByteArray* rangeFilterVisibility, RimCellPropertyFilterCollection* propFilterColl); static void computePropertyVisibility(cvf::UByteArray* cellVisibilities, const RigGridBase* grid, size_t timeStepIndex, const cvf::UByteArray* rangeFilterVisibility, RimEclipsePropertyFilterCollection* propFilterColl);
static void copyByteArray(cvf::UByteArray* cellVisibilities, const cvf::UByteArray* cellIsWellStatuses ); static void copyByteArray(cvf::UByteArray* cellVisibilities, const cvf::UByteArray* cellIsWellStatuses );
RivReservoirPartMgr * reservoirPartManager(RivCellSetEnum geometryType, size_t timeStepIndex ); RivReservoirPartMgr * reservoirPartManager(RivCellSetEnum geometryType, size_t timeStepIndex );

4
ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
View File

@ -155,7 +155,7 @@ QList<caf::PdmOptionItemInfo> RimEclipsePropertyFilter::calculateValueOptions(co
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEclipsePropertyFilter::setParentContainer(RimCellPropertyFilterCollection* parentContainer) void RimEclipsePropertyFilter::setParentContainer(RimEclipsePropertyFilterCollection* parentContainer)
{ {
m_parentContainer = parentContainer; m_parentContainer = parentContainer;
} }
@ -163,7 +163,7 @@ void RimEclipsePropertyFilter::setParentContainer(RimCellPropertyFilterCollectio
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCellPropertyFilterCollection* RimEclipsePropertyFilter::parentContainer() RimEclipsePropertyFilterCollection* RimEclipsePropertyFilter::parentContainer()
{ {
return m_parentContainer; return m_parentContainer;
} }

8
ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h
View File

@ -23,7 +23,7 @@
#include "RimCellFilter.h" #include "RimCellFilter.h"
class RimEclipseView; class RimEclipseView;
class RimCellPropertyFilterCollection; class RimEclipsePropertyFilterCollection;
class RimEclipseResultDefinition; class RimEclipseResultDefinition;
class RigGridBase; class RigGridBase;
@ -47,8 +47,8 @@ public:
caf::PdmField<double> lowerBound; caf::PdmField<double> lowerBound;
caf::PdmField<double> upperBound; caf::PdmField<double> upperBound;
void setParentContainer(RimCellPropertyFilterCollection* parentContainer); void setParentContainer(RimEclipsePropertyFilterCollection* parentContainer);
RimCellPropertyFilterCollection* parentContainer(); RimEclipsePropertyFilterCollection* parentContainer();
void setToDefaultValues(); void setToDefaultValues();
void computeResultValueRange(); void computeResultValueRange();
@ -59,7 +59,7 @@ protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
private: private:
RimCellPropertyFilterCollection* m_parentContainer; RimEclipsePropertyFilterCollection* m_parentContainer;
double m_minimumResultValue; double m_minimumResultValue;
double m_maximumResultValue; double m_maximumResultValue;

26
ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
View File

@ -25,12 +25,12 @@
#include "RimResultSlot.h" #include "RimResultSlot.h"
CAF_PDM_SOURCE_INIT(RimCellPropertyFilterCollection, "CellPropertyFilters"); CAF_PDM_SOURCE_INIT(RimEclipsePropertyFilterCollection, "CellPropertyFilters");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCellPropertyFilterCollection::RimCellPropertyFilterCollection() RimEclipsePropertyFilterCollection::RimEclipsePropertyFilterCollection()
{ {
CAF_PDM_InitObject("Cell Property Filters", ":/CellFilter_Values.png", "", ""); CAF_PDM_InitObject("Cell Property Filters", ":/CellFilter_Values.png", "", "");
@ -42,7 +42,7 @@ RimCellPropertyFilterCollection::RimCellPropertyFilterCollection()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCellPropertyFilterCollection::~RimCellPropertyFilterCollection() RimEclipsePropertyFilterCollection::~RimEclipsePropertyFilterCollection()
{ {
} }
@ -51,7 +51,7 @@ RimCellPropertyFilterCollection::~RimCellPropertyFilterCollection()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellPropertyFilterCollection::setReservoirView(RimEclipseView* reservoirView) void RimEclipsePropertyFilterCollection::setReservoirView(RimEclipseView* reservoirView)
{ {
m_reservoirView = reservoirView; m_reservoirView = reservoirView;
@ -66,7 +66,7 @@ void RimCellPropertyFilterCollection::setReservoirView(RimEclipseView* reservoir
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimEclipseView* RimCellPropertyFilterCollection::reservoirView() RimEclipseView* RimEclipsePropertyFilterCollection::reservoirView()
{ {
CVF_ASSERT(!m_reservoirView.isNull()); CVF_ASSERT(!m_reservoirView.isNull());
return m_reservoirView; return m_reservoirView;
@ -75,7 +75,7 @@ RimEclipseView* RimCellPropertyFilterCollection::reservoirView()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellPropertyFilterCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimEclipsePropertyFilterCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
this->updateUiIconFromToggleField(); this->updateUiIconFromToggleField();
@ -85,7 +85,7 @@ void RimCellPropertyFilterCollection::fieldChangedByUi(const caf::PdmFieldHandle
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimEclipsePropertyFilter* RimCellPropertyFilterCollection::createAndAppendPropertyFilter() RimEclipsePropertyFilter* RimEclipsePropertyFilterCollection::createAndAppendPropertyFilter()
{ {
RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter(); RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter();
@ -110,7 +110,7 @@ RimEclipsePropertyFilter* RimCellPropertyFilterCollection::createAndAppendProper
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellPropertyFilterCollection::loadAndInitializePropertyFilters() void RimEclipsePropertyFilterCollection::loadAndInitializePropertyFilters()
{ {
for (size_t i = 0; i < propertyFilters.size(); i++) for (size_t i = 0; i < propertyFilters.size(); i++)
{ {
@ -128,7 +128,7 @@ void RimCellPropertyFilterCollection::loadAndInitializePropertyFilters()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellPropertyFilterCollection::initAfterRead() void RimEclipsePropertyFilterCollection::initAfterRead()
{ {
loadAndInitializePropertyFilters(); loadAndInitializePropertyFilters();
@ -138,7 +138,7 @@ void RimCellPropertyFilterCollection::initAfterRead()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellPropertyFilterCollection::remove(RimEclipsePropertyFilter* propertyFilter) void RimEclipsePropertyFilterCollection::remove(RimEclipsePropertyFilter* propertyFilter)
{ {
propertyFilters.removeChildObject(propertyFilter); propertyFilters.removeChildObject(propertyFilter);
} }
@ -146,7 +146,7 @@ void RimCellPropertyFilterCollection::remove(RimEclipsePropertyFilter* propertyF
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimCellPropertyFilterCollection::hasActiveFilters() const bool RimEclipsePropertyFilterCollection::hasActiveFilters() const
{ {
if (!active) return false; if (!active) return false;
@ -162,7 +162,7 @@ bool RimCellPropertyFilterCollection::hasActiveFilters() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Returns whether any of the active property filters are based on a dynamic result /// Returns whether any of the active property filters are based on a dynamic result
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimCellPropertyFilterCollection::hasActiveDynamicFilters() const bool RimEclipsePropertyFilterCollection::hasActiveDynamicFilters() const
{ {
if (!active) return false; if (!active) return false;
@ -179,7 +179,7 @@ bool RimCellPropertyFilterCollection::hasActiveDynamicFilters() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimCellPropertyFilterCollection::objectToggleField() caf::PdmFieldHandle* RimEclipsePropertyFilterCollection::objectToggleField()
{ {
return &active; return &active;
} }

6
ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.h
View File

@ -24,12 +24,12 @@
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimCellPropertyFilterCollection : public caf::PdmObject class RimEclipsePropertyFilterCollection : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimCellPropertyFilterCollection(); RimEclipsePropertyFilterCollection();
virtual ~RimCellPropertyFilterCollection(); virtual ~RimEclipsePropertyFilterCollection();
// Fields: // Fields:

2
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -175,7 +175,7 @@ void RimEclipseCase::removeResult(const QString& resultName)
} }
std::list< caf::PdmPointer< RimEclipsePropertyFilter > >::iterator it; std::list< caf::PdmPointer< RimEclipsePropertyFilter > >::iterator it;
RimCellPropertyFilterCollection* propFilterCollection = reservoirView->propertyFilterCollection(); RimEclipsePropertyFilterCollection* propFilterCollection = reservoirView->propertyFilterCollection();
for (size_t filter = 0; filter < propFilterCollection->propertyFilters().size(); filter++) for (size_t filter = 0; filter < propFilterCollection->propertyFilters().size(); filter++)
{ {

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -98,7 +98,7 @@ RimEclipseView::RimEclipseView()
rangeFilterCollection->setReservoirView(this); rangeFilterCollection->setReservoirView(this);
CAF_PDM_InitFieldNoDefault(&propertyFilterCollection, "PropertyFilters", "Property Filters", "", "", ""); CAF_PDM_InitFieldNoDefault(&propertyFilterCollection, "PropertyFilters", "Property Filters", "", "", "");
propertyFilterCollection = new RimCellPropertyFilterCollection(); propertyFilterCollection = new RimEclipsePropertyFilterCollection();
propertyFilterCollection->setReservoirView(this); propertyFilterCollection->setReservoirView(this);
// Visualization fields // Visualization fields

4
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -43,7 +43,7 @@ class Rim3dOverlayInfoConfig;
class RimEclipseCase; class RimEclipseCase;
class RimCellEdgeResultSlot; class RimCellEdgeResultSlot;
class RimEclipsePropertyFilter; class RimEclipsePropertyFilter;
class RimCellPropertyFilterCollection; class RimEclipsePropertyFilterCollection;
class RimCellRangeFilter; class RimCellRangeFilter;
class RimCellRangeFilterCollection; class RimCellRangeFilterCollection;
class RimFaultCollection; class RimFaultCollection;
@ -88,7 +88,7 @@ public:
caf::PdmField<RimCellEdgeResultSlot*> cellEdgeResult; caf::PdmField<RimCellEdgeResultSlot*> cellEdgeResult;
caf::PdmField<RimFaultResultSlot*> faultResultSettings; caf::PdmField<RimFaultResultSlot*> faultResultSettings;
caf::PdmField<RimCellPropertyFilterCollection*> propertyFilterCollection; caf::PdmField<RimEclipsePropertyFilterCollection*> propertyFilterCollection;
caf::PdmField<RimWellCollection*> wellCollection; caf::PdmField<RimWellCollection*> wellCollection;
caf::PdmField<RimFaultCollection*> faultCollection; caf::PdmField<RimFaultCollection*> faultCollection;

8
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@ -80,7 +80,7 @@ bool RimUiTreeModelPdm::deletePropertyFilter(const QModelIndex& itemIndex)
RimEclipsePropertyFilter* propertyFilter = dynamic_cast<RimEclipsePropertyFilter*>(uiItem->dataObject().p()); RimEclipsePropertyFilter* propertyFilter = dynamic_cast<RimEclipsePropertyFilter*>(uiItem->dataObject().p());
CVF_ASSERT(propertyFilter); CVF_ASSERT(propertyFilter);
RimCellPropertyFilterCollection* propertyFilterCollection = propertyFilter->parentContainer(); RimEclipsePropertyFilterCollection* propertyFilterCollection = propertyFilter->parentContainer();
CVF_ASSERT(propertyFilterCollection); CVF_ASSERT(propertyFilterCollection);
bool wasFilterActive = propertyFilter->isActive(); bool wasFilterActive = propertyFilter->isActive();
@ -275,7 +275,7 @@ RimEclipsePropertyFilter* RimUiTreeModelPdm::addPropertyFilter(const QModelIndex
caf::PdmUiTreeItem* currentItem = getTreeItemFromIndex(itemIndex); caf::PdmUiTreeItem* currentItem = getTreeItemFromIndex(itemIndex);
QModelIndex collectionIndex; QModelIndex collectionIndex;
RimCellPropertyFilterCollection* propertyFilterCollection = NULL; RimEclipsePropertyFilterCollection* propertyFilterCollection = NULL;
caf::PdmUiTreeItem* propertyFilterCollectionItem = NULL; caf::PdmUiTreeItem* propertyFilterCollectionItem = NULL;
int position = 0; int position = 0;
@ -287,9 +287,9 @@ RimEclipsePropertyFilter* RimUiTreeModelPdm::addPropertyFilter(const QModelIndex
position = itemIndex.row(); position = itemIndex.row();
collectionIndex = itemIndex.parent(); collectionIndex = itemIndex.parent();
} }
else if (dynamic_cast<RimCellPropertyFilterCollection*>(currentItem->dataObject().p())) else if (dynamic_cast<RimEclipsePropertyFilterCollection*>(currentItem->dataObject().p()))
{ {
propertyFilterCollection = dynamic_cast<RimCellPropertyFilterCollection*>(currentItem->dataObject().p()); propertyFilterCollection = dynamic_cast<RimEclipsePropertyFilterCollection*>(currentItem->dataObject().p());
propertyFilterCollectionItem = currentItem; propertyFilterCollectionItem = currentItem;
position = propertyFilterCollectionItem->childCount(); position = propertyFilterCollectionItem->childCount();
collectionIndex = itemIndex; collectionIndex = itemIndex;

2
ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
View File

@ -149,7 +149,7 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event)
menu.addSeparator(); menu.addSeparator();
menu.addAction(QString("Delete"), this, SLOT(slotDeleteRangeFilter())); menu.addAction(QString("Delete"), this, SLOT(slotDeleteRangeFilter()));
} }
else if (dynamic_cast<RimCellPropertyFilterCollection*>(uiItem->dataObject().p())) else if (dynamic_cast<RimEclipsePropertyFilterCollection*>(uiItem->dataObject().p()))
{ {
menu.addAction(QString("New Property Filter"), this, SLOT(slotAddPropertyFilter())); menu.addAction(QString("New Property Filter"), this, SLOT(slotAddPropertyFilter()));
} }