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

More renaming LikedView -> ViewLink

Browse Source
This commit is contained in:
Jacob Støren 2015-09-11 17:19:33 +02:00
parent 984656cbfa
commit 238c783b26
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp
View File

@ -90,7 +90,7 @@ void RicLinkVisibleViewsFeature::onActionTriggered(bool isChecked)
RimViewLink* viewConfig = new RimViewLink; RimViewLink* viewConfig = new RimViewLink;
viewConfig->setManagedView(rimView); viewConfig->setManagedView(rimView);
linkedViews->linkedViews.push_back(viewConfig); linkedViews->viewLinks.push_back(viewConfig);
viewConfig->initAfterReadRecursively(); viewConfig->initAfterReadRecursively();
viewConfig->updateOptionSensitivity(); viewConfig->updateOptionSensitivity();

4
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -972,9 +972,9 @@ RimViewLinker* RimProject::findViewLinkerFromView(RimView* view)
RimViewLinker* group = viewLinkerCollection()->viewLinkers()[i]; RimViewLinker* group = viewLinkerCollection()->viewLinkers()[i];
if (view == group->mainView()) return group; 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; if (viewConfig->managedView() == view) return group;
} }
} }

4
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@ -442,7 +442,7 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
RimViewLinker* viewLinker = proj->findViewLinkerFromView(this); RimViewLinker* viewLinker = proj->findViewLinkerFromView(this);
if (viewLinker) if (viewLinker)
{ {
RimViewLink* linkedView = viewLinker->linkedViewFromView(this); RimViewLink* linkedView = viewLinker->viewLinkFromView(this);
if (!linkedView || linkedView->syncCamera()) if (!linkedView || linkedView->syncCamera())
{ {
viewLinker->updateScaleZ(this, scaleZ); viewLinker->updateScaleZ(this, scaleZ);
@ -581,7 +581,7 @@ void RimView::notifyCameraHasChanged()
RimViewLinker* viewLinker = proj->findViewLinkerFromView(this); RimViewLinker* viewLinker = proj->findViewLinkerFromView(this);
if (viewLinker) 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 // There is no view config for a master view, but all views for sync must be updated
if (!linkedView || linkedView->syncCamera()) if (!linkedView || linkedView->syncCamera())

52
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@ -63,8 +63,8 @@ RimViewLinker::RimViewLinker(void)
m_mainView.uiCapability()->setUiChildrenHidden(true); m_mainView.uiCapability()->setUiChildrenHidden(true);
m_mainView.uiCapability()->setUiHidden(true); m_mainView.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&linkedViews, "ManagedViews", "Managed Views", "", "", ""); CAF_PDM_InitFieldNoDefault(&viewLinks, "ManagedViews", "Managed Views", "", "", "");
linkedViews.uiCapability()->setUiHidden(true); viewLinks.uiCapability()->setUiHidden(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -81,7 +81,7 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
{ {
if (!isActive()) return; if (!isActive()) return;
RimViewLink* sourceLinkedView = linkedViewFromView(sourceView); RimViewLink* sourceLinkedView = viewLinkFromView(sourceView);
if (sourceLinkedView && !sourceLinkedView->syncTimeStep()) if (sourceLinkedView && !sourceLinkedView->syncTimeStep())
{ {
return; return;
@ -93,9 +93,9 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
m_mainView->viewer()->animationControl()->setCurrentFrameOnly(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->managedView() && managedViewConfig->managedView() != sourceView)
{ {
if (managedViewConfig->syncTimeStep() && managedViewConfig->managedView()->viewer()) if (managedViewConfig->syncTimeStep() && managedViewConfig->managedView()->viewer())
@ -120,9 +120,9 @@ void RimViewLinker::updateCellResult()
{ {
RimEclipseResultDefinition* eclipseCellResultDefinition = masterEclipseView->cellResult(); 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->managedView())
{ {
if (managedViewConfig->syncCellResult()) if (managedViewConfig->syncCellResult())
@ -145,9 +145,9 @@ void RimViewLinker::updateCellResult()
{ {
RimGeoMechResultDefinition* geoMechResultDefinition = masterGeoView->cellResult(); 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->managedView())
{ {
if (managedViewConfig->syncCellResult()) if (managedViewConfig->syncCellResult())
@ -172,9 +172,9 @@ void RimViewLinker::updateRangeFilters()
{ {
if (!isActive()) return; 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->managedView())
{ {
if (managedViewConfig->syncRangeFilters()) if (managedViewConfig->syncRangeFilters())
@ -209,9 +209,9 @@ void RimViewLinker::updatePropertyFilters()
{ {
if (!isActive()) return; 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->managedView())
{ {
if (managedViewConfig->syncPropertyFilters()) if (managedViewConfig->syncPropertyFilters())
@ -242,9 +242,9 @@ void RimViewLinker::updatePropertyFilters()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimViewLinker::configureOverrides() 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(); managedViewConfig->configureOverrides();
} }
} }
@ -261,11 +261,11 @@ void RimViewLinker::allViewsForCameraSync(RimView* source, std::vector<RimView*>
views.push_back(m_mainView()); 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 /*= ""*/) 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) if (childObject)
{ {
uiTreeOrdering.add(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; return NULL;
@ -357,11 +357,11 @@ void RimViewLinker::allViews(std::vector<RimView*>& views)
{ {
views.push_back(m_mainView()); 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());
} }
} }
} }

4
ApplicationCode/ProjectDataModel/RimViewLinker.h
View File

@ -45,7 +45,7 @@ public:
void setMainView(RimView* view); void setMainView(RimView* view);
RimView* mainView(); RimView* mainView();
caf::PdmChildArrayField<RimViewLink*> linkedViews; caf::PdmChildArrayField<RimViewLink*> viewLinks;
void applyAllOperations(); void applyAllOperations();
@ -65,7 +65,7 @@ public:
public: public:
static QString displayNameForView(RimView* view); static QString displayNameForView(RimView* view);
RimViewLink* linkedViewFromView(RimView* view); RimViewLink* viewLinkFromView(RimView* view);
protected: protected:
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; } virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; }