First round of caf::FontTools

This commit is contained in:
Gaute Lindkvist
2020-05-09 11:23:58 +02:00
parent 0e70cf809c
commit 2fe4372dc2
86 changed files with 1021 additions and 966 deletions

View File

@@ -18,7 +18,6 @@
#include "RimFlowCharacteristicsPlot.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RifCsvDataTableFormatter.h"
@@ -244,6 +243,21 @@ void RimFlowCharacteristicsPlot::setAquiferCellThreshold( double aquiferCellThre
m_maxPvFraction = aquiferCellThreshold;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimFlowCharacteristicsPlot::fontSize() const
{
return caf::FontTools::absolutePointSize(RiaPreferences::current()->defaultPlotFontSize());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFlowCharacteristicsPlot::updateFonts()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -788,7 +802,7 @@ double interpolate( const std::vector<double>& xData, const std::vector<double>&
//--------------------------------------------------------------------------------------------------
QString RimFlowCharacteristicsPlot::curveDataAsText() const
{
QString fieldSeparator = RiaApplication::instance()->preferences()->csvTextExportFieldSeparator;
QString fieldSeparator = RiaPreferences::current()->csvTextExportFieldSeparator;
QString tableText;
QTextStream stream( &tableText );
@@ -807,7 +821,7 @@ QString RimFlowCharacteristicsPlot::curveDataAsText() const
std::vector<QDateTime> timeStepDates = m_case->timeStepDates();
std::vector<double> storageCapacitySamplingValues = {0.08, 0.1, 0.2, 0.3, 0.4};
std::vector<double> storageCapacitySamplingValues = { 0.08, 0.1, 0.2, 0.3, 0.4 };
size_t sampleCount = storageCapacitySamplingValues.size();
for ( const auto& timeIndex : m_currentlyPlottedTimeSteps )

View File

@@ -82,6 +82,9 @@ public:
void setMinimumCommunication( double minimumCommunication );
void setAquiferCellThreshold( double aquiferCellThreshold );
int fontSize() const override;
void updateFonts() override;
protected:
// RimViewWindow overrides

View File

@@ -18,6 +18,8 @@
#include "RimTofAccumulatedPhaseFractionsPlot.h"
#include "RiaPreferences.h"
#include "RimEclipseView.h"
#include "RimSimWellInViewCollection.h"
#include "RimWellAllocationPlot.h"
@@ -133,6 +135,21 @@ size_t RimTofAccumulatedPhaseFractionsPlot::timeStep()
return static_cast<size_t>( allocationPlot->timeStep() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimTofAccumulatedPhaseFractionsPlot::fontSize() const
{
return caf::FontTools::absolutePointSize(RiaPreferences::current()->defaultPlotFontSize());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimTofAccumulatedPhaseFractionsPlot::updateFonts()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -73,6 +73,8 @@ public:
QString tracerName();
size_t timeStep();
int fontSize() const override;
void updateFonts() override;
protected:
// RimViewWindow overrides
void assignIdIfNecessary() final;

View File

@@ -18,6 +18,8 @@
#include "RimTotalWellAllocationPlot.h"
#include "RiaPreferences.h"
#include "RimEclipseView.h"
#include "RimSimWellInViewCollection.h"
@@ -86,6 +88,21 @@ void RimTotalWellAllocationPlot::deleteViewWidget()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimTotalWellAllocationPlot::fontSize() const
{
return caf::FontTools::absolutePointSize(RiaPreferences::current()->defaultPlotFontSize());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimTotalWellAllocationPlot::updateFonts()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -69,6 +69,9 @@ public:
QWidget* createViewWidget( QWidget* mainWindowParent ) override;
void deleteViewWidget() override;
int fontSize() const override;
void updateFonts() override;
protected:
// RimViewWindow overrides

View File

@@ -18,6 +18,8 @@
#include "RimWellAllocationPlot.h"
#include "RiaPreferences.h"
#include "RigAccWellFlowCalculator.h"
#include "RigEclipseCaseData.h"
#include "RigFlowDiagResultAddress.h"
@@ -793,6 +795,21 @@ void RimWellAllocationPlot::showPlotLegend( bool doShow )
if ( m_wellAllocationPlotWidget ) m_wellAllocationPlotWidget->showLegend( doShow );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimWellAllocationPlot::fontSize() const
{
return caf::FontTools::absolutePointSize(RiaPreferences::current()->defaultPlotFontSize());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellAllocationPlot::updateFonts()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -89,6 +89,9 @@ public:
void showPlotLegend( bool doShow );
int fontSize() const override;
void updateFonts() override;
protected:
// Overridden PDM methods
caf::PdmFieldHandle* userDescriptionField() override { return &m_userName; }