From 89098705cb2c4ac92b1810fa4b6903d71543fdb3 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 22 Nov 2018 16:02:44 +0100 Subject: [PATCH] Whitespace --- .../RicSummaryCurveCreator.cpp | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp index 9c17fe4ce2..ef83dfb2ab 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp @@ -20,8 +20,8 @@ #include "RiaApplication.h" #include "RiaColorTables.h" -#include "RiaSummaryCurveDefinition.h" #include "RiaCurveSetDefinition.h" +#include "RiaSummaryCurveDefinition.h" #include "RicSelectSummaryPlotUI.h" #include "RiuSummaryCurveDefinitionKeywords.h" @@ -47,11 +47,11 @@ #include "RimSummaryPlot.h" #include "RimSummaryPlotCollection.h" +#include "RiuPlotMainWindow.h" #include "RiuPlotMainWindowTools.h" #include "RiuSummaryCurveDefSelection.h" #include "RiuSummaryQwtPlot.h" #include "RiuTools.h" -#include "RiuPlotMainWindow.h" #include "cafPdmUiComboBoxEditor.h" #include "cafPdmUiPushButtonEditor.h" @@ -77,8 +77,9 @@ const QString RicSummaryCurveCreator::CONFIGURATION_NAME = "CurveCreatorCfg"; //-------------------------------------------------------------------------------------------------- /// Internal functions //-------------------------------------------------------------------------------------------------- -int ensembleCurveCount(const std::set& allCurveDefs); -template std::vector toVector(const std::set& set); +int ensembleCurveCount(const std::set& allCurveDefs); +template +std::vector toVector(const std::set& set); //-------------------------------------------------------------------------------------------------- /// @@ -347,7 +348,8 @@ void RicSummaryCurveCreator::syncPreviewCurvesFromUiSelection() for (const auto& curve : currentCurvesInPreviewPlot) { RimSummaryCase* sumCase = curve->summaryCaseY(); - currentCurveDefs.insert(RiaSummaryCurveDefinition(sumCase, curve->summaryAddressY(), sumCase ? sumCase->ensemble() : nullptr)); + currentCurveDefs.insert( + RiaSummaryCurveDefinition(sumCase, curve->summaryAddressY(), sumCase ? sumCase->ensemble() : nullptr)); } { @@ -381,10 +383,12 @@ void RicSummaryCurveCreator::syncPreviewCurvesFromUiSelection() // Curve sets to delete std::set curveSetsToDelete; { - std::vector allCurveSetDefinitionsVector = m_summaryCurveSelectionEditor->summaryAddressSelection()->allCurveSetDefinitionsFromSelections(); - std::set allCurveSetDefinitions = std::set(allCurveSetDefinitionsVector.begin(), allCurveSetDefinitionsVector.end()); + std::vector allCurveSetDefinitionsVector = + m_summaryCurveSelectionEditor->summaryAddressSelection()->allCurveSetDefinitionsFromSelections(); + std::set allCurveSetDefinitions = + std::set(allCurveSetDefinitionsVector.begin(), allCurveSetDefinitionsVector.end()); std::vector currentCurveSetsInPreviewPlot = m_previewPlot->curveSets(); - std::set currentCurveSetDefs; + std::set currentCurveSetDefs; for (const auto& curveSet : currentCurveSetsInPreviewPlot) { @@ -404,8 +408,8 @@ void RicSummaryCurveCreator::syncPreviewCurvesFromUiSelection() for (const auto& curveSet : currentCurveSetsInPreviewPlot) { - RimSummaryCaseCollection* ensemble = curveSet->summaryCaseCollection(); - RiaCurveSetDefinition curveSetDef = RiaCurveSetDefinition(ensemble, curveSet->summaryAddress()); + RimSummaryCaseCollection* ensemble = curveSet->summaryCaseCollection(); + RiaCurveSetDefinition curveSetDef = RiaCurveSetDefinition(ensemble, curveSet->summaryAddress()); if (deleteCurveSetDefs.count(curveSetDef) > 0) curveSetsToDelete.insert(curveSet); } } @@ -422,9 +426,9 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions( const std::set& allCurveDefsToDisplay, const std::set& curveDefsToAdd, const std::set& curvesToDelete, - const std::set& curveSetsToDelete) + const std::set& curveSetsToDelete) { - static bool warningDisplayed = false; + static bool warningDisplayed = false; std::set summaryCurveDefsToDisplay; @@ -439,11 +443,11 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions( initCurveAppearanceCalculator(curveLookCalc); // Delete curves - if(!curveSetsToDelete.empty()) + if (!curveSetsToDelete.empty()) { m_previewPlot->ensembleCurveSetCollection()->deleteCurveSets(toVector(curveSetsToDelete)); } - if(!curvesToDelete.empty()) + if (!curvesToDelete.empty()) { m_previewPlot->deleteCurves(toVector(curvesToDelete)); } @@ -458,7 +462,7 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions( curve->setSummaryCaseY(currentCase); curve->setSummaryAddressY(curveDef.summaryAddress()); curve->applyCurveAutoNameSettings(*m_curveNameConfig()); - if(currentCase->isObservedData()) curve->setSymbolSkipDistance(0); + if (currentCase->isObservedData()) curve->setSymbolSkipDistance(0); if (curveDef.isEnsembleCurve()) { @@ -480,9 +484,8 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions( curveSet->setSummaryAddress(curveDef.summaryAddress()); // Set single curve set color - auto allCurveSets = m_previewPlot->ensembleCurveSetCollection()->curveSets(); - size_t colorIndex = std::count_if(allCurveSets.begin(), allCurveSets.end(), [](RimEnsembleCurveSet* curveSet) - { + auto allCurveSets = m_previewPlot->ensembleCurveSetCollection()->curveSets(); + size_t colorIndex = std::count_if(allCurveSets.begin(), allCurveSets.end(), [](RimEnsembleCurveSet* curveSet) { return curveSet->colorMode() == RimEnsembleCurveSet::SINGLE_COLOR; }); curveSet->setColor(RiaColorTables::summaryCurveDefaultPaletteColors().cycledColor3f(colorIndex)); @@ -490,7 +493,8 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions( // Add curve to plot m_previewPlot->ensembleCurveSetCollection()->addCurveSet(curveSet); - if (m_previewPlot->ensembleCurveSetCollection()->curveSets().size() > 1 && ensembleCurveCnt > ENSEMBLE_CURVE_COUNT_THRESHOLD) + if (m_previewPlot->ensembleCurveSetCollection()->curveSets().size() > 1 && + ensembleCurveCnt > ENSEMBLE_CURVE_COUNT_THRESHOLD) { // Toggle off new curve set and display warning curveSet->showCurves(false); @@ -559,7 +563,7 @@ std::set RicSummaryCurveCreator::getAllSummaryWellNames() { const std::set allAddresses = reader->allResultAddresses(); - for(auto& address : allAddresses) + for (auto& address : allAddresses) { if (address.category() == RifEclipseSummaryAddress::SUMMARY_WELL) { @@ -1019,7 +1023,8 @@ int ensembleCurveCount(const std::set& allCurveDefs) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -template std::vector toVector(const std::set& set) +template +std::vector toVector(const std::set& set) { return std::vector(set.begin(), set.end()); }