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

#2844 Ensemble curve set. Fix HUGE_VAL -> numerical_limits

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-05-03 11:50:19 +02:00
parent dd23fa2ead
commit 6f275e0915
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -54,6 +54,11 @@ namespace caf
} }
} }
//--------------------------------------------------------------------------------------------------
/// Internal constants
//--------------------------------------------------------------------------------------------------
#define DOUBLE_INF std::numeric_limits<double>::infinity()
CAF_PDM_SOURCE_INIT(RimEnsembleCurveSet, "RimEnsembleCurveSet"); CAF_PDM_SOURCE_INIT(RimEnsembleCurveSet, "RimEnsembleCurveSet");
@@ -682,7 +687,7 @@ void RimEnsembleCurveSet::updateCurveColors()
rimCase->caseRealizationParameters()->parameterValue(parameterName).textValue() : rimCase->caseRealizationParameters()->parameterValue(parameterName).textValue() :
""; "";
double nValue = m_legendConfig->categoryValueFromCategoryName(tValue); double nValue = m_legendConfig->categoryValueFromCategoryName(tValue);
if (nValue != HUGE_VAL) if (nValue != DOUBLE_INF)
{ {
int iValue = static_cast<int>(nValue); int iValue = static_cast<int>(nValue);
curve->setColor(cvf::Color3f(m_legendConfig->scalarMapper()->mapToColor(iValue))); curve->setColor(cvf::Color3f(m_legendConfig->scalarMapper()->mapToColor(iValue)));
@@ -696,8 +701,8 @@ void RimEnsembleCurveSet::updateCurveColors()
} }
else else
{ {
double minValue = std::numeric_limits<double>::infinity(); double minValue = DOUBLE_INF;
double maxValue = -std::numeric_limits<double>::infinity(); double maxValue = -DOUBLE_INF;
for (RimSummaryCase* rimCase : group->allSummaryCases()) for (RimSummaryCase* rimCase : group->allSummaryCases())
{ {
@@ -707,7 +712,7 @@ void RimEnsembleCurveSet::updateCurveColors()
if (value.isNumeric()) if (value.isNumeric())
{ {
double nValue = value.numericValue(); double nValue = value.numericValue();
if (nValue != std::numeric_limits<double>::infinity()) if (nValue != DOUBLE_INF)
{ {
if (nValue < minValue) minValue = nValue; if (nValue < minValue) minValue = nValue;
if (nValue > maxValue) maxValue = nValue; if (nValue > maxValue) maxValue = nValue;
@@ -723,9 +728,9 @@ void RimEnsembleCurveSet::updateCurveColors()
RimSummaryCase* rimCase = curve->summaryCaseY(); RimSummaryCase* rimCase = curve->summaryCaseY();
double value = rimCase->hasCaseRealizationParameters() ? double value = rimCase->hasCaseRealizationParameters() ?
rimCase->caseRealizationParameters()->parameterValue(parameterName).numericValue() : rimCase->caseRealizationParameters()->parameterValue(parameterName).numericValue() :
HUGE_VAL; DOUBLE_INF;
if(value != HUGE_VAL) curve->setColor(cvf::Color3f(m_legendConfig->scalarMapper()->mapToColor(value))); if(value != DOUBLE_INF) curve->setColor(cvf::Color3f(m_legendConfig->scalarMapper()->mapToColor(value)));
else curve->setColor(cvf::Color3f::GRAY); else curve->setColor(cvf::Color3f::GRAY);
curve->updateCurveAppearance(); curve->updateCurveAppearance();
} }
} }