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

#4482 Summary Plot: Missing curve if same case name, but different folders

Browse Source
This commit is contained in:
Magne Sjaastad
2019-06-13 17:34:25 +02:00
parent a6210cfcc1
commit a5670cdb0e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Application/RiaSummaryCurveDefinition.cpp
View File

@@ -142,6 +142,7 @@ QString RiaSummaryCurveDefinition::curveDefinitionText(const QString& caseName,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RiaSummaryCurveDefinition::operator<(const RiaSummaryCurveDefinition& other) const bool RiaSummaryCurveDefinition::operator<(const RiaSummaryCurveDefinition& other) const
{ {
if (m_ensemble != other.ensemble())
{ {
QString ensembleName; QString ensembleName;
QString otherEnsembleName; QString otherEnsembleName;
@@ -156,12 +157,17 @@ bool RiaSummaryCurveDefinition::operator<(const RiaSummaryCurveDefinition& other
otherEnsembleName = other.ensemble()->name(); otherEnsembleName = other.ensemble()->name();
} }
// First check if names are different to ensure stable alphabetic sort
if (ensembleName != otherEnsembleName) if (ensembleName != otherEnsembleName)
{ {
return ensembleName < otherEnsembleName; return ensembleName < otherEnsembleName;
} }
// Use pointer address, sorting will be be unstable
return m_ensemble < other.ensemble();
} }
if (m_summaryCase != other.summaryCase())
{ {
QString summaryCaseName; QString summaryCaseName;
QString otherSummaryCaseName; QString otherSummaryCaseName;
@@ -175,10 +181,14 @@ bool RiaSummaryCurveDefinition::operator<(const RiaSummaryCurveDefinition& other
otherSummaryCaseName = other.summaryCase()->caseName(); otherSummaryCaseName = other.summaryCase()->caseName();
} }
// First check if names are different to ensure stable alphabetic sort
if (summaryCaseName != otherSummaryCaseName) if (summaryCaseName != otherSummaryCaseName)
{ {
return summaryCaseName < otherSummaryCaseName; return summaryCaseName < otherSummaryCaseName;
} }
// Use pointer address, sorting will be be unstable
return m_summaryCase < other.summaryCase();
} }
return (m_summaryAddress < other.summaryAddress()); return (m_summaryAddress < other.summaryAddress());