RealDataEditorWidget is switched to IntensityDataWidget

GUI/coregui/Views/ImportDataView.cpp

@@ -75,7 +75,9 @@ void ImportDataView::onSelectionChanged(SessionItem *item)
         RealDataEditorWidget *widget = m_stackedWidget->currentWidget();
         Q_ASSERT(widget);
         widget->setItem(item);
+        m_toolBar->addActions(widget->actionList());
     }
+
 }
 
 void ImportDataView::setupConnections()

GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp

@@ -19,22 +19,25 @@
 #include "ColorMapCanvas.h"
 #include "RealDataItem.h"
 #include "IntensityDataItem.h"
+#include "IntensityDataWidget.h"
 #include <QVBoxLayout>
 #include <QDebug>
 
 RealDataEditorWidget::RealDataEditorWidget(QWidget *parent)
-    : QWidget(parent)
-    , m_colorMap(new ColorMapCanvas(this))
+    : SessionItemWidget(parent)
+    , m_intensityWidget(new IntensityDataWidget)
+//    , m_colorMap(new ColorMapCanvas(this))
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setMargin(0);
     layout->setSpacing(0);
-    layout->addWidget(m_colorMap);
+//    layout->addWidget(m_colorMap);
+    layout->addWidget(m_intensityWidget);
     setLayout(layout);
 
-    m_colorMap->setStatusLabelEnabled(true);
+//    m_colorMap->setStatusLabelEnabled(true);
 }
 
 void RealDataEditorWidget::setItem(SessionItem *item)
@@ -42,8 +45,14 @@ void RealDataEditorWidget::setItem(SessionItem *item)
     //    m_label->setText(item->displayName());
     qDebug() << "AAAAA ->setItem";
     IntensityDataItem *intensityData = dynamic_cast<IntensityDataItem *>(item->getItem(RealDataItem::T_INTENSITY_DATA));
-    Q_ASSERT(intensityData);
-    Q_ASSERT(intensityData->getOutputData());
-    m_colorMap->setItem(intensityData);
+//    Q_ASSERT(intensityData);
+//    Q_ASSERT(intensityData->getOutputData());
+    m_intensityWidget->setItem(intensityData);
+//    m_colorMap->setItem(intensityData);
     qDebug() << "AAAAA -> done!";
 }
+
+QList<QAction *> RealDataEditorWidget::actionList()
+{
+    return m_intensityWidget->actionList();
+}

GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h

@@ -17,14 +17,15 @@
 #ifndef REALDATAEDITORWIDGET_H
 #define REALDATAEDITORWIDGET_H
 
-#include "WinDllMacros.h"
-#include <QWidget>
+#include "SessionItemWidget.h"
 
+class SessionItem;
+class IntensityDataWidget;
 class ColorMapCanvas;
 
 //! The RealDataEditorWidget class provides editing/presenation of RealDataItem in ImportDataView.
 
-class BA_CORE_API_ RealDataEditorWidget : public QWidget
+class BA_CORE_API_ RealDataEditorWidget : public SessionItemWidget
 {
     Q_OBJECT
 
@@ -36,8 +37,11 @@ public:
 
     void setItem(class SessionItem *item);
 
+    QList<QAction *> actionList();
+
 private:
-    ColorMapCanvas *m_colorMap;
+    IntensityDataWidget *m_intensityWidget;
+//    ColorMapCanvas *m_colorMap;
 };
 
 #endif

GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp

@@ -38,6 +38,8 @@ IntensityDataWidget::IntensityDataWidget(QWidget *parent)
     setLayout(layout);
 
     m_colorMap->setStatusLabelEnabled(true);
+
+    initActions();
 }
 
 void IntensityDataWidget::setItem(SessionItem *item)
@@ -68,7 +70,6 @@ void IntensityDataWidget::onSavePlotAction()
     QString dirname = AppSvc::projectManager()->userExportDir();
     SavePlotAssistant saveAssistant;
     saveAssistant.savePlot(dirname, m_colorMap->customPlot(), m_currentItem);
-
 }
 
 void IntensityDataWidget::initActions()
@@ -83,7 +84,6 @@ void IntensityDataWidget::initActions()
     m_savePlotAction->setText("Save");
     m_savePlotAction->setIcon(QIcon(":/images/toolbar16light_save.svg"));
     m_savePlotAction->setToolTip("Save Plot");
-    connect(m_savePlotAction, SIGNAL(triggered()), this, SIGNAL(savePlot()));
-
+    connect(m_savePlotAction, SIGNAL(triggered()), this, SLOT(onSavePlotAction()));
 }