mirror of
https://github.com/OPM/ResInsight.git
synced 2026-11-05 13:47:06 -06:00
Use point size when defining font size
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:
1 parent
559599c72d
commit
5f7823b8d3
34 files changed
+87
-116
No files matched your search
@@ -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" );
|
||||
|
||||
@@ -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 );
|
||||
|
||||
+1
-1
@@ -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() );
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "RimWellRftEnsembleCurveSet.h"
|
||||
|
||||
#include "RifDataSourceForRftPltQMetaType.h"
|
||||
|
||||
#include "RiuPlotCurveSymbol.h"
|
||||
|
||||
#include "cafPdmField.h"
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "cafPdmPtrField.h"
|
||||
#include "cafSignal.h"
|
||||
|
||||
#include "cafFontTools.h"
|
||||
#include "cafPdmFieldCvfColor.h"
|
||||
#include "cafPdmFieldCvfMat4d.h"
|
||||
#include "cafPdmFieldCvfVec3d.h"
|
||||
|
||||
@@ -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() );
|
||||
}
|
||||
|
||||
@@ -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" );
|
||||
|
||||
Reference in new issue
Block a user