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

#5766 Sim Well Disks : Improve logic related to display of labels

Browse Source
This commit is contained in:
Magne Sjaastad 2020-04-07 08:41:26 +02:00 committed by Gaute Lindkvist
parent 42ca07d2cd
commit bed3381c4c
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ApplicationCode/ModelVisualization/RivWellDiskPartMgr.cpp
View File

@ -198,8 +198,13 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
double accumulatedPropertyValue = 0.0;
const double valueThresholdForLabel = 1e-6;
QString labelText = m_rimWell->name();
RigWellDiskData diskData = m_rimWell->wellDiskData();
QString labelText;
if ( m_rimWell->showWellLabel() )
{
labelText = m_rimWell->name();
}
RigWellDiskData diskData = m_rimWell->wellDiskData();
if ( diskData.isSingleProperty() )
{
// Set color for the triangle vertices
@ -357,8 +362,7 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
}
}
bool showTextLabels = well->showWellLabel() && well->showWellDisks() && !well->name().isEmpty();
if ( showTextLabels )
if ( well->showWellDisks() )
{
cvf::Font* font = RiaGuiApplication::instance()->defaultWellLabelFont();
@ -378,8 +382,11 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
cvf::String cvfString = cvfqt::Utils::toString( labelText );
cvf::Vec3f textCoord( textPosition );
drawableText->addText( cvfString, textCoord );
if ( !cvfString.isEmpty() )
{
cvf::Vec3f textCoord( textPosition );
drawableText->addText( cvfString, textCoord );
}
if ( simWellInViewCollection()->showWellDiskQuantityLables() )
{
@ -389,16 +396,19 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
}
}
cvf::ref<cvf::Part> part = new cvf::Part;
part->setName( "RivWellDiskPartMgr: text " + cvfString );
part->setDrawable( drawableText.p() );
if ( drawableText->numberOfTexts() > 0 )
{
cvf::ref<cvf::Part> part = new cvf::Part;
part->setName( "RivWellDiskPartMgr: text " + cvfString );
part->setDrawable( drawableText.p() );
cvf::ref<cvf::Effect> eff = new cvf::Effect;
cvf::ref<cvf::Effect> eff = new cvf::Effect;
part->setEffect( eff.p() );
part->setPriority( RivPartPriority::PartType::Text );
part->setEffect( eff.p() );
part->setPriority( RivPartPriority::PartType::Text );
m_wellDiskLabelPart = part;
m_wellDiskLabelPart = part;
}
}
}