diff --git a/GUI/Model/Job/MinimizerItem.cpp b/GUI/Model/Job/MinimizerItem.cpp index 3acaeed750be581839894f774bcb31972f18e7ef..b9194a89165bdf5fd3c52dfcc11478cc73f3958a 100644 --- a/GUI/Model/Job/MinimizerItem.cpp +++ b/GUI/Model/Job/MinimizerItem.cpp @@ -33,33 +33,37 @@ const QMap<QString, QString> minimizer_names_map = { const QString default_minimizer = minimizer_names_map.key(MinuitMinimizerItem::M_TYPE); #ifdef ALGORITHM_LIST -QString filler (qsizetype l){ +QString filler(qsizetype l) +{ qsizetype length = 60 - l; QString result = " "; - for(int i = 0; i<length/2; i++) + for (int i = 0; i < length / 2; i++) result += " -"; result += " "; return result; } -QMap<QString/*algorithm*/, QString/*minimizer*/> algorithm_minimizer_map; +QMap<QString /*algorithm*/, QString /*minimizer*/> algorithm_minimizer_map; QStringList create_algorithm_minimizer_map() { QString name, basename; QStringList common_algorithms_list; - QStringList minuit2Algorithms = MinimizerItemCatalog::algorithmNames(MinuitMinimizerItem::M_TYPE); - for(QString algorithm : minuit2Algorithms) { + QStringList minuit2Algorithms = + MinimizerItemCatalog::algorithmNames(MinuitMinimizerItem::M_TYPE); + for (QString algorithm : minuit2Algorithms) { name = algorithm + filler(algorithm.length()) + "(ROOT Minuit2)"; common_algorithms_list.append(name); algorithm_minimizer_map.insert(name, minimizer_names_map.key(MinuitMinimizerItem::M_TYPE)); } - QStringList multiMinAlgorithms = MinimizerItemCatalog::algorithmNames(GSLMultiMinimizerItem::M_TYPE); - for(QString algorithm : multiMinAlgorithms) { + QStringList multiMinAlgorithms = + MinimizerItemCatalog::algorithmNames(GSLMultiMinimizerItem::M_TYPE); + for (QString algorithm : multiMinAlgorithms) { name = algorithm + filler(algorithm.length()) + "(GSL)"; common_algorithms_list.append(name); - algorithm_minimizer_map.insert(name, minimizer_names_map.key(GSLMultiMinimizerItem::M_TYPE)); + algorithm_minimizer_map.insert(name, + minimizer_names_map.key(GSLMultiMinimizerItem::M_TYPE)); } basename = "Genetic"; @@ -174,7 +178,7 @@ ComboProperty MinimizerContainerItem::minimizerCombo() const return getItemValue(P_MINIMIZERS).value<ComboProperty>(); } #ifdef ALGORITHM_LIST -void MinimizerContainerItem::setCurrentCommonAlgorithm(const QString &name) +void MinimizerContainerItem::setCurrentCommonAlgorithm(const QString& name) { ComboProperty combo = commonAlgorithmCombo(); combo.setCurrentValue(name); diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp index a619e7ea5c9620774ac62470ba8a2afa10df2f57..67245453b262ba063df80ad10ebbe1f8bdd9d11c 100644 --- a/GUI/View/Fit/MinimizerSettingsWidget.cpp +++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp @@ -56,13 +56,13 @@ void MinimizerSettingsWidget::setMinItem(MinimizerContainerItem* minimizerItem) return; #ifdef ALGORITHM_LIST - m_mainLayout->addRow("Algorithm:", - GUI::Util::createComboBox([=] { return m_currentItem->commonAlgorithmCombo(); }, - [=](const QString& t) { - m_currentItem->setCurrentCommonAlgorithm(t); - createMimimizerEdits(); - }, - &m_updaters)); + m_mainLayout->addRow("Algorithm:", GUI::Util::createComboBox( + [=] { return m_currentItem->commonAlgorithmCombo(); }, + [=](const QString& t) { + m_currentItem->setCurrentCommonAlgorithm(t); + createMimimizerEdits(); + }, + &m_updaters)); #else m_mainLayout->addRow("Minimizer:", GUI::Util::createComboBox([=] { return m_currentItem->minimizerCombo(); },