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

#2923 Show sensible curve segments to range limits when points are outside range

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-05-15 17:16:43 +02:00
parent 79a8af0e11
commit 1b6d6e714c
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp
View File

@ -122,19 +122,22 @@ void Riv3dWellLogCurveGeometryGenerator::createCurveDrawables(const caf::Display
double maxVisibleResult = -std::numeric_limits<float>::max();
double minVisibleResult = std::numeric_limits<float>::max();
double minCurveValue = rim3dWellLogCurve->minCurveUIValue();
double maxCurveValue = rim3dWellLogCurve->maxCurveUIValue();
double curveEpsilon = 1.0e-6;
for (double& result : m_curveValues)
{
if (!RigCurveDataTools::isValidValue(result, false)) continue;
if ((rim3dWellLogCurve->minCurveUIValue() - result) > curveEpsilon * curveUIRange)
if ((minCurveValue - result) > curveEpsilon * curveUIRange)
{
result = -std::numeric_limits<double>::infinity();
result = minCurveValue - curveEpsilon;
}
else if ((result - rim3dWellLogCurve->maxCurveUIValue()) > curveEpsilon * curveUIRange)
else if ((result - maxCurveValue) > curveEpsilon * curveUIRange)
{
result = std::numeric_limits<double>::infinity();
result = maxCurveValue + curveEpsilon;
}
else
{
@ -157,7 +160,7 @@ void Riv3dWellLogCurveGeometryGenerator::createCurveDrawables(const caf::Display
if (RigCurveDataTools::isValidValue(m_curveValues[i], false))
{
scaledResult = planeOffsetFromWellPathCenter + (m_curveValues[i] - rim3dWellLogCurve->minCurveUIValue()) * plotRangeToResultRangeFactor;
scaledResult = planeOffsetFromWellPathCenter + (m_curveValues[i] - minCurveValue) * plotRangeToResultRangeFactor;
}
cvf::Vec3d curvePoint(interpolatedWellPathPoints[i] + scaledResult * interpolatedCurveNormals[i]);
m_curveVertices.push_back(cvf::Vec3f(curvePoint));
@ -185,8 +188,12 @@ void Riv3dWellLogCurveGeometryGenerator::createCurveDrawables(const caf::Display
if (RigCurveDataTools::isValidValue(m_curveValues[i], false) &&
RigCurveDataTools::isValidValue(m_curveValues[i + 1], false))
{
indices.push_back(cvf::uint(i));
indices.push_back(cvf::uint(i + 1));
if (cvf::Math::valueInRange(m_curveValues[i], minCurveValue, maxCurveValue) ||
cvf::Math::valueInRange(m_curveValues[i + 1], minCurveValue, maxCurveValue))
{
indices.push_back(cvf::uint(i));
indices.push_back(cvf::uint(i + 1));
}
}
}