diff --git a/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp b/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp index b14fed05c2..82be8a0f04 100644 --- a/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp +++ b/ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp @@ -19,7 +19,7 @@ TEST(RimWellLogExtractionCurveImplTest, StripOffInvalidValAtEndsOfVector) values.push_back(HUGE_VAL); std::vector< std::pair > valuesIntervals; - RimWellLogExtractionCurveImpl::validValuesIntervals(values, valuesIntervals); + RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals); EXPECT_EQ(1, valuesIntervals.size()); EXPECT_EQ(2, valuesIntervals[0].first); @@ -43,7 +43,7 @@ TEST(RimWellLogExtractionCurveImplTest, StripOffHugeValAtEndsAndInteriorOfVector values.push_back(HUGE_VAL); std::vector< std::pair > valuesIntervals; - RimWellLogExtractionCurveImpl::validValuesIntervals(values, valuesIntervals); + RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals); EXPECT_EQ(2, valuesIntervals.size()); EXPECT_EQ(2, valuesIntervals[0].first); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp index abae1fde36..07b15274fe 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp @@ -31,7 +31,7 @@ void RimWellLogExtractionCurveImpl::validCurvePointIntervals(const std::vector& depthValues, const std::vector& values, std::vector< std::pair >& intervals) { std::vector< std::pair > valuesIntervals; - validValuesIntervals(values, valuesIntervals); + calculateIntervalsOfValidValues(values, valuesIntervals); intervals = valuesIntervals; @@ -58,7 +58,7 @@ void RimWellLogExtractionCurveImpl::validCurvePointIntervals(const std::vector& values, std::vector< std::pair >& intervals) +void RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(const std::vector& values, std::vector< std::pair >& intervals) { int startIdx = -1; size_t vIdx = 0; diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.h b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.h index 31ff8a63d2..97e9481fcf 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.h @@ -30,7 +30,7 @@ class RimWellLogExtractionCurveImpl { public: - static void validValuesIntervals(const std::vector& values, std::vector< std::pair >& intervals); + static void calculateIntervalsOfValidValues(const std::vector& values, std::vector< std::pair >& intervals); static void validDepthValuesIntervals(const std::vector& depthValues, size_t startIdx, size_t stopIdx, std::vector< std::pair >& intervals); static void validCurvePointIntervals(const std::vector& depthValues, const std::vector& values, std::vector< std::pair >& intervals); static void addValuesFromIntervals(const std::vector& values, std::vector< std::pair >& intervals, std::vector* filteredValues); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp index 77a10ee623..98deab015b 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp @@ -86,7 +86,7 @@ void RimWellLogFileCurve::updatePlotData() if (values.size() > 0 && depthValues.size() > 0) { std::vector< std::pair > valuesIntervals; - RimWellLogExtractionCurveImpl::validValuesIntervals(values, valuesIntervals); + RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals); std::vector filteredValues; std::vector filteredDepths;