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

#5019 Support separate intersection results for 2Dintersection views

Browse Source
This commit is contained in:
Jacob Støren
2019-11-25 11:40:57 +01:00
parent 1ab815e673
commit 9bfe51b205
2 changed files with 156 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp
View File

@@ -319,14 +319,24 @@ void RivIntersectionPartMgr::createFaultLabelParts( const std::vector<std::pair<
if ( !labelAndAnchors.size() ) return;
RimEclipseView* eclipseView = nullptr;
m_rimCrossSection->firstAncestorOrThisOfType( eclipseView );
RimFaultInViewCollection* faultInViewColl = eclipseView->faultCollection();
RimFaultInViewCollection* faultInViewColl = nullptr;
if ( !( eclipseView && faultInViewColl->showFaultLabel() ) ) return;
if ( !m_rimCrossSection->activeSeparateResultDefinition() )
{
RimEclipseView* eclipseView = nullptr;
m_rimCrossSection->firstAncestorOrThisOfType( eclipseView );
if ( eclipseView )
{
faultInViewColl = eclipseView->faultCollection();
cvf::Color3f faultLabelColor = faultInViewColl->faultLabelColor();
cvf::Font* font = RiaGuiApplication::instance()->defaultSceneFont();
if ( faultInViewColl && !faultInViewColl->showFaultLabel() ) return;
}
}
cvf::Color3f faultLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor();
if ( faultInViewColl ) faultLabelColor = faultInViewColl->faultLabelColor();
cvf::Font* font = RiaGuiApplication::instance()->defaultSceneFont();
std::vector<cvf::Vec3f> lineVertices;
@@ -346,9 +356,11 @@ void RivIntersectionPartMgr::createFaultLabelParts( const std::vector<std::pair<
for ( const auto& labelAndAnchorPair : labelAndAnchors )
{
RimFaultInView* fault = faultInViewColl->findFaultByName( labelAndAnchorPair.first );
if ( !( fault && fault->showFault() ) ) continue;
if ( faultInViewColl )
{
RimFaultInView* fault = faultInViewColl->findFaultByName( labelAndAnchorPair.first );
if ( !( fault && fault->showFault() ) ) continue;
}
cvf::String cvfString = cvfqt::Utils::toString( labelAndAnchorPair.first );
cvf::Vec3f textCoord( labelAndAnchorPair.second );