Renamed class RimInputPropertyCollection to RimEclipseInputPropertyCollection

This commit is contained in:
Pål Hagen 2015-06-25 11:54:31 +02:00
parent 33684d32c3
commit 9049a47871
6 changed files with 19 additions and 19 deletions

View File

@ -51,7 +51,7 @@ RimEclipseInputCase::RimEclipseInputCase()
m_additionalFileNames.setUiReadOnly(true);
CAF_PDM_InitFieldNoDefault(&m_inputPropertyCollection, "InputPropertyCollection", "", "", "", "");
m_inputPropertyCollection = new RimInputPropertyCollection;
m_inputPropertyCollection = new RimEclipseInputPropertyCollection;
}

View File

@ -26,7 +26,7 @@
#include "RimEclipseCase.h"
class RifReaderInterface;
class RimInputPropertyCollection;
class RimEclipseInputPropertyCollection;
class RimEclipseInputProperty;
//==================================================================================================
@ -43,7 +43,7 @@ public:
virtual ~RimEclipseInputCase();
// Fields
caf::PdmField<RimInputPropertyCollection*> m_inputPropertyCollection;
caf::PdmField<RimEclipseInputPropertyCollection*> m_inputPropertyCollection;
// File open methods
void openDataFileSet(const QStringList& fileNames);

View File

@ -24,12 +24,12 @@
#include <QFileInfo>
CAF_PDM_SOURCE_INIT(RimInputPropertyCollection, "RimInputPropertyCollection");
CAF_PDM_SOURCE_INIT(RimEclipseInputPropertyCollection, "RimInputPropertyCollection");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimInputPropertyCollection::RimInputPropertyCollection()
RimEclipseInputPropertyCollection::RimEclipseInputPropertyCollection()
{
CAF_PDM_InitObject("Input Properties", ":/EclipseInput48x48.png", "", "");
@ -39,7 +39,7 @@ RimInputPropertyCollection::RimInputPropertyCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimInputPropertyCollection::~RimInputPropertyCollection()
RimEclipseInputPropertyCollection::~RimEclipseInputPropertyCollection()
{
}
@ -47,7 +47,7 @@ RimInputPropertyCollection::~RimInputPropertyCollection()
//--------------------------------------------------------------------------------------------------
/// Returns the InputProperties pointing to the same file as \a fileName
//--------------------------------------------------------------------------------------------------
std::vector<RimEclipseInputProperty*> RimInputPropertyCollection::findInputProperties(QString fileName)
std::vector<RimEclipseInputProperty*> RimEclipseInputPropertyCollection::findInputProperties(QString fileName)
{
QFileInfo fileInfo(fileName);
std::vector<RimEclipseInputProperty*> result;
@ -66,7 +66,7 @@ std::vector<RimEclipseInputProperty*> RimInputPropertyCollection::findInputPrope
/// Remove given input property from collection and checks if the associated file is referenced by other input
/// properties
//--------------------------------------------------------------------------------------------------
void RimInputPropertyCollection::removeInputProperty(RimEclipseInputProperty* inputProperty, bool& isPropertyFileReferencedByOthers)
void RimEclipseInputPropertyCollection::removeInputProperty(RimEclipseInputProperty* inputProperty, bool& isPropertyFileReferencedByOthers)
{
CVF_ASSERT(inputProperty);
@ -85,7 +85,7 @@ void RimInputPropertyCollection::removeInputProperty(RimEclipseInputProperty* in
//--------------------------------------------------------------------------------------------------
/// Returns the InputProperty with resultName \a resultName
//--------------------------------------------------------------------------------------------------
RimEclipseInputProperty * RimInputPropertyCollection::findInputProperty(QString resultName)
RimEclipseInputProperty * RimEclipseInputPropertyCollection::findInputProperty(QString resultName)
{
for (size_t i = 0; i < this->inputProperties.size(); i++)
{

View File

@ -33,13 +33,13 @@ class RimEclipseInputProperty;
//
//
//==================================================================================================
class RimInputPropertyCollection : public caf::PdmObject
class RimEclipseInputPropertyCollection : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimInputPropertyCollection();
virtual ~RimInputPropertyCollection();
RimEclipseInputPropertyCollection();
virtual ~RimEclipseInputPropertyCollection();
std::vector<RimEclipseInputProperty*> findInputProperties(QString fileName);
RimEclipseInputProperty* findInputProperty(QString resultName);

View File

@ -490,7 +490,7 @@ void RimUiTreeModelPdm::addInputProperty(const QModelIndex& itemIndex, const QSt
{
caf::PdmUiTreeItem* currentItem = getTreeItemFromIndex(itemIndex);
RimInputPropertyCollection* inputPropertyCollection = dynamic_cast<RimInputPropertyCollection*>(currentItem->dataObject().p());
RimEclipseInputPropertyCollection* inputPropertyCollection = dynamic_cast<RimEclipseInputPropertyCollection*>(currentItem->dataObject().p());
CVF_ASSERT(inputPropertyCollection);
std::vector<RimEclipseInputCase*> parentObjects;
@ -524,11 +524,11 @@ void RimUiTreeModelPdm::deleteInputProperty(const QModelIndex& itemIndex)
// Remove item from UI tree model before delete of project data structure
removeRows_special(itemIndex.row(), 1, itemIndex.parent());
std::vector<RimInputPropertyCollection*> parentObjects;
std::vector<RimEclipseInputPropertyCollection*> parentObjects;
object->parentObjectsOfType(parentObjects);
CVF_ASSERT(parentObjects.size() == 1);
RimInputPropertyCollection* inputPropertyCollection = parentObjects[0];
RimEclipseInputPropertyCollection* inputPropertyCollection = parentObjects[0];
if (!inputPropertyCollection) return;
std::vector<RimEclipseInputCase*> parentObjects2;

View File

@ -191,7 +191,7 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event)
}
}
}
else if (dynamic_cast<RimInputPropertyCollection*>(uiItem->dataObject().p()))
else if (dynamic_cast<RimEclipseInputPropertyCollection*>(uiItem->dataObject().p()))
{
menu.addAction(QString("Add Input Property"), this, SLOT(slotAddInputProperty()));
}
@ -772,7 +772,7 @@ void RimUiTreeView::slotAddInputProperty()
RimUiTreeModelPdm* myModel = dynamic_cast<RimUiTreeModelPdm*>(model());
caf::PdmUiTreeItem* uiItem = myModel->getTreeItemFromIndex(currentIndex());
RimInputPropertyCollection* inputPropertyCollection = dynamic_cast<RimInputPropertyCollection*>(uiItem->dataObject().p());
RimEclipseInputPropertyCollection* inputPropertyCollection = dynamic_cast<RimEclipseInputPropertyCollection*>(uiItem->dataObject().p());
if (inputPropertyCollection)
{
myModel->addInputProperty(index, fileNames);
@ -827,11 +827,11 @@ void RimUiTreeView::slotWriteInputProperty()
// Find input reservoir for this property
RimEclipseInputCase* inputReservoir = NULL;
{
std::vector<RimInputPropertyCollection*> parentObjects;
std::vector<RimEclipseInputPropertyCollection*> parentObjects;
inputProperty->parentObjectsOfType(parentObjects);
CVF_ASSERT(parentObjects.size() == 1);
RimInputPropertyCollection* inputPropertyCollection = parentObjects[0];
RimEclipseInputPropertyCollection* inputPropertyCollection = parentObjects[0];
if (!inputPropertyCollection) return;
std::vector<RimEclipseInputCase*> parentObjects2;