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

Use odb "Steps" as animation steps

Browse Source 
Issue #293
This is only tested with one step yet.
This commit is contained in:
Jacob Støren
2015-06-01 07:51:11 +02:00
parent ca6d9d364d
commit 96329793f3
10 changed files with 72 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -137,7 +137,7 @@ void RimGeoMechView::loadDataAndUpdate()
progress.setProgressDescription("Reading Current Result");
CVF_ASSERT(this->cellResult() != NULL);
m_geomechCase->geoMechData()->assertResultsLoaded(0, this->cellResult()->resultAddress());
m_geomechCase->geoMechData()->assertResultsLoaded(this->cellResult()->resultAddress());
progress.incrementProgress();
progress.setProgressDescription("Create Display model");
@@ -200,7 +200,7 @@ void RimGeoMechView::createDisplayModel()
if (isTimeStepDependentDataVisible())
{
int i;
for (i = 0; i < geoMechCase()->geoMechData()->frameCount(0, cellResult()->resultAddress()); i++)
for (i = 0; i < geoMechCase()->geoMechData()->frameCount(); ++i)
{
timeStepIndices.push_back(i);
}
@@ -380,11 +380,11 @@ void RimGeoMechView::updateLegends()
RigFemResultAddress resVarAddress = cellResult->resultAddress();
if (resVarAddress.fieldName != "")
{
gmCase->minMaxScalarValues(resVarAddress, 0, m_currentTimeStep, &localMin, &localMax);
gmCase->posNegClosestToZero(resVarAddress, 0, m_currentTimeStep, &localPosClosestToZero, &localNegClosestToZero);
gmCase->minMaxScalarValues(resVarAddress, m_currentTimeStep, &localMin, &localMax);
gmCase->posNegClosestToZero(resVarAddress, m_currentTimeStep, &localPosClosestToZero, &localNegClosestToZero);
gmCase->minMaxScalarValues(resVarAddress, 0, &globalMin, &globalMax);
gmCase->posNegClosestToZero(resVarAddress, 0, &globalPosClosestToZero, &globalNegClosestToZero);
gmCase->minMaxScalarValues(resVarAddress, &globalMin, &globalMax);
gmCase->posNegClosestToZero(resVarAddress, &globalPosClosestToZero, &globalNegClosestToZero);
cellResult->legendConfig->setClosestToZeroValues(globalPosClosestToZero, globalNegClosestToZero, localPosClosestToZero, localNegClosestToZero);
@@ -421,7 +421,7 @@ void RimGeoMechView::clampCurrentTimestep()
int maxFrameCount = 0;
if (m_geomechCase){
maxFrameCount = m_geomechCase->geoMechData()->frameCount(0, cellResult()->resultAddress());
maxFrameCount = m_geomechCase->geoMechData()->frameCount();
}
if (m_currentTimeStep >= maxFrameCount ) m_currentTimeStep = maxFrameCount -1;