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

Rename of RimReservoirView to RimEclipseView

Browse Source 
To make the separation to geomech clearer, and alligning it to the
RigCaseNaming
This commit is contained in:
Jacob Støren
2015-05-21 10:05:33 +02:00
parent caa835331f
commit ed74116376
52 changed files with 154 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@@ -368,7 +368,7 @@ RimView* RimUiTreeModelPdm::addReservoirView(const std::vector<caf::PdmUiItem*>&
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>(currentItem);
RimGeoMechCase* geomCase = dynamic_cast<RimGeoMechCase*>(currentItem);
RimGeoMechView* geoMechView = dynamic_cast<RimGeoMechView*>(currentItem);
RimReservoirView* reservoirView = dynamic_cast<RimReservoirView*>(currentItem);
RimEclipseView* reservoirView = dynamic_cast<RimEclipseView*>(currentItem);
// Find case to insert into
@@ -682,14 +682,14 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, const caf::PdmO
for (size_t rvIdx = 0; rvIdx < rimResultReservoir->reservoirViews.size(); rvIdx++)
{
RimReservoirView* riv = rimResultReservoir->reservoirViews()[rvIdx];
RimEclipseView* riv = rimResultReservoir->reservoirViews()[rvIdx];
riv->loadDataAndUpdate();
}
}
}
else if (caseFromItemIndex(itemIndex))
{
std::vector<caf::PdmPointer<RimReservoirView> > typedObjects;
std::vector<caf::PdmPointer<RimEclipseView> > typedObjects;
pdmObjects.createCopyByType(&typedObjects);
if (typedObjects.size() == 0)
@@ -704,7 +704,7 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, const caf::PdmO
// Add cases to case group
for (size_t i = 0; i < typedObjects.size(); i++)
{
RimReservoirView* rimReservoirView = typedObjects[i];
RimEclipseView* rimReservoirView = typedObjects[i];
QString nameOfCopy = QString("Copy of ") + rimReservoirView->name;
rimReservoirView->name = nameOfCopy;
rimCase->reservoirViews().push_back(rimReservoirView);
@@ -962,9 +962,9 @@ RimEclipseCase* RimUiTreeModelPdm::caseFromItemIndex(const QModelIndex& itemInde
{
rimCase = dynamic_cast<RimEclipseCase*>(currentItem->dataObject().p());
}
else if (dynamic_cast<RimReservoirView*>(currentItem->dataObject().p()))
else if (dynamic_cast<RimEclipseView*>(currentItem->dataObject().p()))
{
RimReservoirView* reservoirView = dynamic_cast<RimReservoirView*>(currentItem->dataObject().p());
RimEclipseView* reservoirView = dynamic_cast<RimEclipseView*>(currentItem->dataObject().p());
CVF_ASSERT(reservoirView);
rimCase = reservoirView->eclipseCase();
@@ -980,7 +980,7 @@ void RimUiTreeModelPdm::setObjectToggleStateForSelection(QModelIndexList selecte
{
bool toggleOn = (state == Qt::Checked);
std::set<RimReservoirView*> resViewsToUpdate;
std::set<RimEclipseView*> resViewsToUpdate;
foreach (QModelIndex index, selectedIndexes)
{