mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Support ensemble cross plot curves
* Remove use of RifEnsembleStatisticsReader * Add RimSummaryAddressSelector and RimEnsembleCrossPlotStatisticsCase * Remove RifEnsembleStatisticsReader * Add support for cross plot x-axis selection * Support source stepping on ensemble cross plot curves * Add isXAxisSummaryVector
This commit is contained in:
@@ -25,7 +25,9 @@
|
||||
#include "RiaDateTimeDefines.h"
|
||||
#include "RiaPlotDefines.h"
|
||||
#include "RiaSummaryCurveAddress.h"
|
||||
#include "RiaSummaryDefines.h"
|
||||
|
||||
#include "RimEnsembleCrossPlotStatisticsCase.h"
|
||||
#include "RimEnsembleCurveSetColorManager.h"
|
||||
#include "RimEnsembleCurveSetInterface.h"
|
||||
#include "RimTimeStepFilter.h"
|
||||
@@ -64,6 +66,7 @@ class RiuSummaryVectorSelectionDialog;
|
||||
class RiuPlotWidget;
|
||||
class RiuPlotCurve;
|
||||
class RimPlotAxisPropertiesInterface;
|
||||
class RimSummaryAddressSelector;
|
||||
|
||||
class QwtPlot;
|
||||
class QwtPlotCurve;
|
||||
@@ -111,6 +114,7 @@ public:
|
||||
void deleteCurve( RimSummaryCurve* curve );
|
||||
|
||||
void setSummaryAddress( RifEclipseSummaryAddress address );
|
||||
void setCurveAddress( RiaSummaryCurveAddress address );
|
||||
void setSummaryAddressAndStatisticsFlag( RifEclipseSummaryAddress address );
|
||||
RifEclipseSummaryAddress summaryAddress() const;
|
||||
RiaSummaryCurveAddress curveAddress() const;
|
||||
@@ -215,10 +219,14 @@ private:
|
||||
|
||||
void onObjectiveFunctionChanged( const caf::SignalEmitter* emitter );
|
||||
void onCustomObjectiveFunctionChanged( const caf::SignalEmitter* emitter );
|
||||
void onXAxisAddressChanged( const caf::SignalEmitter* emitter );
|
||||
|
||||
void setTransparentCurveColor();
|
||||
void onColorTagClicked( const SignalEmitter* emitter, size_t index );
|
||||
|
||||
void setSummaryAddressX( RifEclipseSummaryAddress address );
|
||||
bool isXAxisSummaryVector() const;
|
||||
|
||||
private:
|
||||
caf::PdmField<bool> m_showCurves;
|
||||
caf::PdmChildArrayField<RimSummaryCurve*> m_curves;
|
||||
@@ -231,6 +239,9 @@ private:
|
||||
caf::PdmField<bool> m_yPushButtonSelectSummaryAddress;
|
||||
caf::PdmField<RiaDefines::DateTimePeriodEnum> m_resampling;
|
||||
|
||||
caf::PdmField<caf::AppEnum<RiaDefines::HorizontalAxisType>> m_xAxisType;
|
||||
caf::PdmChildField<RimSummaryAddressSelector*> m_xAddressSelector;
|
||||
|
||||
caf::PdmField<ColorModeEnum> m_colorMode;
|
||||
caf::PdmField<cvf::Color3f> m_mainEnsembleColor;
|
||||
caf::PdmField<cvf::Color3f> m_colorForRealizations;
|
||||
@@ -270,7 +281,8 @@ private:
|
||||
QPointer<RiuDraggableOverlayFrame> m_filterOverlayFrame;
|
||||
QPointer<RiuDraggableOverlayFrame> m_objectiveFunctionOverlayFrame;
|
||||
|
||||
std::unique_ptr<RimEnsembleStatisticsCase> m_ensembleStatCase;
|
||||
std::unique_ptr<RimEnsembleStatisticsCase> m_ensembleStatCaseY;
|
||||
std::unique_ptr<RimEnsembleCrossPlotStatisticsCase> m_ensembleStatCaseXY;
|
||||
|
||||
std::unique_ptr<RiaSummaryCurveDefinitionAnalyser> m_analyserOfSelectedCurveDefs;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user