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

#5019 WIP: Made fields in IntersectionHandle protected

Browse Source
This commit is contained in:
Jacob Støren
2019-11-12 15:10:41 +01:00
parent 8fb3fbc097
commit 9ed3d8babc
11 changed files with 93 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp
View File

@@ -79,7 +79,7 @@ void RimIntersectionCollection::applySingleColorEffect()
for ( RimIntersection* cs : m_intersections )
{
if ( cs->isActive )
if ( cs->isActive() )
{
cs->intersectionPartMgr()->applySingleColorEffect();
}
@@ -105,7 +105,7 @@ void RimIntersectionCollection::updateCellResultColor( size_t
for ( RimIntersection* cs : m_intersections )
{
if ( cs->isActive )
if ( cs->isActive() )
{
cs->intersectionPartMgr()->updateCellResultColor( timeStepIndex, scalarColorMapper, ternaryColorMapper );
}
@@ -127,11 +127,11 @@ void RimIntersectionCollection::appendPartsToModel( Rim3dView& view,
cvf::ModelBasicList* model,
cvf::Transform* scaleTransform )
{
if ( !isActive ) return;
if ( !isActive() ) return;
for ( RimIntersection* cs : m_intersections )
{
if ( cs->isActive )
if ( cs->isActive() )
{
cs->intersectionPartMgr()->appendNativeCrossSectionFacesToModel( model, scaleTransform );
cs->intersectionPartMgr()->appendMeshLinePartsToModel( model, scaleTransform );
@@ -141,7 +141,7 @@ void RimIntersectionCollection::appendPartsToModel( Rim3dView& view,
for ( RimIntersectionBox* cs : m_intersectionBoxes )
{
if ( cs->isActive )
if ( cs->isActive() )
{
cs->intersectionBoxPartMgr()->appendNativeCrossSectionFacesToModel( model, scaleTransform );
cs->intersectionBoxPartMgr()->appendMeshLinePartsToModel( model, scaleTransform );
@@ -302,11 +302,11 @@ void RimIntersectionCollection::fieldChangedByUi( const caf::PdmFieldHandle* cha
//--------------------------------------------------------------------------------------------------
bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell( const RimSimWellInView* simWell ) const
{
if ( !isActive ) return false;
if ( !isActive() ) return false;
for ( RimIntersection* cs : m_intersections )
{
if ( cs->isActive && cs->type() == RimIntersection::CS_SIMULATION_WELL && cs->simulationWell() == simWell )
if ( cs->isActive() && cs->type() == RimIntersection::CS_SIMULATION_WELL && cs->simulationWell() == simWell )
{
return true;
}