Merged from statistics_dialog

This commit is contained in:
Bjørn Erik Jensen
2017-11-16 11:43:24 +01:00
15 changed files with 941 additions and 208 deletions

View File

@@ -27,11 +27,14 @@
#include "cvfObject.h"
#include "cvfVector2.h"
#include <cmath>
#include <memory>
class RimEclipseView;
class RimGeoMechView;
class RimView;
class RigStatisticsDataCache;
class RicGridStatisticsDialog;
//==================================================================================================
///
@@ -41,6 +44,21 @@ class Rim3dOverlayInfoConfig : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
class HistogramData
{
public:
HistogramData() : min(HUGE_VAL), max(HUGE_VAL), p10(HUGE_VAL), p90(HUGE_VAL), mean(HUGE_VAL), weightedMean(HUGE_VAL), sum(0.0) {}
double min;
double max;
double p10;
double p90;
double mean;
double sum;
double weightedMean;
const std::vector<size_t>* histogram;
};
public:
Rim3dOverlayInfoConfig();
virtual ~Rim3dOverlayInfoConfig();
@@ -51,6 +69,12 @@ public:
void setPosition(cvf::Vec2ui position);
HistogramData histogramData(RimEclipseView* eclipseView);
QString caseInfoText(RimEclipseView* eclipseView);
QString resultInfoText(const HistogramData& histData, RimEclipseView* eclipseView);
void showStatisticsInfoDialog();
enum StatisticsTimeRangeType
{
ALL_TIMESTEPS,
@@ -92,4 +116,6 @@ private:
bool hasInvalidStatisticsCombination();
bool m_isVisCellStatUpToDate;
cvf::ref<RigStatisticsDataCache> m_visibleCellStatistics;
std::unique_ptr<RicGridStatisticsDialog> m_gridStatisticsDialog;
};