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

#756 Syncronize from curves to gui selection. Removed "None" option

Browse Source
This commit is contained in:
Jacob Støren
2016-06-16 16:49:31 +02:00
parent cf287160df
commit 7378472ac9
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.cpp
View File

@@ -155,8 +155,6 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurveFilter::calculateValueOptions(const
}
}
optionList.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), QVariant::fromValue(RifEclipseSummaryAddress())));
if(useOptionsOnly) *useOptionsOnly = true;
}
}
@@ -181,6 +179,7 @@ void RimSummaryCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
curveVarSelectionGroup->add(&m_uiFilterResultMultiSelection);
uiOrdering.add(&m_applyButtonField);
uiOrdering.setForgetRemainingFields(true);
}
@@ -242,7 +241,7 @@ void RimSummaryCurveFilter::detachQwtCurve()
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveFilter::syncCurvesFromUiSelection()
{
// Create a search map containing whats supposed to be
// Create a search map containing whats supposed to be curves
std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> > newCurveDefinitions;
@@ -294,10 +293,21 @@ void RimSummaryCurveFilter::syncCurvesFromUiSelection()
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveFilter::syncUiSelectionFromCurves()
{
// Create a search map containing whats supposed to be uiSelected
std::set<RifEclipseSummaryAddress> existingCurveDefinitions;
// Populate the existingCurveDefinitions from the existing curves
for(RimSummaryCurve* curve: m_curves)
{
existingCurveDefinitions.insert(curve->summaryAddress());
}
m_uiFilterResultMultiSelection.v().clear();
RimSummaryCase* currentCase = m_selectedSummaryCase();
for(const RifEclipseSummaryAddress& addr: existingCurveDefinitions)
{
m_uiFilterResultMultiSelection.v().push_back(addr);
}
}
@@ -322,4 +332,6 @@ void RimSummaryCurveFilter::loadDataAndUpdate()
{
curve->loadDataAndUpdate();
}
syncUiSelectionFromCurves();
}