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

(#115) Stopped creating text drawables for empty strings

Browse Source 
Note: Adding empty strings to cvf::TextDrawer will cause asserts.
This commit is contained in:
Pål Hagen 2015-07-02 16:11:34 +02:00
parent a9ecbd9899
commit 1cf2c03f78
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@ -427,6 +427,7 @@ void RivFaultPartMgr::createLabelWithAnchorLine(const cvf::Part* part)
m_faultLabelLinePart = NULL; m_faultLabelLinePart = NULL;
if (!part) return; if (!part) return;
if (m_rimFault->name().isEmpty()) return;
cvf::BoundingBox bb = part->boundingBox(); cvf::BoundingBox bb = part->boundingBox();

2
ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
View File

@ -282,7 +282,7 @@ void RivWellHeadPartMgr::buildWellHeadParts(size_t frameIndex)
m_wellHeadParts.push_back(part.p()); m_wellHeadParts.push_back(part.p());
} }
if (m_rimReservoirView->wellCollection()->showWellLabel() && well->showWellLabel()) if (m_rimReservoirView->wellCollection()->showWellLabel() && well->showWellLabel() && !well->name().isEmpty())
{ {
cvf::Font* standardFont = RiaApplication::instance()->standardFont(); cvf::Font* standardFont = RiaApplication::instance()->standardFont();

2
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
View File

@ -185,7 +185,7 @@ void RivWellPathPartMgr::buildWellPathParts(cvf::Vec3d displayModelOffset, doubl
textPosition.z() += 1.2 * characteristicCellSize; textPosition.z() += 1.2 * characteristicCellSize;
m_wellLabelPart = NULL; m_wellLabelPart = NULL;
if (m_wellPathCollection->showWellPathLabel() && m_rimWellPath->showWellPathLabel()) if (m_wellPathCollection->showWellPathLabel() && m_rimWellPath->showWellPathLabel() && !m_rimWellPath->name().isEmpty())
{ {
cvf::Font* standardFont = RiaApplication::instance()->standardFont(); cvf::Font* standardFont = RiaApplication::instance()->standardFont();