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

System : Manipulation of time step is now only available from RiuViewer

Browse Source
This commit is contained in:
Magne Sjaastad
2016-12-14 10:35:28 +01:00
parent 860b51931c
commit 0fc23c5610
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -496,7 +496,6 @@ void RimEclipseView::createDisplayModel()
if (frameModels.size() > 1 && this->hasUserRequestedAnimation())
{
m_viewer->animationControl()->setCurrentFrameOnly(m_currentTimeStep);
m_viewer->setCurrentFrame(m_currentTimeStep);
}
else

1
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -254,7 +254,6 @@ void RimGeoMechView::createDisplayModel()
if (isTimeStepDependentDataVisible())
{
m_viewer->animationControl()->setCurrentFrameOnly(m_currentTimeStep);
m_viewer->setCurrentFrame(m_currentTimeStep);
}
else

9
ApplicationCode/ProjectDataModel/RimView.h
View File

@@ -137,10 +137,8 @@ public:
void setScaleZAndUpdate(double scaleZ);
// Animation
int currentTimeStep() { return m_currentTimeStep;}
void setCurrentTimeStep(int frameIdx);
int currentTimeStep() const { return m_currentTimeStep;}
void updateCurrentTimeStepAndRedraw();
void endAnimation();
virtual void scheduleGeometryRegen(RivCellSetEnum geometryType) = 0;
void scheduleCreateDisplayModelAndRedraw();
@@ -230,6 +228,11 @@ protected:
private:
RimViewLinker* viewLinkerIfMasterView() const;
friend class RiuViewer;
void setCurrentTimeStep(int frameIdx);
void endAnimation();
private:
bool m_previousGridModeMeshLinesWasFaults;
caf::PdmField<bool> m_disableLighting;

3
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@@ -44,7 +44,6 @@
#include "cvfCamera.h"
#include "cvfScene.h"
#include "cafFrameAnimationControl.h"
#include "cvfMatrix4.h"
#include "cafPdmUiTreeOrdering.h"
@@ -103,7 +102,6 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
if (m_masterView && m_masterView->viewer() && sourceView != m_masterView)
{
m_masterView->viewer()->setCurrentFrame(timeStep);
m_masterView->viewer()->animationControl()->setCurrentFrameOnly(timeStep);
}
for (size_t i = 0; i < m_viewControllers.size(); i++)
@@ -117,7 +115,6 @@ void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
&& viewLink->managedView()->viewer())
{
viewLink->managedView()->viewer()->setCurrentFrame(timeStep);
viewLink->managedView()->viewer()->animationControl()->setCurrentFrameOnly(timeStep);
}
}
}

3
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -40,6 +40,7 @@
#include "cafCategoryLegend.h"
#include "cafCeetronPlusNavigation.h"
#include "cafEffectGenerator.h"
#include "cafFrameAnimationControl.h"
#include "cvfCamera.h"
#include "cvfFont.h"
@@ -610,6 +611,8 @@ void RiuViewer::setCurrentFrame(int frameIndex)
CVF_ASSERT(firstRendering);
if (m_rimView) m_rimView->setCurrentTimeStep(frameIndex);
animationControl()->setCurrentFrameOnly(frameIndex);
caf::Viewer::slotSetCurrentFrame(frameIndex);
}