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

#2659 Ensemble statistics. Fix plot editor issues

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-06-08 08:43:00 +02:00
parent 54ed12a2f7
commit 7cd371c1f8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
View File

@ -40,6 +40,7 @@ namespace caf
addItem(RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR, "SUMMARY_BLOCK_LGR", "Lgr-Block"); addItem(RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR, "SUMMARY_BLOCK_LGR", "Lgr-Block");
addItem(RifEclipseSummaryAddress::SUMMARY_CALCULATED, "SUMMARY_CALCULATED", "Calculated"); addItem(RifEclipseSummaryAddress::SUMMARY_CALCULATED, "SUMMARY_CALCULATED", "Calculated");
addItem(RifEclipseSummaryAddress::SUMMARY_IMPORTED, "SUMMARY_IMPORTED", "Imported"); addItem(RifEclipseSummaryAddress::SUMMARY_IMPORTED, "SUMMARY_IMPORTED", "Imported");
addItem(RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS, "SUMMARY_ENSEMBLE_STATISTICS", "Ensemble Statistics");
setDefault(RifEclipseSummaryAddress::SUMMARY_FIELD); setDefault(RifEclipseSummaryAddress::SUMMARY_FIELD);
} }

8
ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
View File

@ -426,6 +426,9 @@ void RiuSummaryCurveDefSelection::setSelectedCurveDefinitions(const std::vector<
summaryAddress = RifEclipseSummaryAddress::fieldAddress(summaryAddress.quantityName()); summaryAddress = RifEclipseSummaryAddress::fieldAddress(summaryAddress.quantityName());
} }
// Ignore ensemble statistics curves
if (summaryAddress.category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS) continue;
// Select summary category if not already selected // Select summary category if not already selected
auto& selectedCategories = m_selectedSummaryCategories(); auto& selectedCategories = m_selectedSummaryCategories();
@ -605,6 +608,8 @@ QList<caf::PdmOptionItemInfo> RiuSummaryCurveDefSelection::calculateValueOptions
{ {
for (size_t i = 0; i < caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::size(); ++i) for (size_t i = 0; i < caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::size(); ++i)
{ {
if (caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::fromIndex(i) == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS) continue;
options.push_back(caf::PdmOptionItemInfo(caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::uiTextFromIndex(i), options.push_back(caf::PdmOptionItemInfo(caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::uiTextFromIndex(i),
caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::fromIndex(i))); caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::fromIndex(i)));
} }
@ -1040,7 +1045,8 @@ std::set<RifEclipseSummaryAddress> RiuSummaryCurveDefSelection::buildAddressList
std::set<RifEclipseSummaryAddress> addressSet; std::set<RifEclipseSummaryAddress> addressSet;
for (const auto& category : m_selectedSummaryCategories()) for (const auto& category : m_selectedSummaryCategories())
{ {
if (category == RifEclipseSummaryAddress::SummaryVarCategory::SUMMARY_INVALID) continue; if (m_identifierFieldsMap.at(category).size() == 0 ||
category == RifEclipseSummaryAddress::SummaryVarCategory::SUMMARY_INVALID) continue;
const auto& identifierAndFieldList = m_identifierFieldsMap.at(category); const auto& identifierAndFieldList = m_identifierFieldsMap.at(category);
std::vector<std::pair<RifEclipseSummaryAddress::SummaryIdentifierType, QString>> selectionStack; std::vector<std::pair<RifEclipseSummaryAddress::SummaryIdentifierType, QString>> selectionStack;