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

#3990 Rename

Browse Source
This commit is contained in:
Magne Sjaastad 2019-01-29 11:55:06 +01:00
parent c50d75a61f
commit 0a22515a3e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -453,11 +453,11 @@ void RimEclipseCase::updateFormationNamesData()
{
if (activeFormationNames())
{
rigEclipseCase->setActiveFormationNames(activeFormationNames()->formationNamesData());
rigEclipseCase->setActiveFormationNamesAndUpdatePlots(activeFormationNames()->formationNamesData());
}
else
{
rigEclipseCase->setActiveFormationNames(nullptr);
rigEclipseCase->setActiveFormationNamesAndUpdatePlots(nullptr);
}
std::vector<Rim3dView*> views = this->views();
for (Rim3dView* view : views)
@ -552,11 +552,11 @@ void RimEclipseCase::computeCachedData()
pInf.setProgressDescription("Calculating Formation Names Result");
if (activeFormationNames())
{
rigEclipseCase->setActiveFormationNames(activeFormationNames()->formationNamesData());
rigEclipseCase->setActiveFormationNamesAndUpdatePlots(activeFormationNames()->formationNamesData());
}
else
{
rigEclipseCase->setActiveFormationNames(nullptr);
rigEclipseCase->setActiveFormationNamesAndUpdatePlots(nullptr);
}
pInf.incrementProgress();
@ -1028,7 +1028,7 @@ void RimEclipseCase::setFormationNames(RimFormationNames* formationNames)
activeFormationNames = formationNames;
if (m_rigEclipseCase.notNull() && formationNames != nullptr)
{
m_rigEclipseCase->setActiveFormationNames(formationNames->formationNamesData());
m_rigEclipseCase->setActiveFormationNamesAndUpdatePlots(formationNames->formationNamesData());
}
}

2
ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp
View File

@ -673,7 +673,7 @@ void RigEclipseCaseData::computeActiveCellsGeometryBoundingBox()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigEclipseCaseData::setActiveFormationNames(RigFormationNames* activeFormationNames)
void RigEclipseCaseData::setActiveFormationNamesAndUpdatePlots(RigFormationNames* activeFormationNames)
{
m_matrixModelResults->setActiveFormationNames(activeFormationNames);

2
ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h
View File

@ -86,7 +86,7 @@ public:
bool hasFractureResults() const;
void setActiveFormationNames(RigFormationNames* activeFormationNames);
void setActiveFormationNamesAndUpdatePlots(RigFormationNames* activeFormationNames);
RigFormationNames* activeFormationNames();
void setSimWellData(const cvf::Collection<RigSimWellData>& data);