Fixes by clang-format

This commit is contained in:
magnesj
2020-11-09 12:44:29 +00:00
committed by Magne Sjaastad
parent 6efad29aa6
commit 0258874e17
204 changed files with 67512 additions and 67423 deletions

View File

@@ -162,22 +162,22 @@ std::set<double> RimWellPathAttribute::supportedDiameters( RiaDefines::WellPathC
std::set<double> values;
if ( type == RiaDefines::WellPathComponentType::CASING )
{
values = {MAX_DIAMETER_IN_INCHES,
26.0,
22.0,
20.0,
18.0 + 5.0 / 8.0,
16.0,
14.0,
13.0 + 3.0 / 8.0,
10.0 + 3.0 / 4.0,
9.0 + 7.0 / 8.0,
9.0 + 5.0 / 8.0,
MIN_DIAMETER_IN_INCHES};
values = { MAX_DIAMETER_IN_INCHES,
26.0,
22.0,
20.0,
18.0 + 5.0 / 8.0,
16.0,
14.0,
13.0 + 3.0 / 8.0,
10.0 + 3.0 / 4.0,
9.0 + 7.0 / 8.0,
9.0 + 5.0 / 8.0,
MIN_DIAMETER_IN_INCHES };
}
else
{
values = {9.0 + 7.0 / 8.0, 9.0 + 5.0 / 8.0, 7.0, 5.5, 5.0, 4.5, 3.5};
values = { 9.0 + 7.0 / 8.0, 9.0 + 5.0 / 8.0, 7.0, 5.5, 5.0, 4.5, 3.5 };
}
return values;
}
@@ -199,9 +199,9 @@ QList<caf::PdmOptionItemInfo>
QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &m_type )
{
std::set<RiaDefines::WellPathComponentType> supportedTypes = {RiaDefines::WellPathComponentType::CASING,
RiaDefines::WellPathComponentType::LINER,
RiaDefines::WellPathComponentType::PACKER};
std::set<RiaDefines::WellPathComponentType> supportedTypes = { RiaDefines::WellPathComponentType::CASING,
RiaDefines::WellPathComponentType::LINER,
RiaDefines::WellPathComponentType::PACKER };
for ( RiaDefines::WellPathComponentType type : supportedTypes )
{
options.push_back( caf::PdmOptionItemInfo( CompletionTypeEnum::uiText( type ), type ) );