FittingActivity now automatically brings FitComparisonWidget

GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp

@@ -68,6 +68,9 @@ void ItemComboWidget::registerWidget(const QString &presentationType, factory_fu
 
 void ItemComboWidget::setPresentation(const QString &presentationType)
 {
+    if(!getValidPresentationList(m_currentItem).contains(presentationType))
+        return;
+
     Q_ASSERT(m_currentItem);
 
     SessionItemWidget *widget = m_presentationTypeToWidget[presentationType];

GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp

@@ -99,6 +99,9 @@ QList<QAction *> FitComparisonWidget::actionList()
 
 void FitComparisonWidget::setJobItem(JobItem *jobItem)
 {
+    if(!jobItem->isValidForFitting())
+        return;
+
     processJobItemItem(jobItem);
     setSimulatedDataItem(jobItem->getIntensityDataItem());
 
@@ -140,6 +143,7 @@ void FitComparisonWidget::hideEvent(QHideEvent *)
 
 void FitComparisonWidget::processJobItemItem(JobItem *jobItem)
 {
+
     if(jobItem == m_currentJobItem)
         return;
 

GUI/coregui/Views/JobView.cpp

@@ -109,6 +109,7 @@ void JobView::connectActivityRelated()
     // Activity was changed: this -> JobOutputDataWidget
     connect(this, SIGNAL(activityChanged(int)),
             m_docks->jobOutputDataWidget(), SLOT(onActivityChanged(int)));
+
 }
 
 //! Connects signals related to dock layout.

GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp

@@ -20,6 +20,7 @@
 #include "ObsoleteIntensityDataWidget.h"
 #include "JobResultsPresenter.h"
 #include "JobViewFlags.h"
+#include "mainwindow_constants.h"
 #include <QVBoxLayout>
 
 JobOutputDataWidget::JobOutputDataWidget(JobModel *jobModel, QWidget *parent)
@@ -67,6 +68,14 @@ void JobOutputDataWidget::onActivityChanged(int activity)
 //        if(auto widget = currentOutputDataWidget())
 //            widget->setPropertyPanelVisible(false);
 //    }
+
+    if(auto widget = m_stackedWidget->currentWidget()) {
+        if(activity == JobViewFlags::FITTING_ACTIVITY) {
+            widget->setPresentation(Constants::FitComparisonWidgetName);
+        } else if(activity == JobViewFlags::REAL_TIME_ACTIVITY) {
+            widget->setPresentation(Constants::IntensityDataWidgetName);
+        }
+    }
 }
 
 bool JobOutputDataWidget::isValidJobItem(JobItem *item)

GUI/coregui/Views/JobWidgets/JobViewDocks.cpp

@@ -67,7 +67,6 @@ void JobViewDocks::setActivity(int activity)
 
 void JobViewDocks::setItem(JobItem *jobItem)
 {
-    qDebug()  << "AAAA" << m_dockWidgets[JobViewFlags::FIT_PANEL_DOCK]->isHidden();
     jobOutputDataWidget()->setItem(jobItem);
     jobRealTimeWidget()->setItem(jobItem);
     fitActivityPanel()->setItem(jobItem);