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

(#395) Moved managed views from RimView to RimProject

Browse Source
This commit is contained in:
Magne Sjaastad
2015-09-01 17:14:22 +02:00
parent 52281633d6
commit 7969e22364
16 changed files with 324 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@@ -5,7 +5,7 @@
#include "Rim3dOverlayInfoConfig.h"
#include "RimCellRangeFilterCollection.h"
#include "RimManagedViewCollection.h"
#include "RimLinkedViews.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimWellPathCollection.h"
@@ -86,10 +86,6 @@ RimView::RimView(void)
CAF_PDM_InitField(&m_currentTimeStep, "CurrentTimeStep", 0, "Current Time Step", "", "", "");
m_currentTimeStep.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&managedViewCollection, "ManagedViewCollection", "Managed View Collection", "", "", "");
managedViewCollection = new RimManagedViewCollection;
managedViewCollection.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_overlayInfoConfig, "OverlayInfoConfig", "Info Box", "", "", "");
m_overlayInfoConfig = new Rim3dOverlayInfoConfig();
m_overlayInfoConfig->setReservoirView(this);
@@ -456,7 +452,13 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
{
m_viewer->issueBaseClassUpdate();
managedViewCollection->updateTimeStep(m_currentTimeStep);
RimProject* proj = NULL;
this->firstAnchestorOrThisOfType(proj);
RimLinkedViews* linkedViews = proj->findLinkedViewsGroupForView(this);
if (linkedViews)
{
linkedViews->updateTimeStep(this, m_currentTimeStep);
}
}
}
else if (changedField == &backgroundColor)