OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-05 05:37:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad committed 2023-10-23 09:26:33 +02:00
1 parent 5688838899
commit 06f9c6126d
1778 files changed
+35036 -12457
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.cpp
+3 -3
View File
@@ -90,7 +90,7 @@ void RiuScalarMapperLegendFrame::setScalarMapper( cvf::ScalarMapper* scalarMappe
//--------------------------------------------------------------------------------------------------
void RiuScalarMapperLegendFrame::layoutInfo( LayoutInfo* layout ) const
{
QFontMetrics fontMetrics( this->font() );
QFontMetrics fontMetrics( font() );
QStringList titleLines = RiaTextStringTools::splitSkipEmptyParts( m_title, "\n" );
layout->charHeight = fontMetrics.height();
@@ -208,9 +208,9 @@ QRect RiuScalarMapperLegendFrame::labelRect( const LayoutInfo& layout, int index
{
const int posX = layout.tickEndX + layout.tickTextLeadSpace;
QString labelI = this->label( index );
QString labelI = label( index );
int width = this->fontMetrics().boundingRect( labelI ).width() + 4;
int width = fontMetrics().boundingRect( labelI ).width() + 4;
int height = layout.lineSpacing;
int posY = layout.colorBarRect.bottom() - layout.tickYPixelPos[index];