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

(#449) Minor fixes related to isActive

Browse Source
This commit is contained in:
Magne Sjaastad
2015-09-15 10:45:39 +02:00
parent 9aeb949b06
commit 08e266c2f3
6 changed files with 94 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@@ -447,8 +447,8 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
RimViewLinker* viewLinker = proj->findViewLinkerFromView(this);
if (viewLinker)
{
RimViewLink* linkedView = viewLinker->viewLinkFromView(this);
if (!linkedView || linkedView->syncCamera())
RimViewLink* viewLink = viewLinker->viewLinkFromView(this);
if (this == viewLinker->mainView() || (viewLink && viewLink->isActive() && viewLink->syncCamera()))
{
viewLinker->updateScaleZ(this, scaleZ);
}
@@ -485,7 +485,11 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
RimViewLinker* viewLinker = proj->findViewLinkerFromView(this);
if (viewLinker)
{
viewLinker->updateTimeStep(this, m_currentTimeStep);
RimViewLink* viewLink = viewLinker->viewLinkFromView(this);
if (this == viewLinker->mainView() || (viewLink && viewLink->isActive() && viewLink->syncTimeStep()))
{
viewLinker->updateTimeStep(this, m_currentTimeStep);
}
}
}
}
@@ -590,10 +594,9 @@ void RimView::notifyCameraHasChanged()
RimViewLinker* viewLinker = proj->findViewLinkerFromView(this);
if (viewLinker)
{
RimViewLink* linkedView = viewLinker->viewLinkFromView(this);
RimViewLink* viewLink = viewLinker->viewLinkFromView(this);
// There is no view config for a master view, but all views for sync must be updated
if (!linkedView || linkedView->syncCamera())
if (this == viewLinker->mainView() || (viewLink && viewLink->isActive() && viewLink->syncCamera()))
{
viewLinker->allViewsForCameraSync(this, viewsToUpdate);
}