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

Renamed class RimAnalysisModels to RimEclipseCaseCollection

Browse Source
This commit is contained in:
Pål Hagen 2015-06-25 12:11:06 +02:00
parent f6ab965ea1
commit ca7428ca4a
11 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Application/RiaApplication.cpp
View File

@ -318,7 +318,7 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
for (size_t oilFieldIdx = 0; oilFieldIdx < m_project->oilFields().size(); oilFieldIdx++) for (size_t oilFieldIdx = 0; oilFieldIdx < m_project->oilFields().size(); oilFieldIdx++)
{ {
RimOilField* oilField = m_project->oilFields[oilFieldIdx]; RimOilField* oilField = m_project->oilFields[oilFieldIdx];
RimAnalysisModels* analysisModels = oilField ? oilField->analysisModels() : NULL; RimEclipseCaseCollection* analysisModels = oilField ? oilField->analysisModels() : NULL;
if (analysisModels == NULL) continue; if (analysisModels == NULL) continue;
for (size_t cgIdx = 0; cgIdx < analysisModels->caseGroups.size(); ++cgIdx) 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++) for (size_t oilFieldIdx = 0; oilFieldIdx < m_project->oilFields().size(); oilFieldIdx++)
{ {
RimOilField* oilField = m_project->oilFields[oilFieldIdx]; RimOilField* oilField = m_project->oilFields[oilFieldIdx];
RimAnalysisModels* analysisModels = oilField ? oilField->analysisModels() : NULL; RimEclipseCaseCollection* analysisModels = oilField ? oilField->analysisModels() : NULL;
if (analysisModels) if (analysisModels)
{ {
analysisModels->recomputeStatisticsForAllCaseGroups(); analysisModels->recomputeStatisticsForAllCaseGroups();
@ -637,7 +637,7 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase(); RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase();
rimResultReservoir->setCaseInfo(caseName, caseFileName); 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; if (analysisModels == NULL) return false;
analysisModels->cases.push_back(rimResultReservoir); analysisModels->cases.push_back(rimResultReservoir);
@ -680,7 +680,7 @@ bool RiaApplication::openInputEclipseCaseFromFileNames(const QStringList& fileNa
rimInputReservoir->openDataFileSet(fileNames); 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; if (analysisModels == NULL) return false;
analysisModels->cases.push_back(rimInputReservoir); analysisModels->cases.push_back(rimInputReservoir);

2
ApplicationCode/Application/RiaProjectModifier.cpp
View File

@ -145,7 +145,7 @@ bool RiaProjectModifier::replaceSourceCases(RimProject* project)
for (size_t oilFieldIdx = 0; oilFieldIdx < project->oilFields().size(); oilFieldIdx++) for (size_t oilFieldIdx = 0; oilFieldIdx < project->oilFields().size(); oilFieldIdx++)
{ {
RimOilField* oilField = project->oilFields[oilFieldIdx]; RimOilField* oilField = project->oilFields[oilFieldIdx];
RimAnalysisModels* analysisModels = oilField ? oilField->analysisModels() : NULL; RimEclipseCaseCollection* analysisModels = oilField ? oilField->analysisModels() : NULL;
if (analysisModels) if (analysisModels)
{ {
const size_t numCaseGroups = analysisModels->caseGroups.size(); const size_t numCaseGroups = analysisModels->caseGroups.size();

20
ApplicationCode/ProjectDataModel/RimAnalysisModels.cpp
View File

@ -30,11 +30,11 @@
#include "RimStatisticsCase.h" #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", "", ""); CAF_PDM_InitObject("Grid Models", ":/Cases16x16.png", "", "");
@ -47,7 +47,7 @@ RimAnalysisModels::RimAnalysisModels(void)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimAnalysisModels::~RimAnalysisModels(void) RimEclipseCaseCollection::~RimEclipseCaseCollection(void)
{ {
close(); close();
} }
@ -55,7 +55,7 @@ RimAnalysisModels::~RimAnalysisModels(void)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimAnalysisModels::close() void RimEclipseCaseCollection::close()
{ {
m_gridCollection->clear(); m_gridCollection->clear();
@ -66,7 +66,7 @@ void RimAnalysisModels::close()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimIdenticalGridCaseGroup* RimAnalysisModels::createIdenticalCaseGroupFromMainCase(RimEclipseCase* mainCase) RimIdenticalGridCaseGroup* RimEclipseCaseCollection::createIdenticalCaseGroupFromMainCase(RimEclipseCase* mainCase)
{ {
CVF_ASSERT(mainCase); CVF_ASSERT(mainCase);
@ -90,7 +90,7 @@ RimIdenticalGridCaseGroup* RimAnalysisModels::createIdenticalCaseGroupFromMainCa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimAnalysisModels::moveEclipseCaseIntoCaseGroup(RimEclipseCase* rimReservoir) void RimEclipseCaseCollection::moveEclipseCaseIntoCaseGroup(RimEclipseCase* rimReservoir)
{ {
CVF_ASSERT(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()); 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); 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); CVF_ASSERT(rimReservoir);
@ -191,7 +191,7 @@ void RimAnalysisModels::insertCaseInCaseGroup(RimIdenticalGridCaseGroup* caseGro
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimAnalysisModels::recomputeStatisticsForAllCaseGroups() void RimEclipseCaseCollection::recomputeStatisticsForAllCaseGroups()
{ {
const size_t numCaseGroups = caseGroups.size(); const size_t numCaseGroups = caseGroups.size();
for (size_t caseGrpIdx = 0; caseGrpIdx < numCaseGroups; ++caseGrpIdx) for (size_t caseGrpIdx = 0; caseGrpIdx < numCaseGroups; ++caseGrpIdx)

6
ApplicationCode/ProjectDataModel/RimAnalysisModels.h
View File

@ -37,13 +37,13 @@ class RimWellPathCollection;
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimAnalysisModels : public caf::PdmObject class RimEclipseCaseCollection : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimAnalysisModels(void); RimEclipseCaseCollection(void);
virtual ~RimAnalysisModels(void); virtual ~RimEclipseCaseCollection(void);
caf::PdmPointersField<RimEclipseCase*> cases; caf::PdmPointersField<RimEclipseCase*> cases;
caf::PdmPointersField<RimIdenticalGridCaseGroup*> caseGroups; caf::PdmPointersField<RimIdenticalGridCaseGroup*> caseGroups;

2
ApplicationCode/ProjectDataModel/RimOilField.cpp
View File

@ -36,7 +36,7 @@ RimOilField::RimOilField(void)
CAF_PDM_InitFieldNoDefault(&geoMechModels, "GeoMechModels", "Geo Mech Models", ":/GridModels.png", "", ""); CAF_PDM_InitFieldNoDefault(&geoMechModels, "GeoMechModels", "Geo Mech Models", ":/GridModels.png", "", "");
CAF_PDM_InitFieldNoDefault(&wellPathCollection, "WellPathCollection", "Well Paths", ":/WellCollection.png", "", ""); CAF_PDM_InitFieldNoDefault(&wellPathCollection, "WellPathCollection", "Well Paths", ":/WellCollection.png", "", "");
analysisModels = new RimAnalysisModels(); analysisModels = new RimEclipseCaseCollection();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimOilField.h
View File

@ -25,7 +25,7 @@
#include "cafPdmPointer.h" #include "cafPdmPointer.h"
class RimWellPathCollection; class RimWellPathCollection;
class RimAnalysisModels; class RimEclipseCaseCollection;
class RimGeoMechModels; class RimGeoMechModels;
//================================================================================================== //==================================================================================================
@ -40,7 +40,7 @@ public:
RimOilField(void); RimOilField(void);
virtual ~RimOilField(void); virtual ~RimOilField(void);
caf::PdmField<RimAnalysisModels*> analysisModels; caf::PdmField<RimEclipseCaseCollection*> analysisModels;
caf::PdmField<RimGeoMechModels*> geoMechModels; caf::PdmField<RimGeoMechModels*> geoMechModels;
caf::PdmField<RimWellPathCollection*> wellPathCollection; caf::PdmField<RimWellPathCollection*> wellPathCollection;
}; };

6
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -166,7 +166,7 @@ void RimProject::initScriptDirectories()
} }
// Find largest used groupId read from file and make sure all groups have a valid groupId // 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) if (analysisModels)
{ {
int largestGroupId = -1; int largestGroupId = -1;
@ -215,7 +215,7 @@ void RimProject::initAfterRead()
// Handle old project files with obsolete structure. // Handle old project files with obsolete structure.
// Move caseGroupsObsolete and casesObsolete to oilFields()[idx]->analysisModels() // Move caseGroupsObsolete and casesObsolete to oilFields()[idx]->analysisModels()
RimAnalysisModels* analysisModels = activeOilField() ? activeOilField()->analysisModels() : NULL; RimEclipseCaseCollection* analysisModels = activeOilField() ? activeOilField()->analysisModels() : NULL;
bool movedOneRimIdenticalGridCaseGroup = false; bool movedOneRimIdenticalGridCaseGroup = false;
for (size_t cgIdx = 0; cgIdx < caseGroupsObsolete.size(); ++cgIdx) for (size_t cgIdx = 0; cgIdx < caseGroupsObsolete.size(); ++cgIdx)
{ {
@ -380,7 +380,7 @@ void RimProject::allCases(std::vector<RimCase*>& cases)
RimOilField* oilField = oilFields[oilFieldIdx]; RimOilField* oilField = oilFields[oilFieldIdx];
if (!oilField) continue; if (!oilField) continue;
RimAnalysisModels* analysisModels = oilField->analysisModels(); RimEclipseCaseCollection* analysisModels = oilField->analysisModels();
if (analysisModels ) if (analysisModels )
{ {
for (size_t caseIdx = 0; caseIdx < analysisModels->cases.size(); caseIdx++) for (size_t caseIdx = 0; caseIdx < analysisModels->cases.size(); caseIdx++)

8
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@ -239,7 +239,7 @@ void RimUiTreeModelPdm::deleteReservoir(RimEclipseCase* reservoir)
{ {
RimProject* proj = RiaApplication::instance()->project(); RimProject* proj = RiaApplication::instance()->project();
RimOilField* activeOilField = proj ? proj->activeOilField() : NULL; RimOilField* activeOilField = proj ? proj->activeOilField() : NULL;
RimAnalysisModels* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL; RimEclipseCaseCollection* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL;
if (analysisModels) analysisModels->removeCaseFromAllGroups(reservoir); if (analysisModels) analysisModels->removeCaseFromAllGroups(reservoir);
} }
} }
@ -257,7 +257,7 @@ void RimUiTreeModelPdm::deleteReservoir(RimEclipseCase* reservoir)
} }
RimOilField* activeOilField = proj ? proj->activeOilField() : NULL; RimOilField* activeOilField = proj ? proj->activeOilField() : NULL;
RimAnalysisModels* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL; RimEclipseCaseCollection* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL;
if (analysisModels) analysisModels->removeCaseFromAllGroups(reservoir); if (analysisModels) analysisModels->removeCaseFromAllGroups(reservoir);
} }
@ -604,7 +604,7 @@ RimIdenticalGridCaseGroup* RimUiTreeModelPdm::addCaseGroup(QModelIndex& inserted
RimProject* proj = RiaApplication::instance()->project(); RimProject* proj = RiaApplication::instance()->project();
CVF_ASSERT(proj); CVF_ASSERT(proj);
RimAnalysisModels* analysisModels = proj->activeOilField() ? proj->activeOilField()->analysisModels() : NULL; RimEclipseCaseCollection* analysisModels = proj->activeOilField() ? proj->activeOilField()->analysisModels() : NULL;
if (analysisModels) if (analysisModels)
{ {
@ -714,7 +714,7 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, const caf::PdmO
} }
RimOilField* activeOilField = proj ? proj->activeOilField() : NULL; RimOilField* activeOilField = proj ? proj->activeOilField() : NULL;
RimAnalysisModels* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL; RimEclipseCaseCollection* analysisModels = (activeOilField) ? activeOilField->analysisModels() : NULL;
if (analysisModels) analysisModels->insertCaseInCaseGroup(gridCaseGroup, rimResultReservoir); if (analysisModels) analysisModels->insertCaseInCaseGroup(gridCaseGroup, rimResultReservoir);
caf::PdmDocument::updateUiIconStateRecursively(rimResultReservoir); caf::PdmDocument::updateUiIconStateRecursively(rimResultReservoir);

2
ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
View File

@ -256,7 +256,7 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event)
RiuMainWindow* ruiMainWindow = RiuMainWindow::instance(); RiuMainWindow* ruiMainWindow = RiuMainWindow::instance();
ruiMainWindow->appendActionsContextMenuForPdmObject(uiItem->dataObject().p(), &menu); ruiMainWindow->appendActionsContextMenuForPdmObject(uiItem->dataObject().p(), &menu);
} }
else if (dynamic_cast<RimAnalysisModels*>(uiItem->dataObject().p())) else if (dynamic_cast<RimEclipseCaseCollection*>(uiItem->dataObject().p()))
{ {
RiuMainWindow* ruiMainWindow = RiuMainWindow::instance(); RiuMainWindow* ruiMainWindow = RiuMainWindow::instance();
ruiMainWindow->appendActionsContextMenuForPdmObject(uiItem->dataObject().p(), &menu); ruiMainWindow->appendActionsContextMenuForPdmObject(uiItem->dataObject().p(), &menu);

4
ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp
View File

@ -174,7 +174,7 @@ public:
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
{ {
RimProject* proj = RiaApplication::instance()->project(); 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) if (analysisModels)
{ {
std::vector<QString> groupNames; std::vector<QString> groupNames;
@ -239,7 +239,7 @@ public:
} }
RimProject* proj = RiaApplication::instance()->project(); 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) if (analysisModels)
{ {

2
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -2107,7 +2107,7 @@ void RiuMainWindow::appendActionsContextMenuForPdmObject(caf::PdmObject* pdmObje
menu->addAction(m_importWellPathsFromFileAction); menu->addAction(m_importWellPathsFromFileAction);
menu->addAction(m_importWellPathsFromSSIHubAction); menu->addAction(m_importWellPathsFromSSIHubAction);
} }
else if (dynamic_cast<RimAnalysisModels*>(pdmObject)) else if (dynamic_cast<RimEclipseCaseCollection*>(pdmObject))
{ {
menu->addAction(m_importEclipseCaseAction); menu->addAction(m_importEclipseCaseAction);
menu->addAction(m_importInputEclipseFileAction); menu->addAction(m_importInputEclipseFileAction);