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

Fix intersection crash by making sure we do nothing when top limit is below bottom limit

Browse Source
This commit is contained in:
Jon Jenssen 2022-06-01 17:59:54 +02:00 committed by Magne Sjaastad
parent fd7821a10b
commit 89773da26e
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.cpp
View File

@ -236,6 +236,10 @@ void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
{ {
if ( m_intersectionGenerator.isNull() ) return; if ( m_intersectionGenerator.isNull() ) return;
if ( m_rimIntersection->depthFilterType() == RimIntersectionFilterEnum::INTERSECT_FILTER_BETWEEN &&
( m_rimIntersection->lowerFilterDepth( 1.0 ) <= m_rimIntersection->upperFilterDepth( 1.0 ) ) )
return;
bool useBufferObjects = true; bool useBufferObjects = true;
// Surface geometry // Surface geometry
{ {

12
ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp
View File

@ -343,6 +343,18 @@ double RimExtrudedCurveIntersection::upperFilterDepth( double sceneRadius ) cons
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimIntersectionFilterEnum RimExtrudedCurveIntersection::depthFilterType() const
{
if ( m_depthThresholdOverridden )
{
return m_collectionDepthFilterType();
}
return m_depthFilterType();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

5
ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.h
View File

@ -78,8 +78,9 @@ public:
QString name() const override; QString name() const override;
void setName( const QString& newName ); void setName( const QString& newName );
double upperFilterDepth( double sceneRadius ) const; double upperFilterDepth( double sceneRadius ) const;
double lowerFilterDepth( double sceneRadius ) const; double lowerFilterDepth( double sceneRadius ) const;
RimIntersectionFilterEnum depthFilterType() const;
void setDepthOverride( bool collectionOverride ); void setDepthOverride( bool collectionOverride );
void setDepthOverrideParameters( double upperThreshold, double lowerThreshold, RimIntersectionFilterEnum filterType ); void setDepthOverrideParameters( double upperThreshold, double lowerThreshold, RimIntersectionFilterEnum filterType );