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

#2793 RegTest, Fault visibility : Add translation code for older project files

Browse Source
This commit is contained in:
Magne Sjaastad 2018-04-24 12:56:28 +02:00
parent 9ac3d806e2
commit b6aa35bf11
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -857,7 +857,7 @@ void RimEclipseView::onLoadDataAndUpdate()
//--------------------------------------------------------------------------------------------------
void RimEclipseView::initAfterRead()
{
RimViewWindow::initAfterRead();
RimGridView::initAfterRead();
this->faultResultSettings()->setReservoirView(this);
this->cellResult()->setReservoirView(this);

2
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@ -582,7 +582,7 @@ void RimGeoMechView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
//--------------------------------------------------------------------------------------------------
void RimGeoMechView::initAfterRead()
{
RimViewWindow::initAfterRead();
RimGridView::initAfterRead();
this->cellResult()->setGeoMechCase(m_geomechCase);
this->updateUiIconFromToggleField();

21
ApplicationCode/ProjectDataModel/RimGridView.cpp
View File

@ -268,6 +268,27 @@ Rim3dOverlayInfoConfig* RimGridView::overlayInfoConfig() const
return m_overlayInfoConfig;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridView::initAfterRead()
{
RimViewWindow::initAfterRead();
RimProject* proj = nullptr;
firstAncestorOrThisOfType(proj);
if (proj && proj->isProjectFileVersionEqualOrOlderThan("2018.1.1"))
{
// For version prior to 2018.1.1 : Grid visualization mode was derived from surfaceMode and meshMode
// Current : Grid visualization mode is directly defined by m_gridCollection->isActive
// This change was introduced in https://github.com/OPM/ResInsight/commit/f7bfe8d0
bool isGridVisualizationModeBefore_2018_1_1 = ((surfaceMode() == RimGridView::SURFACE) || (meshMode() == RimGridView::FULL_MESH));
m_gridCollection->isActive = isGridVisualizationModeBefore_2018_1_1;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimGridView.h
View File

@ -59,7 +59,7 @@ public:
virtual bool isGridVisualizationMode() const override;
protected:
virtual void initAfterRead() override;
virtual void onTimeStepChanged() override;
virtual void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) = 0;
virtual void selectOverlayInfoConfig() override;