From 238c783b26fdac02557ad81234792548c67d8b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Fri, 11 Sep 2015 17:19:33 +0200 Subject: [PATCH] More renaming LikedView -> ViewLink --- .../Commands/RicLinkVisibleViewsFeature.cpp | 2 +- .../ProjectDataModel/RimProject.cpp | 4 +- ApplicationCode/ProjectDataModel/RimView.cpp | 4 +- .../ProjectDataModel/RimViewLinker.cpp | 52 +++++++++---------- .../ProjectDataModel/RimViewLinker.h | 4 +- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp b/ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp index 1fcbcb4f7c..7e83e46fb8 100644 --- a/ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp +++ b/ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp @@ -90,7 +90,7 @@ void RicLinkVisibleViewsFeature::onActionTriggered(bool isChecked) RimViewLink* viewConfig = new RimViewLink; viewConfig->setManagedView(rimView); - linkedViews->linkedViews.push_back(viewConfig); + linkedViews->viewLinks.push_back(viewConfig); viewConfig->initAfterReadRecursively(); viewConfig->updateOptionSensitivity(); diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index a8d20b3982..676ecbc8f6 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -972,9 +972,9 @@ RimViewLinker* RimProject::findViewLinkerFromView(RimView* view) RimViewLinker* group = viewLinkerCollection()->viewLinkers()[i]; if (view == group->mainView()) return group; - for (size_t j = 0; j < group->linkedViews.size(); j++) + for (size_t j = 0; j < group->viewLinks.size(); j++) { - RimViewLink* viewConfig = group->linkedViews[j]; + RimViewLink* viewConfig = group->viewLinks[j]; if (viewConfig->managedView() == view) return group; } } diff --git a/ApplicationCode/ProjectDataModel/RimView.cpp b/ApplicationCode/ProjectDataModel/RimView.cpp index 02a0fd613c..fd349e13cd 100644 --- a/ApplicationCode/ProjectDataModel/RimView.cpp +++ b/ApplicationCode/ProjectDataModel/RimView.cpp @@ -442,7 +442,7 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV RimViewLinker* viewLinker = proj->findViewLinkerFromView(this); if (viewLinker) { - RimViewLink* linkedView = viewLinker->linkedViewFromView(this); + RimViewLink* linkedView = viewLinker->viewLinkFromView(this); if (!linkedView || linkedView->syncCamera()) { viewLinker->updateScaleZ(this, scaleZ); @@ -581,7 +581,7 @@ void RimView::notifyCameraHasChanged() RimViewLinker* viewLinker = proj->findViewLinkerFromView(this); if (viewLinker) { - RimViewLink* linkedView = viewLinker->linkedViewFromView(this); + RimViewLink* linkedView = viewLinker->viewLinkFromView(this); // There is no view config for a master view, but all views for sync must be updated if (!linkedView || linkedView->syncCamera()) diff --git a/ApplicationCode/ProjectDataModel/RimViewLinker.cpp b/ApplicationCode/ProjectDataModel/RimViewLinker.cpp index 6a6b935f46..e32d6c2095 100644 --- a/ApplicationCode/ProjectDataModel/RimViewLinker.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewLinker.cpp @@ -63,8 +63,8 @@ RimViewLinker::RimViewLinker(void) m_mainView.uiCapability()->setUiChildrenHidden(true); m_mainView.uiCapability()->setUiHidden(true); - CAF_PDM_InitFieldNoDefault(&linkedViews, "ManagedViews", "Managed Views", "", "", ""); - linkedViews.uiCapability()->setUiHidden(true); + CAF_PDM_InitFieldNoDefault(&viewLinks, "ManagedViews", "Managed Views", "", "", ""); + viewLinks.uiCapability()->setUiHidden(true); } //-------------------------------------------------------------------------------------------------- @@ -81,7 +81,7 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep) { if (!isActive()) return; - RimViewLink* sourceLinkedView = linkedViewFromView(sourceView); + RimViewLink* sourceLinkedView = viewLinkFromView(sourceView); if (sourceLinkedView && !sourceLinkedView->syncTimeStep()) { return; @@ -93,9 +93,9 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep) m_mainView->viewer()->animationControl()->setCurrentFrameOnly(timeStep); } - for (size_t i = 0; i < linkedViews.size(); i++) + for (size_t i = 0; i < viewLinks.size(); i++) { - RimViewLink* managedViewConfig = linkedViews[i]; + RimViewLink* managedViewConfig = viewLinks[i]; if (managedViewConfig->managedView() && managedViewConfig->managedView() != sourceView) { if (managedViewConfig->syncTimeStep() && managedViewConfig->managedView()->viewer()) @@ -120,9 +120,9 @@ void RimViewLinker::updateCellResult() { RimEclipseResultDefinition* eclipseCellResultDefinition = masterEclipseView->cellResult(); - for (size_t i = 0; i < linkedViews.size(); i++) + for (size_t i = 0; i < viewLinks.size(); i++) { - RimViewLink* managedViewConfig = linkedViews[i]; + RimViewLink* managedViewConfig = viewLinks[i]; if (managedViewConfig->managedView()) { if (managedViewConfig->syncCellResult()) @@ -145,9 +145,9 @@ void RimViewLinker::updateCellResult() { RimGeoMechResultDefinition* geoMechResultDefinition = masterGeoView->cellResult(); - for (size_t i = 0; i < linkedViews.size(); i++) + for (size_t i = 0; i < viewLinks.size(); i++) { - RimViewLink* managedViewConfig = linkedViews[i]; + RimViewLink* managedViewConfig = viewLinks[i]; if (managedViewConfig->managedView()) { if (managedViewConfig->syncCellResult()) @@ -172,9 +172,9 @@ void RimViewLinker::updateRangeFilters() { if (!isActive()) return; - for (size_t i = 0; i < linkedViews.size(); i++) + for (size_t i = 0; i < viewLinks.size(); i++) { - RimViewLink* managedViewConfig = linkedViews[i]; + RimViewLink* managedViewConfig = viewLinks[i]; if (managedViewConfig->managedView()) { if (managedViewConfig->syncRangeFilters()) @@ -209,9 +209,9 @@ void RimViewLinker::updatePropertyFilters() { if (!isActive()) return; - for (size_t i = 0; i < linkedViews.size(); i++) + for (size_t i = 0; i < viewLinks.size(); i++) { - RimViewLink* managedViewConfig = linkedViews[i]; + RimViewLink* managedViewConfig = viewLinks[i]; if (managedViewConfig->managedView()) { if (managedViewConfig->syncPropertyFilters()) @@ -242,9 +242,9 @@ void RimViewLinker::updatePropertyFilters() //-------------------------------------------------------------------------------------------------- void RimViewLinker::configureOverrides() { - for (size_t i = 0; i < linkedViews.size(); i++) + for (size_t i = 0; i < viewLinks.size(); i++) { - RimViewLink* managedViewConfig = linkedViews[i]; + RimViewLink* managedViewConfig = viewLinks[i]; managedViewConfig->configureOverrides(); } } @@ -261,11 +261,11 @@ void RimViewLinker::allViewsForCameraSync(RimView* source, std::vector views.push_back(m_mainView()); } - for (size_t i = 0; i < linkedViews.size(); i++) + for (size_t i = 0; i < viewLinks.size(); i++) { - if (linkedViews[i]->syncCamera && linkedViews[i]->managedView() && source != linkedViews[i]->managedView()) + if (viewLinks[i]->syncCamera && viewLinks[i]->managedView() && source != viewLinks[i]->managedView()) { - views.push_back(linkedViews[i]->managedView()); + views.push_back(viewLinks[i]->managedView()); } } } @@ -307,9 +307,9 @@ QString RimViewLinker::displayNameForView(RimView* view) //-------------------------------------------------------------------------------------------------- void RimViewLinker::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) { - for (size_t cIdx = 0; cIdx < linkedViews.size(); ++cIdx) + for (size_t cIdx = 0; cIdx < viewLinks.size(); ++cIdx) { - PdmObjectHandle* childObject = linkedViews[cIdx]; + PdmObjectHandle* childObject = viewLinks[cIdx]; if (childObject) { uiTreeOrdering.add(childObject); @@ -322,11 +322,11 @@ void RimViewLinker::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimViewLink* RimViewLinker::linkedViewFromView(RimView* view) +RimViewLink* RimViewLinker::viewLinkFromView(RimView* view) { - for (size_t i = 0; i < linkedViews.size(); i++) + for (size_t i = 0; i < viewLinks.size(); i++) { - if (linkedViews[i]->managedView() == view) return linkedViews[i]; + if (viewLinks[i]->managedView() == view) return viewLinks[i]; } return NULL; @@ -357,11 +357,11 @@ void RimViewLinker::allViews(std::vector& views) { views.push_back(m_mainView()); - for (size_t i = 0; i < linkedViews.size(); i++) + for (size_t i = 0; i < viewLinks.size(); i++) { - if (linkedViews[i]->managedView()) + if (viewLinks[i]->managedView()) { - views.push_back(linkedViews[i]->managedView()); + views.push_back(viewLinks[i]->managedView()); } } } diff --git a/ApplicationCode/ProjectDataModel/RimViewLinker.h b/ApplicationCode/ProjectDataModel/RimViewLinker.h index 9335841436..78e75ce83b 100644 --- a/ApplicationCode/ProjectDataModel/RimViewLinker.h +++ b/ApplicationCode/ProjectDataModel/RimViewLinker.h @@ -45,7 +45,7 @@ public: void setMainView(RimView* view); RimView* mainView(); - caf::PdmChildArrayField linkedViews; + caf::PdmChildArrayField viewLinks; void applyAllOperations(); @@ -65,7 +65,7 @@ public: public: static QString displayNameForView(RimView* view); - RimViewLink* linkedViewFromView(RimView* view); + RimViewLink* viewLinkFromView(RimView* view); protected: virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; }