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

#2168 Summary Plot : Improve identifier stepping

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-24 15:17:20 +01:00
parent 5e3467a5f6
commit a04c42313f
10 changed files with 452 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/FileInterface/RifEclipseSummaryAddress.h
View File

@@ -131,6 +131,7 @@ public:
std::string uiText(RifEclipseSummaryAddress::SummaryIdentifierType itemTypeInput) const;
bool isValid() const;
void setQuantityName(const std::string& quantity) { m_quantityName = quantity; }
void setWellName(const std::string& wellName) { m_wellName = wellName; }
void setWellGroupName(const std::string& wellGroupName) { m_wellGroupName = wellGroupName; }
void setRegion(int region) { m_regionNumber = region; }

26
ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp
View File

@@ -18,14 +18,14 @@
#include "RifEclipseSummaryTools.h"
#include "RiaSummaryCurveAnalyzer.h"
#include "RifReaderEclipseSummary.h"
#include "cafAppEnum.h"
#include "ert/ecl/ecl_util.h"
#include <iostream>
#include "cafAppEnum.h"
//--------------------------------------------------------------------------------------------------
///
@@ -35,7 +35,6 @@ void RifEclipseSummaryTools::findSummaryHeaderFile(const std::string& inputFile,
findSummaryHeaderFileInfo(inputFile, headerFile, NULL, NULL, isFormatted);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -136,7 +135,7 @@ void RifEclipseSummaryTools::dumpMetaData(RifSummaryReaderInterface* readerEclip
{
RifEclipseSummaryAddress::SummaryVarCategory categoryEnum = RifEclipseSummaryAddress::SummaryVarCategory(category);
std::vector<RifEclipseSummaryAddress> catAddresses = addressesForCategory(addresses, categoryEnum);
std::vector<RifEclipseSummaryAddress> catAddresses = RiaSummaryCurveAnalyzer::addressesForCategory(addresses, categoryEnum);
if (catAddresses.size() > 0)
{
@@ -192,20 +191,3 @@ void RifEclipseSummaryTools::findSummaryHeaderFileInfo(const std::string& inputF
util_safe_free(myPath);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RifEclipseSummaryAddress> RifEclipseSummaryTools::addressesForCategory(const std::vector<RifEclipseSummaryAddress>& addresses, RifEclipseSummaryAddress::SummaryVarCategory category)
{
std::vector<RifEclipseSummaryAddress> filteredAddresses;
for (size_t i = 0; i < addresses.size(); i++)
{
if (addresses[i].category() == category)
{
filteredAddresses.push_back(addresses[i]);
}
}
return filteredAddresses;
}

1
ApplicationCode/FileInterface/RifEclipseSummaryTools.h
View File

@@ -42,5 +42,4 @@ public:
private:
static void findSummaryHeaderFileInfo(const std::string& inputFile, std::string* headerFile, std::string* path, std::string* base, bool* isFormatted);
static std::vector<RifEclipseSummaryAddress> addressesForCategory(const std::vector<RifEclipseSummaryAddress>& addresses, RifEclipseSummaryAddress::SummaryVarCategory category);
};