OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Faults: Always show fault color option

Browse Source
This commit is contained in:
Magne Sjaastad
2014-01-02 11:21:35 +01:00
parent 1ea31f61ba
commit 508334fcb0
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
+10 -8
View File
@@ -141,17 +141,12 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::updateCellColor(cvf::Color4f color)
void RivReservoirFaultsPartMgr::applySingleColorEffect()
{
CVF_UNUSED(color);
// NB color is not used, as the color is defined per fault
for (size_t i = 0; i < m_faultParts.size(); i++)
{
m_faultParts[i]->applySingleColorEffect();
}
}
//--------------------------------------------------------------------------------------------------
@@ -159,9 +154,16 @@ void RivReservoirFaultsPartMgr::updateCellColor(cvf::Color4f color)
//--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot)
{
for (size_t i = 0; i < m_faultParts.size(); i++)
if (m_faultCollection->forceFaultColor())
{
m_faultParts[i]->updateCellResultColor(timeStepIndex, cellResultSlot);
applySingleColorEffect();
}
else
{
for (size_t i = 0; i < m_faultParts.size(); i++)
{
m_faultParts[i]->updateCellResultColor(timeStepIndex, cellResultSlot);
}
}
}
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
void setTransform(cvf::Transform* scaleTransform);
void setCellVisibility(cvf::UByteArray* cellVisibilities);
void updateCellColor(cvf::Color4f color);
void applySingleColorEffect();
void updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ void RivReservoirPartMgr::updateCellColor(cvf::Color4f color)
if (m_faultsPartMgr.notNull())
{
m_faultsPartMgr->updateCellColor(color);
m_faultsPartMgr->applySingleColorEffect();
}
}