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

Fixed zoom all bounding box issue related to 1209c908e5

Browse Source 
Used explicit mainRendering instead of renderSequence->firstRendering()
This commit is contained in:
Jacob Støren 2016-09-07 15:53:33 +02:00
parent 45f56b9fab
commit 78b29fc3a0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@ -271,7 +271,7 @@ void RiuViewer::mouseReleaseEvent(QMouseEvent* event)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuViewer::slotEndAnimation() void RiuViewer::slotEndAnimation()
{ {
cvf::Rendering* firstRendering = m_renderingSequence->firstRendering(); cvf::Rendering* firstRendering = m_mainRendering.p();
CVF_ASSERT(firstRendering); CVF_ASSERT(firstRendering);
if (m_rimView) m_rimView->endAnimation(); if (m_rimView) m_rimView->endAnimation();
@ -486,7 +486,7 @@ void RiuViewer::removeAllColorLegends()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuViewer::addColorLegendToBottomLeftCorner(cvf::OverlayItem* legend) void RiuViewer::addColorLegendToBottomLeftCorner(cvf::OverlayItem* legend)
{ {
cvf::Rendering* firstRendering = m_renderingSequence->firstRendering(); cvf::Rendering* firstRendering = m_mainRendering.p();
CVF_ASSERT(firstRendering); CVF_ASSERT(firstRendering);
if (legend) if (legend)
@ -551,7 +551,7 @@ void RiuViewer::navigationPolicyUpdate()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuViewer::setCurrentFrame(int frameIndex) void RiuViewer::setCurrentFrame(int frameIndex)
{ {
cvf::Rendering* firstRendering = m_renderingSequence->firstRendering(); cvf::Rendering* firstRendering = m_mainRendering.p();
CVF_ASSERT(firstRendering); CVF_ASSERT(firstRendering);
if (m_rimView) m_rimView->setCurrentTimeStep(frameIndex); if (m_rimView) m_rimView->setCurrentTimeStep(frameIndex);

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

@ -292,7 +292,7 @@ cvf::Scene* caf::Viewer::mainScene()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::Scene* caf::Viewer::currentScene() cvf::Scene* caf::Viewer::currentScene()
{ {
return m_renderingSequence->firstRendering()->scene(); return m_mainRendering->scene();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -647,7 +647,7 @@ void caf::Viewer::setView(const cvf::Vec3d& alongDirection, const cvf::Vec3d& up
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void caf::Viewer::zoomAll() void caf::Viewer::zoomAll()
{ {
cvf::BoundingBox bb = m_renderingSequence->boundingBox(); cvf::BoundingBox bb = m_mainRendering->boundingBox();
if (!bb.isValid()) if (!bb.isValid())
{ {
return; return;
@ -682,7 +682,7 @@ void caf::Viewer::removeAllFrames()
{ {
m_frameScenes.clear(); m_frameScenes.clear();
m_animationControl->setNumFrames(0); m_animationControl->setNumFrames(0);
m_renderingSequence->firstRendering()->setScene(m_mainScene.p()); m_mainRendering->setScene(m_mainScene.p());
} }
@ -691,7 +691,7 @@ void caf::Viewer::removeAllFrames()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool caf::Viewer::isAnimationActive() bool caf::Viewer::isAnimationActive()
{ {
cvf::Scene* currentScene = m_renderingSequence->firstRendering()->scene(); cvf::Scene* currentScene = m_mainRendering->scene();
if (!currentScene) if (!currentScene)
{ {
@ -722,7 +722,7 @@ void caf::Viewer::slotSetCurrentFrame(int frameIndex)
releaseOGlResourcesForCurrentFrame(); releaseOGlResourcesForCurrentFrame();
} }
m_renderingSequence->firstRendering()->setScene(m_frameScenes.at(clampedFrameIndex)); m_mainRendering->setScene(m_frameScenes.at(clampedFrameIndex));
update(); update();
} }
@ -731,7 +731,7 @@ void caf::Viewer::releaseOGlResourcesForCurrentFrame()
{ {
if (isAnimationActive()) if (isAnimationActive())
{ {
cvf::Scene* currentScene = m_renderingSequence->firstRendering()->scene(); cvf::Scene* currentScene = m_mainRendering->scene();
makeCurrent(); makeCurrent();
cvf::uint modelCount = currentScene->modelCount(); cvf::uint modelCount = currentScene->modelCount();
for (cvf::uint i = 0; i < modelCount; ++i) for (cvf::uint i = 0; i < modelCount; ++i)
@ -759,7 +759,7 @@ void caf::Viewer::slotEndAnimation()
releaseOGlResourcesForCurrentFrame(); releaseOGlResourcesForCurrentFrame();
} }
m_renderingSequence->firstRendering()->setScene(m_mainScene.p()); m_mainRendering->setScene(m_mainScene.p());
update(); update();
} }