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

#2333 Add flattened intersectino geometry. Some view modifications to move towards a final 2D view experience

Browse Source
This commit is contained in:
Jacob Støren
2018-01-25 17:37:22 +01:00
parent 47d8508196
commit 02f6b95959
17 changed files with 336 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -742,9 +742,11 @@ void RiuMainWindow::slotRefreshViewActions()
void RiuMainWindow::refreshAnimationActions()
{
caf::FrameAnimationControl* animationControl = NULL;
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
Rim3dView * activeView = RiaApplication::instance()->activeReservoirView();
if (activeView && activeView->viewer())
{
animationControl = RiaApplication::instance()->activeReservoirView()->viewer()->animationControl();
animationControl = activeView->viewer()->animationControl();
}
m_animationToolBar->connectAnimationControl(animationControl);
@@ -754,37 +756,22 @@ void RiuMainWindow::refreshAnimationActions()
int currentTimeStepIndex = 0;
bool enableAnimControls = false;
Rim3dView * activeView = RiaApplication::instance()->activeReservoirView();
if (activeView &&
activeView->viewer() &&
activeView->viewer()->frameCount())
{
enableAnimControls = true;
RimEclipseView * activeRiv = dynamic_cast<RimEclipseView*>(activeView);
if (activeRiv)
if ( activeView->isTimeStepDependentDataVisible() )
{
if (activeRiv->currentGridCellResults())
{
if (activeRiv->isTimeStepDependentDataVisible())
{
timeStepStrings = activeRiv->eclipseCase()->timeStepStrings();
}
else
{
timeStepStrings.push_back(tr("Static Property"));
}
}
timeStepStrings = activeView->ownerCase()->timeStepStrings();
}
else
{
RimGeoMechView * activeGmv = dynamic_cast<RimGeoMechView*>(activeView);
if (activeGmv)
RimEclipseView * activeRiv = dynamic_cast<RimEclipseView*>(activeView);
if ( activeRiv->currentGridCellResults() )
{
if (activeGmv->isTimeStepDependentDataVisible())
{
timeStepStrings = activeGmv->geoMechCase()->timeStepStrings();
}
timeStepStrings.push_back(tr("Static Property"));
}
}