Skip to content

Commit

Permalink
(#417) Added togglebutton control to Linked View Group
Browse files Browse the repository at this point in the history
  • Loading branch information
magnesj committed Sep 8, 2015
1 parent f26fa65 commit 3ca5406
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
21 changes: 21 additions & 0 deletions ApplicationCode/ProjectDataModel/RimViewLinker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ RimViewLinker::RimViewLinker(void)
{
CAF_PDM_InitObject("Linked Views", ":/Reservoir1View.png", "", "");

CAF_PDM_InitField(&m_isActive, "Active", true, "Active", "", "", "");
m_isActive.uiCapability()->setUiHidden(true);

CAF_PDM_InitField(&m_name, "Name", QString("View Group Name"), "View Group Name", "", "", "");
m_name.uiCapability()->setUiHidden(true);

Expand All @@ -72,6 +75,8 @@ RimViewLinker::~RimViewLinker(void)
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
{
if (!isActive()) return;

RimLinkedView* sourceLinkedView = linkedViewFromView(sourceView);
if (sourceLinkedView && !sourceLinkedView->syncTimeStep())
{
Expand Down Expand Up @@ -103,6 +108,8 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateCellResult()
{
if (!isActive()) return;

RimView* rimView = m_mainView;
RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>(rimView);
if (masterEclipseView && masterEclipseView->cellResult())
Expand Down Expand Up @@ -159,6 +166,8 @@ void RimViewLinker::updateCellResult()
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateRangeFilters()
{
if (!isActive()) return;

for (size_t i = 0; i < linkedViews.size(); i++)
{
RimLinkedView* managedViewConfig = linkedViews[i];
Expand Down Expand Up @@ -194,6 +203,8 @@ void RimViewLinker::updateRangeFilters()
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updatePropertyFilters()
{
if (!isActive()) return;

for (size_t i = 0; i < linkedViews.size(); i++)
{
RimLinkedView* managedViewConfig = linkedViews[i];
Expand Down Expand Up @@ -239,6 +250,8 @@ void RimViewLinker::configureOverrides()
//--------------------------------------------------------------------------------------------------
void RimViewLinker::allViewsForCameraSync(RimView* source, std::vector<RimView*>& views)
{
if (!isActive()) return;

if (source != m_mainView())
{
views.push_back(m_mainView());
Expand Down Expand Up @@ -383,3 +396,11 @@ void RimViewLinker::updateScaleZ(RimView* source, double scaleZ)
}
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimViewLinker::isActive()
{
return m_isActive;
}

5 changes: 5 additions & 0 deletions ApplicationCode/ProjectDataModel/RimViewLinker.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,15 @@ class RimViewLinker : public caf::PdmObject

protected:
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; }
virtual caf::PdmFieldHandle* objectToggleField() { return &m_active; }
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "");
virtual void initAfterRead();

private:
bool isActive();

private:
caf::PdmField<bool> m_active;
caf::PdmPtrField<RimView*> m_mainView;
caf::PdmField<QString> m_name;
};

0 comments on commit 3ca5406

Please sign in to comment.