#3958 Refactoring: Removed result index from NNC data

This commit is contained in:
Jacob Støren
2019-01-23 16:08:25 +01:00
parent 09011862cd
commit d8eded7d49
10 changed files with 75 additions and 73 deletions

View File

@@ -159,18 +159,18 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
bool showNncs = true;
if (faultCollection->hideNncsWhenNoResultIsAvailable())
{
RigEclipseResultAddress scalarResultIndex;
RigEclipseResultAddress eclipseResultAddress;
if (faultResultColors->showCustomFaultResult())
{
scalarResultIndex = faultResultColors->customFaultResult()->eclipseResultAddress();
eclipseResultAddress = faultResultColors->customFaultResult()->eclipseResultAddress();
}
else
{
scalarResultIndex = cellResultColors->eclipseResultAddress();
eclipseResultAddress = cellResultColors->eclipseResultAddress();
}
RigMainGrid* mainGrid = m_reservoirView->mainGrid();
if (!(mainGrid && mainGrid->nncData()->hasScalarValues(scalarResultIndex.scalarResultIndex)))
if (!(mainGrid && mainGrid->nncData()->hasScalarValues(eclipseResultAddress)))
{
showNncs = false;
}