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

Bugfix - make show contour label checkbox work for contour plots

Browse Source
This commit is contained in:
Jon Jenssen
2020-11-04 15:21:17 +01:00
committed by Magne Sjaastad
parent db007dfaab
commit 784e241eb9
3 changed files with 62 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp
View File

@@ -127,8 +127,12 @@ void RivContourMapProjectionPartMgr::appendContourLinesToModel( const cvf::Camer
cvf::ScalarMapper* mapper = m_contourMapProjection->legendConfig()->scalarMapper(); cvf::ScalarMapper* mapper = m_contourMapProjection->legendConfig()->scalarMapper();
std::vector<std::vector<cvf::BoundingBox>> labelBBoxes; std::vector<std::vector<cvf::BoundingBox>> labelBBoxes;
std::vector<cvf::ref<cvf::Drawable>> labelDrawables = std::vector<cvf::ref<cvf::Drawable>> labelDrawables;
createContourLabels( camera, displayCoordTransform, &labelBBoxes );
if ( m_contourMapProjection->showContourLabels() )
{
labelDrawables = createContourLabels( camera, displayCoordTransform, &labelBBoxes );
}
std::vector<std::vector<cvf::ref<cvf::Drawable>>> contourDrawablesForAllLevels = std::vector<std::vector<cvf::ref<cvf::Drawable>>> contourDrawablesForAllLevels =
createContourPolygons( displayCoordTransform, labelBBoxes ); createContourPolygons( displayCoordTransform, labelBBoxes );
@@ -163,6 +167,9 @@ void RivContourMapProjectionPartMgr::appendContourLinesToModel( const cvf::Camer
} }
} }
} }
if ( m_contourMapProjection->showContourLabels() )
{
for ( auto labelDrawableRef : labelDrawables ) for ( auto labelDrawableRef : labelDrawables )
{ {
cvf::ref<cvf::Part> part = new cvf::Part; cvf::ref<cvf::Part> part = new cvf::Part;
@@ -173,6 +180,7 @@ void RivContourMapProjectionPartMgr::appendContourLinesToModel( const cvf::Camer
model->addPart( part.p() ); model->addPart( part.p() );
} }
} }
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -295,6 +303,8 @@ std::vector<std::vector<cvf::ref<cvf::Drawable>>>
lineBBox.add( displayVertex2 ); lineBBox.add( displayVertex2 );
bool addOriginalSegment = true; bool addOriginalSegment = true;
if ( labelBBoxes.size() > 0 )
{
for ( const cvf::BoundingBox& existingBBox : labelBBoxes[i] ) for ( const cvf::BoundingBox& existingBBox : labelBBoxes[i] )
{ {
if ( lineBBox.intersects( existingBBox ) ) if ( lineBBox.intersects( existingBBox ) )
@@ -340,6 +350,7 @@ std::vector<std::vector<cvf::ref<cvf::Drawable>>>
} }
} }
} }
}
if ( addOriginalSegment ) if ( addOriginalSegment )
{ {
displayLines.push_back( cvf::Vec3f( displayVertex1 ) ); displayLines.push_back( cvf::Vec3f( displayVertex1 ) );

8
ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp
View File

@@ -239,6 +239,14 @@ bool RimContourMapProjection::showContourLines() const
return m_showContourLines(); return m_showContourLines();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimContourMapProjection::showContourLabels() const
{
return m_showContourLabels();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimContourMapProjection.h
View File

@@ -89,6 +89,7 @@ public:
double sampleSpacingFactor() const; double sampleSpacingFactor() const;
void setSampleSpacingFactor( double spacingFactor ); void setSampleSpacingFactor( double spacingFactor );
bool showContourLines() const; bool showContourLines() const;
bool showContourLabels() const;
QString resultAggregationText() const; QString resultAggregationText() const;