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

Move RigCurveDataTools and RigTimeHistoryCurveMerger to Application/Tools plus rename

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-06-08 15:10:45 +02:00
parent 68f965f6bb
commit eebd8bef2d
19 changed files with 528 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp
View File

@@ -21,7 +21,7 @@
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "RigCurveDataTools.h"
#include "RiaCurveDataTools.h"
#include "RigWellPath.h"
#include "RigWellPathGeometryTools.h"
@@ -129,7 +129,7 @@ void Riv3dWellLogCurveGeometryGenerator::createCurveDrawables(const caf::Display
for (double& result : m_curveValues)
{
if (!RigCurveDataTools::isValidValue(result, false)) continue;
if (!RiaCurveDataTools::isValidValue(result, false)) continue;
if ((minCurveValue - result) > curveEpsilon * curveUIRange)
{
@@ -158,7 +158,7 @@ void Riv3dWellLogCurveGeometryGenerator::createCurveDrawables(const caf::Display
{
double scaledResult = 0;
if (RigCurveDataTools::isValidValue(m_curveValues[i], false))
if (RiaCurveDataTools::isValidValue(m_curveValues[i], false))
{
scaledResult = planeOffsetFromWellPathCenter + (m_curveValues[i] - minCurveValue) * plotRangeToResultRangeFactor;
}
@@ -174,8 +174,8 @@ void Riv3dWellLogCurveGeometryGenerator::createCurveDrawables(const caf::Display
indices.reserve(m_curveVertices.size() * 2);
for (size_t i = 0; i < m_curveVertices.size() - 1; ++i)
{
if (RigCurveDataTools::isValidValue(m_curveValues[i], false) &&
RigCurveDataTools::isValidValue(m_curveValues[i + 1], false))
if (RiaCurveDataTools::isValidValue(m_curveValues[i], false) &&
RiaCurveDataTools::isValidValue(m_curveValues[i + 1], false))
{
if (cvf::Math::valueInRange(m_curveValues[i], minCurveValue, maxCurveValue) ||
cvf::Math::valueInRange(m_curveValues[i + 1], minCurveValue, maxCurveValue))
@@ -246,8 +246,8 @@ bool Riv3dWellLogCurveGeometryGenerator::findClosestPointOnCurve(const cvf::Vec3
CVF_ASSERT(m_curveVertices.size() == m_curveValues.size());
for (size_t i = 1; i < m_curveVertices.size(); ++i)
{
bool validCurveSegment = RigCurveDataTools::isValidValue(m_curveValues[i], false) &&
RigCurveDataTools::isValidValue(m_curveValues[i - 1], false);
bool validCurveSegment = RiaCurveDataTools::isValidValue(m_curveValues[i], false) &&
RiaCurveDataTools::isValidValue(m_curveValues[i - 1], false);
if (validCurveSegment)
{
cvf::Vec3d a = m_curveVertices[i - 1];
@@ -290,8 +290,8 @@ void Riv3dWellLogCurveGeometryGenerator::createNewVerticesAlongTriangleEdges(con
for (size_t i = 0; i < m_curveVertices.size() - 1; i += 2)
{
if (RigCurveDataTools::isValidValue(m_curveValues[i], false) &&
RigCurveDataTools::isValidValue(m_curveValues[i + 1], false))
if (RiaCurveDataTools::isValidValue(m_curveValues[i], false) &&
RiaCurveDataTools::isValidValue(m_curveValues[i + 1], false))
{
cvf::Vec3d lastVertex = m_curveVertices[i];
cvf::Vec3d fullSegmentVector = m_curveVertices[i + 1] - m_curveVertices[i];