Skip to content

Commit

Permalink
Add icon to intersection results
Browse files Browse the repository at this point in the history
  • Loading branch information
magnesj committed Apr 17, 2020
1 parent 5d86e16 commit 404a9ec
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ CAF_PDM_SOURCE_INIT( RimIntersectionResultDefinition, "IntersectionResultDefinit
//--------------------------------------------------------------------------------------------------
RimIntersectionResultDefinition::RimIntersectionResultDefinition()
{
CAF_PDM_InitObject( "Intersection Result Definition", "", "", "" );
CAF_PDM_InitObject( "Intersection Result Definition", ":/CellResult.png", "", "" );

CAF_PDM_InitField( &m_isActive, "IsActive", true, "Active", "", "", "" );
m_isActive.uiCapability()->setUiHidden( true );
Expand Down Expand Up @@ -340,6 +340,8 @@ void RimIntersectionResultDefinition::fieldChangedByUi( const caf::PdmFieldHandl

update2dIntersectionViews();
}

this->updateUiIconFromToggleField();
}

//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -447,6 +449,8 @@ void RimIntersectionResultDefinition::initAfterRead()
{
m_geomResultDefinition->setGeoMechCase( geomCase );
}

this->updateUiIconFromToggleField();
}

//--------------------------------------------------------------------------------------------------
Expand Down
7 changes: 7 additions & 0 deletions ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@ void RimRegularLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change
{
rftPlot->onLegendDefinitionChanged();
}

this->updateUiIconFromToggleField();
}

//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -540,8 +542,13 @@ void RimRegularLegendConfig::setAutomaticRanges( double globalMin, double global
void RimRegularLegendConfig::initAfterRead()
{
updateFieldVisibility();

this->updateUiIconFromToggleField();
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimRegularLegendConfig::objectToggleField()
{
return &m_showLegend;
Expand Down

0 comments on commit 404a9ec

Please sign in to comment.