OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2630, #2605 unfalltenedTransformMatrix now returns mx[0] and mx[last] for points before and after end.

Browse Source
This commit is contained in:
Jacob Støren 2018-03-21 13:47:22 +01:00
parent ca8e56cff1
commit 2b4e26aaca
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp
View File

@ -565,34 +565,27 @@ RimIntersection* RivIntersectionGeometryGenerator::crossSection() const
//--------------------------------------------------------------------------------------------------
cvf::Mat4d RivIntersectionGeometryGenerator::unflattenTransformMatrix(const cvf::Vec3d& intersectionPointFlat)
{
cvf::Vec3d startPt = cvf::Vec3d::ZERO;
cvf::Mat4d flattenMx = cvf::Mat4d::IDENTITY;
int polyLineIdx = -1;
int segIdx = -1;
for (size_t pLineIdx = 0; pLineIdx < m_flattenedOrOffsettedPolyLines.size(); pLineIdx++)
for ( size_t pLineIdx = 0; pLineIdx < m_flattenedOrOffsettedPolyLines.size(); pLineIdx++ )
{
std::vector<cvf::Vec3d> polyLine = m_flattenedOrOffsettedPolyLines[pLineIdx];
const std::vector<cvf::Vec3d>& polyLine = m_flattenedOrOffsettedPolyLines[pLineIdx];
for(size_t pIdx = 0; pIdx < polyLine.size(); pIdx++)
{
// Assumes ascending sorted list
if (pIdx > 0 && intersectionPointFlat.x() < polyLine[pIdx].x())
if (polyLine[pIdx].x() >= intersectionPointFlat.x() )
{
polyLineIdx = static_cast<int>(pLineIdx);
segIdx = static_cast<int>(pIdx) - 1;
startPt = polyLine[segIdx];
size_t csIdx = pIdx > 0 ? pIdx - 1: 0;
flattenMx = m_segementTransformPrLinePoint[pLineIdx][csIdx];
break;
}
else if (pIdx == polyLine.size() - 1)
{
flattenMx = m_segementTransformPrLinePoint[pLineIdx][pIdx];
}
}
if (!startPt.isZero()) break;
}
if (polyLineIdx > -1 && segIdx > -1)
{
cvf::Mat4d t = m_segementTransformPrLinePoint[polyLineIdx][segIdx];
return t.getInverted(); // Check for invertible?
}
return cvf::Mat4d::ZERO;
return flattenMx.getInverted();
}
//--------------------------------------------------------------------------------------------------