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

Surface Folders

Browse Source 
* #7978 Ensemble Surface : Use collection instead of specialized class
* Review updates
This commit is contained in:
Magne Sjaastad
2021-09-13 10:16:09 +02:00
committed by GitHub
parent 41f80e7d89
commit 7b1185cec4
19 changed files with 219 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationLibCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp
View File

@@ -173,6 +173,7 @@ void RivExtrudedCurveIntersectionGeometryGenerator::calculateSurfaceIntersection
rimSurface->loadDataIfRequired();
auto surface = rimSurface->surfaceData();
if ( !surface ) return;
std::vector<cvf::Vec3d> transformedSurfacePolyline;

10
ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
View File

@@ -237,6 +237,8 @@ QString RivSurfacePartMgr::resultInfoText( Rim3dView* view, uint hitPart, cvf::V
{
const auto& values =
m_usedSurfaceData->propertyValues( m_surfaceInView->surfaceResultDefinition()->propertyName() );
if ( values.empty() ) return "";
const auto& ind = m_usedSurfaceData->triangleIndices();
const auto& vert = m_usedSurfaceData->vertices();
@@ -253,9 +255,11 @@ QString RivSurfacePartMgr::resultInfoText( Rim3dView* view, uint hitPart, cvf::V
double dist2 = vert[vertIndex2].pointDistance( hitPoint );
double dist3 = vert[vertIndex3].pointDistance( hitPoint );
double resultValue = values[vertIndex1];
if ( dist2 < dist1 ) resultValue = values[vertIndex2];
if ( ( dist3 < dist1 ) && ( dist3 < dist2 ) ) resultValue = values[vertIndex3];
double resultValue = -1.0;
if ( vertIndex1 < values.size() ) resultValue = values[vertIndex1];
if ( dist2 < dist1 && vertIndex2 < values.size() ) resultValue = values[vertIndex2];
if ( ( dist3 < dist1 ) && ( dist3 < dist2 ) && vertIndex3 < values.size() )
resultValue = values[vertIndex3];
retval +=
QString( "%1 : %2\n\n" ).arg( m_surfaceInView->surfaceResultDefinition()->propertyName() ).arg( resultValue );