From ca7428ca4ac3363348b691d4533b2a427448be46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20Hagen?= Date: Thu, 25 Jun 2015 12:11:06 +0200 Subject: [PATCH] Renamed class RimAnalysisModels to RimEclipseCaseCollection --- .../Application/RiaApplication.cpp | 8 ++++---- .../Application/RiaProjectModifier.cpp | 2 +- .../ProjectDataModel/RimAnalysisModels.cpp | 20 +++++++++---------- .../ProjectDataModel/RimAnalysisModels.h | 6 +++--- .../ProjectDataModel/RimOilField.cpp | 2 +- .../ProjectDataModel/RimOilField.h | 4 ++-- .../ProjectDataModel/RimProject.cpp | 6 +++--- .../ProjectDataModel/RimUiTreeModelPdm.cpp | 8 ++++---- .../ProjectDataModel/RimUiTreeView.cpp | 2 +- .../RiaProjectInfoCommands.cpp | 4 ++-- .../UserInterface/RiuMainWindow.cpp | 2 +- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 4c9831789e..19f78f0e10 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -318,7 +318,7 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi for (size_t oilFieldIdx = 0; oilFieldIdx < m_project->oilFields().size(); oilFieldIdx++) { RimOilField* oilField = m_project->oilFields[oilFieldIdx]; - RimAnalysisModels* analysisModels = oilField ? oilField->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = oilField ? oilField->analysisModels() : NULL; if (analysisModels == NULL) continue; for (size_t cgIdx = 0; cgIdx < analysisModels->caseGroups.size(); ++cgIdx) @@ -352,7 +352,7 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi for (size_t oilFieldIdx = 0; oilFieldIdx < m_project->oilFields().size(); oilFieldIdx++) { RimOilField* oilField = m_project->oilFields[oilFieldIdx]; - RimAnalysisModels* analysisModels = oilField ? oilField->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = oilField ? oilField->analysisModels() : NULL; if (analysisModels) { analysisModels->recomputeStatisticsForAllCaseGroups(); @@ -637,7 +637,7 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase(); rimResultReservoir->setCaseInfo(caseName, caseFileName); - RimAnalysisModels* analysisModels = m_project->activeOilField() ? m_project->activeOilField()->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = m_project->activeOilField() ? m_project->activeOilField()->analysisModels() : NULL; if (analysisModels == NULL) return false; analysisModels->cases.push_back(rimResultReservoir); @@ -680,7 +680,7 @@ bool RiaApplication::openInputEclipseCaseFromFileNames(const QStringList& fileNa rimInputReservoir->openDataFileSet(fileNames); - RimAnalysisModels* analysisModels = m_project->activeOilField() ? m_project->activeOilField()->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = m_project->activeOilField() ? m_project->activeOilField()->analysisModels() : NULL; if (analysisModels == NULL) return false; analysisModels->cases.push_back(rimInputReservoir); diff --git a/ApplicationCode/Application/RiaProjectModifier.cpp b/ApplicationCode/Application/RiaProjectModifier.cpp index 23d7cd3fd4..5ba3568f1c 100644 --- a/ApplicationCode/Application/RiaProjectModifier.cpp +++ b/ApplicationCode/Application/RiaProjectModifier.cpp @@ -145,7 +145,7 @@ bool RiaProjectModifier::replaceSourceCases(RimProject* project) for (size_t oilFieldIdx = 0; oilFieldIdx < project->oilFields().size(); oilFieldIdx++) { RimOilField* oilField = project->oilFields[oilFieldIdx]; - RimAnalysisModels* analysisModels = oilField ? oilField->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = oilField ? oilField->analysisModels() : NULL; if (analysisModels) { const size_t numCaseGroups = analysisModels->caseGroups.size(); diff --git a/ApplicationCode/ProjectDataModel/RimAnalysisModels.cpp b/ApplicationCode/ProjectDataModel/RimAnalysisModels.cpp index 699742d156..19b9a20375 100644 --- a/ApplicationCode/ProjectDataModel/RimAnalysisModels.cpp +++ b/ApplicationCode/ProjectDataModel/RimAnalysisModels.cpp @@ -30,11 +30,11 @@ #include "RimStatisticsCase.h" -CAF_PDM_SOURCE_INIT(RimAnalysisModels, "ResInsightAnalysisModels"); +CAF_PDM_SOURCE_INIT(RimEclipseCaseCollection, "ResInsightAnalysisModels"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimAnalysisModels::RimAnalysisModels(void) +RimEclipseCaseCollection::RimEclipseCaseCollection(void) { CAF_PDM_InitObject("Grid Models", ":/Cases16x16.png", "", ""); @@ -47,7 +47,7 @@ RimAnalysisModels::RimAnalysisModels(void) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimAnalysisModels::~RimAnalysisModels(void) +RimEclipseCaseCollection::~RimEclipseCaseCollection(void) { close(); } @@ -55,7 +55,7 @@ RimAnalysisModels::~RimAnalysisModels(void) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimAnalysisModels::close() +void RimEclipseCaseCollection::close() { m_gridCollection->clear(); @@ -66,7 +66,7 @@ void RimAnalysisModels::close() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimIdenticalGridCaseGroup* RimAnalysisModels::createIdenticalCaseGroupFromMainCase(RimEclipseCase* mainCase) +RimIdenticalGridCaseGroup* RimEclipseCaseCollection::createIdenticalCaseGroupFromMainCase(RimEclipseCase* mainCase) { CVF_ASSERT(mainCase); @@ -90,7 +90,7 @@ RimIdenticalGridCaseGroup* RimAnalysisModels::createIdenticalCaseGroupFromMainCa //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimAnalysisModels::moveEclipseCaseIntoCaseGroup(RimEclipseCase* rimReservoir) +void RimEclipseCaseCollection::moveEclipseCaseIntoCaseGroup(RimEclipseCase* rimReservoir) { CVF_ASSERT(rimReservoir); @@ -130,7 +130,7 @@ void RimAnalysisModels::moveEclipseCaseIntoCaseGroup(RimEclipseCase* rimReservoi //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimAnalysisModels::removeCaseFromAllGroups(RimEclipseCase* reservoir) +void RimEclipseCaseCollection::removeCaseFromAllGroups(RimEclipseCase* reservoir) { m_gridCollection->removeCase(reservoir->reservoirData()); @@ -148,7 +148,7 @@ void RimAnalysisModels::removeCaseFromAllGroups(RimEclipseCase* reservoir) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigMainGrid* RimAnalysisModels::registerCaseInGridCollection(RigCaseData* rigEclipseCase) +RigMainGrid* RimEclipseCaseCollection::registerCaseInGridCollection(RigCaseData* rigEclipseCase) { CVF_ASSERT(rigEclipseCase); @@ -177,7 +177,7 @@ RigMainGrid* RimAnalysisModels::registerCaseInGridCollection(RigCaseData* rigEcl //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimAnalysisModels::insertCaseInCaseGroup(RimIdenticalGridCaseGroup* caseGroup, RimEclipseCase* rimReservoir) +void RimEclipseCaseCollection::insertCaseInCaseGroup(RimIdenticalGridCaseGroup* caseGroup, RimEclipseCase* rimReservoir) { CVF_ASSERT(rimReservoir); @@ -191,7 +191,7 @@ void RimAnalysisModels::insertCaseInCaseGroup(RimIdenticalGridCaseGroup* caseGro //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimAnalysisModels::recomputeStatisticsForAllCaseGroups() +void RimEclipseCaseCollection::recomputeStatisticsForAllCaseGroups() { const size_t numCaseGroups = caseGroups.size(); for (size_t caseGrpIdx = 0; caseGrpIdx < numCaseGroups; ++caseGrpIdx) diff --git a/ApplicationCode/ProjectDataModel/RimAnalysisModels.h b/ApplicationCode/ProjectDataModel/RimAnalysisModels.h index 35ca5393af..6e8f6e666e 100644 --- a/ApplicationCode/ProjectDataModel/RimAnalysisModels.h +++ b/ApplicationCode/ProjectDataModel/RimAnalysisModels.h @@ -37,13 +37,13 @@ class RimWellPathCollection; /// /// //================================================================================================== -class RimAnalysisModels : public caf::PdmObject +class RimEclipseCaseCollection : public caf::PdmObject { CAF_PDM_HEADER_INIT; public: - RimAnalysisModels(void); - virtual ~RimAnalysisModels(void); + RimEclipseCaseCollection(void); + virtual ~RimEclipseCaseCollection(void); caf::PdmPointersField cases; caf::PdmPointersField caseGroups; diff --git a/ApplicationCode/ProjectDataModel/RimOilField.cpp b/ApplicationCode/ProjectDataModel/RimOilField.cpp index 2349d61467..845075fe36 100644 --- a/ApplicationCode/ProjectDataModel/RimOilField.cpp +++ b/ApplicationCode/ProjectDataModel/RimOilField.cpp @@ -36,7 +36,7 @@ RimOilField::RimOilField(void) CAF_PDM_InitFieldNoDefault(&geoMechModels, "GeoMechModels", "Geo Mech Models", ":/GridModels.png", "", ""); CAF_PDM_InitFieldNoDefault(&wellPathCollection, "WellPathCollection", "Well Paths", ":/WellCollection.png", "", ""); - analysisModels = new RimAnalysisModels(); + analysisModels = new RimEclipseCaseCollection(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimOilField.h b/ApplicationCode/ProjectDataModel/RimOilField.h index e45a0fff5c..f2704939ff 100644 --- a/ApplicationCode/ProjectDataModel/RimOilField.h +++ b/ApplicationCode/ProjectDataModel/RimOilField.h @@ -25,7 +25,7 @@ #include "cafPdmPointer.h" class RimWellPathCollection; -class RimAnalysisModels; +class RimEclipseCaseCollection; class RimGeoMechModels; //================================================================================================== @@ -40,7 +40,7 @@ public: RimOilField(void); virtual ~RimOilField(void); - caf::PdmField analysisModels; + caf::PdmField analysisModels; caf::PdmField geoMechModels; caf::PdmField wellPathCollection; }; diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 454dfe44af..d0ffaabce0 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -166,7 +166,7 @@ void RimProject::initScriptDirectories() } // Find largest used groupId read from file and make sure all groups have a valid groupId - RimAnalysisModels* analysisModels = activeOilField() ? activeOilField()->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = activeOilField() ? activeOilField()->analysisModels() : NULL; if (analysisModels) { int largestGroupId = -1; @@ -215,7 +215,7 @@ void RimProject::initAfterRead() // Handle old project files with obsolete structure. // Move caseGroupsObsolete and casesObsolete to oilFields()[idx]->analysisModels() - RimAnalysisModels* analysisModels = activeOilField() ? activeOilField()->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = activeOilField() ? activeOilField()->analysisModels() : NULL; bool movedOneRimIdenticalGridCaseGroup = false; for (size_t cgIdx = 0; cgIdx < caseGroupsObsolete.size(); ++cgIdx) { @@ -380,7 +380,7 @@ void RimProject::allCases(std::vector& cases) RimOilField* oilField = oilFields[oilFieldIdx]; if (!oilField) continue; - RimAnalysisModels* analysisModels = oilField->analysisModels(); + RimEclipseCaseCollection* analysisModels = oilField->analysisModels(); if (analysisModels ) { for (size_t caseIdx = 0; caseIdx < analysisModels->cases.size(); caseIdx++) diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp index 1872b2e740..e78b135f76 100644 --- a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp +++ b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp @@ -239,7 +239,7 @@ void RimUiTreeModelPdm::deleteReservoir(RimEclipseCase* reservoir) { RimProject* proj = RiaApplication::instance()->project(); RimOilField* activeOilField = proj ? proj->activeOilField() : NULL; - RimAnalysisModels* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL; if (analysisModels) analysisModels->removeCaseFromAllGroups(reservoir); } } @@ -257,7 +257,7 @@ void RimUiTreeModelPdm::deleteReservoir(RimEclipseCase* reservoir) } RimOilField* activeOilField = proj ? proj->activeOilField() : NULL; - RimAnalysisModels* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL; if (analysisModels) analysisModels->removeCaseFromAllGroups(reservoir); } @@ -604,7 +604,7 @@ RimIdenticalGridCaseGroup* RimUiTreeModelPdm::addCaseGroup(QModelIndex& inserted RimProject* proj = RiaApplication::instance()->project(); CVF_ASSERT(proj); - RimAnalysisModels* analysisModels = proj->activeOilField() ? proj->activeOilField()->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = proj->activeOilField() ? proj->activeOilField()->analysisModels() : NULL; if (analysisModels) { @@ -714,7 +714,7 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, const caf::PdmO } RimOilField* activeOilField = proj ? proj->activeOilField() : NULL; - RimAnalysisModels* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL; if (analysisModels) analysisModels->insertCaseInCaseGroup(gridCaseGroup, rimResultReservoir); caf::PdmDocument::updateUiIconStateRecursively(rimResultReservoir); diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp index c917531364..8c883dff52 100644 --- a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp +++ b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp @@ -256,7 +256,7 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event) RiuMainWindow* ruiMainWindow = RiuMainWindow::instance(); ruiMainWindow->appendActionsContextMenuForPdmObject(uiItem->dataObject().p(), &menu); } - else if (dynamic_cast(uiItem->dataObject().p())) + else if (dynamic_cast(uiItem->dataObject().p())) { RiuMainWindow* ruiMainWindow = RiuMainWindow::instance(); ruiMainWindow->appendActionsContextMenuForPdmObject(uiItem->dataObject().p(), &menu); diff --git a/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp b/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp index b345a24af4..52c52ba4dc 100644 --- a/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp @@ -174,7 +174,7 @@ public: virtual bool interpretCommand(RiaSocketServer* server, const QList& args, QDataStream& socketStream) { RimProject* proj = RiaApplication::instance()->project(); - RimAnalysisModels* analysisModels = (proj && proj->activeOilField()) ? proj->activeOilField()->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = (proj && proj->activeOilField()) ? proj->activeOilField()->analysisModels() : NULL; if (analysisModels) { std::vector groupNames; @@ -239,7 +239,7 @@ public: } RimProject* proj = RiaApplication::instance()->project(); - RimAnalysisModels* analysisModels = (proj && proj->activeOilField()) ? proj->activeOilField()->analysisModels() : NULL; + RimEclipseCaseCollection* analysisModels = (proj && proj->activeOilField()) ? proj->activeOilField()->analysisModels() : NULL; if (analysisModels) { diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index 4555eada41..954e3f088d 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -2107,7 +2107,7 @@ void RiuMainWindow::appendActionsContextMenuForPdmObject(caf::PdmObject* pdmObje menu->addAction(m_importWellPathsFromFileAction); menu->addAction(m_importWellPathsFromSSIHubAction); } - else if (dynamic_cast(pdmObject)) + else if (dynamic_cast(pdmObject)) { menu->addAction(m_importEclipseCaseAction); menu->addAction(m_importInputEclipseFileAction);