OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-14 01:12:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

#2778 Observed error bars. Display error bars in the same color as data points

Browse Source
This commit is contained in:
Bjørn Erik Jensen committed 2018-05-25 11:28:55 +02:00
1 parent 14a5fd4009
commit 403e1759f9
10 files changed
+166 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/FileInterface/RifCsvUserData.cpp
+1
View File
@@ -159,6 +159,7 @@ void RifCsvUserData::buildTimeStepsAndMappings()
RifEclipseSummaryAddress sumAddress = ci.summaryAddress;
m_allResultAddresses.push_back(sumAddress);
if (sumAddress.isErrorResult()) m_allErrorAddresses.insert(sumAddress);
m_mapFromAddressToTimeStepIndex[sumAddress] = m_timeSteps.size() - 1;
m_mapFromAddressToResultIndex[sumAddress] = columnIndex;
ApplicationCode/FileInterface/RifEclipseSummaryAddress.cpp
+4 -1
View File
@@ -143,6 +143,9 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::importedAddress(const std::st
std::string RifEclipseSummaryAddress::uiText() const
{
std::string text;
if (m_isErrorResult) text += "ERR:";
text += m_quantityName;
switch(this->category())
{
@@ -227,7 +230,7 @@ std::string RifEclipseSummaryAddress::uiText(RifEclipseSummaryAddress::SummaryId
case RifEclipseSummaryAddress::INPUT_LGR_NAME: return lgrName();
case RifEclipseSummaryAddress::INPUT_SEGMENT_NUMBER: return std::to_string(wellSegmentNumber());
case RifEclipseSummaryAddress::INPUT_AQUIFER_NUMBER: return std::to_string(aquiferNumber());
case RifEclipseSummaryAddress::INPUT_VECTOR_NAME: return quantityName() + (m_isErrorResult ? " (err)" : "");
case RifEclipseSummaryAddress::INPUT_VECTOR_NAME: return quantityName();
}
return "";
}
ApplicationCode/FileInterface/RifSummaryReaderInterface.cpp
+11
View File
@@ -31,6 +31,17 @@ const std::vector<RifEclipseSummaryAddress>& RifSummaryReaderInterface::allResul
return m_allResultAddresses;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RifSummaryReaderInterface::errorAddress(const RifEclipseSummaryAddress& resultAddress) const
{
RifEclipseSummaryAddress errAddr = resultAddress;
errAddr.setAsErrorResult();
return m_allErrorAddresses.find(errAddr) != m_allErrorAddresses.end() ? errAddr : RifEclipseSummaryAddress();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/FileInterface/RifSummaryReaderInterface.h
+3 -1
View File
@@ -38,6 +38,7 @@ class RifSummaryReaderInterface : public cvf::Object
public:
bool hasAddress(const RifEclipseSummaryAddress& resultAddress) const;
const std::vector<RifEclipseSummaryAddress>& allResultAddresses() const;
RifEclipseSummaryAddress errorAddress(const RifEclipseSummaryAddress& resultAddress) const;
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const = 0;
@@ -50,5 +51,6 @@ public:
static std::vector<QDateTime> fromTimeT(const std::vector<time_t>& timeSteps);
protected:
std::vector<RifEclipseSummaryAddress> m_allResultAddresses;
std::vector<RifEclipseSummaryAddress> m_allResultAddresses; // Result and error addresses
std::set<RifEclipseSummaryAddress> m_allErrorAddresses; // Error addresses
};