Renamed class RimCellPropertyFilter to RimEclipsePropertyFilter

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp

@@ -712,7 +712,7 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis
     {
         for (size_t i = 0; i < propFilterColl->propertyFilters().size(); i++)
         {
-            RimCellPropertyFilter* propertyFilter = propFilterColl->propertyFilters()[i];
+            RimEclipsePropertyFilter* propertyFilter = propFilterColl->propertyFilters()[i];
 
             if (propertyFilter->isActive()&& propertyFilter->resultDefinition->hasResult())
             {

ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp

@@ -33,21 +33,21 @@
 namespace caf
 { // Obsolete stuff
     template<>
-    void caf::AppEnum< RimCellPropertyFilter::EvaluationRegionType>::setUp()
+    void caf::AppEnum< RimEclipsePropertyFilter::EvaluationRegionType>::setUp()
     {
-        addItem(RimCellPropertyFilter::RANGE_FILTER_REGION, "RANGE_FILTER_REGION",  "Range filter cells");
+        addItem(RimEclipsePropertyFilter::RANGE_FILTER_REGION, "RANGE_FILTER_REGION",  "Range filter cells");
-        addItem(RimCellPropertyFilter::GLOBAL_REGION,       "GLOBAL_REGION",        "All cells");
+        addItem(RimEclipsePropertyFilter::GLOBAL_REGION,       "GLOBAL_REGION",        "All cells");
-        setDefault(RimCellPropertyFilter::RANGE_FILTER_REGION);
+        setDefault(RimEclipsePropertyFilter::RANGE_FILTER_REGION);
     }
 }
 
 
-CAF_PDM_SOURCE_INIT(RimCellPropertyFilter, "CellPropertyFilter");
+CAF_PDM_SOURCE_INIT(RimEclipsePropertyFilter, "CellPropertyFilter");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCellPropertyFilter::RimCellPropertyFilter()
+RimEclipsePropertyFilter::RimEclipsePropertyFilter()
     : m_parentContainer(NULL)
 {
     CAF_PDM_InitObject("Cell Property Filter", ":/CellFilter_Values.png", "", "");
@@ -86,14 +86,14 @@ RimCellPropertyFilter::RimCellPropertyFilter()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCellPropertyFilter::~RimCellPropertyFilter()
+RimEclipsePropertyFilter::~RimEclipsePropertyFilter()
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCellPropertyFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimEclipsePropertyFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
     if (&name == changedField)
     {
@@ -126,7 +126,7 @@ void RimCellPropertyFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedF
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimCellPropertyFilter::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
+QList<caf::PdmOptionItemInfo> RimEclipsePropertyFilter::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
 {
     QList<caf::PdmOptionItemInfo> optionItems = resultDefinition->calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
 
@@ -155,7 +155,7 @@ QList<caf::PdmOptionItemInfo> RimCellPropertyFilter::calculateValueOptions(const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCellPropertyFilter::setParentContainer(RimCellPropertyFilterCollection* parentContainer)
+void RimEclipsePropertyFilter::setParentContainer(RimCellPropertyFilterCollection* parentContainer)
 {
     m_parentContainer = parentContainer;
 }
@@ -163,7 +163,7 @@ void RimCellPropertyFilter::setParentContainer(RimCellPropertyFilterCollection*
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCellPropertyFilterCollection* RimCellPropertyFilter::parentContainer()
+RimCellPropertyFilterCollection* RimEclipsePropertyFilter::parentContainer()
 {
     return m_parentContainer;
 }
@@ -171,7 +171,7 @@ RimCellPropertyFilterCollection* RimCellPropertyFilter::parentContainer()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCellPropertyFilter::setToDefaultValues()
+void RimEclipsePropertyFilter::setToDefaultValues()
 {
     CVF_ASSERT(m_parentContainer);
 
@@ -184,7 +184,7 @@ void RimCellPropertyFilter::setToDefaultValues()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCellPropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) 
+void RimEclipsePropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) 
 {
     // Fields declared in RimCellFilter
     uiOrdering.add(&name);
@@ -208,7 +208,7 @@ void RimCellPropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCellPropertyFilter::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
+void RimEclipsePropertyFilter::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
 {
     if (m_minimumResultValue == cvf::UNDEFINED_DOUBLE || m_maximumResultValue == cvf::UNDEFINED_DOUBLE)
     {
@@ -231,7 +231,7 @@ void RimCellPropertyFilter::defineEditorAttribute(const caf::PdmFieldHandle* fie
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCellPropertyFilter::computeResultValueRange()
+void RimEclipsePropertyFilter::computeResultValueRange()
 {
     CVF_ASSERT(m_parentContainer);
 

ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h

@@ -34,13 +34,13 @@ class RigCaseCellResultsData;
 ///  
 ///  
 //==================================================================================================
-class RimCellPropertyFilter : public RimCellFilter
+class RimEclipsePropertyFilter : public RimCellFilter
 {
     CAF_PDM_HEADER_INIT;
  
 public:
-    RimCellPropertyFilter();
+    RimEclipsePropertyFilter();
-    virtual ~RimCellPropertyFilter();
+    virtual ~RimEclipsePropertyFilter();
 
     caf::PdmField<RimEclipseResultDefinition*>     resultDefinition;
 

ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp

@@ -57,7 +57,7 @@ void RimCellPropertyFilterCollection::setReservoirView(RimEclipseView* reservoir
 
     for (size_t i = 0; i < propertyFilters.size(); i++)
     {
-        RimCellPropertyFilter* propertyFilter = propertyFilters[i];
+        RimEclipsePropertyFilter* propertyFilter = propertyFilters[i];
 
         propertyFilter->resultDefinition->setReservoirView(m_reservoirView.p());
     }
@@ -85,9 +85,9 @@ void RimCellPropertyFilterCollection::fieldChangedByUi(const caf::PdmFieldHandle
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCellPropertyFilter* RimCellPropertyFilterCollection::createAndAppendPropertyFilter()
+RimEclipsePropertyFilter* RimCellPropertyFilterCollection::createAndAppendPropertyFilter()
 {
-    RimCellPropertyFilter* propertyFilter = new RimCellPropertyFilter();
+    RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter();
     
     propertyFilter->resultDefinition->setReservoirView(m_reservoirView.p());
 
@@ -114,7 +114,7 @@ void RimCellPropertyFilterCollection::loadAndInitializePropertyFilters()
 {
     for (size_t i = 0; i < propertyFilters.size(); i++)
     {
-        RimCellPropertyFilter* propertyFilter = propertyFilters[i];
+        RimEclipsePropertyFilter* propertyFilter = propertyFilters[i];
 
         propertyFilter->setParentContainer(this);
 
@@ -138,7 +138,7 @@ void RimCellPropertyFilterCollection::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCellPropertyFilterCollection::remove(RimCellPropertyFilter* propertyFilter)
+void RimCellPropertyFilterCollection::remove(RimEclipsePropertyFilter* propertyFilter)
 {
     propertyFilters.removeChildObject(propertyFilter);
 }
@@ -152,7 +152,7 @@ bool RimCellPropertyFilterCollection::hasActiveFilters() const
 
     for (size_t i = 0; i < propertyFilters.size(); i++)
     {
-        RimCellPropertyFilter* propertyFilter = propertyFilters[i];
+        RimEclipsePropertyFilter* propertyFilter = propertyFilters[i];
         if (propertyFilter->isActive() && propertyFilter->resultDefinition->hasResult()) return true;
     }
 
@@ -168,7 +168,7 @@ bool RimCellPropertyFilterCollection::hasActiveDynamicFilters() const
 
     for (size_t i = 0; i < propertyFilters.size(); i++)
     {
-        RimCellPropertyFilter* propertyFilter = propertyFilters[i];
+        RimEclipsePropertyFilter* propertyFilter = propertyFilters[i];
         if (propertyFilter->isActive() && propertyFilter->resultDefinition->hasDynamicResult()) return true;
     }
 

ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.h

@@ -34,11 +34,11 @@ public:
 
     // Fields:
     caf::PdmField<bool> active;
-    caf::PdmPointersField<RimCellPropertyFilter*> propertyFilters;
+    caf::PdmPointersField<RimEclipsePropertyFilter*> propertyFilters;
 
     // Methods
-    RimCellPropertyFilter*  createAndAppendPropertyFilter();
+    RimEclipsePropertyFilter*  createAndAppendPropertyFilter();
-    void                    remove(RimCellPropertyFilter* propertyFilter);
+    void                    remove(RimEclipsePropertyFilter* propertyFilter);
 
     bool                    hasActiveFilters() const; 
     bool                    hasActiveDynamicFilters() const; 

ApplicationCode/ProjectDataModel/RimEclipseCase.cpp

@@ -174,12 +174,12 @@ void RimEclipseCase::removeResult(const QString& resultName)
             rebuildDisplayModel = true;
         }
 
-        std::list< caf::PdmPointer< RimCellPropertyFilter > >::iterator it;
+        std::list< caf::PdmPointer< RimEclipsePropertyFilter > >::iterator it;
         RimCellPropertyFilterCollection* propFilterCollection = reservoirView->propertyFilterCollection();
 
         for (size_t filter = 0; filter < propFilterCollection->propertyFilters().size(); filter++)
         {
-            RimCellPropertyFilter* propertyFilter = propFilterCollection->propertyFilters()[filter];
+            RimEclipsePropertyFilter* propertyFilter = propFilterCollection->propertyFilters()[filter];
             if (propertyFilter->resultDefinition->resultVariable() == resultName)
             {
                 propertyFilter->resultDefinition->setResultVariable(RimDefines::undefinedResultName());

ApplicationCode/ProjectDataModel/RimEclipseView.h

@@ -42,7 +42,7 @@ class RigGridCellFaceVisibilityFilter;
 class Rim3dOverlayInfoConfig;
 class RimEclipseCase;
 class RimCellEdgeResultSlot;
-class RimCellPropertyFilter;
+class RimEclipsePropertyFilter;
 class RimCellPropertyFilterCollection;
 class RimCellRangeFilter;
 class RimCellRangeFilterCollection;

ApplicationCode/ProjectDataModel/RimResultDefinition.h

@@ -70,7 +70,7 @@ protected:
     caf::PdmField< caf::AppEnum< RimDefines::PorosityModelType > >  m_porosityModel;
     caf::PdmField<QString>                                          m_resultVariable;
 
-    friend class RimCellPropertyFilter;
+    friend class RimEclipsePropertyFilter;
     friend class RimFaultResultSlot;
 
     // User interface only fields, to support "filtering"-like behaviour etc.

ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp

@@ -77,7 +77,7 @@ bool RimUiTreeModelPdm::deletePropertyFilter(const QModelIndex& itemIndex)
     caf::PdmUiTreeItem* uiItem = getTreeItemFromIndex(itemIndex);
     CVF_ASSERT(uiItem);
 
-    RimCellPropertyFilter* propertyFilter = dynamic_cast<RimCellPropertyFilter*>(uiItem->dataObject().p());
+    RimEclipsePropertyFilter* propertyFilter = dynamic_cast<RimEclipsePropertyFilter*>(uiItem->dataObject().p());
     CVF_ASSERT(propertyFilter);
 
     RimCellPropertyFilterCollection* propertyFilterCollection = propertyFilter->parentContainer();
@@ -270,7 +270,7 @@ void RimUiTreeModelPdm::deleteReservoir(RimEclipseCase* reservoir)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCellPropertyFilter* RimUiTreeModelPdm::addPropertyFilter(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex)
+RimEclipsePropertyFilter* RimUiTreeModelPdm::addPropertyFilter(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex)
 {
     caf::PdmUiTreeItem* currentItem = getTreeItemFromIndex(itemIndex);
 
@@ -279,9 +279,9 @@ RimCellPropertyFilter* RimUiTreeModelPdm::addPropertyFilter(const QModelIndex& i
     caf::PdmUiTreeItem* propertyFilterCollectionItem = NULL;
     int position = 0;
 
-    if (dynamic_cast<RimCellPropertyFilter*>(currentItem->dataObject().p()))
+    if (dynamic_cast<RimEclipsePropertyFilter*>(currentItem->dataObject().p()))
     {
-        RimCellPropertyFilter* propertyFilter = dynamic_cast<RimCellPropertyFilter*>(currentItem->dataObject().p());
+        RimEclipsePropertyFilter* propertyFilter = dynamic_cast<RimEclipsePropertyFilter*>(currentItem->dataObject().p());
         propertyFilterCollection = propertyFilter->parentContainer();
         propertyFilterCollectionItem = currentItem->parent();
         position = itemIndex.row();
@@ -297,7 +297,7 @@ RimCellPropertyFilter* RimUiTreeModelPdm::addPropertyFilter(const QModelIndex& i
 
     beginInsertRows(collectionIndex, position, position);
     
-    RimCellPropertyFilter* propertyFilter = propertyFilterCollection->createAndAppendPropertyFilter();
+    RimEclipsePropertyFilter* propertyFilter = propertyFilterCollection->createAndAppendPropertyFilter();
     caf::PdmUiTreeItem* childItem = new caf::PdmUiTreeItem(propertyFilterCollectionItem, position, propertyFilter);
 
     endInsertRows();

ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.h

@@ -27,7 +27,7 @@
 
 class QFileSystemWatcher;
 
-class RimCellPropertyFilter;
+class RimEclipsePropertyFilter;
 class RimCellRangeFilter;
 class RimGeoMechPropertyFilter;
 class RimEclipseCase;
@@ -58,7 +58,7 @@ public:
     void                        deleteReservoir(RimEclipseCase* reservoir);
     void                        deleteAllWellPaths(const QModelIndex& itemIndex);
 
-    RimCellPropertyFilter*      addPropertyFilter(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex);
+    RimEclipsePropertyFilter*      addPropertyFilter(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex);
     RimGeoMechPropertyFilter*   addGeoMechPropertyFilter(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex);
     RimCellRangeFilter*         addRangeFilter(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex);
 

ApplicationCode/ProjectDataModel/RimUiTreeView.cpp

@@ -153,7 +153,7 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event)
             {
                 menu.addAction(QString("New Property Filter"), this, SLOT(slotAddPropertyFilter()));
             }
-            else if (dynamic_cast<RimCellPropertyFilter*>(uiItem->dataObject().p()))
+            else if (dynamic_cast<RimEclipsePropertyFilter*>(uiItem->dataObject().p()))
             {
                 menu.addAction(QString("Insert Property Filter"), this, SLOT(slotAddPropertyFilter()));
                 menu.addSeparator();
@@ -365,7 +365,7 @@ void RimUiTreeView::slotAddPropertyFilter()
     if (myModel)
     {
         QModelIndex insertedIndex;
-        RimCellPropertyFilter* propFilter = myModel->addPropertyFilter(currentIndex(), insertedIndex);
+        RimEclipsePropertyFilter* propFilter = myModel->addPropertyFilter(currentIndex(), insertedIndex);
         setCurrentIndex(insertedIndex);
         if (propFilter)
         {