diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index e5a01154be..4c9831789e 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -634,7 +634,7 @@ bool RiaApplication::openEclipseCaseFromFile(const QString& fileName) //-------------------------------------------------------------------------------------------------- bool RiaApplication::openEclipseCase(const QString& caseName, const QString& caseFileName) { - RimResultCase* rimResultReservoir = new RimResultCase(); + RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase(); rimResultReservoir->setCaseInfo(caseName, caseFileName); RimAnalysisModels* analysisModels = m_project->activeOilField() ? m_project->activeOilField()->analysisModels() : NULL; @@ -1777,7 +1777,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames) // First file is read completely including grid. // The main grid from the first case is reused directly in for the other cases. // When reading active cell info, only the total cell count is tested for consistency - RimResultCase* mainResultCase = NULL; + RimEclipseResultCase* mainResultCase = NULL; std::vector< std::vector > mainCaseGridDimensions; RimIdenticalGridCaseGroup* gridCaseGroup = NULL; @@ -1787,7 +1787,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames) QString caseName = gridFileName.completeBaseName(); - RimResultCase* rimResultReservoir = new RimResultCase(); + RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase(); rimResultReservoir->setCaseInfo(caseName, firstFileName); if (!rimResultReservoir->openEclipseGridFile()) { @@ -1815,7 +1815,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames) QString caseName = gridFileName.completeBaseName(); - RimResultCase* rimResultReservoir = new RimResultCase(); + RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase(); rimResultReservoir->setCaseInfo(caseName, caseFileName); std::vector< std::vector > caseGridDimensions; diff --git a/ApplicationCode/Application/RiaProjectModifier.cpp b/ApplicationCode/Application/RiaProjectModifier.cpp index 103dac37dd..23d7cd3fd4 100644 --- a/ApplicationCode/Application/RiaProjectModifier.cpp +++ b/ApplicationCode/Application/RiaProjectModifier.cpp @@ -164,7 +164,7 @@ bool RiaProjectModifier::replaceSourceCases(RimProject* project) QString caseName = caseNameFromGridFileName(fileName); // Use this slightly hackish method in order to get a new unique ID - RimResultCase* resCase = new RimResultCase; + RimEclipseResultCase* resCase = new RimEclipseResultCase; resCase->setCaseInfo(caseName, fileName); caseCollection->reservoirs.push_back(resCase); @@ -196,7 +196,7 @@ bool RiaProjectModifier::replaceCase(RimProject* project) for (size_t caseIdx = 0; caseIdx < allCases.size(); ++caseIdx) { - RimResultCase* resultCase = dynamic_cast(allCases[caseIdx]); + RimEclipseResultCase* resultCase = dynamic_cast(allCases[caseIdx]); if (resultCase) { if (m_replaceCase_caseId == FIRST_OCCURENCE || diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 5ead178d2b..0c3ff1f7e2 100644 --- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -179,7 +179,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo() caf::ProgressInfo info(caseCollection()->reservoirs.size(), "Case group - Reading Active Cell data"); for (size_t i = 1; i < caseCollection()->reservoirs.size(); i++) { - RimResultCase* rimReservoir = dynamic_cast(caseCollection()->reservoirs[i]); + RimEclipseResultCase* rimReservoir = dynamic_cast(caseCollection()->reservoirs[i]); if(!rimReservoir) continue; // Input reservoir if (!rimReservoir->openAndReadActiveCellData(rigCaseData)) @@ -227,7 +227,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo() for (size_t i = 1; i < caseCollection()->reservoirs.size(); i++) { - RimResultCase* rimReservoir = dynamic_cast(caseCollection()->reservoirs[i]); + RimEclipseResultCase* rimReservoir = dynamic_cast(caseCollection()->reservoirs[i]); if (!rimReservoir) continue; // Input reservoir RimReservoirCellResultsStorage* cellResultsStorage = rimReservoir->results(poroModel); diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.cpp b/ApplicationCode/ProjectDataModel/RimResultCase.cpp index 9daf5dd3b5..4e7d6c950e 100644 --- a/ApplicationCode/ProjectDataModel/RimResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimResultCase.cpp @@ -39,11 +39,11 @@ #include #include -CAF_PDM_SOURCE_INIT(RimResultCase, "EclipseCase"); +CAF_PDM_SOURCE_INIT(RimEclipseResultCase, "EclipseCase"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimResultCase::RimResultCase() +RimEclipseResultCase::RimEclipseResultCase() : RimEclipseCase() { CAF_PDM_InitObject("Eclipse Case", ":/Case48x48.png", "", ""); @@ -68,7 +68,7 @@ RimResultCase::RimResultCase() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimResultCase::openEclipseGridFile() +bool RimEclipseResultCase::openEclipseGridFile() { caf::ProgressInfo progInfo(50, "Reading Eclipse Grid File"); @@ -127,7 +127,7 @@ bool RimResultCase::openEclipseGridFile() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCase) +bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCase) { // Early exit if data is already read if (m_activeCellInfoIsReadFromFile) return true; @@ -187,7 +187,7 @@ bool RimResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCase) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RimResultCase::createMockModel(QString modelName) +cvf::ref RimEclipseResultCase::createMockModel(QString modelName) { cvf::ref mockFileInterface = new RifReaderMockModel; cvf::ref reservoir = new RigCaseData; @@ -291,7 +291,7 @@ cvf::ref RimResultCase::createMockModel(QString modelName) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimResultCase::~RimResultCase() +RimEclipseResultCase::~RimEclipseResultCase() { reservoirViews.deleteAllChildObjects(); } @@ -299,7 +299,7 @@ RimResultCase::~RimResultCase() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimResultCase::locationOnDisc() const +QString RimEclipseResultCase::locationOnDisc() const { QFileInfo fi(caseFileName()); return fi.absolutePath(); @@ -308,7 +308,7 @@ QString RimResultCase::locationOnDisc() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimResultCase::readGridDimensions(std::vector< std::vector >& gridDimensions) +void RimEclipseResultCase::readGridDimensions(std::vector< std::vector >& gridDimensions) { RifEclipseOutputFileTools::readGridDimensions(caseFileName(), gridDimensions); } @@ -316,7 +316,7 @@ void RimResultCase::readGridDimensions(std::vector< std::vector >& gridDime //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimResultCase::updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) +void RimEclipseResultCase::updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) { bool foundFile = false; std::vector searchedPaths; @@ -335,7 +335,7 @@ void RimResultCase::updateFilePathsFromProjectPath(const QString& newProjectPath //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimResultCase::setGridFileName(const QString& caseFileName) +void RimEclipseResultCase::setGridFileName(const QString& caseFileName) { this->caseFileName = caseFileName; } @@ -344,7 +344,7 @@ void RimResultCase::setGridFileName(const QString& caseFileName) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimResultCase::setCaseInfo(const QString& userDescription, const QString& caseFileName) +void RimEclipseResultCase::setCaseInfo(const QString& userDescription, const QString& caseFileName) { this->caseUserDescription = userDescription; this->caseFileName = caseFileName; @@ -356,7 +356,7 @@ void RimResultCase::setCaseInfo(const QString& userDescription, const QString& c //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimResultCase::initAfterRead() +void RimEclipseResultCase::initAfterRead() { RimEclipseCase::initAfterRead(); @@ -373,7 +373,7 @@ void RimResultCase::initAfterRead() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimResultCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +void RimEclipseResultCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) { uiOrdering.add(&caseUserDescription); uiOrdering.add(&caseId); diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.h b/ApplicationCode/ProjectDataModel/RimResultCase.h index 19ad651c05..f0f17ccebf 100644 --- a/ApplicationCode/ProjectDataModel/RimResultCase.h +++ b/ApplicationCode/ProjectDataModel/RimResultCase.h @@ -30,13 +30,13 @@ class RigMainGrid; // // //================================================================================================== -class RimResultCase : public RimEclipseCase +class RimEclipseResultCase : public RimEclipseCase { CAF_PDM_HEADER_INIT; public: - RimResultCase(); - virtual ~RimResultCase(); + RimEclipseResultCase(); + virtual ~RimEclipseResultCase(); void setGridFileName(const QString& caseFileName); void setCaseInfo(const QString& userDescription, const QString& caseFileName); diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp index 483d2eb374..832d79c38d 100644 --- a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp +++ b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp @@ -639,7 +639,7 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, const caf::PdmO RimIdenticalGridCaseGroup* gridCaseGroup = gridCaseGroupFromItemIndex(itemIndex); if (gridCaseGroup) { - std::vector > typedObjects; + std::vector > typedObjects; pdmObjects.createCopyByType(&typedObjects); if (typedObjects.size() == 0) @@ -647,24 +647,24 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, const caf::PdmO return; } - RimResultCase* mainResultCase = NULL; + RimEclipseResultCase* mainResultCase = NULL; std::vector< std::vector > mainCaseGridDimensions; // Read out main grid and main grid dimensions if present in case group if (gridCaseGroup->mainCase()) { - mainResultCase = dynamic_cast(gridCaseGroup->mainCase()); + mainResultCase = dynamic_cast(gridCaseGroup->mainCase()); CVF_ASSERT(mainResultCase); mainResultCase->readGridDimensions(mainCaseGridDimensions); } - std::vector insertedCases; + std::vector insertedCases; // Add cases to case group for (size_t i = 0; i < typedObjects.size(); i++) { - RimResultCase* rimResultReservoir = typedObjects[i]; + RimEclipseResultCase* rimResultReservoir = typedObjects[i]; proj->assignCaseIdToCase(rimResultReservoir); @@ -679,14 +679,14 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, const caf::PdmO // Initialize the new objects for (size_t i = 0; i < insertedCases.size(); i++) { - RimResultCase* rimResultReservoir = insertedCases[i]; + RimEclipseResultCase* rimResultReservoir = insertedCases[i]; caf::PdmDocument::initAfterReadTraversal(rimResultReservoir); } // Load stuff for (size_t i = 0; i < insertedCases.size(); i++) { - RimResultCase* rimResultReservoir = insertedCases[i]; + RimEclipseResultCase* rimResultReservoir = insertedCases[i]; if (!mainResultCase) @@ -786,7 +786,7 @@ void RimUiTreeModelPdm::moveObjects(const QModelIndex& itemIndex, caf::PdmObject addObjects(itemIndex, pdmObjects); // Delete objects from original container - std::vector > typedObjects; + std::vector > typedObjects; pdmObjects.objectsByType(&typedObjects); for (size_t i = 0; i < typedObjects.size(); i++)