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

Faults: Improved forced visibility control of faults. Renaming.

Browse Source
This commit is contained in:
Magne Sjaastad
2014-01-07 14:27:43 +01:00
parent 645f824ed0
commit 7276c2ad31
8 changed files with 125 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@@ -45,7 +45,7 @@ RivReservoirFaultsPartMgr::RivReservoirFaultsPartMgr(const RigMainGrid* grid, c
}
}
m_isFilterGenerated = false;
m_forceVisibility = false;
}
//--------------------------------------------------------------------------------------------------
@@ -101,9 +101,8 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
CVF_ASSERT(rivFaultPart.notNull());
// Parts that is overridden by the grid settings
bool forceDisplayOfFault = false;
if (isShowingGrid && m_isFilterGenerated)
bool forceDisplayOfFault = isShowingGrid;
if (m_forceVisibility)
{
forceDisplayOfFault = true;
}
@@ -160,7 +159,7 @@ void RivReservoirFaultsPartMgr::applySingleColorEffect()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot)
void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimResultSlot* cellResultSlot)
{
if (m_faultCollection->showResultsOnFaults())
{
@@ -229,8 +228,8 @@ void RivReservoirFaultsPartMgr::appendLabelPartsToModel(cvf::ModelBasicList* mod
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::setGeneratedByFilter(bool isFilterGenerated)
void RivReservoirFaultsPartMgr::setFaultForceVisibility(bool forceVisibility)
{
m_isFilterGenerated = isFilterGenerated;
m_forceVisibility = forceVisibility;
}