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

caf::Viewer: Add inComparisonView option to isAnimationActive

Browse Source 
#4994 preparations
This commit is contained in:
Jacob Støren 2019-11-08 10:38:45 +01:00
parent 0f6a4c0934
commit c27c19ce96
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Fwk/AppFwk/cafViewer/cafViewer.cpp
View File

@ -980,21 +980,40 @@ void caf::Viewer::removeAllFrames(bool isForComparisonView)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool caf::Viewer::isAnimationActive() bool caf::Viewer::isAnimationActive(bool isForComparisonView)
{ {
cvf::Scene* currentScene = m_mainRendering->scene(); if ( !isForComparisonView )
if (!currentScene)
{ {
return false; cvf::Scene* currentScene = m_mainRendering->scene();
}
if (m_mainScene.notNull() && m_mainScene.p() == currentScene) if ( !currentScene )
{
return false;
}
if ( m_mainScene.notNull() && m_mainScene.p() == currentScene )
{
return false;
}
return true;
}
else
{ {
return false; cvf::Scene* currentScene = m_comparisonMainRendering->scene();
}
return true; if ( !currentScene )
{
return false;
}
if ( m_comparisonMainScene.notNull() && m_comparisonMainScene.p() == currentScene )
{
return false;
}
return true;
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
Fwk/AppFwk/cafViewer/cafViewer.h
View File

@ -124,7 +124,7 @@ public:
// As of yet: Only updates bounding boxes. Other things might be added later. // As of yet: Only updates bounding boxes. Other things might be added later.
void updateCachedValuesInScene(); void updateCachedValuesInScene();
bool isAnimationActive(); bool isAnimationActive(bool isForComparisonView = false);
caf::FrameAnimationControl* caf::FrameAnimationControl*
animationControl() { return m_animationControl;} animationControl() { return m_animationControl;}
void setReleaseOGLResourcesEachFrame(bool releaseOGLResourcesEachFrame) { m_releaseOGLResourcesEachFrame = releaseOGLResourcesEachFrame; } void setReleaseOGLResourcesEachFrame(bool releaseOGLResourcesEachFrame) { m_releaseOGLResourcesEachFrame = releaseOGLResourcesEachFrame; }