#2442 Fracture Template : Move several fields from public to protected

This commit is contained in:
Magne Sjaastad
2018-02-08 11:34:18 +01:00
parent beb122c6d0
commit 80eefb3141
6 changed files with 126 additions and 101 deletions

View File

@@ -483,11 +483,11 @@ void RimFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiO
m_perforationLength.uiCapability()->setUiHidden(true);
}
if (fractureTemplate()->conductivityType == RimFractureTemplate::FINITE_CONDUCTIVITY)
if (fractureTemplate()->conductivityType() == RimFractureTemplate::FINITE_CONDUCTIVITY)
{
m_wellDiameter.uiCapability()->setUiHidden(false);
}
else if (fractureTemplate()->conductivityType == RimFractureTemplate::INFINITE_CONDUCTIVITY)
else if (fractureTemplate()->conductivityType() == RimFractureTemplate::INFINITE_CONDUCTIVITY)
{
m_wellDiameter.uiCapability()->setUiHidden(true);
}
@@ -628,7 +628,7 @@ void RimFracture::setFractureTemplate(RimFractureTemplate* fractureTemplate)
if (fractureTemplate->orientationType == RimFractureTemplate::AZIMUTH)
{
m_azimuth = fractureTemplate->azimuthAngle;
m_azimuth = fractureTemplate->azimuthAngle();
}
else
{