OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-14 17:32:13 -05: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 authored and Magne Sjaastad committed 2020-09-01 08:12:44 +02:00
1 parent a114309776
commit a6ddf7e6c4
9 files changed
+36 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/UserInterface/RiuViewer.cpp
+1 -1
View File
@@ -414,7 +414,7 @@ void RiuViewer::paintOverlayItems( QPainter* painter )
bool showAnimBar = false;
if ( isAnimationActive() && frameCount() > 1 ) showAnimBar = true;
if ( m_showInfoText ) columnWidth = CVF_MAX( columnWidth, m_infoLabel->sizeHint().width() );
if ( m_showInfoText ) columnWidth = std::max( columnWidth, m_infoLabel->sizeHint().width() );
int columnPos = this->width() - columnWidth - margin - edgeAxisFrameBorderWidth;
ApplicationCode/UserInterface/RiuViewerCommands.cpp
+3 -3
View File
@@ -375,17 +375,17 @@ void RiuViewerCommands::displayContextMenu( QMouseEvent* event )
QVariantList iSliceList;
iSliceList.push_back( 0 );
iSliceList.push_back( CVF_MAX( static_cast<int>( i + 1 ), 1 ) );
iSliceList.push_back( std::max( static_cast<int>( i + 1 ), 1 ) );
iSliceList.push_back( static_cast<int>( m_currentGridIdx ) );
QVariantList jSliceList;
jSliceList.push_back( 1 );
jSliceList.push_back( CVF_MAX( static_cast<int>( j + 1 ), 1 ) );
jSliceList.push_back( std::max( static_cast<int>( j + 1 ), 1 ) );
jSliceList.push_back( static_cast<int>( m_currentGridIdx ) );
QVariantList kSliceList;
kSliceList.push_back( 2 );
kSliceList.push_back( CVF_MAX( static_cast<int>( k + 1 ), 1 ) );
kSliceList.push_back( std::max( static_cast<int>( k + 1 ), 1 ) );
kSliceList.push_back( static_cast<int>( m_currentGridIdx ) );
menuBuilder.subMenuStart( "Range Filter Slice", QIcon( ":/CellFilter_Range.png" ) );