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

Renamed class RimInputCase to RimEclipseInputCase

Browse Source
This commit is contained in:
Pål Hagen 2015-06-25 11:50:13 +02:00
parent 9458c818b4
commit dec6791027
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/RiaApplication.cpp
View File

@ -675,7 +675,7 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
//--------------------------------------------------------------------------------------------------
bool RiaApplication::openInputEclipseCaseFromFileNames(const QStringList& fileNames)
{
RimInputCase* rimInputReservoir = new RimInputCase();
RimEclipseInputCase* rimInputReservoir = new RimEclipseInputCase();
m_project->assignCaseIdToCase(rimInputReservoir);
rimInputReservoir->openDataFileSet(fileNames);

20
ApplicationCode/ProjectDataModel/RimInputCase.cpp
View File

@ -37,11 +37,11 @@
#include <QFileInfo>
CAF_PDM_SOURCE_INIT(RimInputCase, "RimInputReservoir");
CAF_PDM_SOURCE_INIT(RimEclipseInputCase, "RimInputReservoir");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimInputCase::RimInputCase()
RimEclipseInputCase::RimEclipseInputCase()
: RimEclipseCase()
{
CAF_PDM_InitObject("RimInputCase", ":/EclipseInput48x48.png", "", "");
@ -58,7 +58,7 @@ RimInputCase::RimInputCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimInputCase::~RimInputCase()
RimEclipseInputCase::~RimEclipseInputCase()
{
delete m_inputPropertyCollection;
}
@ -67,7 +67,7 @@ RimInputCase::~RimInputCase()
/// Open the supplied file set. If no grid data has been read, it will first find the possible
/// grid data among the files then read all supported properties from the files matching the grid
//--------------------------------------------------------------------------------------------------
void RimInputCase::openDataFileSet(const QStringList& fileNames)
void RimEclipseInputCase::openDataFileSet(const QStringList& fileNames)
{
if (fileNames.contains(RimDefines::mockModelBasicInputCase()))
{
@ -169,7 +169,7 @@ void RimInputCase::openDataFileSet(const QStringList& fileNames)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimInputCase::openEclipseGridFile()
bool RimEclipseInputCase::openEclipseGridFile()
{
// Early exit if reservoir data is created
if (this->reservoirData() == NULL)
@ -226,7 +226,7 @@ bool RimInputCase::openEclipseGridFile()
/// Loads input property data from the gridFile and additional files
/// Creates new InputProperties if necessary, and flags the unused ones as obsolete
//--------------------------------------------------------------------------------------------------
void RimInputCase::loadAndSyncronizeInputProperties()
void RimEclipseInputCase::loadAndSyncronizeInputProperties()
{
// Make sure we actually have reservoir data
@ -334,7 +334,7 @@ void RimInputCase::loadAndSyncronizeInputProperties()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimInputCase::removeProperty(RimInputProperty* inputProperty)
void RimEclipseInputCase::removeProperty(RimInputProperty* inputProperty)
{
bool isPropertyFileReferencedByOthers = false;
@ -364,7 +364,7 @@ void RimInputCase::removeProperty(RimInputProperty* inputProperty)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RifReaderInterface> RimInputCase::createMockModel(QString modelName)
cvf::ref<RifReaderInterface> RimEclipseInputCase::createMockModel(QString modelName)
{
cvf::ref<RigCaseData> reservoir = new RigCaseData;
cvf::ref<RifReaderMockModel> mockFileInterface = new RifReaderMockModel;
@ -410,7 +410,7 @@ cvf::ref<RifReaderInterface> RimInputCase::createMockModel(QString modelName)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimInputCase::locationOnDisc() const
QString RimEclipseInputCase::locationOnDisc() const
{
if (m_gridFileName().isEmpty()) return QString();
@ -421,7 +421,7 @@ QString RimInputCase::locationOnDisc() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimInputCase::updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath)
void RimEclipseInputCase::updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath)
{
bool foundFile = false;
std::vector<QString> searchedPaths;

6
ApplicationCode/ProjectDataModel/RimInputCase.h
View File

@ -34,13 +34,13 @@ class RimInputProperty;
//
//
//==================================================================================================
class RimInputCase : public RimEclipseCase
class RimEclipseInputCase : public RimEclipseCase
{
CAF_PDM_HEADER_INIT;
public:
RimInputCase();
virtual ~RimInputCase();
RimEclipseInputCase();
virtual ~RimEclipseInputCase();
// Fields
caf::PdmField<RimInputPropertyCollection*> m_inputPropertyCollection;

8
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@ -493,11 +493,11 @@ void RimUiTreeModelPdm::addInputProperty(const QModelIndex& itemIndex, const QSt
RimInputPropertyCollection* inputPropertyCollection = dynamic_cast<RimInputPropertyCollection*>(currentItem->dataObject().p());
CVF_ASSERT(inputPropertyCollection);
std::vector<RimInputCase*> parentObjects;
std::vector<RimEclipseInputCase*> parentObjects;
inputPropertyCollection->parentObjectsOfType(parentObjects);
CVF_ASSERT(parentObjects.size() == 1);
RimInputCase* inputReservoir = parentObjects[0];
RimEclipseInputCase* inputReservoir = parentObjects[0];
CVF_ASSERT(inputReservoir);
if (inputReservoir)
{
@ -531,11 +531,11 @@ void RimUiTreeModelPdm::deleteInputProperty(const QModelIndex& itemIndex)
RimInputPropertyCollection* inputPropertyCollection = parentObjects[0];
if (!inputPropertyCollection) return;
std::vector<RimInputCase*> parentObjects2;
std::vector<RimEclipseInputCase*> parentObjects2;
inputPropertyCollection->parentObjectsOfType(parentObjects2);
CVF_ASSERT(parentObjects2.size() == 1);
RimInputCase* inputReservoir = parentObjects2[0];
RimEclipseInputCase* inputReservoir = parentObjects2[0];
if (!inputReservoir) return;
inputReservoir->removeProperty(inputProperty);

4
ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
View File

@ -825,7 +825,7 @@ void RimUiTreeView::slotWriteInputProperty()
exportSettings.eclipseKeyword = inputProperty->eclipseKeyword;
// Find input reservoir for this property
RimInputCase* inputReservoir = NULL;
RimEclipseInputCase* inputReservoir = NULL;
{
std::vector<RimInputPropertyCollection*> parentObjects;
inputProperty->parentObjectsOfType(parentObjects);
@ -834,7 +834,7 @@ void RimUiTreeView::slotWriteInputProperty()
RimInputPropertyCollection* inputPropertyCollection = parentObjects[0];
if (!inputPropertyCollection) return;
std::vector<RimInputCase*> parentObjects2;
std::vector<RimEclipseInputCase*> parentObjects2;
inputPropertyCollection->parentObjectsOfType(parentObjects2);
CVF_ASSERT(parentObjects2.size() == 1);

4
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@ -613,7 +613,7 @@ public:
if (m_currentReservoir != NULL)
{
// Create a new input property if we have an input reservoir
RimInputCase* inputRes = dynamic_cast<RimInputCase*>(m_currentReservoir);
RimEclipseInputCase* inputRes = dynamic_cast<RimEclipseInputCase*>(m_currentReservoir);
if (inputRes)
{
RimInputProperty* inputProperty = NULL;
@ -959,7 +959,7 @@ public:
if (m_currentReservoir != NULL)
{
// Create a new input property if we have an input reservoir
RimInputCase* inputRes = dynamic_cast<RimInputCase*>(m_currentReservoir);
RimEclipseInputCase* inputRes = dynamic_cast<RimEclipseInputCase*>(m_currentReservoir);
if (inputRes)
{
RimInputProperty* inputProperty = NULL;

2
ApplicationCode/SocketInterface/RiaSocketTools.cpp
View File

@ -103,7 +103,7 @@ void RiaSocketTools::getCaseInfoFromCase(RimCase* rimCase, qint64& caseId, QStri
{
caseGroupId = -1;
if (dynamic_cast<RimInputCase*>(rimCase))
if (dynamic_cast<RimEclipseInputCase*>(rimCase))
{
caseType = "InputCase";
}