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

clang-format: Set column width to 140

Browse Source 
* Set column width to 140
* Use c++20
* Remove redundant virtual
This commit is contained in:
Magne Sjaastad
2023-02-26 10:48:40 +01:00
committed by GitHub
parent 8768e186d8
commit f8c5cf389f
1535 changed files with 10456 additions and 19398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationLibCode/ProjectDataModel/RimMultipleLocations.cpp
View File

@@ -44,10 +44,7 @@ RimMultipleLocations::RimMultipleLocations()
{
CAF_PDM_InitObject( "RimMultipleLocations", ":/FishBoneGroup16x16.png" );
CAF_PDM_InitField( &m_locationType,
"LocationMode",
caf::AppEnum<LocationType>( LocationType::COUNT ),
"Location Defined By" );
CAF_PDM_InitField( &m_locationType, "LocationMode", caf::AppEnum<LocationType>( LocationType::COUNT ), "Location Defined By" );
CAF_PDM_InitField( &m_rangeStart, "RangeStart", 100.0, "Start MD" );
m_rangeStart.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() );
@@ -263,9 +260,7 @@ void RimMultipleLocations::defineUiOrdering( QString uiConfigName, caf::PdmUiOrd
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimMultipleLocations::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
void RimMultipleLocations::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
bool recomputeLocations = false;
@@ -277,8 +272,7 @@ void RimMultipleLocations::fieldChangedByUi( const caf::PdmFieldHandle* changedF
}
}
if ( changedField == &m_rangeStart || changedField == &m_rangeEnd || changedField == &m_rangeCount ||
changedField == &m_rangeSpacing )
if ( changedField == &m_rangeStart || changedField == &m_rangeEnd || changedField == &m_rangeCount || changedField == &m_rangeSpacing )
{
recomputeLocations = true;
}
@@ -287,8 +281,7 @@ void RimMultipleLocations::fieldChangedByUi( const caf::PdmFieldHandle* changedF
{
double minimumDistanceMeter = minimumSpacingMeters();
m_rangeSpacing =
std::clamp( m_rangeSpacing(), minimumDistanceMeter, std::max( m_rangeSpacing(), minimumDistanceMeter ) );
m_rangeSpacing = std::clamp( m_rangeSpacing(), minimumDistanceMeter, std::max( m_rangeSpacing(), minimumDistanceMeter ) );
}
if ( recomputeLocations )