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

Moved building of time step names for UI to case

Browse Source
This commit is contained in:
Magne Sjaastad
2015-09-21 11:20:07 +02:00
parent c32f4cabfe
commit 06e8bc2ec5
6 changed files with 65 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -799,12 +799,11 @@ void RiuMainWindow::refreshAnimationActions()
m_animationToolBar->connectAnimationControl(animationControl);
QStringList timeStepStrings;
int currentTimeStepIndex = 0;
RiaApplication* app = RiaApplication::instance();
bool enableAnimControls = false;
RimView * activeView = app->activeReservoirView();
RimView * activeView = RiaApplication::instance()->activeReservoirView();
if (activeView &&
activeView->viewer() &&
activeView->viewer()->frameCount())
@@ -818,27 +817,7 @@ void RiuMainWindow::refreshAnimationActions()
{
if (activeRiv->isTimeStepDependentDataVisible())
{
std::vector<QDateTime> timeStepDates = activeRiv->currentGridCellResults()->cellResults()->timeStepDates(0);
bool showHoursAndMinutes = false;
for (size_t i = 0; i < timeStepDates.size(); i++)
{
if (timeStepDates[i].time().hour() != 0.0 || timeStepDates[i].time().minute() != 0.0)
{
showHoursAndMinutes = true;
}
}
QString formatString = "dd.MMM yyyy";
if (showHoursAndMinutes)
{
formatString += " - hh:mm";
}
for (size_t i = 0; i < timeStepDates.size(); i++)
{
timeStepStrings += timeStepDates[i].toString(formatString);
}
currentTimeStepIndex = RiaApplication::instance()->activeReservoirView()->currentTimeStep();
timeStepStrings = activeRiv->eclipseCase()->timeStepStrings();
}
else
{
@@ -853,16 +832,13 @@ void RiuMainWindow::refreshAnimationActions()
{
if (activeGmv->isTimeStepDependentDataVisible())
{
std::vector<std::string> stepNames = activeGmv->geoMechCase()->geoMechData()->femPartResults()->stepNames();
for (size_t i = 0; i < stepNames.size(); i++)
{
timeStepStrings += QString::fromStdString(stepNames[i]);
}
currentTimeStepIndex = RiaApplication::instance()->activeReservoirView()->currentTimeStep();
activeGmv->geoMechCase()->timeStepStrings();
}
}
}
currentTimeStepIndex = activeView->currentTimeStep();
// Animation control is only relevant for more than one time step
if (timeStepStrings.size() < 2)
@@ -870,7 +846,7 @@ void RiuMainWindow::refreshAnimationActions()
enableAnimControls = false;
}
m_animationToolBar->setFrameRate(app->activeReservoirView()->maximumFrameRate());
m_animationToolBar->setFrameRate(activeView->maximumFrameRate());
}
m_animationToolBar->setTimeStepStrings(timeStepStrings);