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

(#395) Make sure the update() virtual function is called from camera related functions

Browse Source
This commit is contained in:
Magne Sjaastad
2015-08-31 12:31:38 +02:00
parent 854c47500b
commit 444500f6cc
12 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -496,7 +496,10 @@ void RiuViewer::updateNavigationPolicy()
}
//--------------------------------------------------------------------------------------------------
///
/// Only camera related operations are supposed to call this function. Especially navigation policies
/// will call this function
///
/// All other updates should be redirected to caf::OpenGLWidget::update()
//--------------------------------------------------------------------------------------------------
void RiuViewer::update()
{
@@ -504,6 +507,8 @@ void RiuViewer::update()
if (m_reservoirView)
{
viewsToUpdate.push_back(m_reservoirView);
RimView* rimView = m_reservoirView;
std::vector<caf::PdmObjectHandle*> objects;
@@ -512,14 +517,21 @@ void RiuViewer::update()
while (objects.size() > 0)
{
RimManagedViewConfig* viewConfig = dynamic_cast<RimManagedViewConfig*>(objects[0]);
viewConfig->firstAnchestorOrThisOfType(rimView);
objects.clear();
rimView->objectsWithReferringPtrFields(objects);
if (viewConfig->syncCamera())
{
viewConfig->firstAnchestorOrThisOfType(rimView);
rimView->objectsWithReferringPtrFields(objects);
}
}
viewsToUpdate.push_back(rimView);
rimView->managedViewCollection()->allManagedViews(viewsToUpdate);
if (rimView != m_reservoirView)
{
viewsToUpdate.push_back(rimView);
}
rimView->managedViewCollection()->allViewsForCameraSync(viewsToUpdate);
}
// Propagate view matrix to all relevant views