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

Use less generic names to work-around msvc compilation failure

Browse Source
This commit is contained in:
Kristian Bendiksen 2021-05-14 09:14:17 +02:00
parent 31734d04cb
commit 5566db7b28
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.cpp
View File

@ -55,9 +55,9 @@ namespace caf
template <> template <>
void caf::AppEnum<RimStatisticsPlot::HistogramFrequencyType>::setUp() void caf::AppEnum<RimStatisticsPlot::HistogramFrequencyType>::setUp()
{ {
addItem( RimStatisticsPlot::HistogramFrequencyType::ABSOLUTE, "ABSOLUTE", "Absolute" ); addItem( RimStatisticsPlot::HistogramFrequencyType::ABSOLUTE_FREQUENCY, "ABSOLUTE_FREQUENCY", "Absolute" );
addItem( RimStatisticsPlot::HistogramFrequencyType::RELATIVE, "RELATIVE", "Relative" ); addItem( RimStatisticsPlot::HistogramFrequencyType::RELATIVE_FREQUENCY, "RELATIVE_FREQUENCY", "Relative" );
setDefault( RimStatisticsPlot::HistogramFrequencyType::ABSOLUTE ); setDefault( RimStatisticsPlot::HistogramFrequencyType::ABSOLUTE_FREQUENCY );
} }
} // namespace caf } // namespace caf
@ -266,7 +266,7 @@ void RimStatisticsPlot::updatePlots()
for ( double value : histogramData.histogram ) for ( double value : histogramData.histogram )
{ {
if ( m_histogramFrequencyType() == HistogramFrequencyType::RELATIVE ) value /= sumElements; if ( m_histogramFrequencyType() == HistogramFrequencyType::RELATIVE_FREQUENCY ) value /= sumElements;
*set0 << value; *set0 << value;
minValue = std::min( minValue, value ); minValue = std::min( minValue, value );
maxValue = std::max( maxValue, value ); maxValue = std::max( maxValue, value );

5
ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.h
View File

@ -26,6 +26,7 @@
#include "RiuQtChartView.h" #include "RiuQtChartView.h"
#include "cafAppEnum.h"
#include "cafPdmField.h" #include "cafPdmField.h"
#include "cafPdmFieldCvfColor.h" #include "cafPdmFieldCvfColor.h"
@ -44,8 +45,8 @@ class RimStatisticsPlot : public RimPlotWindow
public: public:
enum class HistogramFrequencyType enum class HistogramFrequencyType
{ {
ABSOLUTE, ABSOLUTE_FREQUENCY,
RELATIVE RELATIVE_FREQUENCY
}; };
RimStatisticsPlot(); RimStatisticsPlot();