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

#3261 Fix crash when setting case to null in 3d well log curves.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-08-24 08:51:48 +02:00
parent b8f4aab4a9
commit 28285ceddf
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp
View File

@@ -233,35 +233,37 @@ std::pair<double, double> Rim3dWellLogExtractionCurve::findCurveValueRange()
{
double foundMinValue = std::numeric_limits<float>::infinity();
double foundMaxValue = -std::numeric_limits<float>::infinity();
std::set<int> timeStepsToCheck;
if (followAnimationTimeStep())
if (m_case())
{
// Check all time steps to avoid range changing during animation.
for (int i = 0; i < m_case->timeStepStrings().size(); ++i)
std::set<int> timeStepsToCheck;
if (followAnimationTimeStep())
{
timeStepsToCheck.insert(i);
}
}
else
{
timeStepsToCheck.insert(m_timeStep());
}
for (int timeStep : timeStepsToCheck)
{
std::vector<double> values;
std::vector<double> measuredDepths;
this->curveValuesAndMdsAtTimeStep(&values, &measuredDepths, timeStep);
for (double value : values)
{
if (RiaCurveDataTools::isValidValue(value, false))
// Check all time steps to avoid range changing during animation.
for (int i = 0; i < m_case->timeStepStrings().size(); ++i)
{
foundMinValue = std::min(foundMinValue, value);
foundMaxValue = std::max(foundMaxValue, value);
timeStepsToCheck.insert(i);
}
}
}
else
{
timeStepsToCheck.insert(m_timeStep());
}
for (int timeStep : timeStepsToCheck)
{
std::vector<double> values;
std::vector<double> measuredDepths;
this->curveValuesAndMdsAtTimeStep(&values, &measuredDepths, timeStep);
for (double value : values)
{
if (RiaCurveDataTools::isValidValue(value, false))
{
foundMinValue = std::min(foundMinValue, value);
foundMaxValue = std::max(foundMaxValue, value);
}
}
}
}
return std::make_pair(foundMinValue, foundMaxValue);
}