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:
github-actions[bot]
2020-06-08 09:09:11 +00:00
committed by Magne Sjaastad
parent 64a719b1f4
commit 6b5f4dddc9
58 changed files with 202 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -209,7 +209,7 @@ RiuViewer::RiuViewer( const QGLFormat& format, QWidget* parent )
m_comparisonWindowMover = new RiuComparisonViewMover( this );
this->setComparisonViewToFollowAnimation( false );
m_fontPointSize = caf::FontTools::absolutePointSize(RiaPreferences::current()->defaultSceneFontSize());
m_fontPointSize = caf::FontTools::absolutePointSize( RiaPreferences::current()->defaultSceneFontSize() );
}
//--------------------------------------------------------------------------------------------------
@@ -719,7 +719,7 @@ void RiuViewer::addColorLegendToBottomLeftCorner( caf::TitledOverlayFrame* added
addedLegend->enableBackground( preferences->showLegendBackground() );
addedLegend->setBackgroundColor( backgroundColor );
addedLegend->setBackgroundFrameColor( frameColor );
addedLegend->setFont( app->sceneFont(m_fontPointSize) );
addedLegend->setFont( app->sceneFont( m_fontPointSize ) );
overlayRendering->addOverlayItem( addedLegend );
@@ -912,7 +912,7 @@ void RiuViewer::updateLegendLayout()
const int xPos = width() - (int)scaleLegendSize.x() - margin - edgeAxisBorderWidth;
const int yPos = margin + edgeAxisBorderHeight + margin + otherItemsHeight;
m_scaleLegend->setLayoutFixedPosition( { xPos, yPos } );
m_scaleLegend->setLayoutFixedPosition( {xPos, yPos} );
}
}
@@ -1115,17 +1115,17 @@ void RiuViewer::leaveEvent( QEvent* )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::updateGridBoxData( double scaleZ,
const cvf::Vec3d& displayModelOffset,
const cvf::Color3f& backgroundColor,
void RiuViewer::updateGridBoxData( double scaleZ,
const cvf::Vec3d& displayModelOffset,
const cvf::Color3f& backgroundColor,
const cvf::BoundingBox& domainCoordBoundingBox,
int fontPointSize )
int fontPointSize )
{
m_gridBoxGenerator->setScaleZ( scaleZ );
m_gridBoxGenerator->setDisplayModelOffset( displayModelOffset );
m_gridBoxGenerator->updateFromBackgroundColor( backgroundColor );
m_gridBoxGenerator->setGridBoxDomainCoordBoundingBox( domainCoordBoundingBox );
m_gridBoxGenerator->setGridLabelFontSize(fontPointSize);
m_gridBoxGenerator->setGridLabelFontSize( fontPointSize );
m_gridBoxGenerator->createGridBoxParts();
@@ -1291,9 +1291,9 @@ void RiuViewer::showScaleLegend( bool show )
if ( show )
{
if ( m_scaleLegend->orientation() == caf::OverlayScaleLegend::HORIZONTAL )
m_scaleLegend->setRenderSize( { 280, 45 } );
m_scaleLegend->setRenderSize( {280, 45} );
else
m_scaleLegend->setRenderSize( { 50, 280 } );
m_scaleLegend->setRenderSize( {50, 280} );
overlayItemsRendering()->addOverlayItem( m_scaleLegend.p() );
}
@@ -1322,22 +1322,22 @@ void RiuViewer::clearHoverCursor()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::updateFonts(int fontPointSize)
void RiuViewer::updateFonts( int fontPointSize )
{
m_fontPointSize = fontPointSize;
auto defaultFontSize = RiaApplication::instance()->preferences()->defaultSceneFontSize();
cvf::Font* axisFont = RiaGuiApplication::instance()->defaultSceneFont();
QFont font = QApplication::font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize(m_fontPointSize ));
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( m_fontPointSize ) );
if ( caf::FontTools::absolutePointSize(defaultFontSize) != m_fontPointSize )
if ( caf::FontTools::absolutePointSize( defaultFontSize ) != m_fontPointSize )
{
axisFont = RiaFontCache::getFont( m_fontPointSize ).p();
}
overlayItemsRendering()->removeOverlayItem( m_axisCross.p() );
m_axisCross = new cvf::OverlayAxisCross( m_mainCamera.p(), axisFont );
m_axisCross->setAxisLabels( "X", "Y", "Z" );
m_axisCross->setLayout( cvf::OverlayItem::VERTICAL, cvf::OverlayItem::BOTTOM_RIGHT );
@@ -1352,7 +1352,7 @@ void RiuViewer::updateFonts(int fontPointSize)
m_animationProgressCompView->setFont( font );
m_versionInfoLabel->setFont( font );
m_gridBoxGenerator->setGridLabelFontSize(m_fontPointSize);
m_gridBoxGenerator->setGridLabelFontSize( m_fontPointSize );
}
//--------------------------------------------------------------------------------------------------