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

#2763 Use std::min and std::max instead of CVF_MAX and CVF_MIN

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-08-31 15:52:36 +02:00
committed by Magne Sjaastad
parent a114309776
commit a6ddf7e6c4
9 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimBoxIntersection.cpp
View File

@@ -289,7 +289,7 @@ void RimBoxIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedFie
}
else
{
m_minXCoord = CVF_MIN( m_maxXCoord, m_minXCoord );
m_minXCoord = std::min( m_maxXCoord, m_minXCoord );
}
}
else if ( changedField == &m_minYCoord )
@@ -300,7 +300,7 @@ void RimBoxIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedFie
}
else
{
m_minYCoord = CVF_MIN( m_maxYCoord, m_minYCoord );
m_minYCoord = std::min( m_maxYCoord, m_minYCoord );
}
}
else if ( changedField == &m_minDepth )
@@ -311,20 +311,20 @@ void RimBoxIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedFie
}
else
{
m_minDepth = CVF_MIN( m_maxDepth, m_minDepth );
m_minDepth = std::min( m_maxDepth, m_minDepth );
}
}
else if ( changedField == &m_maxXCoord )
{
m_maxXCoord = CVF_MAX( m_maxXCoord, m_minXCoord );
m_maxXCoord = std::max( m_maxXCoord, m_minXCoord );
}
else if ( changedField == &m_maxYCoord )
{
m_maxYCoord = CVF_MAX( m_maxYCoord, m_minYCoord );
m_maxYCoord = std::max( m_maxYCoord, m_minYCoord );
}
else if ( changedField == &m_maxDepth )
{
m_maxDepth = CVF_MAX( m_maxDepth, m_minDepth );
m_maxDepth = std::max( m_maxDepth, m_minDepth );
}
else if ( changedField == &m_show3DManipulator )
{

4
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@@ -475,8 +475,8 @@ void RimCellEdgeColors::minMaxCellEdgeValues( double& min, double& max )
double cMin, cMax;
m_reservoirView->currentGridCellResults()->minMaxCellScalarValues( resultAddresses[faceIdx], cMin, cMax );
globalMin = CVF_MIN( globalMin, cMin );
globalMax = CVF_MAX( globalMax, cMax );
globalMin = std::min( globalMin, cMin );
globalMax = std::max( globalMax, cMax );
}
}
}

2
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
View File

@@ -469,7 +469,7 @@ void RimRegularLegendConfig::updateLegend()
else
{
// For linear mapping, use the max value as reference for num valid digits
double absRange = CVF_MAX( cvf::Math::abs( adjustedMax ), cvf::Math::abs( adjustedMin ) );
double absRange = std::max( cvf::Math::abs( adjustedMax ), cvf::Math::abs( adjustedMin ) );
decadesInRange = log10( absRange );
}