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

Always show result color when showing grid

Browse Source
This commit is contained in:
Magne Sjaastad
2014-07-25 13:26:43 +02:00
parent 57f1da1675
commit ff674d8eb0
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@@ -107,7 +107,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
forceDisplayOfFault = isShowingGrid; forceDisplayOfFault = isShowingGrid;
} }
if (m_forceVisibility) if (m_forceVisibility && isShowingGrid)
{ {
forceDisplayOfFault = true; forceDisplayOfFault = true;
} }
@@ -166,18 +166,27 @@ void RivReservoirFaultsPartMgr::applySingleColorEffect()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimResultSlot* cellResultSlot) void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimResultSlot* cellResultSlot)
{ {
bool isShowingGrid = m_faultCollection->isGridVisualizationMode();
for (size_t i = 0; i < m_faultCollection->faults.size(); i++) for (size_t i = 0; i < m_faultCollection->faults.size(); i++)
{ {
RimFault* rimFault = m_faultCollection->faults[i]; RimFault* rimFault = m_faultCollection->faults[i];
if (m_faultCollection->showFaultCollection && rimFault->showFault && !m_faultCollection->showResultsOnFaults()) if (isShowingGrid)
{ {
m_faultParts[i]->applySingleColorEffect(); m_faultParts[i]->updateCellResultColor(timeStepIndex, cellResultSlot);
} }
else else
{
if (m_faultCollection->showResultsOnFaults())
{ {
m_faultParts[i]->updateCellResultColor(timeStepIndex, cellResultSlot); m_faultParts[i]->updateCellResultColor(timeStepIndex, cellResultSlot);
} }
else
{
m_faultParts[i]->applySingleColorEffect();
}
}
} }
} }