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

#2917 SummaryCurveDefinition: Remove pair, improve less operator

Browse Source
This commit is contained in:
Jacob Støren 2018-05-15 10:14:18 +02:00
parent 3effc4ca66
commit 9b591f622c
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/Application/RiaSummaryCurveDefinition.cpp
View File

@ -25,9 +25,10 @@
///
//--------------------------------------------------------------------------------------------------
RiaSummaryCurveDefinition::RiaSummaryCurveDefinition()
: m_summaryCase(nullptr)
, m_ensemble(nullptr)
{
m_curveDefinition = std::make_pair(nullptr, RifEclipseSummaryAddress());
m_ensemble = nullptr;
}
//--------------------------------------------------------------------------------------------------
@ -36,9 +37,11 @@ RiaSummaryCurveDefinition::RiaSummaryCurveDefinition()
RiaSummaryCurveDefinition::RiaSummaryCurveDefinition(RimSummaryCase* summaryCase,
const RifEclipseSummaryAddress& summaryAddress,
RimSummaryCaseCollection* ensemble)
: m_summaryCase(summaryCase)
, m_ensemble(ensemble)
, m_summaryAddress(summaryAddress)
{
m_curveDefinition = std::make_pair(summaryCase, summaryAddress);
m_ensemble = ensemble;
}
//--------------------------------------------------------------------------------------------------
@ -46,7 +49,7 @@ RiaSummaryCurveDefinition::RiaSummaryCurveDefinition(RimSummaryCase* summaryCase
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RiaSummaryCurveDefinition::summaryCase() const
{
return m_curveDefinition.first;
return m_summaryCase;
}
//--------------------------------------------------------------------------------------------------
@ -62,7 +65,7 @@ RimSummaryCaseCollection* RiaSummaryCurveDefinition::ensemble() const
//--------------------------------------------------------------------------------------------------
const RifEclipseSummaryAddress& RiaSummaryCurveDefinition::summaryAddress() const
{
return m_curveDefinition.second;
return m_summaryAddress;
}
//--------------------------------------------------------------------------------------------------
@ -73,13 +76,6 @@ bool RiaSummaryCurveDefinition::isEnsembleCurve() const
return m_ensemble != nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaSummaryCurveDefinition::isValid() const
{
return m_curveDefinition.first != nullptr;
}
//--------------------------------------------------------------------------------------------------
///
@ -144,14 +140,16 @@ QString RiaSummaryCurveDefinition::curveDefinitionText(RimSummaryCase* summaryCa
//--------------------------------------------------------------------------------------------------
bool RiaSummaryCurveDefinition::operator<(const RiaSummaryCurveDefinition& other) const
{
if (m_curveDefinition.first == other.summaryCase())
if (m_summaryCase != other.summaryCase())
{
if (m_curveDefinition.second == other.summaryAddress())
{
return m_ensemble < other.m_ensemble;
}
return (m_curveDefinition.second < other.summaryAddress());
return m_summaryCase < other.summaryCase();
}
return (m_curveDefinition.first < other.summaryCase());
if (m_ensemble != other.ensemble())
{
return (m_ensemble < other.ensemble());
}
return (m_summaryAddress < other.summaryAddress());
}

5
ApplicationCode/Application/RiaSummaryCurveDefinition.h
View File

@ -44,8 +44,6 @@ public:
RimSummaryCaseCollection* ensemble() const;
bool isEnsembleCurve() const;
bool isValid() const;
bool operator < (const RiaSummaryCurveDefinition& other) const;
// TODO: Consider moving to a separate tools class
@ -59,6 +57,7 @@ public:
private:
private:
std::pair<RimSummaryCase*, RifEclipseSummaryAddress> m_curveDefinition;
RimSummaryCase* m_summaryCase;
RifEclipseSummaryAddress m_summaryAddress;
RimSummaryCaseCollection* m_ensemble;
};