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

Use point size when defining font size

Browse Source 
Avoid pixel size for easier config across multiple environments
Set default font size for plots to 10 points
Use Small instead of XSmall for default font in plot
Remove pt postfix to indicate point size
This commit is contained in:
Magne Sjaastad
2025-03-10 16:56:16 +01:00
parent 559599c72d
commit 5f7823b8d3
34 changed files with 87 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/Application/RiaPreferences.cpp
+3 -1
View File
@@ -179,7 +179,9 @@ RiaPreferences::RiaPreferences()
CAF_PDM_InitFieldNoDefault( &defaultSceneFontSize, "defaultSceneFontSizePt", "Viewer Font Size" );
CAF_PDM_InitFieldNoDefault( &defaultAnnotationFontSize, "defaultAnnotationFontSizePt", "Annotation Font Size" );
CAF_PDM_InitFieldNoDefault( &defaultWellLabelFontSize, "defaultWellLabelFontSizePt", "Well Label Font Size" );
CAF_PDM_InitFieldNoDefault( &defaultPlotFontSize, "defaultPlotFontSizePt", "Plot Font Size" );
auto defaultValue = FontSizeEnum( RiaFontCache::FontSize::FONT_SIZE_10 );
CAF_PDM_InitField( &defaultPlotFontSize, "defaultPlotFontSizePt", defaultValue, "Plot Font Size" );
CAF_PDM_InitField( &m_showLegendBackground, "showLegendBackground", true, "Show Box around Legends" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showLegendBackground );
ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ RimWellLogPlot* RicNewWellLogPlotFeatureImpl::createRftSegmentPlot()
plot->setLegendItemsClickable( false );
plot->enableDepthMarkerLine( true );
plot->setLegendPosition( RimPlotWindow::LegendPosition::INSIDE_UPPER_RIGHT );
plot->setLegendFontSize( caf::FontTools::RelativeSize::XSmall );
plot->setLegendFontSize( caf::FontTools::RelativeSize::Small );
plot->setLegendsHorizontal( false );
plot->setAutoZoomMaximumDepthFactor( 0.1 );
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
+3 -3
View File
@@ -79,13 +79,13 @@ RimAbstractCorrelationPlot::RimAbstractCorrelationPlot()
CAF_PDM_InitField( &m_description, "PlotTitle", QString( "Correlation Plot" ), "Custom Plot Title" );
CAF_PDM_InitFieldNoDefault( &m_labelFontSize, "LabelFontSize", "Label Font Size" );
m_labelFontSize = caf::FontTools::RelativeSize::XSmall;
m_labelFontSize = caf::FontTools::RelativeSize::Small;
CAF_PDM_InitFieldNoDefault( &m_axisTitleFontSize, "AxisTitleFontSize", "Axis Title Font Size" );
CAF_PDM_InitFieldNoDefault( &m_axisValueFontSize, "AxisValueFontSize", "Axis Value Font Size" );
m_axisValueFontSize = caf::FontTools::RelativeSize::XSmall;
m_axisValueFontSize = caf::FontTools::RelativeSize::Small;
m_legendFontSize = caf::FontTools::RelativeSize::XSmall;
m_legendFontSize = caf::FontTools::RelativeSize::Small;
CAF_PDM_InitField( &m_useCaseFilter, "UseCaseFilter", false, "Use Ensemble Filter" );
CAF_PDM_InitFieldNoDefault( &m_curveSetForFiltering, "CurveSetForFiltering", " Ensemble Filter" );
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
+2 -2
View File
@@ -75,9 +75,9 @@ RimCorrelationReportPlot::RimCorrelationReportPlot()
m_titleFontSize = caf::FontTools::RelativeSize::XLarge;
m_subTitleFontSize = caf::FontTools::RelativeSize::Large;
m_labelFontSize = caf::FontTools::RelativeSize::XSmall;
m_labelFontSize = caf::FontTools::RelativeSize::Small;
m_axisTitleFontSize = caf::FontTools::RelativeSize::Small;
m_axisValueFontSize = caf::FontTools::RelativeSize::XSmall;
m_axisValueFontSize = caf::FontTools::RelativeSize::Small;
m_correlationMatrixPlot = new RimCorrelationMatrixPlot;
m_correlationMatrixPlot->setLegendsVisible( false );
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ RimParameterResultCrossPlot::RimParameterResultCrossPlot()
m_selectMultipleVectors = true;
m_legendFontSize = caf::FontTools::RelativeSize::XSmall;
m_legendFontSize = caf::FontTools::RelativeSize::Small;
m_xRange = std::make_pair( std::numeric_limits<double>::infinity(), -std::numeric_limits<double>::infinity() );
m_yRange = std::make_pair( std::numeric_limits<double>::infinity(), -std::numeric_limits<double>::infinity() );
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h
+1
View File
@@ -24,6 +24,7 @@
#include "RimWellRftEnsembleCurveSet.h"
#include "RifDataSourceForRftPltQMetaType.h"
#include "RiuPlotCurveSymbol.h"
#include "cafPdmField.h"
ApplicationLibCode/ProjectDataModel/Rim3dView.h
+1
View File
@@ -34,6 +34,7 @@
#include "cafPdmPtrField.h"
#include "cafSignal.h"
#include "cafFontTools.h"
#include "cafPdmFieldCvfColor.h"
#include "cafPdmFieldCvfMat4d.h"
#include "cafPdmFieldCvfVec3d.h"
ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.cpp
+7 -7
View File
@@ -436,7 +436,7 @@ void RimStatisticsPlot::updatePlots()
// Set font of label equal axis value font
QFont labelFont = QFont();
labelFont.setPixelSize( fontScalingToMatchQwt * axisValueFontSize() );
labelFont.setPointSize( fontScalingToMatchQwt * axisValueFontSize() );
labelSeries->setPointLabelsFont( labelFont );
// Remove legend for dummy point
@@ -446,23 +446,23 @@ void RimStatisticsPlot::updatePlots()
// Set axis value font
QFont axisYValueFont = axisY->labelsFont();
axisYValueFont.setPixelSize( fontScalingToMatchQwt * axisValueFontSize() );
axisYValueFont.setPointSize( fontScalingToMatchQwt * axisValueFontSize() );
axisY->setLabelsFont( axisYValueFont );
QFont axisXValueFont = axisX->labelsFont();
axisXValueFont.setPixelSize( fontScalingToMatchQwt * axisValueFontSize() );
axisXValueFont.setPointSize( fontScalingToMatchQwt * axisValueFontSize() );
axisX->setLabelsFont( axisXValueFont );
// Set axis title font
QFont axisYTitleFont = axisY->titleFont();
axisYTitleFont.setPixelSize( fontScalingToMatchQwt * axisTitleFontSize() );
axisYTitleFont.setPointSize( fontScalingToMatchQwt * axisTitleFontSize() );
axisY->setTitleFont( axisYTitleFont );
QFont axisXTitleFont = axisX->titleFont();
axisXTitleFont.setPixelSize( fontScalingToMatchQwt * axisTitleFontSize() );
axisXTitleFont.setPointSize( fontScalingToMatchQwt * axisTitleFontSize() );
axisX->setTitleFont( axisXTitleFont );
// Set plot title font
QFont titleFont = chart->titleFont();
titleFont.setPixelSize( fontScalingToMatchQwt * titleFontSize() );
titleFont.setPointSize( fontScalingToMatchQwt * titleFontSize() );
chart->setTitleFont( titleFont );
// Set legend font
@@ -470,7 +470,7 @@ void RimStatisticsPlot::updatePlots()
if ( legend )
{
QFont legendFont = legend->font();
legendFont.setPixelSize( fontScalingToMatchQwt * legendFontSize() );
legendFont.setPointSize( fontScalingToMatchQwt * legendFontSize() );
legend->setFont( legendFont );
legend->setVisible( legendsVisible() );
}
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp
+1 -1
View File
@@ -231,7 +231,7 @@ RimWellLogTrack::RimWellLogTrack()
CAF_PDM_InitField( &m_showRegionLabels, "ShowFormationLabels", true, "Show Labels" );
caf::FontTools::RelativeSizeEnum regionLabelFontSizeDefault = caf::FontTools::RelativeSize::XSmall;
caf::FontTools::RelativeSizeEnum regionLabelFontSizeDefault = caf::FontTools::RelativeSize::Small;
CAF_PDM_InitField( &m_regionLabelFontSize, "RegionLabelFontSize", regionLabelFontSizeDefault, "Font Size" );
CAF_PDM_InitFieldNoDefault( &m_formationSource, "FormationSource", "Source" );
ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
+1 -1
View File
@@ -169,7 +169,7 @@ public:
QwtText text( string );
QFont font = text.font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( m_labelFontPointSize + fontSizeChange ) );
font.setPointSize( m_labelFontPointSize + fontSizeChange );
text.setFont( font );
text.setPaintAttribute( QwtText::PaintUsingTextFont, true );
ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ RiuAbstractOverlayContentFrame::~RiuAbstractOverlayContentFrame()
void RiuAbstractOverlayContentFrame::updateFontSize()
{
QFont font = this->font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( RiaPreferences::current()->defaultPlotFontSize() ) );
font.setPointSize( caf::FontTools::pointSizeFromEnum( RiaPreferences::current()->defaultPlotFontSize() ) );
setFont( font );
}
@@ -98,6 +98,6 @@ void RiuTextOverlayContentFrame::renderTo( QPainter* painter, const QRect& targe
void RiuTextOverlayContentFrame::updateLabelFont()
{
QFont font = m_textLabel->font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( RiaPreferences::current()->defaultPlotFontSize() ) );
font.setPointSize( caf::FontTools::pointSizeFromEnum( RiaPreferences::current()->defaultPlotFontSize() ) );
m_textLabel->setFont( font );
}
ApplicationLibCode/UserInterface/RiuDockedQwtPlot.cpp
+4 -4
View File
@@ -50,7 +50,7 @@ void RiuDockedQwtPlot::applyFontSizes( bool replot /*= false*/ )
QwtText titleText = title();
QFont font = titleText.font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( titleFontSize ) );
font.setPointSize( titleFontSize );
titleText.setFont( font );
setTitle( titleText );
@@ -58,19 +58,19 @@ void RiuDockedQwtPlot::applyFontSizes( bool replot /*= false*/ )
{
QwtText text = axisTitle( axis );
QFont axisTitleFont = text.font();
axisTitleFont.setPixelSize( caf::FontTools::pointSizeToPixelSize( axisFontSize ) );
axisTitleFont.setPointSize( axisFontSize );
text.setFont( axisTitleFont );
setAxisTitle( axis, text );
QFont valuesFont = axisFont( axis );
valuesFont.setPixelSize( axisTitleFont.pixelSize() );
valuesFont.setPointSize( axisTitleFont.pointSize() );
setAxisFont( axis, valuesFont );
}
if ( legend() )
{
auto font = legend()->font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( legendFontSize ) );
font.setPointSize( legendFontSize );
legend()->setFont( font );
}
ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ void RiuGridCrossQwtPlot::setLegendFontSize( int fontSize )
if ( qwtPlot()->legend() )
{
QFont font = qwtPlot()->legend()->font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( fontSize ) );
font.setPointSize( fontSize );
qwtPlot()->legend()->setFont( font );
// Set font size for all existing labels
QList<QwtLegendLabel*> labels = qwtPlot()->legend()->findChildren<QwtLegendLabel*>();
ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp
+1 -1
View File
@@ -431,7 +431,7 @@ void RiuMatrixPlotWidget::createMatrixCells()
cvf::Color3f contrastColor = RiaColorTools::contrastColor( cvf::Color3f( color ) );
textLabel.setColor( RiaColorTools::toQColor( contrastColor ) );
QFont font = textLabel.font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( m_valueFontSize ) );
font.setPointSize( m_valueFontSize );
textLabel.setFont( font );
QwtPlotMarker* marker = new QwtPlotMarker();
marker->setLabel( textLabel );
ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.h
-1
View File
@@ -22,7 +22,6 @@
#include "RiuPlotItem.h"
#include "RiuQwtPlotWidget.h"
#include "cafFontTools.h"
#include "cafPdmPointer.h"
#include "cafSignal.h"
ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp
+9 -9
View File
@@ -80,9 +80,9 @@ RiuMultiPlotPage::RiuMultiPlotPage( RimPlotWindow* plotDefinition, QWidget* pare
, m_previewMode( false )
, m_showSubTitles( false )
, m_autoAlignAxes( true )
, m_titleFontPixelSize( 12 )
, m_subTitleFontPixelSize( 11 )
, m_legendFontPixelSize( 8 )
, m_titleFontSize( 12 )
, m_subTitleFontSize( 11 )
, m_legendFontSize( 8 )
, m_axisTitleFontSize( 8 )
, m_axisValueFontSize( 8 )
@@ -290,8 +290,8 @@ void RiuMultiPlotPage::setTitleVisible( bool visible )
//--------------------------------------------------------------------------------------------------
void RiuMultiPlotPage::setTitleFontSizes( int titleFontSize, int subTitleFontSize )
{
m_titleFontPixelSize = caf::FontTools::pointSizeToPixelSize( titleFontSize );
m_subTitleFontPixelSize = caf::FontTools::pointSizeToPixelSize( subTitleFontSize );
m_titleFontSize = titleFontSize;
m_subTitleFontSize = subTitleFontSize;
scheduleUpdate();
}
@@ -301,7 +301,7 @@ void RiuMultiPlotPage::setTitleFontSizes( int titleFontSize, int subTitleFontSiz
//--------------------------------------------------------------------------------------------------
void RiuMultiPlotPage::setLegendFontSize( int legendFontSize )
{
m_legendFontPixelSize = caf::FontTools::pointSizeToPixelSize( legendFontSize );
m_legendFontSize = legendFontSize;
scheduleUpdate();
}
@@ -779,7 +779,7 @@ void RiuMultiPlotPage::updateSubTitleVisibility( QLabel* subTitle )
bool isSubTitleVisible = m_showSubTitles && !subTitle->text().isEmpty();
subTitle->setVisible( isSubTitleVisible );
QFont subTitleFont = subTitle->font();
subTitleFont.setPixelSize( m_subTitleFontPixelSize );
subTitleFont.setPointSize( m_subTitleFontSize );
subTitle->setFont( subTitleFont );
}
@@ -836,7 +836,7 @@ void RiuMultiPlotPage::setRowAndColumnStretches( int row, int column, int rowSpa
void RiuMultiPlotPage::updateLegendFont( RiuQwtPlotLegend* legend )
{
QFont legendFont = legend->font();
legendFont.setPixelSize( m_legendFontPixelSize );
legendFont.setPointSize( m_legendFontSize );
// Set font size for all existing labels
QList<QwtLegendLabel*> labels = legend->findChildren<QwtLegendLabel*>();
@@ -1104,7 +1104,7 @@ void RiuMultiPlotPage::applyLook()
void RiuMultiPlotPage::updateTitleFont()
{
auto titleFont = m_plotTitle->font();
titleFont.setPixelSize( m_titleFontPixelSize );
titleFont.setPointSize( m_titleFontSize );
m_plotTitle->setFont( titleFont );
}
ApplicationLibCode/UserInterface/RiuMultiPlotPage.h
+3 -3
View File
@@ -172,9 +172,9 @@ protected:
std::map<int, std::pair<int, int>> m_visibleIndexToPositionMapping;
caf::PdmPointer<RimPlotWindow> m_plotDefinition;
int m_titleFontPixelSize;
int m_subTitleFontPixelSize;
int m_legendFontPixelSize;
int m_titleFontSize;
int m_subTitleFontSize;
int m_legendFontSize;
int m_axisTitleFontSize;
int m_axisValueFontSize;
ApplicationLibCode/UserInterface/RiuPlotCurveSymbol.cpp
+4 -4
View File
@@ -28,11 +28,11 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuPlotCurveSymbol::RiuPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSizePt )
RiuPlotCurveSymbol::RiuPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSize )
: m_style( riuStyle )
, m_globalLabel( label )
, m_labelPosition( labelPosition )
, m_labelFontSizePx( caf::FontTools::pointSizeToPixelSize( labelFontSizePt ) )
, m_labelFontSize( labelFontSize )
{
}
@@ -63,9 +63,9 @@ void RiuPlotCurveSymbol::setLabelPosition( LabelPosition labelPosition )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuPlotCurveSymbol::setLabelFontSize( int labelFontSizePt )
void RiuPlotCurveSymbol::setLabelFontSize( int labelFontSize )
{
m_labelFontSizePx = caf::FontTools::pointSizeToPixelSize( labelFontSizePt );
m_labelFontSize = labelFontSize;
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/UserInterface/RiuPlotCurveSymbol.h
+3 -3
View File
@@ -64,7 +64,7 @@ public:
SYMBOL_DOWN_ALIGNED_TRIANGLE
};
RiuPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition = LabelAboveSymbol, int labelFontSizePt = 8 );
RiuPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition = LabelAboveSymbol, int labelFontSize = 8 );
QString globalLabel() const;
@@ -72,7 +72,7 @@ public:
void setLabelPosition( LabelPosition labelPosition );
void setLabelFontSize( int labelFontSizePt );
void setLabelFontSize( int labelFontSize );
virtual void setPixmap( const QPixmap& pixmap ) = 0;
@@ -94,6 +94,6 @@ public:
protected:
PointSymbolEnum m_style;
QString m_globalLabel;
int m_labelFontSizePx;
int m_labelFontSize;
LabelPosition m_labelPosition;
};
ApplicationLibCode/UserInterface/RiuQtChartsPlotCurveSymbol.cpp
+2 -2
View File
@@ -37,8 +37,8 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuQtChartsPlotCurveSymbol::RiuQtChartsPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSizePt )
: RiuPlotCurveSymbol( riuStyle, label, labelPosition, labelFontSizePt )
RiuQtChartsPlotCurveSymbol::RiuQtChartsPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSize )
: RiuPlotCurveSymbol( riuStyle, label, labelPosition, labelFontSize )
{
}
ApplicationLibCode/UserInterface/RiuQtChartsPlotCurveSymbol.h
+3 -3
View File
@@ -38,9 +38,9 @@ class RiuQtChartsPlotCurveSymbol : public RiuPlotCurveSymbol
{
public:
RiuQtChartsPlotCurveSymbol( RiuPlotCurveSymbol::PointSymbolEnum riuStyle,
const QString& label = QString(),
LabelPosition labelPosition = RiuPlotCurveSymbol::LabelAboveSymbol,
int labelFontSizePt = 8 );
const QString& label = QString(),
LabelPosition labelPosition = RiuPlotCurveSymbol::LabelAboveSymbol,
int labelFontSize = 8 );
void renderSymbolLabel( QPainter* painter, const QPointF& position, const QString& label ) const;
ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
+4 -7
View File
@@ -160,18 +160,15 @@ int RiuQtChartsPlotWidget::axisValueFontSize( RiuPlotAxis axis ) const
//--------------------------------------------------------------------------------------------------
void RiuQtChartsPlotWidget::setAxisFontsAndAlignment( RiuPlotAxis axis, int titleFontSize, int valueFontSize, bool titleBold, int alignment )
{
int titleFontPixelSize = caf::FontTools::pointSizeToPixelSize( titleFontSize );
int valueFontPixelSize = caf::FontTools::pointSizeToPixelSize( valueFontSize );
// Axis number font
QFont axisFont = plotAxis( axis )->labelsFont();
axisFont.setPixelSize( valueFontPixelSize );
axisFont.setPointSize( valueFontSize );
axisFont.setBold( false );
plotAxis( axis )->setLabelsFont( axisFont );
// Axis title font
QFont axisTitleFont = plotAxis( axis )->labelsFont();
axisTitleFont.setPixelSize( titleFontPixelSize );
axisTitleFont.setPointSize( titleFontSize );
axisTitleFont.setBold( titleBold );
plotAxis( axis )->setTitleFont( axisTitleFont );
@@ -268,7 +265,7 @@ bool RiuQtChartsPlotWidget::plotTitleEnabled() const
void RiuQtChartsPlotWidget::setPlotTitleFontSize( int titleFontSize )
{
QFont font = qtChart()->titleFont();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( titleFontSize ) );
font.setPointSize( titleFontSize );
qtChart()->setTitleFont( font );
}
@@ -280,7 +277,7 @@ void RiuQtChartsPlotWidget::setLegendFontSize( int fontSize )
if ( qtChart()->legend() )
{
QFont font = qtChart()->legend()->font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( fontSize ) );
font.setPointSize( fontSize );
qtChart()->legend()->setFont( font );
}
}
ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp
+2 -2
View File
@@ -71,7 +71,7 @@ void RiuQwtPlotTools::setCommonPlotBehaviour( QwtPlot* plot )
int axisFontSize =
caf::FontTools::absolutePointSize( RiaPreferences::current()->defaultPlotFontSize(), caf::FontTools::RelativeSize::Medium );
QFont axisFont = plot->axisFont( QwtAxis::XBottom );
axisFont.setPixelSize( caf::FontTools::pointSizeToPixelSize( axisFontSize ) );
axisFont.setPointSize( axisFontSize );
plot->setAxisFont( QwtAxis::XBottom, axisFont );
plot->setAxisFont( QwtAxis::XTop, axisFont );
@@ -85,7 +85,7 @@ void RiuQwtPlotTools::setCommonPlotBehaviour( QwtPlot* plot )
{
QwtText axisTitle = plot->axisTitle( axis );
QFont axisTitleFont = axisTitle.font();
axisTitleFont.setPixelSize( caf::FontTools::pointSizeToPixelSize( axisFontSize ) );
axisTitleFont.setPointSize( axisFontSize );
axisTitleFont.setBold( false );
axisTitle.setFont( axisTitleFont );
axisTitle.setRenderFlags( Qt::AlignRight );
ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
+4 -8
View File
@@ -156,21 +156,17 @@ int RiuQwtPlotWidget::axisValueFontSize( RiuPlotAxis axis ) const
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::setAxisFontsAndAlignment( RiuPlotAxis axis, int titleFontSize, int valueFontSize, bool titleBold, int alignment )
{
int titleFontPixelSize = caf::FontTools::pointSizeToPixelSize( titleFontSize );
int valueFontPixelSize = caf::FontTools::pointSizeToPixelSize( valueFontSize );
// Axis number font
auto qwtAxis = toQwtPlotAxis( axis );
QFont axisFont = m_plot->axisFont( qwtAxis );
axisFont.setPixelSize( valueFontPixelSize );
axisFont.setPointSize( valueFontSize );
axisFont.setBold( false );
m_plot->setAxisFont( qwtAxis, axisFont );
// Axis title font
QwtText axisTitle = m_plot->axisTitle( qwtAxis );
QFont axisTitleFont = axisTitle.font();
axisTitleFont.setPixelSize( titleFontPixelSize );
axisTitleFont.setPointSize( titleFontSize );
axisTitleFont.setBold( titleBold );
axisTitle.setFont( axisTitleFont );
axisTitle.setRenderFlags( alignment | Qt::TextWordWrap );
@@ -260,7 +256,7 @@ void RiuQwtPlotWidget::setLegendFontSize( int fontSize )
if ( m_plot->legend() )
{
QFont font = m_plot->legend()->font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( fontSize ) );
font.setPointSize( fontSize );
m_plot->legend()->setFont( font );
// Set font size for all existing labels
QList<QwtLegendLabel*> labels = m_plot->legend()->findChildren<QwtLegendLabel*>();
@@ -689,7 +685,7 @@ void RiuQwtPlotWidget::applyPlotTitleToQwt()
if ( m_titleFontSize > 0 )
{
QFont font = qwtText.font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( m_titleFontSize ) );
font.setPointSize( m_titleFontSize );
qwtText.setFont( font );
}
qwtText.setText( plotTitleToApply );
ApplicationLibCode/UserInterface/RiuQwtSymbol.cpp
+3 -3
View File
@@ -32,8 +32,8 @@
//--------------------------------------------------------------------------------------------------
/// Internal class to support labels on symbols
//--------------------------------------------------------------------------------------------------
RiuQwtSymbol::RiuQwtSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSizePt )
: RiuPlotCurveSymbol( riuStyle, label, labelPosition, labelFontSizePt )
RiuQwtSymbol::RiuQwtSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSize )
: RiuPlotCurveSymbol( riuStyle, label, labelPosition, labelFontSize )
, QwtSymbol( QwtSymbol::NoSymbol )
{
QwtSymbol::Style style = QwtSymbol::NoSymbol;
@@ -192,7 +192,7 @@ void RiuQwtSymbol::renderSymbolLabel( QPainter* painter, const QPointF& position
{
painter->save();
QFont font = painter->font();
font.setPixelSize( m_labelFontSizePx );
font.setPointSize( m_labelFontSize );
painter->setFont( font );
painter->setPen( RiaColorTools::textColor() );
ApplicationLibCode/UserInterface/RiuQwtSymbol.h
+3 -3
View File
@@ -38,9 +38,9 @@ class RiuQwtSymbol : public RiuPlotCurveSymbol, public QwtSymbol
{
public:
RiuQwtSymbol( RiuPlotCurveSymbol::PointSymbolEnum riuStyle,
const QString& label = QString(),
LabelPosition labelPosition = RiuPlotCurveSymbol::LabelAboveSymbol,
int labelFontSizePt = 8 );
const QString& label = QString(),
LabelPosition labelPosition = RiuPlotCurveSymbol::LabelAboveSymbol,
int labelFontSize = 8 );
void renderSymbols( QPainter* painter, const QPointF* points, int numPoints ) const override;
void renderSymbolLabel( QPainter* painter, const QPointF& position, const QString& label ) const;
ApplicationLibCode/UserInterface/RiuTextContentFrame.cpp
+3 -3
View File
@@ -38,7 +38,7 @@ RiuTextContentFrame::RiuTextContentFrame( QWidget* parent, const QString& title,
: RiuAbstractOverlayContentFrame( parent )
, m_title( title )
, m_text( text )
, m_fontPixelSize( fontPixelSize )
, m_fontSize( fontPixelSize )
{
setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
@@ -170,10 +170,10 @@ void RiuTextContentFrame::layoutInfo( LayoutInfo* layout ) const
//--------------------------------------------------------------------------------------------------
void RiuTextContentFrame::updateFontSize()
{
if ( m_fontPixelSize != -1 )
if ( m_fontSize != -1 )
{
QFont font = this->font();
font.setPixelSize( m_fontPixelSize );
font.setPointSize( m_fontSize );
setFont( font );
}
else
ApplicationLibCode/UserInterface/RiuTextContentFrame.h
+1 -1
View File
@@ -65,5 +65,5 @@ private:
private:
QString m_title;
QString m_text;
int m_fontPixelSize;
int m_fontSize;
};
ApplicationLibCode/UserInterface/RiuViewer.cpp
+8 -8
View File
@@ -174,7 +174,7 @@ RiuViewer::RiuViewer( QWidget* parent )
if ( RiaRegressionTestRunner::instance()->isRunningRegressionTests() )
{
QFont regTestFont = m_infoLabel->font();
regTestFont.setPixelSize( 11 );
regTestFont.setPointSize( 11 );
m_infoLabel->setFont( regTestFont );
m_shortInfoLabel->setFont( regTestFont );
@@ -211,7 +211,7 @@ RiuViewer::RiuViewer( QWidget* parent )
m_comparisonWindowMover = new RiuComparisonViewMover( this );
setComparisonViewToFollowAnimation( false );
m_fontPointSize = caf::FontTools::absolutePointSize( RiaPreferences::current()->defaultSceneFontSize() );
m_fontSize = caf::FontTools::absolutePointSize( RiaPreferences::current()->defaultSceneFontSize() );
}
//--------------------------------------------------------------------------------------------------
@@ -744,7 +744,7 @@ void RiuViewer::addColorLegendToBottomLeftCorner( caf::TitledOverlayFrame* added
addedLegend->enableBackground( RiaPreferences::current()->showLegendBackground() );
addedLegend->setBackgroundColor( backgroundColor );
addedLegend->setBackgroundFrameColor( frameColor );
addedLegend->setFont( app->sceneFont( m_fontPointSize ) );
addedLegend->setFont( app->sceneFont( m_fontSize ) );
overlayRendering->addOverlayItem( addedLegend );
@@ -1336,16 +1336,16 @@ void RiuViewer::clearHoverCursor()
//--------------------------------------------------------------------------------------------------
void RiuViewer::updateFonts( int fontPointSize )
{
m_fontPointSize = fontPointSize;
m_fontSize = 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.setPointSize( m_fontSize );
if ( caf::FontTools::absolutePointSize( defaultFontSize ) != m_fontPointSize )
if ( caf::FontTools::absolutePointSize( defaultFontSize ) != m_fontSize )
{
axisFont = RiaFontCache::getFont( m_fontPointSize ).p();
axisFont = RiaFontCache::getFont( m_fontSize ).p();
}
overlayItemsRendering()->removeOverlayItem( m_axisCross.p() );
@@ -1364,7 +1364,7 @@ void RiuViewer::updateFonts( int fontPointSize )
m_animationProgressCompView->setFont( font );
m_versionInfoLabel->setFont( font );
m_gridBoxGenerator->setGridLabelFontSize( m_fontPointSize );
m_gridBoxGenerator->setGridLabelFontSize( m_fontSize );
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/UserInterface/RiuViewer.h
+1 -1
View File
@@ -177,7 +177,7 @@ private:
bool m_showZScaleLabel;
bool m_hideZScaleCheckbox;
double m_zScale;
int m_fontPointSize;
int m_fontSize;
caf::QStyledProgressBar* m_animationProgress;
caf::QStyledProgressBar* m_animationProgressCompView;
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.cpp
+2 -18
View File
@@ -89,25 +89,9 @@ int FontTools::absolutePointSize( FontSize normalPointSize, RelativeSize relativ
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int FontTools::pointSizeToPixelSize( int pointSize )
int FontTools::pointSizeFromEnum( FontSize pointSize )
{
return pointSize;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int FontTools::pointSizeToPixelSize( FontSize pointSize )
{
return pointSizeToPixelSize( (int)pointSize );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int FontTools::pixelSizeToPointSize( int pixelSize )
{
return pixelSize;
return (int)pointSize;
}
QList<PdmOptionItemInfo> FontTools::relativeSizeValueOptions( FontSize normalPointSize )
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.h
+1 -3
View File
@@ -83,9 +83,7 @@ public:
typedef caf::AppEnum<RelativeSize> RelativeSizeEnum;
static int absolutePointSize( FontSize normalPointSize, RelativeSize relativeSize = RelativeSize::Medium );
static int pointSizeToPixelSize( FontSize pointSize );
static int pointSizeToPixelSize( int pointSize );
static int pixelSizeToPointSize( int pixelSize );
static int pointSizeFromEnum( FontSize pointSize );
static QList<caf::PdmOptionItemInfo> relativeSizeValueOptions( FontSize normalPointSize );
};
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp
+1 -8
View File
@@ -163,14 +163,7 @@ void PdmUiTreeViewItemDelegate::paint( QPainter* painter, const QStyleOptionView
const int outsideLeftRightMargins = 4;
QFont font = QApplication::font();
if ( font.pixelSize() > 0 )
{
font.setPixelSize( std::max( 1, font.pixelSize() - 1 ) );
}
else
{
font.setPointSize( std::max( 1, font.pointSize() - 1 ) );
}
font.setPointSize( std::max( 1, font.pointSize() - 1 ) );
painter->setFont( font );
QString text = tag->text;
ThirdParty/nightcharts/nightcharts.cpp
Vendored
+1 -1
View File
@@ -28,7 +28,7 @@ Nightcharts::Nightcharts()//QPainter *painter)
{
font.setFamily("verdana");
font.setPixelSize(15);
font.setPointSize(15);
//painter = painter;
//painter->setFont(font);
ctype = Nightcharts::Dpie;