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

8
ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
View File

@@ -135,9 +135,9 @@ void RicLinkVisibleViewsFeature::linkViews(std::vector<RimView*>& views)
for (size_t i = 0; i < views.size(); i++)
{
RimView* rimView = views[i];
if (rimView == viewLinker->mainView()) continue;
if (rimView == viewLinker->masterView()) continue;
RimViewLink* viewLink = new RimViewLink;
RimViewController* viewLink = new RimViewController;
viewLink->setManagedView(rimView);
viewLinker->viewLinks.push_back(viewLink);
@@ -166,14 +166,14 @@ void RicLinkVisibleViewsFeature::linkViews(std::vector<RimView*>& views)
RimView* masterView = featureUi.masterView();
viewLinker = new RimViewLinker;
proj->viewLinkerCollection()->viewLinker = viewLinker;
viewLinker->setMainView(masterView);
viewLinker->setMasterView(masterView);
for (size_t i = 0; i < views.size(); i++)
{
RimView* rimView = views[i];
if (rimView == masterView) continue;
RimViewLink* viewLink = new RimViewLink;
RimViewController* viewLink = new RimViewController;
viewLink->setManagedView(rimView);
viewLinker->viewLinks.push_back(viewLink);

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);

2
ApplicationCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.cpp
View File

@@ -45,7 +45,7 @@ void RicShowAllLinkedViewsFeature::onActionTriggered(bool isChecked)
std::vector<RimViewLinker*> linkedViews;
caf::SelectionManager::instance()->objectsByType(&linkedViews);
std::vector<RimViewLink*> managedViews;
std::vector<RimViewController*> managedViews;
caf::SelectionManager::instance()->objectsByType(&managedViews);
for (size_t i = 0; i < managedViews.size(); i++)
{

4
ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp
View File

@@ -63,7 +63,7 @@ void RicShowLinkOptionsFeature::onActionTriggered(bool isChecked)
RimViewLinker* viewLinker = proj->findViewLinkerFromView(activeView);
if (viewLinker)
{
if (viewLinker->mainView() == activeView)
if (viewLinker->masterView() == activeView)
{
RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(viewLinker);
@@ -72,7 +72,7 @@ void RicShowLinkOptionsFeature::onActionTriggered(bool isChecked)
for (size_t i = 0; i < viewLinker->viewLinks.size(); i++)
{
RimViewLink* viewLink = viewLinker->viewLinks[i];
RimViewController* viewLink = viewLinker->viewLinks[i];
if (viewLink->managedView() == activeView)
{
RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(viewLink);

4
ApplicationCode/Commands/ViewLink/RicUnLinkViewFeature.cpp
View File

@@ -44,7 +44,7 @@ bool RicUnLinkViewFeature::isCommandEnabled()
RimViewLinker* viewLinker = proj->findViewLinkerFromView(activeView);
if (viewLinker)
{
if (viewLinker->mainView() == activeView)
if (viewLinker->masterView() == activeView)
{
return false;
}
@@ -69,7 +69,7 @@ void RicUnLinkViewFeature::onActionTriggered(bool isChecked)
{
for (size_t i = 0; i < viewLinker->viewLinks.size(); i++)
{
RimViewLink* viewLink = viewLinker->viewLinks[i];
RimViewController* viewLink = viewLinker->viewLinks[i];
if (viewLink->managedView() == activeView)
{
caf::SelectionManager::instance()->setSelectedItem(viewLink);

4
ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp
View File

@@ -174,12 +174,12 @@ void RivFemElmVisibilityCalculator::computePropertyVisibility(cvf::UByteArray* c
//--------------------------------------------------------------------------------------------------
void RivFemElmVisibilityCalculator::computeOverriddenCellVisibility(cvf::UByteArray* elmVisibilities,
const RigFemPart* femPart,
RimViewLink* masterViewLink)
RimViewController* masterViewLink)
{
CVF_ASSERT(elmVisibilities != NULL);
CVF_ASSERT(femPart != NULL);
RimView* masterView = masterViewLink->ownerViewLinker()->mainView();
RimView* masterView = masterViewLink->ownerViewLinker()->masterView();
cvf::ref<cvf::UByteArray> totCellVisibility = masterView->currentTotalCellVisibility();
int elmCount = femPart->elementCount();

4
ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.h
View File

@@ -28,7 +28,7 @@ namespace cvf
class RigFemPart;
class RimGeoMechPropertyFilterCollection;
class RimViewLink;
class RimViewController;
class RivFemElmVisibilityCalculator
{
@@ -45,7 +45,7 @@ public:
static void computeOverriddenCellVisibility(cvf::UByteArray* elmVisibilities,
const RigFemPart* femPart ,
RimViewLink* masterViewLink);
RimViewController* masterViewLink);
};

4
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@@ -597,11 +597,11 @@ void RivReservoirViewPartMgr::computeNativeVisibility(cvf::UByteArray* cellVisib
void RivReservoirViewPartMgr::computeOverriddenCellVisibility(cvf::UByteArray* cellVisibility, const RigGridBase* grid)
{
RimViewLink* masterViewLink = m_reservoirView->controllingViewLink();
RimViewController* masterViewLink = m_reservoirView->controllingViewLink();
CVF_ASSERT(masterViewLink);
RimView* masterView = masterViewLink->ownerViewLinker()->mainView();
RimView* masterView = masterViewLink->ownerViewLinker()->masterView();
// get cell visibility
#if 1

2
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
View File

@@ -320,7 +320,7 @@ void RimCellRangeFilterCollection::updateIconState()
{
bool activeIcon = true;
RimViewLink* viewLink = RimViewLinker::viewLinkForView(baseView());
RimViewController* viewLink = RimViewLinker::viewLinkForView(baseView());
if (viewLink && viewLink->syncRangeFilters())
{
activeIcon = false;

2
ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
View File

@@ -229,7 +229,7 @@ RimLegendConfig* RimEclipseCellColors::legendConfig()
//--------------------------------------------------------------------------------------------------
void RimEclipseCellColors::updateIconState()
{
RimViewLink* viewLink = RimViewLinker::viewLinkForView(m_reservoirView);
RimViewController* viewLink = RimViewLinker::viewLinkForView(m_reservoirView);
if (viewLink && viewLink->syncCellResult())
{
updateUiIconFromState(false);

2
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp
View File

@@ -156,7 +156,7 @@ void RimEclipsePropertyFilterCollection::updateIconState()
RimEclipseView* view = NULL;
this->firstAnchestorOrThisOfType(view);
RimViewLink* viewLink = RimViewLinker::viewLinkForView(view);
RimViewController* viewLink = RimViewLinker::viewLinkForView(view);
if (viewLink && viewLink->syncPropertyFilters())
{
activeIcon = false;

2
ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp
View File

@@ -53,7 +53,7 @@ void RimGeoMechCellColors::updateIconState()
RimView* rimView = NULL;
this->firstAnchestorOrThisOfType(rimView);
RimViewLink* viewLink = RimViewLinker::viewLinkForView(rimView);
RimViewController* viewLink = RimViewLinker::viewLinkForView(rimView);
if (viewLink && viewLink->syncCellResult())
{
updateUiIconFromState(false);

2
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp
View File

@@ -158,7 +158,7 @@ void RimGeoMechPropertyFilterCollection::updateIconState()
RimGeoMechView* view = NULL;
this->firstAnchestorOrThisOfType(view);
RimViewLink* viewLink = RimViewLinker::viewLinkForView(view);
RimViewController* viewLink = RimViewLinker::viewLinkForView(view);
if (viewLink && viewLink->syncPropertyFilters())
{
activeIcon = false;

2
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -797,7 +797,7 @@ void RimProject::actionsBasedOnSelection(QMenu& contextMenu)
commandIds << "RicAddScriptPathFeature";
commandIds << "RicDeleteScriptPathFeature";
}
else if (dynamic_cast<RimViewLink*>(uiItem))
else if (dynamic_cast<RimViewController*>(uiItem))
{
commandIds << "RicShowAllLinkedViewsFeature";
commandIds << "Separator";

2
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@@ -586,7 +586,7 @@ void RimView::setScaleZAndUpdate(double scaleZ)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimViewLink* RimView::controllingViewLink() const
RimViewController* RimView::controllingViewLink() const
{
return RimViewLinker::viewLinkForView(this);
}

4
ApplicationCode/ProjectDataModel/RimView.h
View File

@@ -41,7 +41,7 @@ class RimCase;
class RimCellRangeFilterCollection;
class RiuViewer;
class RimViewLinker;
class RimViewLink;
class RimViewController;
namespace cvf
{
@@ -125,7 +125,7 @@ public:
void scheduleCreateDisplayModelAndRedraw();
void createDisplayModelAndRedraw();
RimViewLink* controllingViewLink() const;
RimViewController* controllingViewLink() const;
cvf::ref<cvf::UByteArray> currentTotalCellVisibility();
public:

66
ApplicationCode/ProjectDataModel/RimViewLink.cpp
View File

@@ -45,11 +45,11 @@
#include "cafPdmUiTreeOrdering.h"
CAF_PDM_SOURCE_INIT(RimViewLink, "RimViewLink");
CAF_PDM_SOURCE_INIT(RimViewController, "ViewController");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimViewLink::RimViewLink(void)
RimViewController::RimViewController(void)
{
CAF_PDM_InitObject("View Link", "", "", "");
@@ -77,7 +77,7 @@ RimViewLink::RimViewLink(void)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimViewLink::~RimViewLink(void)
RimViewController::~RimViewController(void)
{
this->removeOverrides();
}
@@ -85,7 +85,7 @@ RimViewLink::~RimViewLink(void)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimViewLink::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> optionList;
@@ -106,7 +106,7 @@ QList<caf::PdmOptionItemInfo> RimViewLink::calculateValueOptions(const caf::PdmF
for (size_t i = 0; i< views.size(); i++)
{
if (views[i] != linkedViews->mainView())
if (views[i] != linkedViews->masterView())
{
RimCase* rimCase = NULL;
views[i]->firstAnchestorOrThisOfType(rimCase);
@@ -135,7 +135,7 @@ QList<caf::PdmOptionItemInfo> RimViewLink::calculateValueOptions(const caf::PdmF
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
void RimViewController::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{
uiTreeOrdering.setForgetRemainingFields(true);
}
@@ -143,7 +143,7 @@ void RimViewLink::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, Q
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimViewController::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &isActive)
{
@@ -224,10 +224,6 @@ void RimViewLink::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
{
geoView->setOverridePropertyFilterCollection(NULL);
}
RimViewLinker* linkedViews = NULL;
this->firstAnchestorOrThisOfType(linkedViews);
linkedViews->configureOverrides(); // Should not be neccesary? JJS
}
updateOptionSensitivity();
@@ -246,7 +242,7 @@ void RimViewLink::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::initAfterRead()
void RimViewController::initAfterRead()
{
configureOverrides();
updateDisplayNameAndIcon();
@@ -257,7 +253,7 @@ void RimViewLink::initAfterRead()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseView* RimViewLink::managedEclipseView()
RimEclipseView* RimViewController::managedEclipseView()
{
RimView* rimView = m_managedView;
@@ -267,7 +263,7 @@ RimEclipseView* RimViewLink::managedEclipseView()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechView* RimViewLink::managedGeoView()
RimGeoMechView* RimViewController::managedGeoView()
{
RimView* rimView = m_managedView;
@@ -277,7 +273,7 @@ RimGeoMechView* RimViewLink::managedGeoView()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::configureOverrides()
void RimViewController::configureOverrides()
{
RimViewLinkerCollection* viewLinkerColl = NULL;
this->firstAnchestorOrThisOfType(viewLinkerColl);
@@ -286,7 +282,7 @@ void RimViewLink::configureOverrides()
RimViewLinker* viewLinker = NULL;
this->firstAnchestorOrThisOfType(viewLinker);
RimView* masterView = viewLinker->mainView();
RimView* masterView = viewLinker->masterView();
CVF_ASSERT(masterView);
if (!masterView) return;
@@ -369,13 +365,13 @@ void RimViewLink::configureOverrides()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::updateOptionSensitivity()
void RimViewController::updateOptionSensitivity()
{
RimViewLinker* linkedViews = NULL;
firstAnchestorOrThisOfType(linkedViews);
CVF_ASSERT(linkedViews);
RimView* mainView = linkedViews->mainView();
RimView* mainView = linkedViews->masterView();
CVF_ASSERT(mainView);
RimEclipseView* eclipseMasterView = dynamic_cast<RimEclipseView*>(mainView);
@@ -414,7 +410,7 @@ void RimViewLink::updateOptionSensitivity()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimViewLink::managedView()
RimView* RimViewController::managedView()
{
return m_managedView;
}
@@ -422,7 +418,7 @@ RimView* RimViewLink::managedView()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::setManagedView(RimView* view)
void RimViewController::setManagedView(RimView* view)
{
m_managedView = view;
}
@@ -430,7 +426,7 @@ void RimViewLink::setManagedView(RimView* view)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimViewController::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
updateOptionSensitivity();
uiOrdering.add(&m_managedView);
@@ -450,7 +446,7 @@ void RimViewLink::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiO
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::removeOverrides()
void RimViewController::removeOverrides()
{
if (m_managedView)
{
@@ -465,7 +461,7 @@ void RimViewLink::removeOverrides()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::updateUiIconFromActiveState()
void RimViewController::updateUiIconFromActiveState()
{
RimViewLinker::applyIconEnabledState(this, m_originalIcon, !isActive());
}
@@ -473,7 +469,7 @@ void RimViewLink::updateUiIconFromActiveState()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::updateDisplayNameAndIcon()
void RimViewController::updateDisplayNameAndIcon()
{
RimViewLinker::findNameAndIconFromView(&name.v(), &m_originalIcon, managedView());
}
@@ -481,7 +477,7 @@ void RimViewLink::updateDisplayNameAndIcon()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::doSyncCamera()
void RimViewController::doSyncCamera()
{
RimViewLinkerCollection* viewLinkerColl = NULL;
this->firstAnchestorOrThisOfType(viewLinkerColl);
@@ -489,14 +485,14 @@ void RimViewLink::doSyncCamera()
RimViewLinker* viewLinker = NULL;
this->firstAnchestorOrThisOfType(viewLinker);
viewLinker->updateScaleZ(viewLinker->mainView(), viewLinker->mainView()->scaleZ());
viewLinker->updateCamera(viewLinker->mainView());
viewLinker->updateScaleZ(viewLinker->masterView(), viewLinker->masterView()->scaleZ());
viewLinker->updateCamera(viewLinker->masterView());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::doSyncTimeStep()
void RimViewController::doSyncTimeStep()
{
RimViewLinkerCollection* viewLinkerColl = NULL;
this->firstAnchestorOrThisOfType(viewLinkerColl);
@@ -513,7 +509,7 @@ void RimViewLink::doSyncTimeStep()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLink::doSyncCellResult()
void RimViewController::doSyncCellResult()
{
RimViewLinker* viewLinker = ownerViewLinker();
viewLinker->updateCellResult();
@@ -522,7 +518,7 @@ void RimViewLink::doSyncCellResult()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimViewLinker* RimViewLink::ownerViewLinker()
RimViewLinker* RimViewController::ownerViewLinker()
{
RimViewLinker* viewLinker = NULL;
this->firstAnchestorOrThisOfType(viewLinker);
@@ -534,7 +530,7 @@ RimViewLinker* RimViewLink::ownerViewLinker()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RigCaseToCaseCellMapper* RimViewLink::cellMapper()
const RigCaseToCaseCellMapper* RimViewController::cellMapper()
{
RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>(masterView());
RimEclipseView* dependEclipseView = managedEclipseView();
@@ -612,15 +608,15 @@ const RigCaseToCaseCellMapper* RimViewLink::cellMapper()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimViewLink::masterView()
RimView* RimViewController::masterView()
{
return ownerViewLinker()->mainView();
return ownerViewLinker()->masterView();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimViewLink::isVisibleCellsSyncPossible()
bool RimViewController::isVisibleCellsSyncPossible()
{
RimEclipseView* eclipseMasterView = dynamic_cast<RimEclipseView*>(masterView());
RimGeoMechView* geoMasterView = dynamic_cast<RimGeoMechView*>(masterView());
@@ -641,7 +637,7 @@ bool RimViewLink::isVisibleCellsSyncPossible()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimViewLink::syncVisibleCells()
bool RimViewController::syncVisibleCells()
{
if (isVisibleCellsSyncPossible())
{

6
ApplicationCode/ProjectDataModel/RimViewLink.h
View File

@@ -36,13 +36,13 @@ class RigCaseToCaseCellMapper;
///
///
//==================================================================================================
class RimViewLink : public caf::PdmObject
class RimViewController : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimViewLink(void);
virtual ~RimViewLink(void);
RimViewController(void);
virtual ~RimViewController(void);
caf::PdmField<bool> isActive;
caf::PdmField<QString> name;

64
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@@ -49,7 +49,7 @@
CAF_PDM_SOURCE_INIT(RimViewLinker, "RimViewLinker");
CAF_PDM_SOURCE_INIT(RimViewLinker, "ViewLinker");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -60,9 +60,9 @@ RimViewLinker::RimViewLinker(void)
CAF_PDM_InitField(&m_name, "Name", QString("View Group Name"), "View Group Name", "", "", "");
m_name.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_mainView, "MainView", "Main View", "", "", "");
m_mainView.uiCapability()->setUiChildrenHidden(true);
m_mainView.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_masterView, "MainView", "Main View", "", "", "");
m_masterView.uiCapability()->setUiChildrenHidden(true);
m_masterView.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&viewLinks, "ManagedViews", "Managed Views", "", "", "");
viewLinks.uiCapability()->setUiHidden(true);
@@ -88,9 +88,9 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
if (!isActive()) return;
if (mainView() != sourceView)
if (masterView() != sourceView)
{
RimViewLink* sourceViewLink = viewLinkForView(sourceView);
RimViewController* sourceViewLink = viewLinkForView(sourceView);
CVF_ASSERT(sourceViewLink);
if (!sourceViewLink->isActive() || !sourceViewLink->syncTimeStep())
@@ -99,15 +99,15 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
}
}
if (m_mainView && m_mainView->viewer() && sourceView != m_mainView)
if (m_masterView && m_masterView->viewer() && sourceView != m_masterView)
{
m_mainView->viewer()->setCurrentFrame(timeStep);
m_mainView->viewer()->animationControl()->setCurrentFrameOnly(timeStep);
m_masterView->viewer()->setCurrentFrame(timeStep);
m_masterView->viewer()->animationControl()->setCurrentFrameOnly(timeStep);
}
for (size_t i = 0; i < viewLinks.size(); i++)
{
RimViewLink* viewLink = viewLinks[i];
RimViewController* viewLink = viewLinks[i];
if (!viewLink->isActive) continue;
if (viewLink->managedView() && viewLink->managedView() != sourceView)
@@ -128,7 +128,7 @@ void RimViewLinker::updateCellResult()
{
if (!isActive()) return;
RimView* rimView = m_mainView;
RimView* rimView = m_masterView;
RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>(rimView);
if (masterEclipseView && masterEclipseView->cellResult())
{
@@ -136,7 +136,7 @@ void RimViewLinker::updateCellResult()
for (size_t i = 0; i < viewLinks.size(); i++)
{
RimViewLink* viewLink = viewLinks[i];
RimViewController* viewLink = viewLinks[i];
if (!viewLink->isActive) continue;
if (viewLink->managedView())
@@ -166,7 +166,7 @@ void RimViewLinker::updateCellResult()
for (size_t i = 0; i < viewLinks.size(); i++)
{
RimViewLink* viewLink = viewLinks[i];
RimViewController* viewLink = viewLinks[i];
if (!viewLink->isActive) continue;
if (viewLink->managedView())
@@ -217,7 +217,7 @@ void RimViewLinker::configureOverrides()
{
for (size_t i = 0; i < viewLinks.size(); i++)
{
RimViewLink* viewLink = viewLinks[i];
RimViewController* viewLink = viewLinks[i];
if (viewLink->isActive)
{
viewLink->configureOverrides();
@@ -236,9 +236,9 @@ void RimViewLinker::allViewsForCameraSync(RimView* source, std::vector<RimView*>
{
if (!isActive()) return;
if (source != m_mainView())
if (source != m_masterView())
{
views.push_back(m_mainView());
views.push_back(m_masterView());
}
for (size_t i = 0; i < viewLinks.size(); i++)
@@ -258,11 +258,11 @@ void RimViewLinker::applyAllOperations()
configureOverrides();
updateCellResult();
updateTimeStep(m_mainView, m_mainView->currentTimeStep());
updateTimeStep(m_masterView, m_masterView->currentTimeStep());
updateRangeFilters();
updatePropertyFilters();
updateScaleZ(m_mainView, m_mainView->scaleZ());
updateCamera(m_mainView);
updateScaleZ(m_masterView, m_masterView->scaleZ());
updateCamera(m_masterView);
}
//--------------------------------------------------------------------------------------------------
@@ -286,9 +286,9 @@ QString RimViewLinker::displayNameForView(RimView* view)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::setMainView(RimView* view)
void RimViewLinker::setMasterView(RimView* view)
{
m_mainView = view;
m_masterView = view;
setNameAndIcon();
updateUiIcon();
@@ -297,9 +297,9 @@ void RimViewLinker::setMainView(RimView* view)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimViewLinker::mainView()
RimView* RimViewLinker::masterView()
{
return m_mainView;
return m_masterView;
}
//--------------------------------------------------------------------------------------------------
@@ -307,7 +307,7 @@ RimView* RimViewLinker::mainView()
//--------------------------------------------------------------------------------------------------
void RimViewLinker::allViews(std::vector<RimView*>& views)
{
views.push_back(m_mainView());
views.push_back(m_masterView());
for (size_t i = 0; i < viewLinks.size(); i++)
{
@@ -334,9 +334,9 @@ void RimViewLinker::updateScaleZ(RimView* sourceView, double scaleZ)
{
if (!isActive()) return;
if (mainView() != sourceView)
if (masterView() != sourceView)
{
RimViewLink* sourceViewLink = viewLinkForView(sourceView);
RimViewController* sourceViewLink = viewLinkForView(sourceView);
CVF_ASSERT(sourceViewLink);
if (!sourceViewLink->isActive() || !sourceViewLink->syncCamera())
@@ -397,7 +397,7 @@ void RimViewLinker::updateUiIcon()
//--------------------------------------------------------------------------------------------------
void RimViewLinker::setNameAndIcon()
{
RimViewLinker::findNameAndIconFromView(&m_name.v(), &m_originalIcon, m_mainView);
RimViewLinker::findNameAndIconFromView(&m_name.v(), &m_originalIcon, m_masterView);
}
//--------------------------------------------------------------------------------------------------
@@ -498,15 +498,15 @@ void RimViewLinker::findNameAndIconFromView(QString* name, QIcon* icon, RimView*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimViewLink* RimViewLinker::viewLinkForView(const RimView* view)
RimViewController* RimViewLinker::viewLinkForView(const RimView* view)
{
RimViewLink* viewLink = NULL;
RimViewController* viewLink = NULL;
std::vector<caf::PdmObjectHandle*> reffingObjs;
view->objectsWithReferringPtrFields(reffingObjs);
for (size_t i = 0; i < reffingObjs.size(); ++i)
{
viewLink = dynamic_cast<RimViewLink*>(reffingObjs[i]);
viewLink = dynamic_cast<RimViewController*>(reffingObjs[i]);
if (viewLink) break;
}
@@ -540,7 +540,7 @@ RimViewLinker* RimViewLinker::viewLinkerForMainOrControlledView(RimView* view)
RimViewLinker* viewLinker = RimViewLinker::viewLinkerIfMainView(view);
if (!viewLinker)
{
RimViewLink* viewLink = RimViewLinker::viewLinkForView(view);
RimViewController* viewLink = RimViewLinker::viewLinkForView(view);
if (viewLink)
{
viewLinker = viewLink->ownerViewLinker();
@@ -559,7 +559,7 @@ void RimViewLinker::updateCamera(RimView* sourceView)
if (!isActive()) return;
RimViewLink* viewLink = RimViewLinker::viewLinkForView(sourceView);
RimViewController* viewLink = RimViewLinker::viewLinkForView(sourceView);
if (viewLink)
{
if ((!viewLink->isActive() || !viewLink->syncCamera()))

22
ApplicationCode/ProjectDataModel/RimViewLinker.h
View File

@@ -33,7 +33,7 @@ namespace cvf
class BoundingBox;
}
class RimViewLink;
class RimViewController;
class RiuViewer;
class RimView;
@@ -49,17 +49,17 @@ public:
RimViewLinker(void);
virtual ~RimViewLinker(void);
void setMainView(RimView* view);
RimView* mainView();
void setMasterView(RimView* view);
RimView* masterView();
caf::PdmChildArrayField<RimViewLink*> viewLinks;
caf::PdmChildArrayField<RimViewController*> viewLinks;
void applyAllOperations();
void removeOverrides();
void updateCamera(RimView* sourceView);
void updateTimeStep(RimView* sourceView, int timeStep);
void updateScaleZ(RimView* sourceView, double scaleZ);
void allViewsForCameraSync(RimView* source, std::vector<RimView*>& views);
void updateCellResult();
void updateRangeFilters();
@@ -68,9 +68,6 @@ public:
void scheduleGeometryRegenForDepViews(RivCellSetEnum geometryType);
void scheduleCreateDisplayModelAndRedrawForDependentViews();
void configureOverrides();
void removeOverrides();
void allViews(std::vector<RimView*>& views);
void updateUiIcon();
@@ -81,7 +78,9 @@ public:
public:
static QString displayNameForView(RimView* view);
static RimViewLink* viewLinkForView(const RimView* view);
// Move to RimView and make nonstatic
static RimViewController* viewLinkForView(const RimView* view);
static RimViewLinker* viewLinkerIfMainView(RimView* view);
static RimViewLinker* viewLinkerForMainOrControlledView(RimView* view);
@@ -90,11 +89,14 @@ protected:
virtual void initAfterRead();
private:
void allViewsForCameraSync(RimView* source, std::vector<RimView*>& views);
void configureOverrides();
bool isActive();
static bool isBoundingBoxesOverlappingOrClose(const cvf::BoundingBox& sourceBB, const cvf::BoundingBox& destBB);
private:
caf::PdmPtrField<RimView*> m_mainView;
caf::PdmPtrField<RimView*> m_masterView;
caf::PdmField<QString> m_name;
QIcon m_originalIcon;
};