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

Statistics dialog. Fix crash when no results exist

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-11-16 13:22:05 +01:00
parent c59c167bbf
commit 985388e60f
2 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Commands/RicGridStatisticsDialog.cpp
View File

@ -122,12 +122,14 @@ void RicGridStatisticsDialog::setHistogramData(RimEclipseView* eclipseView)
Rim3dOverlayInfoConfig::HistogramData histogramData = overlayInfo->histogramData(); Rim3dOverlayInfoConfig::HistogramData histogramData = overlayInfo->histogramData();
if (histogramData.isValid())
{
QVector<QwtIntervalSample> histSamples; QVector<QwtIntervalSample> histSamples;
QVector<QPointF> aggrSamples; QVector<QPointF> aggrSamples;
double xStep = (histogramData.max - histogramData.min) / (*histogramData.histogram).size(); double xStep = (histogramData.max - histogramData.min) / (*histogramData.histogram).size();
double xCurr = histogramData.min; double xCurr = histogramData.min;
double aggrValue = 0.0; double aggrValue = 0.0;
for(size_t value : *histogramData.histogram) for (size_t value : *histogramData.histogram)
{ {
double xNext = xCurr + xStep; double xNext = xCurr + xStep;
histSamples.push_back(QwtIntervalSample(value, xCurr, xNext)); histSamples.push_back(QwtIntervalSample(value, xCurr, xNext));
@ -151,11 +153,12 @@ void RicGridStatisticsDialog::setHistogramData(RimEclipseView* eclipseView)
// Markers // Markers
setMarkers(histogramData, m_historgramPlot); setMarkers(histogramData, m_historgramPlot);
setMarkers(histogramData, m_aggregatedPlot); setMarkers(histogramData, m_aggregatedPlot);
}
}
// Refresh plot // Refresh plot
m_historgramPlot->replot(); m_historgramPlot->replot();
m_aggregatedPlot->replot(); m_aggregatedPlot->replot();
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

7
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h
View File

@ -47,7 +47,7 @@ class Rim3dOverlayInfoConfig : public caf::PdmObject
class HistogramData class HistogramData
{ {
public: public:
HistogramData() : min(HUGE_VAL), max(HUGE_VAL), p10(HUGE_VAL), p90(HUGE_VAL), mean(HUGE_VAL), weightedMean(HUGE_VAL), sum(0.0) {} HistogramData() : min(HUGE_VAL), max(HUGE_VAL), p10(HUGE_VAL), p90(HUGE_VAL), mean(HUGE_VAL), weightedMean(HUGE_VAL), sum(0.0), histogram(nullptr) {}
double min; double min;
double max; double max;
@ -57,6 +57,8 @@ class Rim3dOverlayInfoConfig : public caf::PdmObject
double sum; double sum;
double weightedMean; double weightedMean;
const std::vector<size_t>* histogram; const std::vector<size_t>* histogram;
bool isValid() { return histogram && histogram->size() > 0; }
}; };
public: public:
@ -97,6 +99,9 @@ private:
void updateEclipse3DInfo(RimEclipseView * reservoirView); void updateEclipse3DInfo(RimEclipseView * reservoirView);
void updateGeoMech3DInfo(RimGeoMechView * geoMechView); void updateGeoMech3DInfo(RimGeoMechView * geoMechView);
HistogramData histogramData(RimEclipseView* eclipseView);
HistogramData histogramData(RimGeoMechView* geoMechView);
caf::PdmField<bool> active; caf::PdmField<bool> active;
caf::PdmField<bool> showAnimProgress; caf::PdmField<bool> showAnimProgress;
caf::PdmField<bool> showCaseInfo; caf::PdmField<bool> showCaseInfo;