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

#2031 Curve Calculator : Add display of curve address

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-24 09:44:50 +02:00
parent 9455ed1bac
commit 035e2ccaf9
5 changed files with 81 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/Application/RiaSummaryCurveDefinition.cpp
View File

@@ -77,6 +77,32 @@ const std::vector<time_t>& RiaSummaryCurveDefinition::timeSteps(const RiaSummary
return reader->timeSteps(curveDefinition.summaryAddress());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiaSummaryCurveDefinition::curveDefinitionText() const
{
return RiaSummaryCurveDefinition::curveDefinitionText(summaryCase(), summaryAddress());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiaSummaryCurveDefinition::curveDefinitionText(RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& summaryAddress)
{
QString txt;
if (summaryCase)
{
txt += summaryCase->caseName();
txt += ", ";
}
txt += QString::fromStdString(summaryAddress.uiText());
return txt;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

7
ApplicationCode/Application/RiaSummaryCurveDefinition.h
View File

@@ -20,6 +20,8 @@
#include "RifEclipseSummaryAddress.h"
#include <QString>
#include <utility>
#include <vector>
@@ -42,6 +44,11 @@ public:
static void resultValues(const RiaSummaryCurveDefinition& curveDefinition, std::vector<double>* values);
static const std::vector<time_t>& timeSteps(const RiaSummaryCurveDefinition& curveDefinition);
QString curveDefinitionText() const;
private:
static QString curveDefinitionText(RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& summaryAddress);
private:
std::pair<RimSummaryCase*, RifEclipseSummaryAddress> m_curveDefinition;
};