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

#5465 Allen : Fix logic to control visibility of NNCs

Browse Source
This commit is contained in:
Magne Sjaastad 2020-02-04 15:44:52 +01:00
parent bf108c928b
commit 9c90caedd1
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -157,39 +157,39 @@ void RivReservoirFaultsPartMgr::appendPartsToModel( cvf::ModelBasicList* model )
bool showNncs = true;
bool showCompleteNncGeo = false;
if ( faultCollection->hideNncsWhenNoResultIsAvailable() )
RigEclipseResultAddress eclipseResultAddress;
if ( faultResultColors->showCustomFaultResult() )
{
RigEclipseResultAddress eclipseResultAddress;
if ( faultResultColors->showCustomFaultResult() )
{
eclipseResultAddress = faultResultColors->customFaultResult()->eclipseResultAddress();
}
else
{
eclipseResultAddress = cellResultColors->eclipseResultAddress();
}
eclipseResultAddress = faultResultColors->customFaultResult()->eclipseResultAddress();
}
else
{
eclipseResultAddress = cellResultColors->eclipseResultAddress();
}
if ( eclipseResultAddress.m_resultCatType == RiaDefines::ALLEN_DIAGRAMS )
{
showCompleteNncGeo = true;
}
if ( eclipseResultAddress.m_resultCatType == RiaDefines::ALLEN_DIAGRAMS )
{
showCompleteNncGeo = true;
}
{
QStringList stringsToMatch{RiaDefines::combinedRiTranResultName(),
RiaDefines::combinedRiMultResultName(),
RiaDefines::combinedRiAreaNormTranResultName(),
RiaDefines::combinedTransmissibilityResultName(),
RiaDefines::combinedMultResultName()};
{
QStringList stringsToMatch{RiaDefines::combinedRiTranResultName(),
RiaDefines::combinedRiMultResultName(),
RiaDefines::combinedRiAreaNormTranResultName(),
RiaDefines::combinedTransmissibilityResultName(),
RiaDefines::combinedMultResultName()};
for ( const auto& s : stringsToMatch )
for ( const auto& s : stringsToMatch )
{
if ( eclipseResultAddress.m_resultName.contains( s, Qt::CaseInsensitive ) )
{
if ( eclipseResultAddress.m_resultName.contains( s, Qt::CaseInsensitive ) )
{
showCompleteNncGeo = true;
}
showCompleteNncGeo = true;
}
}
}
if ( faultCollection->hideNncsWhenNoResultIsAvailable() )
{
RigMainGrid* mainGrid = m_reservoirView->mainGrid();
if ( !( mainGrid && mainGrid->nncData()->hasScalarValues( eclipseResultAddress ) ) )
{