OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

114
ApplicationLibCode/ProjectDataModel/RimPlotCurve.h
View File

@@ -22,7 +22,7 @@
#include "RimPlotCurveAppearance.h"
#include "RiaCurveDataTools.h"
#include "RiaDefines.h"
#include "RiaPlotDefines.h"
#include "RiuQwtPlotCurveDefines.h"
#include "RiuQwtSymbol.h"
@@ -35,10 +35,8 @@
#include <QPointer>
#include <Qt>
class QwtPlot;
class QwtPlotCurve;
class QwtPlotIntervalCurve;
class RiuQwtPlotCurve;
class RiuPlotCurve;
class RiuPlotWidget;
//==================================================================================================
///
@@ -60,33 +58,24 @@ public:
void loadDataAndUpdate( bool updateParentPlot );
virtual bool xValueRangeInQwt( double* minimumValue, double* maximumValue ) const;
virtual bool yValueRangeInQwt( double* minimumValue, double* maximumValue ) const;
void setParentQwtPlotAndReplot( QwtPlot* plot );
void setParentQwtPlotNoReplot( QwtPlot* plot );
void detachQwtCurve();
void reattachQwtCurve();
QwtPlotCurve* qwtPlotCurve() const;
void setColor( const cvf::Color3f& color );
cvf::Color3f color() const;
void setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum lineStyle );
void setSymbol( RiuQwtSymbol::PointSymbolEnum symbolStyle );
void setInterpolation( RiuQwtPlotCurveDefines::CurveInterpolationEnum );
RiuQwtSymbol::PointSymbolEnum symbol();
int symbolSize() const;
cvf::Color3f symbolEdgeColor() const;
void setSymbolEdgeColor( const cvf::Color3f& edgeColor );
void setSymbolSkipDistance( float distance );
void setSymbolLabel( const QString& label );
void setSymbolLabelPosition( RiuQwtSymbol::LabelPosition labelPosition );
void setSymbolSize( int sizeInPixels );
void setLineThickness( int thickness );
void resetAppearance();
Qt::BrushStyle fillStyle() const;
void setFillStyle( Qt::BrushStyle brushStyle );
void setFillColor( const cvf::Color3f& fillColor );
void setColor( const cvf::Color3f& color );
cvf::Color3f color() const;
void setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum lineStyle );
void setSymbol( RiuPlotCurveSymbol::PointSymbolEnum symbolStyle );
void setInterpolation( RiuQwtPlotCurveDefines::CurveInterpolationEnum );
RiuPlotCurveSymbol::PointSymbolEnum symbol();
int symbolSize() const;
cvf::Color3f symbolEdgeColor() const;
void setSymbolEdgeColor( const cvf::Color3f& edgeColor );
void setSymbolSkipDistance( float distance );
void setSymbolLabel( const QString& label );
void setSymbolLabelPosition( RiuPlotCurveSymbol::LabelPosition labelPosition );
void setSymbolSize( int sizeInPixels );
void setLineThickness( int thickness );
void resetAppearance();
Qt::BrushStyle fillStyle() const;
void setFillStyle( Qt::BrushStyle brushStyle );
void setFillColor( const cvf::Color3f& fillColor );
bool isCurveVisible() const;
void setCurveVisibility( bool visible );
@@ -95,32 +84,48 @@ public:
void updateCurveNameAndUpdatePlotLegendAndTitle();
void updateCurveNameNoLegendUpdate();
QString curveName() const { return m_curveName; }
virtual QString curveExportDescription( const RifEclipseSummaryAddress& address = RifEclipseSummaryAddress() ) const
{
return m_curveName;
}
QString curveName() const;
virtual QString curveExportDescription( const RifEclipseSummaryAddress& address = RifEclipseSummaryAddress() ) const;
void setCustomName( const QString& customName );
QString legendEntryText() const;
void setLegendEntryText( const QString& legendEntryText );
void updateCurveVisibility();
void updateLegendEntryVisibilityAndPlotLegend();
void updateLegendEntryVisibilityNoPlotUpdate();
virtual void updateCurveVisibility();
void updateLegendEntryVisibilityAndPlotLegend();
void updateLegendEntryVisibilityNoPlotUpdate();
virtual void replotParentPlot();
bool showInLegend() const;
bool errorBarsVisible() const;
void setShowInLegend( bool show );
void setZOrder( double z );
void setErrorBarsVisible( bool isVisible );
void setShowInLegend( bool show );
virtual void setZOrder( double z );
void setErrorBarsVisible( bool isVisible );
virtual void updateCurveAppearance();
bool isCrossPlotCurve() const;
void updateUiIconFromPlotSymbol();
virtual void updateUiIconFromPlotSymbol();
virtual bool hasParentPlot() const;
void updateCurveAppearanceForFilesOlderThan_2021_06();
virtual bool xValueRange( double* minimumValue, double* maximumValue ) const;
virtual bool yValueRange( double* minimumValue, double* maximumValue ) const;
virtual void setTitle( const QString& title );
int dataSize() const;
std::pair<double, double> sample( int index ) const;
void setParentPlotNoReplot( RiuPlotWidget* );
void setParentPlotAndReplot( RiuPlotWidget* );
void attach( RiuPlotWidget* );
void detach();
void reattach();
bool isSameCurve( const RiuPlotCurve* plotCurve ) const;
protected:
virtual QString createCurveAutoName() = 0;
virtual void updateZoomInParentPlot() = 0;
@@ -137,9 +142,11 @@ protected:
const std::vector<double>& errorValues,
bool keepOnlyPositiveValues,
RiaCurveDataTools::ErrorAxis errorAxis = RiaCurveDataTools::ErrorAxis::ERROR_ALONG_Y_AXIS );
void setSamplesFromXYValues( const std::vector<double>& xValues,
const std::vector<double>& yValues,
bool keepOnlyPositiveValues );
void setSamplesFromDatesAndYValues( const std::vector<QDateTime>& dateTimes,
const std::vector<double>& yValues,
bool keepOnlyPositiveValues );
@@ -156,20 +163,16 @@ protected:
void appearanceUiOrdering( caf::PdmUiOrdering& uiOrdering );
void curveNameUiOrdering( caf::PdmUiOrdering& uiOrdering );
virtual void onCurveAppearanceChanged( const caf::SignalEmitter* emitter );
void onCurveAppearanceChanged( const caf::SignalEmitter* emitter );
virtual void onFillColorChanged( const caf::SignalEmitter* emitter );
private:
bool canCurveBeAttached() const;
void attachCurveAndErrorBars();
void checkAndApplyDefaultFillColor();
bool canCurveBeAttached() const;
virtual void clearErrorBars();
void checkAndApplyDefaultFillColor();
virtual void updateAxisInPlot( RiaDefines::PlotAxis plotAxis );
protected:
QPointer<QwtPlot> m_parentQwtPlot;
RiuQwtPlotCurve* m_qwtPlotCurve;
QwtPlotIntervalCurve* m_qwtCurveErrorBars;
caf::PdmField<bool> m_showCurve;
caf::PdmField<QString> m_curveName;
caf::PdmField<QString> m_customCurveName;
@@ -180,6 +183,9 @@ protected:
caf::PdmChildField<RimPlotCurveAppearance*> m_curveAppearance;
QPointer<RiuPlotWidget> m_parentPlot;
RiuPlotCurve* m_plotCurve;
caf::PdmField<QString> m_symbolLabel_OBSOLETE;
caf::PdmField<int> m_symbolSize_OBSOLETE;
caf::PdmField<cvf::Color3f> m_curveColor_OBSOLETE;