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

Janitor : Remove confusing concept hasUserRequestedAnimation

Browse Source
This commit is contained in:
Magne Sjaastad
2021-10-05 11:07:50 +02:00
parent 4c01472fc1
commit f9c2bb4349
14 changed files with 19 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.cpp
View File

@@ -411,12 +411,6 @@ void RimGeoMechResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch
m_compactionRefLayer = m_compactionRefLayerUiField();
}
if ( m_geomCase->geoMechData() &&
m_geomCase->geoMechData()->femPartResults()->assertResultsLoaded( this->resultAddress() ) )
{
if ( view ) view->hasUserRequestedAnimation = true;
}
if ( propFilter )
{
propFilter->setToDefaultValues();

10
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp
View File

@@ -168,11 +168,8 @@ void RimGeoMechView::onLoadDataAndUpdate()
progress.setProgressDescription( "Reading Current Result" );
CVF_ASSERT( this->cellResult() != nullptr );
if ( this->hasUserRequestedAnimation() )
{
m_geomechCase->geoMechData()->femPartResults()->setNormalizationAirGap( this->cellResult()->normalizationAirGap() );
m_geomechCase->geoMechData()->femPartResults()->assertResultsLoaded( this->cellResult()->resultAddress() );
}
m_geomechCase->geoMechData()->femPartResults()->setNormalizationAirGap( this->cellResult()->normalizationAirGap() );
m_geomechCase->geoMechData()->femPartResults()->assertResultsLoaded( this->cellResult()->resultAddress() );
progress.incrementProgress();
progress.setProgressDescription( "Create Display model" );
@@ -778,8 +775,7 @@ size_t RimGeoMechView::onTimeStepCountRequested()
//--------------------------------------------------------------------------------------------------
bool RimGeoMechView::isTimeStepDependentDataVisible() const
{
if ( this->hasUserRequestedAnimation() &&
( this->cellResult()->hasResult() || this->geoMechPropertyFilterCollection()->hasActiveFilters() ) )
if ( this->cellResult()->hasResult() || this->geoMechPropertyFilterCollection()->hasActiveFilters() )
{
return true;
}