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

#945 Rename

Browse Source
This commit is contained in:
Magne Sjaastad
2016-11-17 14:37:10 +01:00
parent 8b95f1c06d
commit 3ba7ade88e
8 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@@ -37,6 +37,7 @@
#include "cafPdmFieldCvfColor.h"
#include <QDebug>
//--------------------------------------------------------------------------------------------------
///
@@ -58,7 +59,7 @@ RivReservoirFaultsPartMgr::RivReservoirFaultsPartMgr(const RigMainGrid* grid, R
}
}
m_forceVisibility = false;
m_forceWatertightGeometry = false;
}
//--------------------------------------------------------------------------------------------------
@@ -106,6 +107,20 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
// Check match between model fault count and fault parts
CVF_ASSERT(faultCollection->faults.size() == m_faultParts.size());
// Parts that is overridden by the grid settings
bool forceDisplayOfFault = false;
if (!faultCollection->showFaultsOutsideFilters())
{
forceDisplayOfFault = isShowingGrid;
}
if (m_forceWatertightGeometry && isShowingGrid)
{
forceDisplayOfFault = true;
}
//qDebug() << forceDisplayOfFault;
cvf::ModelBasicList parts;
for (size_t i = 0; i < faultCollection->faults.size(); i++)
@@ -115,18 +130,6 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
cvf::ref<RivFaultPartMgr> rivFaultPart = m_faultParts[i];
CVF_ASSERT(rivFaultPart.notNull());
// Parts that is overridden by the grid settings
bool forceDisplayOfFault = false;
if (!faultCollection->showFaultsOutsideFilters())
{
forceDisplayOfFault = isShowingGrid;
}
if (m_forceVisibility && isShowingGrid)
{
forceDisplayOfFault = true;
}
if ( (faultCollection->showFaultCollection() && rimFault->showFault()) || forceDisplayOfFault)
{
if (faultCollection->showFaultFaces() || forceDisplayOfFault)
@@ -280,9 +283,9 @@ void RivReservoirFaultsPartMgr::appendLabelPartsToModel(cvf::ModelBasicList* mod
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::setFaultForceVisibility(bool forceVisibility)
void RivReservoirFaultsPartMgr::forceWatertightGeometryOn(bool forceWatertightGeometry)
{
m_forceVisibility = forceVisibility;
m_forceWatertightGeometry = forceWatertightGeometry;
}
//--------------------------------------------------------------------------------------------------