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

Renaming and cleanup in ViewLinker and friends

Browse Source
This commit is contained in:
Jacob Støren
2015-09-24 11:29:01 +02:00
parent cc62e93d45
commit 5e0505dfe8
20 changed files with 107 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp
View File

@@ -44,7 +44,7 @@ bool RicSetMasterViewFeature::isCommandEnabled()
RimProject* proj = RiaApplication::instance()->project();
RimViewLinker* viewLinker = proj->findViewLinkerFromView(activeView);
if (viewLinker && viewLinker->mainView() == activeView)
if (viewLinker && viewLinker->masterView() == activeView)
{
return false;
}
@@ -68,9 +68,9 @@ void RicSetMasterViewFeature::onActionTriggered(bool isChecked)
RimProject* proj = RiaApplication::instance()->project();
RimViewLinker* viewLinker = proj->viewLinkerCollection()->viewLinker();
RimView* previousMasterView = viewLinker->mainView();
RimView* previousMasterView = viewLinker->masterView();
RimViewLink* previousViewLink = RimViewLinker::viewLinkForView(activeView);
RimViewController* previousViewLink = RimViewLinker::viewLinkForView(activeView);
if (previousViewLink)
{
size_t indexToErase = cvf::UNDEFINED_SIZE_T;
@@ -91,11 +91,11 @@ void RicSetMasterViewFeature::onActionTriggered(bool isChecked)
}
viewLinker->removeOverrides();
viewLinker->setMainView(activeView);
viewLinker->setMasterView(activeView);
if (previousMasterView)
{
RimViewLink* viewLink = new RimViewLink;
RimViewController* viewLink = new RimViewController;
viewLink->setManagedView(previousMasterView);
viewLinker->viewLinks.push_back(viewLink);