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

Avoid access out of bounds when displaying time step in statistics

Browse Source
This commit is contained in:
Magne Sjaastad 2017-11-29 07:13:16 +01:00
parent c530841e41
commit 2d5ce8730d
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@ -819,11 +819,14 @@ QString Rim3dOverlayInfoConfig::timeStepText(RimEclipseView* eclipseView)
int currTimeStepIndex = eclipseView->currentTimeStep(); int currTimeStepIndex = eclipseView->currentTimeStep();
std::vector<QDateTime> timeSteps = eclipseView->currentGridCellResults()->allTimeStepDatesFromEclipseReader(); std::vector<QDateTime> timeSteps = eclipseView->currentGridCellResults()->allTimeStepDatesFromEclipseReader();
QString dateFormat = RimTools::createTimeFormatStringFromDates(timeSteps); QString dateTimeString;
if (currTimeStepIndex >= 0 && currTimeStepIndex < timeSteps.size())
QString dateTimeString = QString("Time Step: %1/%2 %3").arg(QString::number(currTimeStepIndex), {
QString::number(timeSteps.size() - 1), QString dateFormat = RimTools::createTimeFormatStringFromDates(timeSteps);
timeSteps[currTimeStepIndex].toString(dateFormat)); dateTimeString = QString("Time Step: %1/%2 %3").arg(QString::number(currTimeStepIndex),
QString::number(timeSteps.size() - 1),
timeSteps[currTimeStepIndex].toString(dateFormat));
}
return QString("<p><b><center>-- %1 --</center></b>").arg(dateTimeString) + return QString("<p><b><center>-- %1 --</center></b>").arg(dateTimeString) +
QString("<center>------------------------------------------------</center>"); QString("<center>------------------------------------------------</center>");
@ -837,9 +840,13 @@ QString Rim3dOverlayInfoConfig::timeStepText(RimGeoMechView* geoMechView)
int currTimeStepIndex = geoMechView->currentTimeStep(); int currTimeStepIndex = geoMechView->currentTimeStep();
QStringList timeSteps = geoMechView->geoMechCase()->timeStepStrings(); QStringList timeSteps = geoMechView->geoMechCase()->timeStepStrings();
QString dateTimeString = QString("Time Step: %1/%2 %3").arg(QString::number(currTimeStepIndex), QString dateTimeString;
QString::number(timeSteps.size() - 1), if (currTimeStepIndex >= 0 && currTimeStepIndex < timeSteps.size())
timeSteps[currTimeStepIndex]); {
dateTimeString = QString("Time Step: %1/%2 %3").arg(QString::number(currTimeStepIndex),
QString::number(timeSteps.size() - 1),
timeSteps[currTimeStepIndex]);
}
return QString("<p><b><center>-- %1 --</center></b>").arg(dateTimeString) + return QString("<p><b><center>-- %1 --</center></b>").arg(dateTimeString) +
QString("<center>------------------------------------------------</center>"); QString("<center>------------------------------------------------</center>");