IntensityDataCanvas is switched to NewSessionItemWidget

GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp

@@ -26,7 +26,7 @@
 #include <QMouseEvent>
 
 IntensityDataCanvas::IntensityDataCanvas(QWidget *parent)
-    : SessionItemWidget(parent)
+    : NewSessionItemWidget(parent)
     , m_colorMap(new ColorMapCanvas(this))
     , m_resetViewAction(nullptr)
     , m_savePlotAction(nullptr)
@@ -47,10 +47,10 @@ IntensityDataCanvas::IntensityDataCanvas(QWidget *parent)
             this, SLOT(onMousePress(QMouseEvent*)), Qt::UniqueConnection);
 }
 
-void IntensityDataCanvas::setItem(SessionItem* item)
+void IntensityDataCanvas::setItem(SessionItem* intensityItem)
 {
-    IntensityDataItem* intensityItem = dynamic_cast<IntensityDataItem*>(item);
-    setIntensityData(intensityItem);
+    NewSessionItemWidget::setItem(intensityItem);
+    m_colorMap->setItem(intensityDataItem());
 }
 
 QSize IntensityDataCanvas::sizeHint() const
@@ -70,14 +70,14 @@ QList<QAction*> IntensityDataCanvas::actionList()
 
 void IntensityDataCanvas::onResetViewAction()
 {
-    m_currentItem->resetView();
+    intensityDataItem()->resetView();
 }
 
 void IntensityDataCanvas::onSavePlotAction()
 {
     QString dirname = AppSvc::projectManager()->userExportDir();
     SavePlotAssistant saveAssistant;
-    saveAssistant.savePlot(dirname, m_colorMap->customPlot(), m_currentItem);
+    saveAssistant.savePlot(dirname, m_colorMap->customPlot(), intensityDataItem());
 }
 
 void IntensityDataCanvas::onMousePress(QMouseEvent* event)
@@ -86,10 +86,11 @@ void IntensityDataCanvas::onMousePress(QMouseEvent* event)
         emit customContextMenuRequested(event->globalPos());
 }
 
-void IntensityDataCanvas::setIntensityData(IntensityDataItem* intensityItem)
+IntensityDataItem* IntensityDataCanvas::intensityDataItem()
 {
-    m_currentItem = intensityItem;
-    m_colorMap->setItem(intensityItem);
+    IntensityDataItem* result = dynamic_cast<IntensityDataItem*>(currentItem());
+    Q_ASSERT(result);
+    return result;
 }
 
 void IntensityDataCanvas::initActions()

GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h

@@ -27,13 +27,13 @@ class QAction;
 //! The IntensityDataCanvas class represents IntensityDataItem as color map,
 //! provides standard actions (reset view, save as) for external toolbars and context menus.
 
-class BA_CORE_API_ IntensityDataCanvas : public SessionItemWidget
+class BA_CORE_API_ IntensityDataCanvas : public NewSessionItemWidget
 {
     Q_OBJECT
 public:
     explicit IntensityDataCanvas(QWidget* parent = 0);
 
-    void setItem(SessionItem* item);
+    void setItem(SessionItem* intensityItem);
 
     QSize sizeHint() const;
     QSize minimumSizeHint() const;
@@ -46,11 +46,10 @@ public slots:
     void onMousePress(QMouseEvent *event);
 
 private:
-    void setIntensityData(IntensityDataItem* intensityItem);
+    IntensityDataItem* intensityDataItem();
     void initActions();
 
     ColorMapCanvas* m_colorMap;
-    IntensityDataItem* m_currentItem;
     QAction* m_resetViewAction;
     QAction* m_savePlotAction;
 };