Curve creator. Minor refactoring

This commit is contained in:
Bjørn Erik Jensen
2017-10-05 13:33:08 +02:00
parent 1ecf6cd60a
commit d283e3aa8c
2 changed files with 2 additions and 11 deletions

View File

@@ -262,7 +262,7 @@ void RicSummaryCurveCreator::updateFromSummaryPlot(RimSummaryPlot* targetPlot)
if (m_targetPlot) if (m_targetPlot)
{ {
populateCurveCreator(*m_targetPlot); populateCurveCreator(*m_targetPlot);
loadDataAndUpdatePlot(); syncPreviewCurvesFromUiSelection();
} }
caf::PdmUiItem::updateConnectedEditors(); caf::PdmUiItem::updateConnectedEditors();
@@ -328,7 +328,7 @@ void RicSummaryCurveCreator::fieldChangedByUi(const caf::PdmFieldHandle* changed
changedField == &m_selectedSummaryCategories || changedField == &m_selectedSummaryCategories ||
identifierAndField != nullptr) identifierAndField != nullptr)
{ {
loadDataAndUpdatePlot(); syncPreviewCurvesFromUiSelection();
} }
} }
} }
@@ -846,14 +846,6 @@ void RicSummaryCurveCreator::buildAddressListForCategoryRecursively(RifEclipseSu
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::loadDataAndUpdatePlot()
{
syncPreviewCurvesFromUiSelection();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@@ -108,7 +108,6 @@ private:
std::vector<std::pair<RifEclipseSummaryAddress::SummaryIdentifierType, QString>>& identifierPath, std::vector<std::pair<RifEclipseSummaryAddress::SummaryIdentifierType, QString>>& identifierPath,
std::set<RifEclipseSummaryAddress>& addressSet); std::set<RifEclipseSummaryAddress>& addressSet);
void loadDataAndUpdatePlot();
void syncPreviewCurvesFromUiSelection(); void syncPreviewCurvesFromUiSelection();
void updatePreviewCurvesFromCurveDefinitions(const std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> >& allCurveDefsToDisplay, void updatePreviewCurvesFromCurveDefinitions(const std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> >& allCurveDefsToDisplay,
const std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> >& curveDefsToAdd, const std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress> >& curveDefsToAdd,