diff --git a/ApplicationCode/ReservoirDataModel/RigCurveDataTools.cpp b/ApplicationCode/ReservoirDataModel/RigCurveDataTools.cpp index 6ddfeedb28..cb0bcd9cbf 100644 --- a/ApplicationCode/ReservoirDataModel/RigCurveDataTools.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCurveDataTools.cpp @@ -27,7 +27,7 @@ /// //-------------------------------------------------------------------------------------------------- RigCurveDataTools::CurveIntervals RigCurveDataTools::calculateIntervalsOfValidValues(const std::vector& values, - bool removeNegativeValues) + bool includePositiveValuesOnly) { CurveIntervals intervals; @@ -37,7 +37,7 @@ RigCurveDataTools::CurveIntervals RigCurveDataTools::calculateIntervalsOfValidVa size_t valueCount = values.size(); while (vIdx < valueCount) { - bool isValid = RigCurveDataTools::isValidValue(values[vIdx], removeNegativeValues); + bool isValid = RigCurveDataTools::isValidValue(values[vIdx], includePositiveValuesOnly); if (!isValid) { @@ -90,14 +90,14 @@ std::vector> RigCurveDataTools::computePolyLineStartSt //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigCurveDataTools::isValidValue(double value, bool removeNegativeValues) +bool RigCurveDataTools::isValidValue(double value, bool allowPositiveValuesOnly) { if (value == HUGE_VAL || value == -HUGE_VAL || value != value) { return false; } - if (removeNegativeValues && std::signbit(value)) + if (allowPositiveValuesOnly && value <= 0) { return false; } diff --git a/ApplicationCode/ReservoirDataModel/RigCurveDataTools.h b/ApplicationCode/ReservoirDataModel/RigCurveDataTools.h index 9f559324aa..ab195f241f 100644 --- a/ApplicationCode/ReservoirDataModel/RigCurveDataTools.h +++ b/ApplicationCode/ReservoirDataModel/RigCurveDataTools.h @@ -39,7 +39,7 @@ public: public: static CurveIntervals calculateIntervalsOfValidValues(const std::vector& values, - bool removeNegativeValues); + bool includePositiveValuesOnly); template static void getValuesByIntervals(const std::vector& values, @@ -62,6 +62,6 @@ public: public: // Helper methods, available as public to be able to access from unit tests - static bool isValidValue(double value, bool removeNegativeValues); + static bool isValidValue(double value, bool allowPositiveValuesOnly); }; diff --git a/ApplicationCode/UserInterface/RiuLineSegmentQwtPlotCurve.cpp b/ApplicationCode/UserInterface/RiuLineSegmentQwtPlotCurve.cpp index 0a68ded6e7..9db96c0326 100644 --- a/ApplicationCode/UserInterface/RiuLineSegmentQwtPlotCurve.cpp +++ b/ApplicationCode/UserInterface/RiuLineSegmentQwtPlotCurve.cpp @@ -51,7 +51,7 @@ RiuLineSegmentQwtPlotCurve::~RiuLineSegmentQwtPlotCurve() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuLineSegmentQwtPlotCurve::setSamplesFromXValuesAndYValues(const std::vector& xValues, const std::vector& yValues, bool removeNegativeValues) +void RiuLineSegmentQwtPlotCurve::setSamplesFromXValuesAndYValues(const std::vector& xValues, const std::vector& yValues, bool keepOnlyPositiveValues) { CVF_ASSERT(xValues.size() == yValues.size()); @@ -62,7 +62,7 @@ void RiuLineSegmentQwtPlotCurve::setSamplesFromXValuesAndYValues(const std::vect std::vector filteredXValues; { - auto intervalsOfValidValues = RigCurveDataTools::calculateIntervalsOfValidValues(yValues, removeNegativeValues); + auto intervalsOfValidValues = RigCurveDataTools::calculateIntervalsOfValidValues(yValues, keepOnlyPositiveValues); RigCurveDataTools::getValuesByIntervals(yValues, intervalsOfValidValues, &filteredYValues); RigCurveDataTools::getValuesByIntervals(xValues, intervalsOfValidValues, &filteredXValues); @@ -84,17 +84,17 @@ void RiuLineSegmentQwtPlotCurve::setSamplesFromXValuesAndYValues(const std::vect //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuLineSegmentQwtPlotCurve::setSamplesFromDatesAndYValues(const std::vector& dateTimes, const std::vector& yValues, bool removeNegativeValues) +void RiuLineSegmentQwtPlotCurve::setSamplesFromDatesAndYValues(const std::vector& dateTimes, const std::vector& yValues, bool keepOnlyPositiveValues) { - setSamplesFromXValuesAndYValues(RiuLineSegmentQwtPlotCurve::fromQDateTime(dateTimes), yValues, removeNegativeValues); + setSamplesFromXValuesAndYValues(RiuLineSegmentQwtPlotCurve::fromQDateTime(dateTimes), yValues, keepOnlyPositiveValues); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuLineSegmentQwtPlotCurve::setSamplesFromTimeTAndYValues(const std::vector& dateTimes, const std::vector& yValues, bool removeNegativeValues) +void RiuLineSegmentQwtPlotCurve::setSamplesFromTimeTAndYValues(const std::vector& dateTimes, const std::vector& yValues, bool keepOnlyPositiveValues) { - setSamplesFromXValuesAndYValues(RiuLineSegmentQwtPlotCurve::fromTime_t(dateTimes), yValues, removeNegativeValues); + setSamplesFromXValuesAndYValues(RiuLineSegmentQwtPlotCurve::fromTime_t(dateTimes), yValues, keepOnlyPositiveValues); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/UserInterface/RiuLineSegmentQwtPlotCurve.h b/ApplicationCode/UserInterface/RiuLineSegmentQwtPlotCurve.h index 5ec9ec5251..31e220fcf9 100644 --- a/ApplicationCode/UserInterface/RiuLineSegmentQwtPlotCurve.h +++ b/ApplicationCode/UserInterface/RiuLineSegmentQwtPlotCurve.h @@ -49,15 +49,15 @@ public: void setSamplesFromXValuesAndYValues(const std::vector& xValues, const std::vector& yValues, - bool removeNegativeValues); + bool keepOnlyPositiveValues); void setSamplesFromDatesAndYValues(const std::vector& dateTimes, const std::vector& yValues, - bool removeNegativeValues); + bool keepOnlyPositiveValues); void setSamplesFromTimeTAndYValues(const std::vector& dateTimes, const std::vector& yValues, - bool removeNegativeValues); + bool keepOnlyPositiveValues); void setLineSegmentStartStopIndices(const std::vector< std::pair >& lineSegmentStartStopIndices);