Merge pull request #8387 from OPM/qtcharts-summary-plots

Closes #8228 

Major refactoring of summary plotting. Now possible to create plots both with Qwt and QtChart as plotting tool.
This commit is contained in:
Kristian Bendiksen
2022-01-17 13:14:21 +01:00
committed by GitHub
parent d9bb82de91
commit 258fbddc10
145 changed files with 7245 additions and 2932 deletions

View File

@@ -28,8 +28,6 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "qwt_plot.h"
#include <QString>
class RimPlotAxisAnnotation;
@@ -59,13 +57,12 @@ public:
void setEnableTitleTextSettings( bool enable );
void enableRangeSettings( bool enable );
void setNameAndAxis( const QString& name, QwtPlot::Axis axis );
void setNameAndAxis( const QString& name, RiaDefines::PlotAxis axis );
AxisTitlePositionType titlePosition() const override;
int titleFontSize() const override;
int valuesFontSize() const override;
QwtPlot::Axis qwtPlotAxisType() const;
QString name() const;
RiaDefines::PlotAxis plotAxisType() const override;
bool useAutoTitle() const;
@@ -121,7 +118,7 @@ private:
caf::PdmField<bool> m_isAxisInverted;
caf::PdmField<QString> m_name;
QwtPlot::Axis m_axis;
RiaDefines::PlotAxis m_axis;
bool m_enableTitleTextSettings;
bool m_isRangeSettingsEnabled;
@@ -131,24 +128,3 @@ private:
caf::PdmField<caf::FontTools::RelativeSizeEnum> m_valuesFontSize;
caf::PdmChildArrayField<RimPlotAxisAnnotation*> m_annotations;
};
class QwtPlotCurve;
//==================================================================================================
///
///
//==================================================================================================
class RimPlotAxisLogRangeCalculator
{
public:
RimPlotAxisLogRangeCalculator( QwtPlot::Axis axis, const std::vector<const QwtPlotCurve*>& qwtCurves );
void computeAxisRange( double* minPositive, double* max ) const;
private:
bool curveValueRange( const QwtPlotCurve* qwtCurve, double* minPositive, double* max ) const;
private:
QwtPlot::Axis m_axis;
const std::vector<const QwtPlotCurve*> m_curves;
};