diff --git a/GUI/View/Fit/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp
index 72d9569cc9db2fa38f620d700d9f0e10343e3171..c8dc11a53a966d371cfae1798eada7c2ad528995 100644
--- a/GUI/View/Fit/FitSessionWidget.cpp
+++ b/GUI/View/Fit/FitSessionWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/View/Fit/FitSessionController.h"
#include "GUI/View/FitControl/FitEditor.h"
-#include "GUI/View/FitControl/MinimizerSettingsWidget.h"
+#include "GUI/View/FitControl/MinimizerEditor.h"
#include "GUI/View/Layout/mainwindow_constants.h"
#include "GUI/View/Tuning/FitParameterWidget.h"
#include <QSettings>
@@ -28,7 +28,7 @@ FitSessionWidget::FitSessionWidget(QWidget* parent)
, m_tab_widget(new QTabWidget(this))
, m_control_widget(new FitEditor)
, m_fit_parameters_widget(new FitParameterWidget)
- , m_minimizer_settings_widget(new MinimizerSettingsWidget)
+ , m_minimizer_settings_widget(new MinimizerEditor)
, m_session_controller(nullptr)
{
auto* layout = new QVBoxLayout(this);
diff --git a/GUI/View/Fit/FitSessionWidget.h b/GUI/View/Fit/FitSessionWidget.h
index aef0fcb42f1b479481b0fec5611ded052b7865c2..56e317f49fb556f50607a09645ee637d338f4867 100644
--- a/GUI/View/Fit/FitSessionWidget.h
+++ b/GUI/View/Fit/FitSessionWidget.h
@@ -21,7 +21,7 @@
class FitParameterWidget;
class FitSessionController;
class JobItem;
-class MinimizerSettingsWidget;
+class MinimizerEditor;
class ParameterTuningWidget;
class FitEditor;
@@ -47,7 +47,7 @@ private:
QTabWidget* m_tab_widget;
FitEditor* m_control_widget;
FitParameterWidget* m_fit_parameters_widget;
- MinimizerSettingsWidget* m_minimizer_settings_widget;
+ MinimizerEditor* m_minimizer_settings_widget;
FitSessionController* m_session_controller;
};
diff --git a/GUI/View/FitControl/MinimizerSettingsWidget.cpp b/GUI/View/FitControl/MinimizerEditor.cpp
similarity index 95%
rename from GUI/View/FitControl/MinimizerSettingsWidget.cpp
rename to GUI/View/FitControl/MinimizerEditor.cpp
index fa11a4e6a2c20f31ab72b70282075db370685ac0..b8c738d840d0e9a998c1e05196f91520b3eb9935 100644
--- a/GUI/View/FitControl/MinimizerSettingsWidget.cpp
+++ b/GUI/View/FitControl/MinimizerEditor.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitControl/MinimizerSettingsWidget.cpp
-//! @brief Implements class MinimizerSettingsWidget.
+//! @file GUI/View/FitControl/MinimizerEditor.cpp
+//! @brief Implements class MinimizerEditor.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitControl/MinimizerSettingsWidget.h"
+#include "GUI/View/FitControl/MinimizerEditor.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
@@ -23,7 +23,7 @@
#include <QSpinBox>
#include <QStandardItemModel>
-MinimizerSettingsWidget::MinimizerSettingsWidget(QWidget* parent)
+MinimizerEditor::MinimizerEditor(QWidget* parent)
: QWidget(parent)
, m_container_item(nullptr)
, m_main_layout(new QFormLayout(this))
@@ -34,13 +34,13 @@ MinimizerSettingsWidget::MinimizerSettingsWidget(QWidget* parent)
m_main_layout->setSpacing(5);
}
-void MinimizerSettingsWidget::setJobItem(JobItem* jobItem)
+void MinimizerEditor::setJobItem(JobItem* jobItem)
{
ASSERT(jobItem);
setMinContainerItem(jobItem->fitSuiteItem()->minimizerContainerItem());
}
-void MinimizerSettingsWidget::setMinContainerItem(MinimizerContainerItem* containerItem)
+void MinimizerEditor::setMinContainerItem(MinimizerContainerItem* containerItem)
{
ASSERT(containerItem);
@@ -82,7 +82,7 @@ void MinimizerSettingsWidget::setMinContainerItem(MinimizerContainerItem* contai
updateUIValues();
}
-void MinimizerSettingsWidget::createGroupedAlgorithmsCombo()
+void MinimizerEditor::createGroupedAlgorithmsCombo()
{
auto* comboBox = new QComboBox;
QStringList list = m_container_item->commonAlgorithmCombo().values();
@@ -154,7 +154,7 @@ void MinimizerSettingsWidget::createGroupedAlgorithmsCombo()
m_main_layout->addRow("Algorithm:", comboBox);
}
-void MinimizerSettingsWidget::createMimimizerEdits()
+void MinimizerEditor::createMimimizerEdits()
{
GUI::Util::Layout::clearLayout(m_minimizer_layout);
@@ -179,7 +179,7 @@ void MinimizerSettingsWidget::createMimimizerEdits()
createGSLLevMarEdits();
}
-void MinimizerSettingsWidget::createMinuitEdits()
+void MinimizerEditor::createMinuitEdits()
{
MinuitMinimizerItem* minItem = m_container_item->minimizerItemMinuit();
@@ -236,7 +236,7 @@ void MinimizerSettingsWidget::createMinuitEdits()
&m_updaters, true /*easy scroll*/));
}
-void MinimizerSettingsWidget::createGSLMultiMinEdits()
+void MinimizerEditor::createGSLMultiMinEdits()
{
GSLMultiMinimizerItem* minItem = m_container_item->minimizerItemGSLMulti();
@@ -251,7 +251,7 @@ void MinimizerSettingsWidget::createGSLMultiMinEdits()
&m_updaters, true /*easy scroll*/));
}
-void MinimizerSettingsWidget::createTMVAGeneticEdits()
+void MinimizerEditor::createTMVAGeneticEdits()
{
GeneticMinimizerItem* minItem = m_container_item->minimizerItemGenetic();
@@ -296,7 +296,7 @@ void MinimizerSettingsWidget::createTMVAGeneticEdits()
true /*easy scroll*/));
}
-void MinimizerSettingsWidget::createGSLSimulatedAnnealingEdits()
+void MinimizerEditor::createGSLSimulatedAnnealingEdits()
{
SimAnMinimizerItem* minItem = m_container_item->minimizerItemSimAn();
@@ -365,7 +365,7 @@ void MinimizerSettingsWidget::createGSLSimulatedAnnealingEdits()
RealLimits::nonnegative()));
}
-void MinimizerSettingsWidget::createGSLLevMarEdits()
+void MinimizerEditor::createGSLLevMarEdits()
{
GSLLMAMinimizerItem* minItem = m_container_item->minimizerItemGSLLMA();
@@ -390,7 +390,7 @@ void MinimizerSettingsWidget::createGSLLevMarEdits()
&m_updaters, true /*easy scroll*/));
}
-void MinimizerSettingsWidget::updateUIValues()
+void MinimizerEditor::updateUIValues()
{
for (const auto& updater : m_updaters)
updater();
diff --git a/GUI/View/FitControl/MinimizerSettingsWidget.h b/GUI/View/FitControl/MinimizerEditor.h
similarity index 71%
rename from GUI/View/FitControl/MinimizerSettingsWidget.h
rename to GUI/View/FitControl/MinimizerEditor.h
index b69e78c8fb00cf1d266f2896d8b600668349aac4..b9f528ea00ae168a11842c7a0c99c1d3422bb9fc 100644
--- a/GUI/View/FitControl/MinimizerSettingsWidget.h
+++ b/GUI/View/FitControl/MinimizerEditor.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitControl/MinimizerSettingsWidget.h
-//! @brief Defines class MinimizerSettingsWidget.
+//! @file GUI/View/FitControl/MinimizerEditor.h
+//! @brief Defines class MinimizerEditor.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZEREDITOR_H
+#define BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZEREDITOR_H
#include "GUI/Model/Mini/MinimizerItems.h"
#include <QFormLayout>
@@ -21,13 +21,13 @@
class JobItem;
-//! The MinimizerSettingsWidget contains editor for all minimizer settings and related fit
+//! The MinimizerEditor contains editor for all minimizer settings and related fit
//! options. Part of FitSuiteWidget.
-class MinimizerSettingsWidget : public QWidget {
+class MinimizerEditor : public QWidget {
Q_OBJECT
public:
- MinimizerSettingsWidget(QWidget* parent = nullptr);
+ MinimizerEditor(QWidget* parent = nullptr);
public slots:
void setJobItem(JobItem* jobItem);
@@ -51,4 +51,4 @@ private:
QList<std::function<void()>> m_updaters;
};
-#endif // BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZEREDITOR_H