OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-10 08:03:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1919 Curve Creator. Fix summary category initial selection

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-09-22 12:53:54 +02:00
parent 0ae5c344d3
commit d83c468033
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@ -263,13 +263,6 @@ void RicSummaryCurveCreator::updateFromSummaryPlot(RimSummaryPlot* targetPlot)
loadDataAndUpdatePlot(); loadDataAndUpdatePlot();
} }
// Select all summary categories
m_selectedSummaryCategories.v().clear();
for (size_t i = 0; i < caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::size(); ++i)
{
m_selectedSummaryCategories.v().push_back(caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::fromIndex(i));
}
caf::PdmUiItem::updateConnectedEditors(); caf::PdmUiItem::updateConnectedEditors();
} }
@ -1066,8 +1059,17 @@ void RicSummaryCurveCreator::defineEditorAttribute(const caf::PdmFieldHandle* fi
void RicSummaryCurveCreator::populateCurveCreator(const RimSummaryPlot& sourceSummaryPlot) void RicSummaryCurveCreator::populateCurveCreator(const RimSummaryPlot& sourceSummaryPlot)
{ {
m_previewPlot->deleteAllSummaryCurves(); m_previewPlot->deleteAllSummaryCurves();
m_selectedSummaryCategories.v().clear();
for (const auto& curve : sourceSummaryPlot.summaryCurves()) for (const auto& curve : sourceSummaryPlot.summaryCurves())
{ {
// Select summary category if not already selected
auto& selectedCategories = m_selectedSummaryCategories();
if (std::find(selectedCategories.begin(), selectedCategories.end(),
curve->summaryAddress().category()) == selectedCategories.end())
{
m_selectedSummaryCategories.v().push_back(curve->summaryAddress().category());
}
// Select case if not already selected // Select case if not already selected
if (std::find(m_selectedCases.begin(), m_selectedCases.end(), curve->summaryCase()) == m_selectedCases.end()) if (std::find(m_selectedCases.begin(), m_selectedCases.end(), curve->summaryCase()) == m_selectedCases.end())
{ {
@ -1158,6 +1160,7 @@ void RicSummaryCurveCreator::copyCurveAndAddToPlot(const RimSummaryCurve *curve,
void RicSummaryCurveCreator::resetAllFields() void RicSummaryCurveCreator::resetAllFields()
{ {
m_selectedCases.clear(); m_selectedCases.clear();
m_selectedSummaryCategories = std::vector<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>>();
m_previewPlot->deleteAllSummaryCurves(); m_previewPlot->deleteAllSummaryCurves();
m_targetPlot = nullptr; m_targetPlot = nullptr;