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

Rename of LinkedView -> ViewLink

Browse Source
This commit is contained in:
Jacob Støren 2015-09-11 13:42:06 +02:00
parent dce0361660
commit 733b3603db
8 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp
View File

@ -87,7 +87,7 @@ void RicLinkVisibleViewsFeature::onActionTriggered(bool isChecked)
RimView* rimView = views[i];
if (rimView == masterView) continue;
RimLinkedView* viewConfig = new RimLinkedView;
RimViewLink* viewConfig = new RimViewLink;
viewConfig->setManagedView(rimView);
linkedViews->linkedViews.push_back(viewConfig);

2
ApplicationCode/Commands/RicShowAllLinkedViewsFeature.cpp
View File

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

32
ApplicationCode/ProjectDataModel/RimLinkedView.cpp
View File

@ -36,11 +36,11 @@
#include "cafPdmUiTreeOrdering.h"
CAF_PDM_SOURCE_INIT(RimLinkedView, "RimManagedViewConfig");
CAF_PDM_SOURCE_INIT(RimViewLink, "RimViewLink");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimLinkedView::RimLinkedView(void)
RimViewLink::RimViewLink(void)
{
CAF_PDM_InitObject("View Config", ":/ReservoirView.png", "", "");
@ -61,14 +61,14 @@ RimLinkedView::RimLinkedView(void)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimLinkedView::~RimLinkedView(void)
RimViewLink::~RimViewLink(void)
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimLinkedView::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
QList<caf::PdmOptionItemInfo> RimViewLink::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> optionList;
@ -118,7 +118,7 @@ QList<caf::PdmOptionItemInfo> RimLinkedView::calculateValueOptions(const caf::Pd
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimLinkedView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
void RimViewLink::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{
uiTreeOrdering.setForgetRemainingFields(true);
}
@ -126,7 +126,7 @@ void RimLinkedView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimLinkedView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimViewLink::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &syncCamera && syncCamera())
{
@ -217,7 +217,7 @@ void RimLinkedView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, co
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimLinkedView::initAfterRead()
void RimViewLink::initAfterRead()
{
configureOverrides();
updateDisplayNameAndIcon();
@ -227,7 +227,7 @@ void RimLinkedView::initAfterRead()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseView* RimLinkedView::managedEclipseView()
RimEclipseView* RimViewLink::managedEclipseView()
{
RimView* rimView = m_managedView;
@ -237,7 +237,7 @@ RimEclipseView* RimLinkedView::managedEclipseView()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechView* RimLinkedView::managedGeoView()
RimGeoMechView* RimViewLink::managedGeoView()
{
RimView* rimView = m_managedView;
@ -247,7 +247,7 @@ RimGeoMechView* RimLinkedView::managedGeoView()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimLinkedView::configureOverridesUpdateDisplayModel()
void RimViewLink::configureOverridesUpdateDisplayModel()
{
configureOverrides();
@ -272,7 +272,7 @@ void RimLinkedView::configureOverridesUpdateDisplayModel()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimLinkedView::configureOverrides()
void RimViewLink::configureOverrides()
{
RimViewLinker* linkedViews = NULL;
this->firstAnchestorOrThisOfType(linkedViews);
@ -332,7 +332,7 @@ void RimLinkedView::configureOverrides()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimLinkedView::updateViewChanged()
void RimViewLink::updateViewChanged()
{
RimViewLinker* linkedViews = NULL;
firstAnchestorOrThisOfType(linkedViews);
@ -374,7 +374,7 @@ void RimLinkedView::updateViewChanged()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimLinkedView::updateDisplayNameAndIcon()
void RimViewLink::updateDisplayNameAndIcon()
{
if (m_managedView)
{
@ -400,7 +400,7 @@ void RimLinkedView::updateDisplayNameAndIcon()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimLinkedView::managedView()
RimView* RimViewLink::managedView()
{
return m_managedView;
}
@ -408,7 +408,7 @@ RimView* RimLinkedView::managedView()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimLinkedView::setManagedView(RimView* view)
void RimViewLink::setManagedView(RimView* view)
{
m_managedView = view;
}
@ -416,7 +416,7 @@ void RimLinkedView::setManagedView(RimView* view)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimLinkedView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimViewLink::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_managedView);

6
ApplicationCode/ProjectDataModel/RimLinkedView.h
View File

@ -31,13 +31,13 @@ class RimGeoMechView;
///
///
//==================================================================================================
class RimLinkedView : public caf::PdmObject
class RimViewLink : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimLinkedView(void);
virtual ~RimLinkedView(void);
RimViewLink(void);
virtual ~RimViewLink(void);
caf::PdmField<QString> name;

4
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -793,7 +793,7 @@ void RimProject::actionsBasedOnSelection(QMenu& contextMenu)
commandIds << "RicAddScriptPathFeature";
commandIds << "RicDeleteScriptPathFeature";
}
else if (dynamic_cast<RimLinkedView*>(uiItem))
else if (dynamic_cast<RimViewLink*>(uiItem))
{
commandIds << "RicShowAllLinkedViewsFeature";
commandIds << "Separator";
@ -974,7 +974,7 @@ RimViewLinker* RimProject::findViewLinkerFromView(RimView* view)
for (size_t j = 0; j < group->linkedViews.size(); j++)
{
RimLinkedView* viewConfig = group->linkedViews[j];
RimViewLink* viewConfig = group->linkedViews[j];
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);
if (viewLinker)
{
RimLinkedView* linkedView = viewLinker->linkedViewFromView(this);
RimViewLink* linkedView = viewLinker->linkedViewFromView(this);
if (!linkedView || linkedView->syncCamera())
{
viewLinker->updateScaleZ(this, scaleZ);
@ -581,7 +581,7 @@ void RimView::notifyCameraHasChanged()
RimViewLinker* viewLinker = proj->findViewLinkerFromView(this);
if (viewLinker)
{
RimLinkedView* linkedView = viewLinker->linkedViewFromView(this);
RimViewLink* linkedView = viewLinker->linkedViewFromView(this);
// There is no view config for a master view, but all views for sync must be updated
if (!linkedView || linkedView->syncCamera())

18
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@ -45,7 +45,7 @@
CAF_PDM_SOURCE_INIT(RimViewLinker, "RimLinkedViews");
CAF_PDM_SOURCE_INIT(RimViewLinker, "RimViewLinker");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -81,7 +81,7 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
{
if (!isActive()) return;
RimLinkedView* sourceLinkedView = linkedViewFromView(sourceView);
RimViewLink* sourceLinkedView = linkedViewFromView(sourceView);
if (sourceLinkedView && !sourceLinkedView->syncTimeStep())
{
return;
@ -95,7 +95,7 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
for (size_t i = 0; i < linkedViews.size(); i++)
{
RimLinkedView* managedViewConfig = linkedViews[i];
RimViewLink* managedViewConfig = linkedViews[i];
if (managedViewConfig->managedView() && managedViewConfig->managedView() != sourceView)
{
if (managedViewConfig->syncTimeStep() && managedViewConfig->managedView()->viewer())
@ -122,7 +122,7 @@ void RimViewLinker::updateCellResult()
for (size_t i = 0; i < linkedViews.size(); i++)
{
RimLinkedView* managedViewConfig = linkedViews[i];
RimViewLink* managedViewConfig = linkedViews[i];
if (managedViewConfig->managedView())
{
if (managedViewConfig->syncCellResult())
@ -147,7 +147,7 @@ void RimViewLinker::updateCellResult()
for (size_t i = 0; i < linkedViews.size(); i++)
{
RimLinkedView* managedViewConfig = linkedViews[i];
RimViewLink* managedViewConfig = linkedViews[i];
if (managedViewConfig->managedView())
{
if (managedViewConfig->syncCellResult())
@ -174,7 +174,7 @@ void RimViewLinker::updateRangeFilters()
for (size_t i = 0; i < linkedViews.size(); i++)
{
RimLinkedView* managedViewConfig = linkedViews[i];
RimViewLink* managedViewConfig = linkedViews[i];
if (managedViewConfig->managedView())
{
if (managedViewConfig->syncRangeFilters())
@ -211,7 +211,7 @@ void RimViewLinker::updatePropertyFilters()
for (size_t i = 0; i < linkedViews.size(); i++)
{
RimLinkedView* managedViewConfig = linkedViews[i];
RimViewLink* managedViewConfig = linkedViews[i];
if (managedViewConfig->managedView())
{
if (managedViewConfig->syncPropertyFilters())
@ -244,7 +244,7 @@ void RimViewLinker::configureOverrides()
{
for (size_t i = 0; i < linkedViews.size(); i++)
{
RimLinkedView* managedViewConfig = linkedViews[i];
RimViewLink* managedViewConfig = linkedViews[i];
managedViewConfig->configureOverrides();
}
}
@ -322,7 +322,7 @@ void RimViewLinker::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimLinkedView* RimViewLinker::linkedViewFromView(RimView* view)
RimViewLink* RimViewLinker::linkedViewFromView(RimView* view)
{
for (size_t i = 0; i < linkedViews.size(); i++)
{

6
ApplicationCode/ProjectDataModel/RimViewLinker.h
View File

@ -26,7 +26,7 @@
#include "cafPdmObject.h"
#include "cafPdmPtrField.h"
class RimLinkedView;
class RimViewLink;
class RiuViewer;
class RimView;
@ -45,7 +45,7 @@ public:
void setMainView(RimView* view);
RimView* mainView();
caf::PdmChildArrayField<RimLinkedView*> linkedViews;
caf::PdmChildArrayField<RimViewLink*> linkedViews;
void applyAllOperations();
@ -65,7 +65,7 @@ public:
public:
static QString displayNameForView(RimView* view);
RimLinkedView* linkedViewFromView(RimView* view);
RimViewLink* linkedViewFromView(RimView* view);
protected:
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; }