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

#5300 Formations : Move update of Rim-related structures to RimEclipseCase

Browse Source
This commit is contained in:
Magne Sjaastad 2020-01-06 15:27:16 +01:00
parent 7d05a8bd0a
commit ff2963293b
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -480,12 +480,25 @@ void RimEclipseCase::updateFormationNamesData()
{
if ( activeFormationNames() )
{
rigEclipseCase->setActiveFormationNamesAndUpdatePlots( activeFormationNames()->formationNamesData() );
rigEclipseCase->setActiveFormationNames( activeFormationNames()->formationNamesData() );
}
else
{
rigEclipseCase->setActiveFormationNamesAndUpdatePlots( nullptr );
rigEclipseCase->setActiveFormationNames( nullptr );
}
// Update plots based on formations
{
RimProject* project = RiaApplication::instance()->project();
if ( project )
{
if ( project->mainPlotCollection() )
{
project->mainPlotCollection->updatePlotsWithFormations();
}
}
}
std::vector<Rim3dView*> views = this->views();
for ( Rim3dView* view : views )
{

21
ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp
View File

@ -36,10 +36,6 @@
#include "RigVirtualPerforationTransmissibilities.h"
#include "RigWellPath.h"
#include "RimFlowPlotCollection.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include <QDebug>
//--------------------------------------------------------------------------------------------------
@ -707,23 +703,6 @@ void RigEclipseCaseData::setActiveFormationNames( RigFormationNames* activeForma
m_matrixModelResults->setActiveFormationNames( activeFormationNames );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigEclipseCaseData::setActiveFormationNamesAndUpdatePlots( RigFormationNames* activeFormationNames )
{
setActiveFormationNames( activeFormationNames );
RimProject* project = RiaApplication::instance()->project();
if ( project )
{
if ( project->mainPlotCollection() )
{
project->mainPlotCollection->updatePlotsWithFormations();
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h
View File

@ -90,7 +90,6 @@ public:
bool hasFractureResults() const;
void setActiveFormationNames( RigFormationNames* activeFormationNames );
void setActiveFormationNamesAndUpdatePlots( RigFormationNames* activeFormationNames );
const RigFormationNames* activeFormationNames() const;
const std::vector<QString> formationNames() const;
RigAllenDiagramData* allenDiagramData();