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

#3904 Summary : Always insert summary curve without H when match is found

Browse Source
This commit is contained in:
Magne Sjaastad 2018-12-19 10:08:10 +01:00
parent b7e569d09a
commit 8011c9994d
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/Application/Tools/RiaSummaryCurveAnalyzer.cpp
View File

@ -76,7 +76,7 @@ std::set<std::string> RiaSummaryCurveAnalyzer::quantityNamesWithHistory() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<std::string> RiaSummaryCurveAnalyzer::quantityNamesNoHistory() const
std::set<std::string> RiaSummaryCurveAnalyzer::quantityNamesNoHistory() const
{
assignCategoryToQuantities();
@ -241,31 +241,23 @@ void RiaSummaryCurveAnalyzer::computeQuantityNamesWithHistory() const
for (const auto& s : m_quantities)
{
if (RiaStdStringTools::endsWith(s, historyIdentifier))
{
std::string summaryCurveName = s.substr(0, s.size() - 1);
std::string correspondingHistoryCurve = correspondingHistorySummaryCurveName(s);
if (m_quantities.find(summaryCurveName) != m_quantities.end())
if (m_quantities.find(correspondingHistoryCurve) != m_quantities.end())
{
// Insert the curve name without H
if (RiaStdStringTools::endsWith(s, historyIdentifier))
{
m_quantitiesWithMatchingHistory.insert(summaryCurveName);
m_quantitiesWithMatchingHistory.insert(correspondingHistoryCurve);
}
else
{
m_quantitiesNoMatchingHistory.insert(summaryCurveName);
m_quantitiesWithMatchingHistory.insert(s);
}
}
else
{
std::string historySummaryCurveName = s + historyIdentifier;
if (m_quantities.find(historySummaryCurveName) != m_quantities.end())
{
m_quantitiesWithMatchingHistory.insert(s);
}
else
{
m_quantitiesNoMatchingHistory.insert(s);
}
m_quantitiesNoMatchingHistory.insert(s);
}
}
}