JobRealTimeToolBar moved to ParameterTuningWidget

GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp

@@ -17,17 +17,19 @@
 #include "JobRealTimeToolBar.h"
 #include <QToolButton>
 
-//! main tool bar on top of SampleView window
-JobRealTimeToolBar::JobRealTimeToolBar(QWidget *parent)
+JobRealTimeToolBar::JobRealTimeToolBar(QWidget* parent)
     : StyledToolBar(parent)
-    , m_resetParametersButton(0)
+    , m_resetParametersButton(new QToolButton)
 {
-    m_resetParametersButton = new QToolButton;
-    m_resetParametersButton->setText("Reset Values");
+    setMinimumSize(25, 25);
+
+    m_resetParametersButton->setText("Reset values");
     m_resetParametersButton->setIcon(QIcon(":/images/toolbar16light_refresh.svg"));
     m_resetParametersButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     m_resetParametersButton->setToolTip("Reset parameter tree to initial values");
-    connect(m_resetParametersButton, SIGNAL(clicked()), this, SIGNAL(resetParameters()));
     addWidget(m_resetParametersButton);
+
+    connect(m_resetParametersButton, &QToolButton::clicked,
+            this, &JobRealTimeToolBar::resetParameters);
 }
 

GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h

@@ -19,20 +19,22 @@
 
 #include "StyledToolBar.h"
 
-//! The JobRealTimeToolBar class represents a toolbar with buttons for JobRealTimeWidget.
+class QToolButton;
+
+//! Represents a toolbar with buttons for ParameterTuningWidget.
 
 class BA_CORE_API_ JobRealTimeToolBar : public StyledToolBar
 {
     Q_OBJECT
 
 public:
-    explicit JobRealTimeToolBar(QWidget *parent = 0);
+    explicit JobRealTimeToolBar(QWidget *parent = nullptr);
 
 signals:
     void resetParameters();
 
 private:
-    class QToolButton *m_resetParametersButton;
+    QToolButton* m_resetParametersButton;
 };
 
 #endif // JOBREALTIMETOOLBAR_H

GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp

@@ -24,7 +24,6 @@
 
 JobRealTimeWidget::JobRealTimeWidget(JobModel *jobModel, QWidget *parent)
     : QWidget(parent)
-    , m_toolBar(new JobRealTimeToolBar)
     , m_stackedWidget(new ItemStackPresenter<ParameterTuningWidget>)
 {
     setWindowTitle(Constants::JobRealTimeWidgetName);
@@ -34,13 +33,11 @@ JobRealTimeWidget::JobRealTimeWidget(JobModel *jobModel, QWidget *parent)
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);
 
-    mainLayout->addWidget(m_toolBar);
     mainLayout->addWidget(m_stackedWidget);
 
     setLayout(mainLayout);
 
     m_stackedWidget->setModel(jobModel);
-    connect(m_toolBar, SIGNAL(resetParameters()), this, SLOT(onResetParameters()));
 }
 
 ParameterTuningWidget *JobRealTimeWidget::parameterTuningWidget(JobItem *jobItem)
@@ -75,17 +72,6 @@ void JobRealTimeWidget::setItem(JobItem * jobItem)
     }
 }
 
-void JobRealTimeWidget::onResetParameters()
-{
-    if(auto widget = currentParameterTuningWidget())
-        widget->restoreModelsOfCurrentJobItem();
-}
-
-ParameterTuningWidget *JobRealTimeWidget::currentParameterTuningWidget()
-{
-    return m_stackedWidget->currentWidget();
-}
-
 //! Returns true if JobItem is valid for real time simulation.
 
 bool JobRealTimeWidget::isValidJobItem(JobItem *item)

GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h

@@ -39,13 +39,10 @@ public:
 
 public slots:
     void setItem(JobItem *jobItem);
-    void onResetParameters();
 
 private:
-    ParameterTuningWidget *currentParameterTuningWidget();
     bool isValidJobItem(JobItem *item);
 
-    class JobRealTimeToolBar *m_toolBar;
     ItemStackPresenter<ParameterTuningWidget> *m_stackedWidget;
 };
 

GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp

@@ -17,6 +17,7 @@
 #include "ParameterTuningWidget.h"
 #include "DesignerHelper.h"
 #include "GUIHelpers.h"
+#include "JobRealTimeToolBar.h"
 #include "InstrumentModel.h"
 #include "IntensityDataItem.h"
 #include "JobItem.h"
@@ -41,6 +42,7 @@
 
 ParameterTuningWidget::ParameterTuningWidget(QWidget *parent)
     : QWidget(parent)
+    , m_toolBar(new JobRealTimeToolBar(this))
     , m_jobModel(0)
     , m_currentJobItem(0)
     , m_parameterTuningModel(0)
@@ -71,6 +73,7 @@ ParameterTuningWidget::ParameterTuningWidget(QWidget *parent)
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);
+    mainLayout->addWidget(m_toolBar);
     mainLayout->addWidget(m_sliderSettingsWidget);
     mainLayout->addWidget(m_treeView);
     setLayout(mainLayout);
@@ -83,6 +86,7 @@ ParameterTuningWidget::ParameterTuningWidget(QWidget *parent)
             this, SLOT(onCurrentLinkChanged(SessionItem*)));
     connect(m_treeView, SIGNAL(customContextMenuRequested(const QPoint &)),
             this, SLOT(onCustomContextMenuRequested(const QPoint &)));
+    connect(m_toolBar, SIGNAL(resetParameters()), this, SLOT(restoreModelsOfCurrentJobItem()));
 }
 
 void ParameterTuningWidget::setItem(JobItem *item)

GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h

@@ -20,6 +20,7 @@
 #include <QWidget>
 #include <memory>
 
+class JobRealTimeToolBar;
 class JobModel;
 class JobItem;
 class SessionItem;
@@ -69,6 +70,7 @@ private:
     void setTuningDelegateEnabled(bool enabled);
     void closeActiveEditors();
 
+    JobRealTimeToolBar *m_toolBar;
     JobModel *m_jobModel;
     JobItem *m_currentJobItem;
     ParameterTuningModel *m_parameterTuningModel;