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

Several minor refactoring and cleanup

Browse Source
This commit is contained in:
Magne Sjaastad 2015-09-23 12:50:06 +02:00
parent 9a840b9243
commit af75f513f9
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@ -448,13 +448,14 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
updateScaleTransform(); updateScaleTransform();
createDisplayModelAndRedraw(); createDisplayModelAndRedraw();
m_viewer->update();
RimViewLinker* viewLinker = RimViewLinker::viewLinkerForMainOrControlledView(this); RimViewLinker* viewLinker = RimViewLinker::viewLinkerForMainOrControlledView(this);
if (viewLinker) if (viewLinker)
{ {
viewLinker->updateScaleZ(this, scaleZ); viewLinker->updateScaleZ(this, scaleZ);
viewLinker->updateCamera(this);
} }
m_viewer->navigationPolicyUpdate();
} }
RiuMainWindow::instance()->updateScaleValue(); RiuMainWindow::instance()->updateScaleValue();

15
ApplicationCode/ProjectDataModel/RimViewLink.cpp
View File

@ -464,11 +464,7 @@ void RimViewLink::doSyncCamera()
RimViewLinker* viewLinker = NULL; RimViewLinker* viewLinker = NULL;
this->firstAnchestorOrThisOfType(viewLinker); this->firstAnchestorOrThisOfType(viewLinker);
viewLinker->updateScaleZ(viewLinker->mainView(), viewLinker->mainView()->scaleZ()); viewLinker->updateScaleZ(viewLinker->mainView(), viewLinker->mainView()->scaleZ());
viewLinker->updateCamera(viewLinker->mainView());
if (m_managedView && m_managedView->viewer())
{
m_managedView->viewer()->navigationPolicyUpdate();
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -493,13 +489,8 @@ void RimViewLink::doSyncTimeStep()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimViewLink::doSyncCellResult() void RimViewLink::doSyncCellResult()
{ {
RimViewLinkerCollection* viewLinkerColl = NULL; RimViewLinker* viewLinker = ownerViewLinker();
this->firstAnchestorOrThisOfType(viewLinkerColl); viewLinker->updateCellResult();
if (!viewLinkerColl->isActive()) return;
RimViewLinker* linkedViews = NULL;
this->firstAnchestorOrThisOfType(linkedViews);
linkedViews->updateCellResult();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@ -483,7 +483,7 @@ void RiuViewer::updateNavigationPolicy()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuViewer::navigationPolicyUpdate() void RiuViewer::navigationPolicyUpdate()
{ {
update(); caf::Viewer::navigationPolicyUpdate();
if (m_reservoirView) if (m_reservoirView)
{ {