#5101 clang-format: Adjusted penalties

Use lower absolute values to improve control of behavior
This commit is contained in:
Magne Sjaastad
2020-02-12 11:43:15 +01:00
parent 10f0abc9b5
commit c82df63e10
710 changed files with 3167 additions and 4721 deletions

View File

@@ -34,9 +34,7 @@ template <>
void RimPlotAxisAnnotation::ExportKeywordEnum::setUp()
{
addItem( RimPlotAxisAnnotation::PL_USER_DEFINED, "User Defined", "User Defined" );
addItem( RimPlotAxisAnnotation::PL_EQUIL_WATER_OIL_CONTACT,
"PL_EQUIL_WATER_OIL_CONTACT",
"PL_EQUIL_WATER_OIL_CONTACT" );
addItem( RimPlotAxisAnnotation::PL_EQUIL_WATER_OIL_CONTACT, "PL_EQUIL_WATER_OIL_CONTACT", "PL_EQUIL_WATER_OIL_CONTACT" );
addItem( RimPlotAxisAnnotation::PL_EQUIL_GAS_OIL_CONTACT, "PL_EQUIL_GAS_OIL_CONTACT", "PL_EQUIL_GAS_OIL_CONTACT" );
setDefault( RimPlotAxisAnnotation::PL_USER_DEFINED );
}
@@ -250,8 +248,8 @@ void RimPlotAxisAnnotation::updateName()
if ( m_annotationType() == PL_EQUIL_WATER_OIL_CONTACT || m_annotationType() == PL_EQUIL_GAS_OIL_CONTACT )
{
double diffBetweenTwoContactDepths = std::fabs( selectedItem().gasOilContactDepth() -
selectedItem().waterOilContactDepth() );
double diffBetweenTwoContactDepths =
std::fabs( selectedItem().gasOilContactDepth() - selectedItem().waterOilContactDepth() );
if ( diffBetweenTwoContactDepths < 0.1 )
{