From c02538b8bd778743cd2388d7586626ad8aade327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Mon, 13 Nov 2017 11:10:27 +0100 Subject: [PATCH] Rename of RifWellRftAddress to RifDataSourceForRftPlt --- .../Application/RiaRftPltCurveDefinition.cpp | 4 +- .../Application/RiaRftPltCurveDefinition.h | 8 +- .../FileInterface/CMakeLists_files.cmake | 6 +- ...Address.cpp => RifDataSourceForRftPlt.cpp} | 28 ++--- ...lRftAddress.h => RifDataSourceForRftPlt.h} | 20 +-- ...pe.h => RifDataSourceForRftPltQMetaType.h} | 4 +- .../ProjectDataModel/Flow/RimRftAddress.cpp | 20 +-- .../ProjectDataModel/Flow/RimRftAddress.h | 10 +- .../Flow/RimWellPlotTools.cpp | 62 ++++----- .../ProjectDataModel/Flow/RimWellPlotTools.h | 22 ++-- .../ProjectDataModel/Flow/RimWellPltPlot.cpp | 118 +++++++++--------- .../ProjectDataModel/Flow/RimWellPltPlot.h | 20 +-- .../ProjectDataModel/Flow/RimWellRftPlot.cpp | 106 ++++++++-------- .../ProjectDataModel/Flow/RimWellRftPlot.h | 10 +- 14 files changed, 219 insertions(+), 219 deletions(-) rename ApplicationCode/FileInterface/{RifWellRftAddress.cpp => RifDataSourceForRftPlt.cpp} (84%) rename ApplicationCode/FileInterface/{RifWellRftAddress.h => RifDataSourceForRftPlt.h} (69%) rename ApplicationCode/FileInterface/{RifWellRftAddressQMetaType.h => RifDataSourceForRftPltQMetaType.h} (90%) diff --git a/ApplicationCode/Application/RiaRftPltCurveDefinition.cpp b/ApplicationCode/Application/RiaRftPltCurveDefinition.cpp index d5687225f9..79e2e5031d 100644 --- a/ApplicationCode/Application/RiaRftPltCurveDefinition.cpp +++ b/ApplicationCode/Application/RiaRftPltCurveDefinition.cpp @@ -22,7 +22,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaRftPltCurveDefinition::RiaRftPltCurveDefinition(RifWellRftAddress address, const QDateTime timeStep) +RiaRftPltCurveDefinition::RiaRftPltCurveDefinition(RifDataSourceForRftPlt address, const QDateTime timeStep) { m_curveDefinition = std::make_pair(address, timeStep); } @@ -30,7 +30,7 @@ RiaRftPltCurveDefinition::RiaRftPltCurveDefinition(RifWellRftAddress address, co //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifWellRftAddress RiaRftPltCurveDefinition::address() const +RifDataSourceForRftPlt RiaRftPltCurveDefinition::address() const { return m_curveDefinition.first; } diff --git a/ApplicationCode/Application/RiaRftPltCurveDefinition.h b/ApplicationCode/Application/RiaRftPltCurveDefinition.h index b8867de6b9..ccb1f4e8bc 100644 --- a/ApplicationCode/Application/RiaRftPltCurveDefinition.h +++ b/ApplicationCode/Application/RiaRftPltCurveDefinition.h @@ -18,7 +18,7 @@ #pragma once -#include "RifWellRftAddress.h" +#include "RifDataSourceForRftPlt.h" #include @@ -33,13 +33,13 @@ class RimSummaryCase; class RiaRftPltCurveDefinition { public: - explicit RiaRftPltCurveDefinition(RifWellRftAddress address, const QDateTime timeStep); + explicit RiaRftPltCurveDefinition(RifDataSourceForRftPlt address, const QDateTime timeStep); - RifWellRftAddress address() const; + RifDataSourceForRftPlt address() const; QDateTime timeStep() const; bool operator < (const RiaRftPltCurveDefinition& other) const; private: - std::pair m_curveDefinition; + std::pair m_curveDefinition; }; diff --git a/ApplicationCode/FileInterface/CMakeLists_files.cmake b/ApplicationCode/FileInterface/CMakeLists_files.cmake index d61bddc1e0..2c04ab9eff 100644 --- a/ApplicationCode/FileInterface/CMakeLists_files.cmake +++ b/ApplicationCode/FileInterface/CMakeLists_files.cmake @@ -34,8 +34,8 @@ ${CEE_CURRENT_LIST_DIR}RifWellPathImporter.h ${CEE_CURRENT_LIST_DIR}RifHdf5ReaderInterface.h ${CEE_CURRENT_LIST_DIR}RifColumnBasedUserData.h ${CEE_CURRENT_LIST_DIR}RifKeywordVectorUserData.h -${CEE_CURRENT_LIST_DIR}RifWellRftAddress.h -${CEE_CURRENT_LIST_DIR}RifWellRftAddressQMetaType.h +${CEE_CURRENT_LIST_DIR}RifDataSourceForRftPlt.h +${CEE_CURRENT_LIST_DIR}RifDataSourceForRftPltQMetaType.h ${CEE_CURRENT_LIST_DIR}RifEclipseUserDataKeywordTools.h # HDF5 file reader is directly included in ResInsight main CmakeList.txt @@ -77,7 +77,7 @@ ${CEE_CURRENT_LIST_DIR}RifWellPathImporter.cpp ${CEE_CURRENT_LIST_DIR}RifHdf5ReaderInterface.cpp ${CEE_CURRENT_LIST_DIR}RifColumnBasedUserData.cpp ${CEE_CURRENT_LIST_DIR}RifKeywordVectorUserData.cpp -${CEE_CURRENT_LIST_DIR}RifWellRftAddress.cpp +${CEE_CURRENT_LIST_DIR}RifDataSourceForRftPlt.cpp ${CEE_CURRENT_LIST_DIR}RifEclipseUserDataKeywordTools.cpp diff --git a/ApplicationCode/FileInterface/RifWellRftAddress.cpp b/ApplicationCode/FileInterface/RifDataSourceForRftPlt.cpp similarity index 84% rename from ApplicationCode/FileInterface/RifWellRftAddress.cpp rename to ApplicationCode/FileInterface/RifDataSourceForRftPlt.cpp index 1ff325420b..e61f4a7e3f 100644 --- a/ApplicationCode/FileInterface/RifWellRftAddress.cpp +++ b/ApplicationCode/FileInterface/RifDataSourceForRftPlt.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RifWellRftAddress.h" +#include "RifDataSourceForRftPlt.h" #include "RimEclipseCase.h" #include "RimWellLogFile.h" @@ -29,14 +29,14 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifWellRftAddress::RifWellRftAddress() : m_sourceType(SourceType::NONE) +RifDataSourceForRftPlt::RifDataSourceForRftPlt() : m_sourceType(SourceType::NONE) { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifWellRftAddress::RifWellRftAddress(SourceType sourceType, RimEclipseCase* eclCase) +RifDataSourceForRftPlt::RifDataSourceForRftPlt(SourceType sourceType, RimEclipseCase* eclCase) { CVF_ASSERT(sourceType == SourceType::RFT || sourceType == SourceType::GRID); CVF_ASSERT(eclCase != nullptr); @@ -48,7 +48,7 @@ RifWellRftAddress::RifWellRftAddress(SourceType sourceType, RimEclipseCase* eclC //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifWellRftAddress::RifWellRftAddress(SourceType sourceType, RimWellLogFile* wellLogFile) +RifDataSourceForRftPlt::RifDataSourceForRftPlt(SourceType sourceType, RimWellLogFile* wellLogFile) { CVF_ASSERT(sourceType == SourceType::OBSERVED); @@ -59,7 +59,7 @@ RifWellRftAddress::RifWellRftAddress(SourceType sourceType, RimWellLogFile* well //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifWellRftAddress::SourceType RifWellRftAddress::sourceType() const +RifDataSourceForRftPlt::SourceType RifDataSourceForRftPlt::sourceType() const { return m_sourceType; } @@ -67,7 +67,7 @@ RifWellRftAddress::SourceType RifWellRftAddress::sourceType() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimEclipseCase* RifWellRftAddress::eclCase() const +RimEclipseCase* RifDataSourceForRftPlt::eclCase() const { return m_eclCase; } @@ -75,7 +75,7 @@ RimEclipseCase* RifWellRftAddress::eclCase() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimWellLogFile* RifWellRftAddress::wellLogFile() const +RimWellLogFile* RifDataSourceForRftPlt::wellLogFile() const { return m_wellLogFile; } @@ -83,7 +83,7 @@ RimWellLogFile* RifWellRftAddress::wellLogFile() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RifWellRftAddress::sourceTypeUiText(SourceType sourceType) +QString RifDataSourceForRftPlt::sourceTypeUiText(SourceType sourceType) { switch (sourceType) { @@ -97,7 +97,7 @@ QString RifWellRftAddress::sourceTypeUiText(SourceType sourceType) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool operator==(const RifWellRftAddress& addr1, const RifWellRftAddress& addr2) +bool operator==(const RifDataSourceForRftPlt& addr1, const RifDataSourceForRftPlt& addr2) { return addr1.sourceType() == addr2.sourceType() && addr1.eclCase() == addr2.eclCase() @@ -107,7 +107,7 @@ bool operator==(const RifWellRftAddress& addr1, const RifWellRftAddress& addr2) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QTextStream& operator << (QTextStream& str, const RifWellRftAddress& addr) +QTextStream& operator << (QTextStream& str, const RifDataSourceForRftPlt& addr) { // Not implemented CVF_ASSERT(false); @@ -117,7 +117,7 @@ QTextStream& operator << (QTextStream& str, const RifWellRftAddress& addr) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QTextStream& operator >> (QTextStream& str, RifWellRftAddress& source) +QTextStream& operator >> (QTextStream& str, RifDataSourceForRftPlt& source) { // Not implemented CVF_ASSERT(false); @@ -128,16 +128,16 @@ QTextStream& operator >> (QTextStream& str, RifWellRftAddress& source) /// This sort order controls the plot order in PLT plot. (Layer-wise) /// Observed data is supposed to be the bottom layers (first) //-------------------------------------------------------------------------------------------------- -bool operator<(const RifWellRftAddress& addr1, const RifWellRftAddress& addr2) +bool operator<(const RifDataSourceForRftPlt& addr1, const RifDataSourceForRftPlt& addr2) { if ( addr1.m_sourceType != addr2.m_sourceType ) { return addr1.m_sourceType < addr2.m_sourceType; } - if ( addr1.m_sourceType == RifWellRftAddress::NONE ) return false; // + if ( addr1.m_sourceType == RifDataSourceForRftPlt::NONE ) return false; // - if (addr1.m_sourceType == RifWellRftAddress::OBSERVED) + if (addr1.m_sourceType == RifDataSourceForRftPlt::OBSERVED) { if(addr1.wellLogFile() && addr2.wellLogFile()) { diff --git a/ApplicationCode/FileInterface/RifWellRftAddress.h b/ApplicationCode/FileInterface/RifDataSourceForRftPlt.h similarity index 69% rename from ApplicationCode/FileInterface/RifWellRftAddress.h rename to ApplicationCode/FileInterface/RifDataSourceForRftPlt.h index 4228081cf2..09f2d395ec 100644 --- a/ApplicationCode/FileInterface/RifWellRftAddress.h +++ b/ApplicationCode/FileInterface/RifDataSourceForRftPlt.h @@ -38,7 +38,7 @@ class RimEclipseCase; /// /// //================================================================================================== -class RifWellRftAddress +class RifDataSourceForRftPlt { public: enum SourceType @@ -49,9 +49,9 @@ public: GRID }; - RifWellRftAddress(); - RifWellRftAddress(SourceType sourceType, RimEclipseCase* eclCase); - RifWellRftAddress(SourceType sourceType, RimWellLogFile* wellLogFile = nullptr); + RifDataSourceForRftPlt(); + RifDataSourceForRftPlt(SourceType sourceType, RimEclipseCase* eclCase); + RifDataSourceForRftPlt(SourceType sourceType, RimWellLogFile* wellLogFile = nullptr); SourceType sourceType() const; RimEclipseCase* eclCase() const; @@ -59,8 +59,8 @@ public: static QString sourceTypeUiText(SourceType sourceType); - friend QTextStream& operator >> (QTextStream& str, RifWellRftAddress& addr); - friend bool operator<(const RifWellRftAddress& addr1, const RifWellRftAddress& addr2); + friend QTextStream& operator >> (QTextStream& str, RifDataSourceForRftPlt& addr); + friend bool operator<(const RifDataSourceForRftPlt& addr1, const RifDataSourceForRftPlt& addr2); private: SourceType m_sourceType; @@ -68,7 +68,7 @@ private: caf::PdmPointer m_wellLogFile; }; -bool operator==(const RifWellRftAddress& addr1, const RifWellRftAddress& addr2); -QTextStream& operator <<(QTextStream& str, const RifWellRftAddress& addr); -QTextStream& operator >> (QTextStream& str, RifWellRftAddress& addr); -bool operator<(const RifWellRftAddress& addr1, const RifWellRftAddress& addr2); \ No newline at end of file +bool operator==(const RifDataSourceForRftPlt& addr1, const RifDataSourceForRftPlt& addr2); +QTextStream& operator <<(QTextStream& str, const RifDataSourceForRftPlt& addr); +QTextStream& operator >> (QTextStream& str, RifDataSourceForRftPlt& addr); +bool operator<(const RifDataSourceForRftPlt& addr1, const RifDataSourceForRftPlt& addr2); \ No newline at end of file diff --git a/ApplicationCode/FileInterface/RifWellRftAddressQMetaType.h b/ApplicationCode/FileInterface/RifDataSourceForRftPltQMetaType.h similarity index 90% rename from ApplicationCode/FileInterface/RifWellRftAddressQMetaType.h rename to ApplicationCode/FileInterface/RifDataSourceForRftPltQMetaType.h index b342b65921..bbab7d3e17 100644 --- a/ApplicationCode/FileInterface/RifWellRftAddressQMetaType.h +++ b/ApplicationCode/FileInterface/RifDataSourceForRftPltQMetaType.h @@ -18,7 +18,7 @@ #pragma once #include -#include "RifWellRftAddress.h" +#include "RifDataSourceForRftPlt.h" -Q_DECLARE_METATYPE(RifWellRftAddress); +Q_DECLARE_METATYPE(RifDataSourceForRftPlt); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimRftAddress.cpp b/ApplicationCode/ProjectDataModel/Flow/RimRftAddress.cpp index 8168f0fccb..b4756c31dc 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimRftAddress.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimRftAddress.cpp @@ -29,12 +29,12 @@ namespace caf { template<> - void caf::AppEnum::setUp() + void caf::AppEnum::setUp() { - addItem(RifWellRftAddress::SourceType::RFT, "RFT", "RFT Cases"); - addItem(RifWellRftAddress::SourceType::GRID, "GRID", "Grid Cases"); - addItem(RifWellRftAddress::SourceType::OBSERVED, "OBSERVED", "Observed Data"); - setDefault(RifWellRftAddress::SourceType::NONE); + addItem(RifDataSourceForRftPlt::SourceType::RFT, "RFT", "RFT Cases"); + addItem(RifDataSourceForRftPlt::SourceType::GRID, "GRID", "Grid Cases"); + addItem(RifDataSourceForRftPlt::SourceType::OBSERVED, "OBSERVED", "Observed Data"); + setDefault(RifDataSourceForRftPlt::SourceType::NONE); } } @@ -54,7 +54,7 @@ RimRftAddress::RimRftAddress() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimRftAddress::RimRftAddress(const RifWellRftAddress& addr) +RimRftAddress::RimRftAddress(const RifDataSourceForRftPlt& addr) { InitPdmObject(); setAddress(addr); @@ -63,7 +63,7 @@ RimRftAddress::RimRftAddress(const RifWellRftAddress& addr) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimRftAddress::setAddress(const RifWellRftAddress& address) +void RimRftAddress::setAddress(const RifDataSourceForRftPlt& address) { m_sourceType = address.sourceType(); m_eclCase = address.eclCase(); @@ -73,11 +73,11 @@ void RimRftAddress::setAddress(const RifWellRftAddress& address) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifWellRftAddress RimRftAddress::address() const +RifDataSourceForRftPlt RimRftAddress::address() const { return m_eclCase() != nullptr ? - RifWellRftAddress(m_sourceType(), m_eclCase()) : - RifWellRftAddress(m_sourceType(), m_wellLogFile()); + RifDataSourceForRftPlt(m_sourceType(), m_eclCase()) : + RifDataSourceForRftPlt(m_sourceType(), m_wellLogFile()); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Flow/RimRftAddress.h b/ApplicationCode/ProjectDataModel/Flow/RimRftAddress.h index 2341cd4c5b..08ac5b80e1 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimRftAddress.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimRftAddress.h @@ -26,7 +26,7 @@ #include "cafPdmPtrField.h" #include "cafPdmPointer.h" -#include "RifWellRftAddressQMetaType.h" +#include "RifDataSourceForRftPltQMetaType.h" #include "cafAppEnum.h" @@ -48,17 +48,17 @@ class RimRftAddress : public caf::PdmObject public: RimRftAddress(); - RimRftAddress(const RifWellRftAddress& addr); + RimRftAddress(const RifDataSourceForRftPlt& addr); - void setAddress(const RifWellRftAddress& address); - RifWellRftAddress address() const; + void setAddress(const RifDataSourceForRftPlt& address); + RifDataSourceForRftPlt address() const; RimRftAddress& operator=(const RimRftAddress& other); private: void InitPdmObject(); - caf::PdmField > m_sourceType; + caf::PdmField > m_sourceType; caf::PdmPtrField m_eclCase; caf::PdmPtrField m_wellLogFile; }; diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.cpp index d4dd06971e..77cccf718e 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.cpp @@ -227,18 +227,18 @@ FlowPhase RimWellPlotTools::flowPhaseFromChannelName(const QString& channelName) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellPlotTools::addTimeStepToMap(std::map>& destMap, - const std::pair>& timeStepToAdd) +void RimWellPlotTools::addTimeStepToMap(std::map>& destMap, + const std::pair>& timeStepToAdd) { - auto timeStepMapToAdd = std::map>{ timeStepToAdd }; + auto timeStepMapToAdd = std::map>{ timeStepToAdd }; addTimeStepsToMap(destMap, timeStepMapToAdd); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellPlotTools::addTimeStepsToMap(std::map>& destMap, - const std::map>& timeStepsToAdd) +void RimWellPlotTools::addTimeStepsToMap(std::map>& destMap, + const std::map>& timeStepsToAdd) { for (const auto& timeStepPair : timeStepsToAdd) { @@ -246,7 +246,7 @@ void RimWellPlotTools::addTimeStepsToMap(std::map())); + destMap.insert(std::make_pair(timeStepPair.first, std::set())); } auto addresses = timeStepPair.second; destMap[timeStepPair.first].insert(addresses.begin(), addresses.end()); @@ -539,9 +539,9 @@ QDateTime RimWellPlotTools::timeStepFromWellLogFile(RimWellLogFile* wellLogFile) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::map> RimWellPlotTools::timeStepsMapFromRftCase(RimEclipseResultCase* rftCase, const QString& simWellName) +std::map> RimWellPlotTools::timeStepsMapFromRftCase(RimEclipseResultCase* rftCase, const QString& simWellName) { - std::map> timeStepsMap; + std::map> timeStepsMap; RifReaderEclipseRft* const reader = rftCase->rftReader(); if (reader != nullptr) { @@ -549,9 +549,9 @@ std::map> RimWellPlotTools::timeStepsMapF { if (timeStepsMap.count(timeStep) == 0) { - timeStepsMap.insert(std::make_pair(timeStep, std::set())); + timeStepsMap.insert(std::make_pair(timeStep, std::set())); } - timeStepsMap[timeStep].insert(RifWellRftAddress(RifWellRftAddress::RFT, rftCase)); + timeStepsMap[timeStep].insert(RifDataSourceForRftPlt(RifDataSourceForRftPlt::RFT, rftCase)); } } return timeStepsMap; @@ -560,21 +560,21 @@ std::map> RimWellPlotTools::timeStepsMapF //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::map> RimWellPlotTools::timeStepsMapFromGridCase(RimEclipseCase* gridCase) +std::map> RimWellPlotTools::timeStepsMapFromGridCase(RimEclipseCase* gridCase) { const RigEclipseCaseData* const eclipseCaseData = gridCase->eclipseCaseData(); std::pair resultDataInfo = pressureResultDataInfo(eclipseCaseData); - std::map> timeStepsMap; + std::map> timeStepsMap; if (resultDataInfo.first != cvf::UNDEFINED_SIZE_T) { for (const QDateTime& timeStep : eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->timeStepDates(resultDataInfo.first)) { if (timeStepsMap.count(timeStep) == 0) { - timeStepsMap.insert(std::make_pair(timeStep, std::set())); + timeStepsMap.insert(std::make_pair(timeStep, std::set())); } - timeStepsMap[timeStep].insert(RifWellRftAddress(RifWellRftAddress::GRID, gridCase)); + timeStepsMap[timeStep].insert(RifDataSourceForRftPlt(RifDataSourceForRftPlt::GRID, gridCase)); } } return timeStepsMap; @@ -583,17 +583,17 @@ std::map> RimWellPlotTools::timeStepsMapF //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::map > RimWellPlotTools::timeStepsMapFromWellLogFile(RimWellLogFile* wellLogFile) +std::map > RimWellPlotTools::timeStepsMapFromWellLogFile(RimWellLogFile* wellLogFile) { - std::map > timeStepsMap; + std::map > timeStepsMap; QDateTime timeStep = wellLogFile->date(); if (timeStepsMap.count(timeStep) == 0) { - timeStepsMap.insert(std::make_pair(timeStep, std::set())); + timeStepsMap.insert(std::make_pair(timeStep, std::set())); } - timeStepsMap[timeStep].insert(RifWellRftAddress(RifWellRftAddress::OBSERVED, wellLogFile)); + timeStepsMap[timeStep].insert(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED, wellLogFile)); return timeStepsMap; } @@ -601,16 +601,16 @@ std::map > RimWellPlotTools::timeStepsMap //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::map> -RimWellPlotTools::adjacentTimeSteps(const std::vector>>& allTimeSteps, - const std::pair>& searchTimeStepPair) +std::map> +RimWellPlotTools::adjacentTimeSteps(const std::vector>>& allTimeSteps, + const std::pair>& searchTimeStepPair) { - std::map> timeStepsMap; + std::map> timeStepsMap; if (allTimeSteps.size() > 0) { auto itr = std::find_if(allTimeSteps.begin(), allTimeSteps.end(), - [searchTimeStepPair](const std::pair>& dt) + [searchTimeStepPair](const std::pair>& dt) { return dt.first > searchTimeStepPair.first; }); @@ -632,9 +632,9 @@ RimWellPlotTools::adjacentTimeSteps(const std::vector>& map, const QDateTime& timeStep) +bool RimWellPlotTools::mapContainsTimeStep(const std::map>& map, const QDateTime& timeStep) { - return std::find_if(map.begin(), map.end(), [timeStep](const std::pair>& pair) + return std::find_if(map.begin(), map.end(), [timeStep](const std::pair>& pair) { return pair.first == timeStep; }) != map.end(); @@ -656,7 +656,7 @@ RiaRftPltCurveDefinition RimWellPlotTools::curveDefFromCurve(const RimWellLogCur { const RifEclipseRftAddress rftAddress = rftCurve->rftAddress(); const QDateTime timeStep = rftAddress.timeStep(); - return RiaRftPltCurveDefinition(RifWellRftAddress(RifWellRftAddress::RFT, rftCase), timeStep); + return RiaRftPltCurveDefinition(RifDataSourceForRftPlt(RifDataSourceForRftPlt::RFT, rftCase), timeStep); } } else if (gridCurve != nullptr) @@ -665,12 +665,12 @@ RiaRftPltCurveDefinition RimWellPlotTools::curveDefFromCurve(const RimWellLogCur if (gridCase != nullptr) { size_t timeStepIndex = gridCurve->currentTimeStep(); - const std::map>& timeStepsMap = timeStepsMapFromGridCase(gridCase); - auto timeStepsVector = std::vector>>( + const std::map>& timeStepsMap = timeStepsMapFromGridCase(gridCase); + auto timeStepsVector = std::vector>>( timeStepsMap.begin(), timeStepsMap.end()); if (timeStepIndex < timeStepsMap.size()) { - return RiaRftPltCurveDefinition(RifWellRftAddress(RifWellRftAddress::GRID, gridCase), + return RiaRftPltCurveDefinition(RifDataSourceForRftPlt(RifDataSourceForRftPlt::GRID, gridCase), timeStepsVector[timeStepIndex].first); } } @@ -686,11 +686,11 @@ RiaRftPltCurveDefinition RimWellPlotTools::curveDefFromCurve(const RimWellLogCur if (date.isValid()) { - return RiaRftPltCurveDefinition(RifWellRftAddress(RifWellRftAddress::OBSERVED, wellLogFile), date); + return RiaRftPltCurveDefinition(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED, wellLogFile), date); } } } - return RiaRftPltCurveDefinition(RifWellRftAddress(), QDateTime()); + return RiaRftPltCurveDefinition(RifDataSourceForRftPlt(), QDateTime()); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.h b/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.h index 9f7496b285..ef45f20c07 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.h @@ -19,7 +19,7 @@ #pragma once -#include "RifWellRftAddressQMetaType.h" +#include "RifDataSourceForRftPltQMetaType.h" #include "RiaRftPltCurveDefinition.h" #include @@ -72,10 +72,10 @@ public: static bool hasFlowData(RimWellPath* wellPath); static FlowPhase flowPhaseFromChannelName(const QString& channelName); - static void addTimeStepToMap(std::map>& destMap, - const std::pair>& timeStepToAdd); - static void addTimeStepsToMap(std::map>& destMap, - const std::map>& timeStepsToAdd); + static void addTimeStepToMap(std::map>& destMap, + const std::pair>& timeStepToAdd); + static void addTimeStepsToMap(std::map>& destMap, + const std::map>& timeStepsToAdd); static std::vector wellLogFilesContainingPressure(const QString& simWellName); static RimWellLogFileChannel* getPressureChannelFromWellFile(const RimWellLogFile* wellLogFile); @@ -92,12 +92,12 @@ public: static std::set timeStepsFromGridCase(RimEclipseCase* gridCase); static QDateTime timeStepFromWellLogFile(RimWellLogFile* wellLogFile); - static std::map> timeStepsMapFromRftCase(RimEclipseResultCase* rftCase, const QString& simWellName); - static std::map> timeStepsMapFromGridCase(RimEclipseCase* gridCase); - static std::map> timeStepsMapFromWellLogFile(RimWellLogFile* wellLogFile); - static std::map> adjacentTimeSteps(const std::vector>>& allTimeSteps, - const std::pair>& searchTimeStepPair); - static bool mapContainsTimeStep(const std::map>& map, const QDateTime& timeStep); + static std::map> timeStepsMapFromRftCase(RimEclipseResultCase* rftCase, const QString& simWellName); + static std::map> timeStepsMapFromGridCase(RimEclipseCase* gridCase); + static std::map> timeStepsMapFromWellLogFile(RimWellLogFile* wellLogFile); + static std::map> adjacentTimeSteps(const std::vector>>& allTimeSteps, + const std::pair>& searchTimeStepPair); + static bool mapContainsTimeStep(const std::map>& map, const QDateTime& timeStep); static RiaRftPltCurveDefinition curveDefFromCurve(const RimWellLogCurve* curve); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index cd8d5772c0..6e65016f01 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -441,18 +441,18 @@ void RimWellPltPlot::updateWidgetTitleWindowTitle() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::set < std::pair> RimWellPltPlot::selectedCurveDefs() const +std::set < std::pair> RimWellPltPlot::selectedCurveDefs() const { - std::set> curveDefs; + std::set> curveDefs; const std::vector rftCases = RimWellPlotTools::rftCasesForWell(RimWellPlotTools::simWellName(m_wellPathName)); const std::vector gridCases = RimWellPlotTools::gridCasesForWell(RimWellPlotTools::simWellName(m_wellPathName)); const QString simWellName = RimWellPlotTools::simWellName(m_wellPathName); for (const QDateTime& timeStep : m_selectedTimeSteps()) { - for (const RifWellRftAddress& addr : selectedSources()) + for (const RifDataSourceForRftPlt& addr : selectedSources()) { - if (addr.sourceType() == RifWellRftAddress::RFT) + if (addr.sourceType() == RifDataSourceForRftPlt::RFT) { for (RimEclipseResultCase* const rftCase : rftCases) { @@ -463,7 +463,7 @@ std::set < std::pair> RimWellPltPlot::selectedCurv } } } - else if (addr.sourceType() == RifWellRftAddress::GRID) + else if (addr.sourceType() == RifDataSourceForRftPlt::GRID) { for (RimEclipseResultCase* const gridCase : gridCases) { @@ -475,14 +475,14 @@ std::set < std::pair> RimWellPltPlot::selectedCurv } } else - if (addr.sourceType() == RifWellRftAddress::OBSERVED) + if (addr.sourceType() == RifDataSourceForRftPlt::OBSERVED) { if (addr.wellLogFile() != nullptr) { const QDateTime& wellLogFileTimeStep = RimWellPlotTools::timeStepFromWellLogFile(addr.wellLogFile()); if (wellLogFileTimeStep == timeStep) { - curveDefs.insert(std::make_pair(RifWellRftAddress(RifWellRftAddress::OBSERVED, addr.wellLogFile()), timeStep)); + curveDefs.insert(std::make_pair(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED, addr.wellLogFile()), timeStep)); } } } @@ -768,7 +768,7 @@ public: void RimWellPltPlot::syncCurvesFromUiSelection() { RimWellLogTrack* plotTrack = m_wellLogPlot->trackByIndex(0); - const std::set>& curveDefs = selectedCurveDefs(); + const std::set>& curveDefs = selectedCurveDefs(); setPlotXAxisTitles(plotTrack); @@ -785,13 +785,13 @@ void RimWellPltPlot::syncCurvesFromUiSelection() RimWellPath* wellPath = RimWellPlotTools::wellPathByWellPathNameOrSimWellName(m_wellPathName); // Add curves - for (const std::pair& curveDefToAdd : curveDefs) + for (const std::pair& curveDefToAdd : curveDefs) { std::set selectedPhases = m_phaseSelectionMode == FLOW_TYPE_PHASE_SPLIT ? std::set(m_phases().begin(), m_phases().end()) : std::set({ FLOW_PHASE_TOTAL }); - RifWellRftAddress sourceDef = curveDefToAdd.first; + RifDataSourceForRftPlt sourceDef = curveDefToAdd.first; QDateTime timeStep = curveDefToAdd.second; std::unique_ptr resultPointCalc; @@ -800,17 +800,17 @@ void RimWellPltPlot::syncCurvesFromUiSelection() { curveName += sourceDef.eclCase() ? sourceDef.eclCase()->caseUserDescription() : ""; curveName += sourceDef.wellLogFile() ? sourceDef.wellLogFile()->name() : ""; - if ( sourceDef.sourceType() == RifWellRftAddress::RFT ) curveName += ", RFT"; + if ( sourceDef.sourceType() == RifDataSourceForRftPlt::RFT ) curveName += ", RFT"; curveName += ", " + timeStep.toString(); } - if ( sourceDef.sourceType() == RifWellRftAddress::RFT ) + if ( sourceDef.sourceType() == RifDataSourceForRftPlt::RFT ) { resultPointCalc.reset(new RigRftResultPointCalculator(m_wellPathName, dynamic_cast(sourceDef.eclCase()), timeStep)); } - else if (sourceDef.sourceType() == RifWellRftAddress::GRID) + else if (sourceDef.sourceType() == RifDataSourceForRftPlt::GRID) { resultPointCalc.reset(new RigSimWellResultPointCalculator(m_wellPathName, dynamic_cast(sourceDef.eclCase()), @@ -854,7 +854,7 @@ void RimWellPltPlot::syncCurvesFromUiSelection() } } } - else if ( sourceDef.sourceType() == RifWellRftAddress::OBSERVED ) + else if ( sourceDef.sourceType() == RifDataSourceForRftPlt::OBSERVED ) { RimWellLogFile* const wellLogFile = sourceDef.wellLogFile(); if ( wellLogFile ) @@ -919,21 +919,21 @@ void RimWellPltPlot::addStackedCurve(const QString& curveName, //-------------------------------------------------------------------------------------------------- bool RimWellPltPlot::isOnlyGridSourcesSelected() const { - const std::vector& selSources = m_selectedSources(); - return std::find_if(selSources.begin(), selSources.end(), [](const RifWellRftAddress& addr) + const std::vector& selSources = m_selectedSources(); + return std::find_if(selSources.begin(), selSources.end(), [](const RifDataSourceForRftPlt& addr) { - return addr.sourceType() == RifWellRftAddress::RFT || addr.sourceType() == RifWellRftAddress::OBSERVED; + return addr.sourceType() == RifDataSourceForRftPlt::RFT || addr.sourceType() == RifDataSourceForRftPlt::OBSERVED; }) == selSources.end(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimWellPltPlot::isAnySourceAddressSelected(const std::set& addresses) const +bool RimWellPltPlot::isAnySourceAddressSelected(const std::set& addresses) const { - const std::vector& selectedSourcesVector = m_selectedSources(); - const auto selectedSources = std::set(selectedSourcesVector.begin(), selectedSourcesVector.end()); - std::vector intersectVector; + const std::vector& selectedSourcesVector = m_selectedSources(); + const auto selectedSources = std::set(selectedSourcesVector.begin(), selectedSourcesVector.end()); + std::vector intersectVector; std::set_intersection(selectedSources.begin(), selectedSources.end(), addresses.begin(), addresses.end(), std::inserter(intersectVector, intersectVector.end())); @@ -943,16 +943,16 @@ bool RimWellPltPlot::isAnySourceAddressSelected(const std::set RimWellPltPlot::selectedSources() const +std::vector RimWellPltPlot::selectedSources() const { - std::vector sources; - for (const RifWellRftAddress& addr : m_selectedSources()) + std::vector sources; + for (const RifDataSourceForRftPlt& addr : m_selectedSources()) { - if (addr.sourceType() == RifWellRftAddress::OBSERVED) + if (addr.sourceType() == RifDataSourceForRftPlt::OBSERVED) { for (RimWellLogFile* const wellLogFile : RimWellPlotTools::wellLogFilesContainingFlow(m_wellPathName)) { - sources.push_back(RifWellRftAddress(RifWellRftAddress::OBSERVED, wellLogFile)); + sources.push_back(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED, wellLogFile)); } } else @@ -964,16 +964,16 @@ std::vector RimWellPltPlot::selectedSources() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimWellPltPlot::selectedSourcesAndTimeSteps() const +std::vector RimWellPltPlot::selectedSourcesAndTimeSteps() const { - std::vector sources; - for (const RifWellRftAddress& addr : m_selectedSources()) + std::vector sources; + for (const RifDataSourceForRftPlt& addr : m_selectedSources()) { - if (addr.sourceType() == RifWellRftAddress::OBSERVED) + if (addr.sourceType() == RifDataSourceForRftPlt::OBSERVED) { for (const QDateTime& timeStep : m_selectedTimeSteps()) { - for (const RifWellRftAddress& address : m_timeStepsToAddresses.at(timeStep)) + for (const RifDataSourceForRftPlt& address : m_timeStepsToAddresses.at(timeStep)) { sources.push_back(address); } @@ -1047,17 +1047,17 @@ QList RimWellPltPlot::calculateValueOptions(const caf::P } else if (fieldNeedingOptions == &m_selectedSources) { - std::set optionAddresses; + std::set optionAddresses; const std::vector rftCases = RimWellPlotTools::rftCasesForWell(simWellName); if (rftCases.size() > 0) { - options.push_back(caf::PdmOptionItemInfo::createHeader(RifWellRftAddress::sourceTypeUiText(RifWellRftAddress::RFT), true)); + options.push_back(caf::PdmOptionItemInfo::createHeader(RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::RFT), true)); } for (const auto& rftCase : rftCases) { - auto addr = RifWellRftAddress(RifWellRftAddress::RFT, rftCase); + auto addr = RifDataSourceForRftPlt(RifDataSourceForRftPlt::RFT, rftCase); auto item = caf::PdmOptionItemInfo(rftCase->caseUserDescription(), QVariant::fromValue(addr)); item.setLevel(1); options.push_back(item); @@ -1066,12 +1066,12 @@ QList RimWellPltPlot::calculateValueOptions(const caf::P const std::vector gridCases = RimWellPlotTools::gridCasesForWell(simWellName); if (gridCases.size() > 0) { - options.push_back(caf::PdmOptionItemInfo::createHeader(RifWellRftAddress::sourceTypeUiText(RifWellRftAddress::GRID), true)); + options.push_back(caf::PdmOptionItemInfo::createHeader(RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::GRID), true)); } for (const auto& gridCase : gridCases) { - auto addr = RifWellRftAddress(RifWellRftAddress::GRID, gridCase); + auto addr = RifDataSourceForRftPlt(RifDataSourceForRftPlt::GRID, gridCase); auto item = caf::PdmOptionItemInfo(gridCase->caseUserDescription(), QVariant::fromValue(addr)); item.setLevel(1); options.push_back(item); @@ -1079,9 +1079,9 @@ QList RimWellPltPlot::calculateValueOptions(const caf::P if (RimWellPlotTools::wellLogFilesContainingFlow(m_wellPathName).size() > 0) { - options.push_back(caf::PdmOptionItemInfo::createHeader(RifWellRftAddress::sourceTypeUiText(RifWellRftAddress::OBSERVED), true)); + options.push_back(caf::PdmOptionItemInfo::createHeader(RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::OBSERVED), true)); - auto addr = RifWellRftAddress(RifWellRftAddress::OBSERVED); + auto addr = RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED); auto item = caf::PdmOptionItemInfo("Observed Data", QVariant::fromValue(addr)); item.setLevel(1); options.push_back(item); @@ -1258,19 +1258,19 @@ void RimWellPltPlot::setupBeforeSave() //-------------------------------------------------------------------------------------------------- void RimWellPltPlot::initAfterLoad() { - std::set selectedSources; + std::set selectedSources; for (RimRftAddress* addr : m_selectedSourcesForIo) { - if (addr->address().sourceType() == RifWellRftAddress::OBSERVED) + if (addr->address().sourceType() == RifDataSourceForRftPlt::OBSERVED) { - selectedSources.insert(RifWellRftAddress(RifWellRftAddress::OBSERVED)); + selectedSources.insert(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED)); } else { selectedSources.insert(addr->address()); } } - m_selectedSources = std::vector(selectedSources.begin(), selectedSources.end()); + m_selectedSources = std::vector(selectedSources.begin(), selectedSources.end()); } //-------------------------------------------------------------------------------------------------- @@ -1279,7 +1279,7 @@ void RimWellPltPlot::initAfterLoad() void RimWellPltPlot::syncSourcesIoFieldFromGuiField() { m_selectedSourcesForIo.clear(); - for (const RifWellRftAddress& addr : selectedSourcesAndTimeSteps()) + for (const RifDataSourceForRftPlt& addr : selectedSourcesAndTimeSteps()) { m_selectedSourcesForIo.push_back(new RimRftAddress(addr)); } @@ -1288,13 +1288,13 @@ void RimWellPltPlot::syncSourcesIoFieldFromGuiField() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellPltPlot::updateTimeStepsToAddresses(const std::vector& addressesToKeep) +void RimWellPltPlot::updateTimeStepsToAddresses(const std::vector& addressesToKeep) { for (auto& timeStepPair : m_timeStepsToAddresses) { - std::vector addressesToDelete; - std::set keepAddresses = std::set(addressesToKeep.begin(), addressesToKeep.end()); - std::set& currentAddresses = timeStepPair.second; + std::vector addressesToDelete; + std::set keepAddresses = std::set(addressesToKeep.begin(), addressesToKeep.end()); + std::set& currentAddresses = timeStepPair.second; std::set_difference(currentAddresses.begin(), currentAddresses.end(), keepAddresses.begin(), keepAddresses.end(), @@ -1342,31 +1342,31 @@ void RimWellPltPlot::calculateValueOptionsForWells(QList void RimWellPltPlot::calculateValueOptionsForTimeSteps(const QString& wellPathNameOrSimWellName, QList& options) { const QString simWellName = RimWellPlotTools::simWellName(m_wellPathName); - std::map> displayTimeStepsMap, obsAndRftTimeStepsMap, gridTimeStepsMap; + std::map> displayTimeStepsMap, obsAndRftTimeStepsMap, gridTimeStepsMap; const std::vector rftCases = RimWellPlotTools::rftCasesForWell(simWellName); const std::vector gridCases = RimWellPlotTools::gridCasesForWell(simWellName); // First update timeSteps to Address 'cache' - std::vector selSources = selectedSources(); + std::vector selSources = selectedSources(); updateTimeStepsToAddresses(selectedSources()); - for (const RifWellRftAddress& selection : selSources) + for (const RifDataSourceForRftPlt& selection : selSources) { - if (selection.sourceType() == RifWellRftAddress::RFT) + if (selection.sourceType() == RifDataSourceForRftPlt::RFT) { for (RimEclipseResultCase* const rftCase : rftCases) { RimWellPlotTools::addTimeStepsToMap(obsAndRftTimeStepsMap, RimWellPlotTools::timeStepsMapFromRftCase(rftCase, simWellName)); } } - else if (selection.sourceType() == RifWellRftAddress::GRID) + else if (selection.sourceType() == RifDataSourceForRftPlt::GRID) { for (RimEclipseResultCase* const gridCase : gridCases) { RimWellPlotTools::addTimeStepsToMap(gridTimeStepsMap, RimWellPlotTools::timeStepsMapFromGridCase(gridCase)); } } - else if (selection.sourceType() == RifWellRftAddress::OBSERVED) + else if (selection.sourceType() == RifDataSourceForRftPlt::OBSERVED) { if (selection.wellLogFile() != nullptr) { @@ -1381,11 +1381,11 @@ void RimWellPltPlot::calculateValueOptionsForTimeSteps(const QString& wellPathNa } else { - const auto gridTimeStepsVector = std::vector>>(gridTimeStepsMap.begin(), gridTimeStepsMap.end()); + const auto gridTimeStepsVector = std::vector>>(gridTimeStepsMap.begin(), gridTimeStepsMap.end()); - for (const std::pair>& timeStepPair : obsAndRftTimeStepsMap) + for (const std::pair>& timeStepPair : obsAndRftTimeStepsMap) { - const std::map>& adjTimeSteps = RimWellPlotTools::adjacentTimeSteps(gridTimeStepsVector, timeStepPair); + const std::map>& adjTimeSteps = RimWellPlotTools::adjacentTimeSteps(gridTimeStepsVector, timeStepPair); RimWellPlotTools::addTimeStepsToMap(displayTimeStepsMap, adjTimeSteps); } @@ -1400,7 +1400,7 @@ void RimWellPltPlot::calculateValueOptionsForTimeSteps(const QString& wellPathNa { if (m_timeStepsToAddresses.count(timeStep) > 0) { - const std::set sourceAddresses = m_timeStepsToAddresses[timeStep]; + const std::set sourceAddresses = m_timeStepsToAddresses[timeStep]; if (isAnySourceAddressSelected(sourceAddresses)) { RimWellPlotTools::addTimeStepToMap(displayTimeStepsMap, std::make_pair(timeStep, m_timeStepsToAddresses[timeStep])); @@ -1413,13 +1413,13 @@ void RimWellPltPlot::calculateValueOptionsForTimeSteps(const QString& wellPathNa // Create vector of all time steps std::vector allTimeSteps; - for (const std::pair>& timeStepPair : m_timeStepsToAddresses) + for (const std::pair>& timeStepPair : m_timeStepsToAddresses) { allTimeSteps.push_back(timeStepPair.first); } const QString dateFormatString = RimTools::createTimeFormatStringFromDates(allTimeSteps); - for (const std::pair>& timeStepPair : displayTimeStepsMap) + for (const std::pair>& timeStepPair : displayTimeStepsMap) { options.push_back(caf::PdmOptionItemInfo(timeStepPair.first.toString(dateFormatString), timeStepPair.first)); } diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h index 4230802361..c9b846ec1b 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h @@ -21,7 +21,7 @@ #include "RigFlowDiagResultAddress.h" #include "RimRftAddress.h" -#include "RifWellRftAddressQMetaType.h" +#include "RifDataSourceForRftPltQMetaType.h" #include "RimPlotCurve.h" #include "RimWellPlotTools.h" @@ -105,7 +105,7 @@ protected: void syncSourcesIoFieldFromGuiField(); private: - void updateTimeStepsToAddresses(const std::vector& addressesToKeep); + void updateTimeStepsToAddresses(const std::vector& addressesToKeep); void calculateValueOptionsForWells(QList& options); void calculateValueOptionsForTimeSteps(const QString& wellPathNameOrSimWellName, QList& options); @@ -113,9 +113,9 @@ private: void syncCurvesFromUiSelection(); - std::set> selectedCurveDefs() const; - std::set> curveDefsFromCurves() const; - std::pair curveDefFromCurve(const RimWellLogCurve* curve) const; + std::set> selectedCurveDefs() const; + std::set> curveDefsFromCurves() const; + std::pair curveDefFromCurve(const RimWellLogCurve* curve) const; void addStackedCurve(const QString& tracerName, const std::vector& depthValues, const std::vector& accFlow, @@ -125,9 +125,9 @@ private: bool doFillCurve); bool isOnlyGridSourcesSelected() const; - bool isAnySourceAddressSelected(const std::set& addresses) const; - std::vector selectedSources() const; - std::vector selectedSourcesAndTimeSteps() const; + bool isAnySourceAddressSelected(const std::set& addresses) const; + std::vector selectedSources() const; + std::vector selectedSourcesAndTimeSteps() const; // RimViewWindow overrides @@ -147,7 +147,7 @@ private: caf::PdmField m_wellPathName; - caf::PdmField> m_selectedSources; + caf::PdmField> m_selectedSources; caf::PdmChildArrayField m_selectedSourcesForIo; caf::PdmField> m_selectedTimeSteps; @@ -156,7 +156,7 @@ private: caf::PdmChildField m_wellLogPlot; - std::map> m_timeStepsToAddresses; + std::map> m_timeStepsToAddresses; caf::PdmField> m_phaseSelectionMode; caf::PdmField>> m_phases; diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index 21f85925fb..358468bcff 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -217,7 +217,7 @@ void RimWellRftPlot::applyCurveAppearance(RimWellLogCurve* newCurve) } // Observed data - currentLineStyle = newCurveDef.address().sourceType() == RifWellRftAddress::OBSERVED + currentLineStyle = newCurveDef.address().sourceType() == RifDataSourceForRftPlt::OBSERVED ? RimPlotCurve::STYLE_NONE : RimPlotCurve::STYLE_SOLID; newCurve->setColor(currentColor); @@ -231,15 +231,15 @@ void RimWellRftPlot::applyCurveAppearance(RimWellLogCurve* newCurve) void RimWellRftPlot::updateSelectedTimeStepsFromSelectedSources() { std::vector newTimeStepsSelections; - std::vector selectedSourcesVector = selectedSources(); - auto selectedSources = std::set(selectedSourcesVector.begin(), selectedSourcesVector.end()); + std::vector selectedSourcesVector = selectedSources(); + auto selectedSources = std::set(selectedSourcesVector.begin(), selectedSourcesVector.end()); for (const QDateTime& timeStep : m_selectedTimeSteps()) { if(m_timeStepsToAddresses.count(timeStep) > 0) { - std::vector intersectVector; - const std::set& addresses = m_timeStepsToAddresses[timeStep]; + std::vector intersectVector; + const std::set& addresses = m_timeStepsToAddresses[timeStep]; std::set_intersection(selectedSources.begin(), selectedSources.end(), addresses.begin(), addresses.end(), std::inserter(intersectVector, intersectVector.end())); if(intersectVector.size() > 0) @@ -310,7 +310,7 @@ QString RimWellRftPlot::associatedSimWellName() const //-------------------------------------------------------------------------------------------------- void RimWellRftPlot::applyInitialSelections() { - std::vector sourcesToSelect; + std::vector sourcesToSelect; std::set rftTimeSteps; std::set observedTimeSteps; std::set gridTimeSteps; @@ -318,20 +318,20 @@ void RimWellRftPlot::applyInitialSelections() for(RimEclipseResultCase* const rftCase : RimWellPlotTools::rftCasesForWell(simWellName)) { - sourcesToSelect.push_back(RifWellRftAddress(RifWellRftAddress::RFT, rftCase)); + sourcesToSelect.push_back(RifDataSourceForRftPlt(RifDataSourceForRftPlt::RFT, rftCase)); RimWellPlotTools::appendSet(rftTimeSteps, RimWellPlotTools::timeStepsFromRftCase(rftCase, simWellName)); } for (RimEclipseResultCase* const gridCase : RimWellPlotTools::gridCasesForWell(simWellName)) { - sourcesToSelect.push_back(RifWellRftAddress(RifWellRftAddress::GRID, gridCase)); + sourcesToSelect.push_back(RifDataSourceForRftPlt(RifDataSourceForRftPlt::GRID, gridCase)); RimWellPlotTools::appendSet(gridTimeSteps, RimWellPlotTools::timeStepsFromGridCase(gridCase)); } std::vector wellLogFiles = RimWellPlotTools::wellLogFilesContainingPressure(simWellName); if(wellLogFiles.size() > 0) { - sourcesToSelect.push_back(RifWellRftAddress(RifWellRftAddress::OBSERVED)); + sourcesToSelect.push_back(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED)); for (RimWellLogFile* const wellLogFile : wellLogFiles) { observedTimeSteps.insert(RimWellPlotTools::timeStepFromWellLogFile(wellLogFile)); @@ -362,26 +362,26 @@ void RimWellRftPlot::applyInitialSelections() //-------------------------------------------------------------------------------------------------- void RimWellRftPlot::updateEditorsFromCurves() { - std::set selectedSources; + std::set selectedSources; std::set selectedTimeSteps; - std::map> selectedTimeStepsMap; + std::map> selectedTimeStepsMap; for (const RiaRftPltCurveDefinition& curveDef : curveDefsFromCurves()) { - if (curveDef.address().sourceType() == RifWellRftAddress::OBSERVED) - selectedSources.insert(RifWellRftAddress(RifWellRftAddress::OBSERVED)); + if (curveDef.address().sourceType() == RifDataSourceForRftPlt::OBSERVED) + selectedSources.insert(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED)); else selectedSources.insert(curveDef.address()); - auto newTimeStepMap = std::map> + auto newTimeStepMap = std::map> { - { curveDef.timeStep(), std::set { curveDef.address()} } + { curveDef.timeStep(), std::set { curveDef.address()} } }; RimWellPlotTools::addTimeStepsToMap(selectedTimeStepsMap, newTimeStepMap); selectedTimeSteps.insert(curveDef.timeStep()); } - m_selectedSources = std::vector(selectedSources.begin(), selectedSources.end()); + m_selectedSources = std::vector(selectedSources.begin(), selectedSources.end()); m_selectedTimeSteps = std::vector(selectedTimeSteps.begin(), selectedTimeSteps.end()); RimWellPlotTools::addTimeStepsToMap(m_timeStepsToAddresses, selectedTimeStepsMap); } @@ -455,9 +455,9 @@ std::set < RiaRftPltCurveDefinition> RimWellRftPlot::selectedCurveDefs() const for (const QDateTime& timeStep : m_selectedTimeSteps()) { - for (const RifWellRftAddress& addr : selectedSources()) + for (const RifDataSourceForRftPlt& addr : selectedSources()) { - if (addr.sourceType() == RifWellRftAddress::RFT) + if (addr.sourceType() == RifDataSourceForRftPlt::RFT) { for (RimEclipseResultCase* const rftCase : rftCases) { @@ -468,7 +468,7 @@ std::set < RiaRftPltCurveDefinition> RimWellRftPlot::selectedCurveDefs() const } } } - else if (addr.sourceType() == RifWellRftAddress::GRID) + else if (addr.sourceType() == RifDataSourceForRftPlt::GRID) { for (RimEclipseResultCase* const gridCase : gridCases) { @@ -479,14 +479,14 @@ std::set < RiaRftPltCurveDefinition> RimWellRftPlot::selectedCurveDefs() const } } } - else if (addr.sourceType() == RifWellRftAddress::OBSERVED) + else if (addr.sourceType() == RifDataSourceForRftPlt::OBSERVED) { if (addr.wellLogFile() != nullptr) { const QDateTime wellLogFileTimeStep = RimWellPlotTools::timeStepFromWellLogFile(addr.wellLogFile()); if (wellLogFileTimeStep == timeStep) { - curveDefs.insert(RiaRftPltCurveDefinition(RifWellRftAddress(RifWellRftAddress::OBSERVED, addr.wellLogFile()), timeStep)); + curveDefs.insert(RiaRftPltCurveDefinition(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED, addr.wellLogFile()), timeStep)); } } } @@ -529,7 +529,7 @@ void RimWellRftPlot::updateCurvesInPlot(const std::set // Add new curves for (const RiaRftPltCurveDefinition& curveDefToAdd : curveDefsToAdd) { - if (curveDefToAdd.address().sourceType() == RifWellRftAddress::RFT) + if (curveDefToAdd.address().sourceType() == RifDataSourceForRftPlt::RFT) { auto curve = new RimWellLogRftCurve(); plotTrack->addCurve(curve); @@ -543,7 +543,7 @@ void RimWellRftPlot::updateCurvesInPlot(const std::set applyCurveAppearance(curve); } - else if (curveDefToAdd.address().sourceType() == RifWellRftAddress::GRID) + else if (curveDefToAdd.address().sourceType() == RifDataSourceForRftPlt::GRID) { auto curve = new RimWellLogExtractionCurve(); plotTrack->addCurve(curve); @@ -577,7 +577,7 @@ void RimWellRftPlot::updateCurvesInPlot(const std::set applyCurveAppearance(curve); } } - else if (curveDefToAdd.address().sourceType() == RifWellRftAddress::OBSERVED) + else if (curveDefToAdd.address().sourceType() == RifDataSourceForRftPlt::OBSERVED) { RimWellLogFile* const wellLogFile = curveDefToAdd.address().wellLogFile(); RimWellPath* const wellPath = RimWellPlotTools::wellPathFromWellLogFile(wellLogFile); @@ -608,21 +608,21 @@ void RimWellRftPlot::updateCurvesInPlot(const std::set //-------------------------------------------------------------------------------------------------- bool RimWellRftPlot::isOnlyGridSourcesSelected() const { - const std::vector& selSources = m_selectedSources(); - return std::find_if(selSources.begin(), selSources.end(), [](const RifWellRftAddress& addr) + const std::vector& selSources = m_selectedSources(); + return std::find_if(selSources.begin(), selSources.end(), [](const RifDataSourceForRftPlt& addr) { - return addr.sourceType() == RifWellRftAddress::RFT || addr.sourceType() == RifWellRftAddress::OBSERVED; + return addr.sourceType() == RifDataSourceForRftPlt::RFT || addr.sourceType() == RifDataSourceForRftPlt::OBSERVED; }) == selSources.end(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimWellRftPlot::isAnySourceAddressSelected(const std::set& addresses) const +bool RimWellRftPlot::isAnySourceAddressSelected(const std::set& addresses) const { - const std::vector& selectedSourcesVector = m_selectedSources(); - const auto selectedSources = std::set(selectedSourcesVector.begin(), selectedSourcesVector.end()); - std::vector intersectVector; + const std::vector& selectedSourcesVector = m_selectedSources(); + const auto selectedSources = std::set(selectedSourcesVector.begin(), selectedSourcesVector.end()); + std::vector intersectVector; std::set_intersection(selectedSources.begin(), selectedSources.end(), addresses.begin(), addresses.end(), std::inserter(intersectVector, intersectVector.end())); @@ -632,16 +632,16 @@ bool RimWellRftPlot::isAnySourceAddressSelected(const std::set RimWellRftPlot::selectedSources() const +std::vector RimWellRftPlot::selectedSources() const { - std::vector sources; - for (const RifWellRftAddress& addr : m_selectedSources()) + std::vector sources; + for (const RifDataSourceForRftPlt& addr : m_selectedSources()) { - if (addr.sourceType() == RifWellRftAddress::OBSERVED) + if (addr.sourceType() == RifDataSourceForRftPlt::OBSERVED) { for (RimWellLogFile* const wellLogFile : RimWellPlotTools::wellLogFilesContainingPressure(associatedSimWellName())) { - sources.push_back(RifWellRftAddress(RifWellRftAddress::OBSERVED, wellLogFile)); + sources.push_back(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED, wellLogFile)); } } else @@ -724,11 +724,11 @@ QList RimWellRftPlot::calculateValueOptions(const caf::P const std::vector rftCases = RimWellPlotTools::rftCasesForWell(simWellName); if (rftCases.size() > 0) { - options.push_back(caf::PdmOptionItemInfo::createHeader(RifWellRftAddress::sourceTypeUiText(RifWellRftAddress::RFT), true)); + options.push_back(caf::PdmOptionItemInfo::createHeader(RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::RFT), true)); } for (const auto& rftCase : rftCases) { - auto addr = RifWellRftAddress(RifWellRftAddress::RFT, rftCase); + auto addr = RifDataSourceForRftPlt(RifDataSourceForRftPlt::RFT, rftCase); auto item = caf::PdmOptionItemInfo(rftCase->caseUserDescription(), QVariant::fromValue(addr)); item.setLevel(1); options.push_back(item); @@ -737,11 +737,11 @@ QList RimWellRftPlot::calculateValueOptions(const caf::P const std::vector gridCases = RimWellPlotTools::gridCasesForWell(simWellName); if (gridCases.size() > 0) { - options.push_back(caf::PdmOptionItemInfo::createHeader(RifWellRftAddress::sourceTypeUiText(RifWellRftAddress::GRID), true)); + options.push_back(caf::PdmOptionItemInfo::createHeader(RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::GRID), true)); } for (const auto& gridCase : gridCases) { - auto addr = RifWellRftAddress(RifWellRftAddress::GRID, gridCase); + auto addr = RifDataSourceForRftPlt(RifDataSourceForRftPlt::GRID, gridCase); auto item = caf::PdmOptionItemInfo(gridCase->caseUserDescription(), QVariant::fromValue(addr)); item.setLevel(1); options.push_back(item); @@ -749,9 +749,9 @@ QList RimWellRftPlot::calculateValueOptions(const caf::P if (RimWellPlotTools::wellLogFilesContainingPressure(simWellName).size() > 0) { - options.push_back(caf::PdmOptionItemInfo::createHeader(RifWellRftAddress::sourceTypeUiText(RifWellRftAddress::OBSERVED), true)); + options.push_back(caf::PdmOptionItemInfo::createHeader(RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::OBSERVED), true)); - auto addr = RifWellRftAddress(RifWellRftAddress::OBSERVED); + auto addr = RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED); auto item = caf::PdmOptionItemInfo("Observed Data", QVariant::fromValue(addr)); item.setLevel(1); options.push_back(item); @@ -946,27 +946,27 @@ void RimWellRftPlot::calculateValueOptionsForTimeSteps(QList> displayTimeStepsMap, obsAndRftTimeStepsMap, gridTimeStepsMap; + std::map> displayTimeStepsMap, obsAndRftTimeStepsMap, gridTimeStepsMap; const std::vector rftCases = RimWellPlotTools::rftCasesForWell(simWellName); const std::vector gridCases = RimWellPlotTools::gridCasesForWell(simWellName); - for (const RifWellRftAddress& selection : selectedSources()) + for (const RifDataSourceForRftPlt& selection : selectedSources()) { - if (selection.sourceType() == RifWellRftAddress::RFT) + if (selection.sourceType() == RifDataSourceForRftPlt::RFT) { for (RimEclipseResultCase* const rftCase : rftCases) { RimWellPlotTools::addTimeStepsToMap(obsAndRftTimeStepsMap, RimWellPlotTools::timeStepsMapFromRftCase(rftCase, simWellName)); } } - else if (selection.sourceType() == RifWellRftAddress::GRID) + else if (selection.sourceType() == RifDataSourceForRftPlt::GRID) { for (RimEclipseResultCase* const gridCase : gridCases) { RimWellPlotTools::addTimeStepsToMap(gridTimeStepsMap, RimWellPlotTools::timeStepsMapFromGridCase(gridCase)); } } - else if (selection.sourceType() == RifWellRftAddress::OBSERVED) + else if (selection.sourceType() == RifDataSourceForRftPlt::OBSERVED) { if (selection.wellLogFile() != nullptr) { @@ -981,11 +981,11 @@ void RimWellRftPlot::calculateValueOptionsForTimeSteps(QList>>(gridTimeStepsMap.begin(), gridTimeStepsMap.end()); + const auto gridTimeStepsVector = std::vector>>(gridTimeStepsMap.begin(), gridTimeStepsMap.end()); - for (const std::pair>& timeStepPair : obsAndRftTimeStepsMap) + for (const std::pair>& timeStepPair : obsAndRftTimeStepsMap) { - const std::map>& adjTimeSteps = RimWellPlotTools::adjacentTimeSteps(gridTimeStepsVector, timeStepPair); + const std::map>& adjTimeSteps = RimWellPlotTools::adjacentTimeSteps(gridTimeStepsVector, timeStepPair); RimWellPlotTools::addTimeStepsToMap(displayTimeStepsMap, adjTimeSteps); } @@ -1000,7 +1000,7 @@ void RimWellRftPlot::calculateValueOptionsForTimeSteps(QList 0) { - const std::set sourceAddresses = m_timeStepsToAddresses[timeStep]; + const std::set sourceAddresses = m_timeStepsToAddresses[timeStep]; if (isAnySourceAddressSelected(sourceAddresses)) { RimWellPlotTools::addTimeStepToMap(displayTimeStepsMap, std::make_pair(timeStep, m_timeStepsToAddresses[timeStep])); @@ -1013,13 +1013,13 @@ void RimWellRftPlot::calculateValueOptionsForTimeSteps(QList allTimeSteps; - for (const std::pair>& timeStepPair : m_timeStepsToAddresses) + for (const std::pair>& timeStepPair : m_timeStepsToAddresses) { allTimeSteps.push_back(timeStepPair.first); } const QString dateFormatString = RimTools::createTimeFormatStringFromDates(allTimeSteps); - for (const std::pair>& timeStepPair : displayTimeStepsMap) + for (const std::pair>& timeStepPair : displayTimeStepsMap) { options.push_back(caf::PdmOptionItemInfo(timeStepPair.first.toString(dateFormatString), timeStepPair.first)); } diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h index ff7ba71ec0..6d353e6310 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h @@ -26,7 +26,7 @@ #include "RimCase.h" #include "RimPlotCurve.h" -#include "RifWellRftAddressQMetaType.h" +#include "RifDataSourceForRftPltQMetaType.h" #include "cafPdmField.h" #include "cafPdmObject.h" @@ -119,8 +119,8 @@ private: const std::set& curveDefsToAdd, const std::set& curvesToDelete); bool isOnlyGridSourcesSelected() const; - bool isAnySourceAddressSelected(const std::set& addresses) const; - std::vector selectedSources() const; + bool isAnySourceAddressSelected(const std::set& addresses) const; + std::vector selectedSources() const; // RimViewWindow overrides @@ -139,7 +139,7 @@ private: caf::PdmField m_wellPathNameOrSimWellName; caf::PdmField m_branchIndex; - caf::PdmField> m_selectedSources; + caf::PdmField> m_selectedSources; caf::PdmField> m_selectedTimeSteps; @@ -147,7 +147,7 @@ private: caf::PdmChildField m_wellLogPlot; - std::map> m_timeStepsToAddresses; + std::map> m_timeStepsToAddresses; bool m_selectedSourcesOrTimeStepsFieldsChanged; bool m_isOnLoad;