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

Fixes by clang-format

Browse Source
This commit is contained in:
magnesj 2021-02-22 12:16:33 +00:00 committed by Magne Sjaastad
parent 1caac72715
commit cf7887ad8e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp
View File

@ -332,14 +332,14 @@ void RimMultipleValveLocations::fieldChangedByUi( const caf::PdmFieldHandle* cha
{ {
double minimumDistanceFeet = RiaEclipseUnitTools::meterToFeet( minimumDistanceMeter ); double minimumDistanceFeet = RiaEclipseUnitTools::meterToFeet( minimumDistanceMeter );
m_rangeValveSpacing = std::clamp( m_rangeValveSpacing(), m_rangeValveSpacing = std::clamp( m_rangeValveSpacing(),
minimumDistanceFeet, minimumDistanceFeet,
std::max( m_rangeValveSpacing(), minimumDistanceFeet ) ); std::max( m_rangeValveSpacing(), minimumDistanceFeet ) );
} }
else else
{ {
m_rangeValveSpacing = std::clamp( m_rangeValveSpacing(), m_rangeValveSpacing = std::clamp( m_rangeValveSpacing(),
minimumDistanceMeter, minimumDistanceMeter,
std::max( m_rangeValveSpacing(), minimumDistanceMeter ) ); std::max( m_rangeValveSpacing(), minimumDistanceMeter ) );
} }
} }

3
ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -1137,8 +1137,7 @@ void RimEclipseView::updateStaticCellColors( RivCellSetEnum geometryType )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::Color4f RimEclipseView::colorFromCellCategory( RivCellSetEnum geometryType ) const cvf::Color4f RimEclipseView::colorFromCellCategory( RivCellSetEnum geometryType ) const
{ {
float opacity = float opacity = static_cast<float>( 1 - std::clamp( this->wellCollection()->wellCellTransparencyLevel(), 0.0, 1.0 ) );
static_cast<float>( 1 - std::clamp( this->wellCollection()->wellCellTransparencyLevel(), 0.0, 1.0 ) );
cvf::Color4f color( cvf::Color3::ORANGE ); cvf::Color4f color( cvf::Color3::ORANGE );
switch ( geometryType ) switch ( geometryType )