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

Renamed impl class/files

Browse Source
This commit is contained in:
Pål Hagen 2015-10-12 15:04:21 +02:00
parent ba879f0c34
commit fac6252d01
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -68,7 +68,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCurve.h
${CEE_CURRENT_LIST_DIR}RimViewLinker.h ${CEE_CURRENT_LIST_DIR}RimViewLinker.h
${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.h ${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.h
${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.h ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.h
${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurveImpl.h ${CEE_CURRENT_LIST_DIR}RimWellLogCurveImpl.h
${CEE_CURRENT_LIST_DIR}RimWellLogFile.h ${CEE_CURRENT_LIST_DIR}RimWellLogFile.h
${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.h ${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.h
${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.h ${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.h
@ -138,7 +138,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCurve.cpp
${CEE_CURRENT_LIST_DIR}RimViewLinker.cpp ${CEE_CURRENT_LIST_DIR}RimViewLinker.cpp
${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.cpp ${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.cpp ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurveImpl.cpp ${CEE_CURRENT_LIST_DIR}RimWellLogCurveImpl.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogFile.cpp ${CEE_CURRENT_LIST_DIR}RimWellLogFile.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.cpp ${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.cpp ${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.cpp

6
ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp
View File

@ -1,6 +1,6 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "../RimWellLogExtractionCurveImpl.h" #include "../RimWellLogCurveImpl.h"
#include <cmath> // Needed for HUGE_VAL on Linux #include <cmath> // Needed for HUGE_VAL on Linux
@ -19,7 +19,7 @@ TEST(RimWellLogExtractionCurveImplTest, StripOffInvalidValAtEndsOfVector)
values.push_back(HUGE_VAL); values.push_back(HUGE_VAL);
std::vector< std::pair<size_t, size_t> > valuesIntervals; std::vector< std::pair<size_t, size_t> > valuesIntervals;
RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals); RimWellLogCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals);
EXPECT_EQ(1, valuesIntervals.size()); EXPECT_EQ(1, valuesIntervals.size());
EXPECT_EQ(2, valuesIntervals[0].first); EXPECT_EQ(2, valuesIntervals[0].first);
@ -43,7 +43,7 @@ TEST(RimWellLogExtractionCurveImplTest, StripOffHugeValAtEndsAndInteriorOfVector
values.push_back(HUGE_VAL); values.push_back(HUGE_VAL);
std::vector< std::pair<size_t, size_t> > valuesIntervals; std::vector< std::pair<size_t, size_t> > valuesIntervals;
RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals); RimWellLogCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals);
EXPECT_EQ(2, valuesIntervals.size()); EXPECT_EQ(2, valuesIntervals.size());
EXPECT_EQ(2, valuesIntervals[0].first); EXPECT_EQ(2, valuesIntervals[0].first);

12
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp → ApplicationCode/ProjectDataModel/RimWellLogCurveImpl.cpp
View File

@ -17,7 +17,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimWellLogExtractionCurveImpl.h" #include "RimWellLogCurveImpl.h"
#include "cvfBase.h" #include "cvfBase.h"
#include "cvfMath.h" #include "cvfMath.h"
@ -28,7 +28,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurveImpl::validCurvePointIntervals(const std::vector<double>& depthValues, const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals) void RimWellLogCurveImpl::validCurvePointIntervals(const std::vector<double>& depthValues, const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals)
{ {
std::vector< std::pair<size_t, size_t> > valuesIntervals; std::vector< std::pair<size_t, size_t> > valuesIntervals;
calculateIntervalsOfValidValues(values, valuesIntervals); calculateIntervalsOfValidValues(values, valuesIntervals);
@ -58,7 +58,7 @@ void RimWellLogExtractionCurveImpl::validCurvePointIntervals(const std::vector<d
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals) void RimWellLogCurveImpl::calculateIntervalsOfValidValues(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals)
{ {
int startIdx = -1; int startIdx = -1;
size_t vIdx = 0; size_t vIdx = 0;
@ -92,7 +92,7 @@ void RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(const std::v
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurveImpl::validDepthValuesIntervals(const std::vector<double>& depthValues, size_t startIdx, size_t stopIdx, std::vector< std::pair<size_t, size_t> >& intervals) void RimWellLogCurveImpl::validDepthValuesIntervals(const std::vector<double>& depthValues, size_t startIdx, size_t stopIdx, std::vector< std::pair<size_t, size_t> >& intervals)
{ {
if (startIdx > stopIdx) if (startIdx > stopIdx)
{ {
@ -128,7 +128,7 @@ void RimWellLogExtractionCurveImpl::validDepthValuesIntervals(const std::vector<
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurveImpl::addValuesFromIntervals(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals, std::vector<double>* filteredValues) void RimWellLogCurveImpl::addValuesFromIntervals(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals, std::vector<double>* filteredValues)
{ {
CVF_ASSERT(filteredValues); CVF_ASSERT(filteredValues);
@ -144,7 +144,7 @@ void RimWellLogExtractionCurveImpl::addValuesFromIntervals(const std::vector<dou
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurveImpl::filteredIntervals(const std::vector< std::pair<size_t, size_t> >& intervals, std::vector< std::pair<size_t, size_t> >* fltrIntervals) void RimWellLogCurveImpl::filteredIntervals(const std::vector< std::pair<size_t, size_t> >& intervals, std::vector< std::pair<size_t, size_t> >* fltrIntervals)
{ {
CVF_ASSERT(fltrIntervals); CVF_ASSERT(fltrIntervals);

2
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.h → ApplicationCode/ProjectDataModel/RimWellLogCurveImpl.h
View File

@ -27,7 +27,7 @@
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimWellLogExtractionCurveImpl class RimWellLogCurveImpl
{ {
public: public:
static void calculateIntervalsOfValidValues(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals); static void calculateIntervalsOfValidValues(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals);

16
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@ -18,7 +18,7 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimWellLogExtractionCurve.h" #include "RimWellLogExtractionCurve.h"
#include "RimWellLogExtractionCurveImpl.h" #include "RimWellLogCurveImpl.h"
#include "RiaApplication.h" #include "RiaApplication.h"
@ -225,9 +225,9 @@ void RimWellLogExtractionCurve::updatePlotData()
if (values.size() > 0 && values.size() == depthValues.size()) if (values.size() > 0 && values.size() == depthValues.size())
{ {
RimWellLogExtractionCurveImpl::validCurvePointIntervals(depthValues, values, plotIntervals); RimWellLogCurveImpl::validCurvePointIntervals(depthValues, values, plotIntervals);
RimWellLogExtractionCurveImpl::addValuesFromIntervals(depthValues, plotIntervals, &filteredDepths); RimWellLogCurveImpl::addValuesFromIntervals(depthValues, plotIntervals, &filteredDepths);
RimWellLogExtractionCurveImpl::addValuesFromIntervals(values, plotIntervals, &filteredValues); RimWellLogCurveImpl::addValuesFromIntervals(values, plotIntervals, &filteredValues);
} }
} }
else if (geomExtractor.notNull()) // geomExtractor else if (geomExtractor.notNull()) // geomExtractor
@ -244,16 +244,16 @@ void RimWellLogExtractionCurve::updatePlotData()
if (values.size() > 0 && values.size() == depthValues.size()) if (values.size() > 0 && values.size() == depthValues.size())
{ {
RimWellLogExtractionCurveImpl::validCurvePointIntervals(depthValues, values, plotIntervals); RimWellLogCurveImpl::validCurvePointIntervals(depthValues, values, plotIntervals);
RimWellLogExtractionCurveImpl::addValuesFromIntervals(depthValues, plotIntervals, &filteredDepths); RimWellLogCurveImpl::addValuesFromIntervals(depthValues, plotIntervals, &filteredDepths);
RimWellLogExtractionCurveImpl::addValuesFromIntervals(values, plotIntervals, &filteredValues); RimWellLogCurveImpl::addValuesFromIntervals(values, plotIntervals, &filteredValues);
} }
} }
m_plotCurve->setSamples(filteredValues.data(), filteredDepths.data(), (int)filteredValues.size()); m_plotCurve->setSamples(filteredValues.data(), filteredDepths.data(), (int)filteredValues.size());
std::vector< std::pair<size_t, size_t> > fltrIntervals; std::vector< std::pair<size_t, size_t> > fltrIntervals;
RimWellLogExtractionCurveImpl::filteredIntervals(plotIntervals, &fltrIntervals); RimWellLogCurveImpl::filteredIntervals(plotIntervals, &fltrIntervals);
m_plotCurve->setPlotIntervals(fltrIntervals); m_plotCurve->setPlotIntervals(fltrIntervals);

10
ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
View File

@ -27,7 +27,7 @@
#include "RimWellLogFile.h" #include "RimWellLogFile.h"
#include "RimWellLogPlotTrack.h" #include "RimWellLogPlotTrack.h"
#include "RimWellLogPlot.h" #include "RimWellLogPlot.h"
#include "RimWellLogExtractionCurveImpl.h" #include "RimWellLogCurveImpl.h"
#include "RiuWellLogTrackPlot.h" #include "RiuWellLogTrackPlot.h"
#include "RiuWellLogPlotCurve.h" #include "RiuWellLogPlotCurve.h"
@ -86,15 +86,15 @@ void RimWellLogFileCurve::updatePlotData()
if (values.size() > 0 && depthValues.size() > 0) if (values.size() > 0 && depthValues.size() > 0)
{ {
std::vector< std::pair<size_t, size_t> > valuesIntervals; std::vector< std::pair<size_t, size_t> > valuesIntervals;
RimWellLogExtractionCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals); RimWellLogCurveImpl::calculateIntervalsOfValidValues(values, valuesIntervals);
std::vector<double> filteredValues; std::vector<double> filteredValues;
std::vector<double> filteredDepths; std::vector<double> filteredDepths;
RimWellLogExtractionCurveImpl::addValuesFromIntervals(values, valuesIntervals, &filteredValues); RimWellLogCurveImpl::addValuesFromIntervals(values, valuesIntervals, &filteredValues);
RimWellLogExtractionCurveImpl::addValuesFromIntervals(depthValues, valuesIntervals, &filteredDepths); RimWellLogCurveImpl::addValuesFromIntervals(depthValues, valuesIntervals, &filteredDepths);
std::vector< std::pair<size_t, size_t> > fltrIntervals; std::vector< std::pair<size_t, size_t> > fltrIntervals;
RimWellLogExtractionCurveImpl::filteredIntervals(valuesIntervals, &fltrIntervals); RimWellLogCurveImpl::filteredIntervals(valuesIntervals, &fltrIntervals);
m_plotCurve->setSamples(filteredValues.data(), filteredDepths.data(), (int)filteredDepths.size()); m_plotCurve->setSamples(filteredValues.data(), filteredDepths.data(), (int)filteredDepths.size());
m_plotCurve->setPlotIntervals(fltrIntervals); m_plotCurve->setPlotIntervals(fltrIntervals);