diff --git a/GUI/View/Fit/JobRealTimeToolBar.cpp b/GUI/View/Fit/JobRealTimeToolBar.cpp deleted file mode 100644 index 9880d1786e663bc9d650e2e03d2ddfb96fdbf506..0000000000000000000000000000000000000000 --- a/GUI/View/Fit/JobRealTimeToolBar.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// ************************************************************************************************ -// -// BornAgain: simulate and fit reflection and scattering -// -//! @file GUI/View/Fit/JobRealTimeToolBar.cpp -//! @brief Implements class JobRealTimeToolBar -//! -//! @homepage http://www.bornagainproject.org -//! @license GNU General Public License v3 or higher (see COPYING) -//! @copyright Forschungszentrum Jülich GmbH 2018 -//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS) -// -// ************************************************************************************************ - -#include "GUI/View/Fit/JobRealTimeToolBar.h" -#include <QToolButton> - -JobRealTimeToolBar::JobRealTimeToolBar(QWidget* parent) - : StyledToolBar(parent), m_resetParametersButton(new QToolButton) -{ - setMinimumSize(minimumHeight(), minimumHeight()); - - m_resetParametersButton->setText("Reset values"); - m_resetParametersButton->setIcon(QIcon(":/images/undo-variant.svg")); - m_resetParametersButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - m_resetParametersButton->setToolTip("Reset parameter tree to initial values"); - addWidget(m_resetParametersButton); - - connect(m_resetParametersButton, &QToolButton::clicked, this, - &JobRealTimeToolBar::resetParameters); -} diff --git a/GUI/View/Fit/JobRealTimeToolBar.h b/GUI/View/Fit/JobRealTimeToolBar.h deleted file mode 100644 index 194b42ec3548d7fc8e341c08f993da6e48421372..0000000000000000000000000000000000000000 --- a/GUI/View/Fit/JobRealTimeToolBar.h +++ /dev/null @@ -1,37 +0,0 @@ -// ************************************************************************************************ -// -// BornAgain: simulate and fit reflection and scattering -// -//! @file GUI/View/Fit/JobRealTimeToolBar.h -//! @brief Defines class JobRealTimeToolBar -//! -//! @homepage http://www.bornagainproject.org -//! @license GNU General Public License v3 or higher (see COPYING) -//! @copyright Forschungszentrum Jülich GmbH 2018 -//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS) -// -// ************************************************************************************************ - -#ifndef BORNAGAIN_GUI_VIEW_FIT_JOBREALTIMETOOLBAR_H -#define BORNAGAIN_GUI_VIEW_FIT_JOBREALTIMETOOLBAR_H - -#include "GUI/View/Common/StyledToolBar.h" - -class QToolButton; - -//! Represents a toolbar with buttons for ParameterTuningWidget. - -class JobRealTimeToolBar : public StyledToolBar { - Q_OBJECT - -public: - explicit JobRealTimeToolBar(QWidget* parent = nullptr); - -signals: - void resetParameters(); - -private: - QToolButton* m_resetParametersButton; -}; - -#endif // BORNAGAIN_GUI_VIEW_FIT_JOBREALTIMETOOLBAR_H diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/Fit/ParameterTuningWidget.cpp index 5e775ca11c421af36fd272e3734ffde209d79c62..957e803e58fe8ab97d490503eec585b902bab7b7 100644 --- a/GUI/View/Fit/ParameterTuningWidget.cpp +++ b/GUI/View/Fit/ParameterTuningWidget.cpp @@ -19,16 +19,16 @@ #include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Job/JobModel.h" #include "GUI/Util/Error.h" -#include "GUI/View/Fit/JobRealTimeToolBar.h" +#include "GUI/View/Common/StyledToolBar.h" #include "GUI/View/Fit/ParameterTuningDelegate.h" #include "GUI/View/Fit/SliderSettingsWidget.h" #include "GUI/View/Info/CautionSign.h" +#include <QAction> #include <QTreeView> #include <QVBoxLayout> ParameterTuningWidget::ParameterTuningWidget(QWidget* parent) : SessionItemWidget(parent) - , m_toolBar(new JobRealTimeToolBar(this)) , m_jobModel(nullptr) , m_parameterTuningModel(nullptr) , m_sliderSettingsWidget(new SliderSettingsWidget(this)) @@ -43,10 +43,19 @@ ParameterTuningWidget::ParameterTuningWidget(QWidget* parent) m_treeView->setDragDropMode(QAbstractItemView::NoDragDrop); m_treeView->setAttribute(Qt::WA_MacShowFocusRect, false); + auto* resetValuesAction = new QAction(QIcon(":/images/undo-variant.svg"), "Reset values", this); + resetValuesAction->setToolTip("Reset parameter tree to initial values"); + connect(resetValuesAction, &QAction::triggered, this, + &ParameterTuningWidget::restoreModelsOfCurrentJobItem); + + auto* toolBar = new StyledToolBar(this); + toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + toolBar->addAction(resetValuesAction); + auto* mainLayout = new QVBoxLayout; mainLayout->setMargin(0); mainLayout->setSpacing(0); - mainLayout->addWidget(m_toolBar); + mainLayout->addWidget(toolBar); mainLayout->addWidget(m_sliderSettingsWidget); mainLayout->addWidget(m_treeView); setLayout(mainLayout); @@ -59,8 +68,6 @@ ParameterTuningWidget::ParameterTuningWidget(QWidget* parent) &ParameterTuningWidget::onCurrentLinkChanged); connect(m_treeView, &QTreeView::customContextMenuRequested, this, &ParameterTuningWidget::onCustomContextMenuRequested); - connect(m_toolBar, &JobRealTimeToolBar::resetParameters, this, - &ParameterTuningWidget::restoreModelsOfCurrentJobItem); } QItemSelectionModel* ParameterTuningWidget::selectionModel() diff --git a/GUI/View/Fit/ParameterTuningWidget.h b/GUI/View/Fit/ParameterTuningWidget.h index 4f3ff6f3b8e8dfa5d3a368baacd9866319048036..377a442869ccdebc7741e5dabfb24481a36f17a4 100644 --- a/GUI/View/Fit/ParameterTuningWidget.h +++ b/GUI/View/Fit/ParameterTuningWidget.h @@ -17,7 +17,6 @@ #include "GUI/View/Common/SessionItemWidget.h" -class JobRealTimeToolBar; class JobModel; class JobItem; class SessionItem; @@ -68,7 +67,6 @@ private: void closeActiveEditors(); void updateJobStatus(); - JobRealTimeToolBar* m_toolBar; JobModel* m_jobModel; ParameterTuningModel* m_parameterTuningModel; SliderSettingsWidget* m_sliderSettingsWidget;