RealDataEditorWidget -> IntensityDataWidget

GUI/coregui/Views/ImportDataView.h

@@ -18,7 +18,6 @@
 #define IMPORTDATAVIEW_H
 
 #include "ItemStackPresenter.h"
-#include "RealDataEditorWidget.h"
 #include "RealDataMaskWidget.h"
 
 class ImportDataToolBar;
@@ -45,7 +44,6 @@ private:
     Manhattan::MiniSplitter *m_splitter;
     RealDataSelectorWidget *m_selectorWidget;
     ItemStackPresenter<RealDataMaskWidget> *m_stackedWidget;
-//    ItemStackPresenter<RealDataEditorWidget> *m_stackedWidget;
     RealDataModel *m_realDataModel;
 };
 

GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp → GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
-//! @brief     Declares class RealDataEditorWidget
+//! @file      GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
+//! @brief     Implements class IntensityDataWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -14,7 +14,7 @@
 //
 // ************************************************************************** //
 
-#include "RealDataEditorWidget.h"
+#include "IntensityDataWidget.h"
 #include "IntensityDataItem.h"
 #include "IntensityDataPropertyWidget.h"
 #include "IntensityDataCanvas.h"
@@ -23,7 +23,7 @@
 #include <QAction>
 #include <QBoxLayout>
 
-RealDataEditorWidget::RealDataEditorWidget(QWidget *parent)
+IntensityDataWidget::IntensityDataWidget(QWidget *parent)
     : SessionItemWidget(parent)
     , m_intensityWidget(new IntensityDataCanvas)
     , m_propertyWidget(new IntensityDataPropertyWidget)
@@ -46,14 +46,14 @@ RealDataEditorWidget::RealDataEditorWidget(QWidget *parent)
 
 }
 
-void RealDataEditorWidget::setItem(SessionItem *item)
+void IntensityDataWidget::setItem(SessionItem *item)
 {
-    IntensityDataItem *intensityData = dynamic_cast<IntensityDataItem *>(item->getItem(RealDataItem::T_INTENSITY_DATA));
+    IntensityDataItem *intensityData = dynamic_cast<IntensityDataItem *>(item);
     m_intensityWidget->setItem(intensityData);
     m_propertyWidget->setItem(intensityData);
 }
 
-QList<QAction *> RealDataEditorWidget::actionList()
+QList<QAction *> IntensityDataWidget::actionList()
 {
     return m_intensityWidget->actionList() + m_propertyWidget->actionList();
 }

GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h → GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h
-//! @brief     Defines class RealDataEditorWidget
+//! @file      GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
+//! @brief     Defines class IntensityDataWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -14,8 +14,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALDATAEDITORWIDGET_H
-#define REALDATAEDITORWIDGET_H
+#ifndef INTENSITYDATAWIDGET_H
+#define INTENSITYDATAWIDGET_H
 
 #include "SessionItemWidget.h"
 
@@ -25,26 +25,24 @@ class IntensityDataPropertyWidget;
 class IntensityDataItem;
 class QAction;
 
-//! The RealDataEditorWidget class provides editing/presenation of RealDataItem in ImportDataView.
+//! A common widget to display color map (IntensityDataCanvas) and properties
+//! (IntensityDataPropertyWidget) of intensity data item.
 
-class BA_CORE_API_ RealDataEditorWidget : public SessionItemWidget
+class BA_CORE_API_ IntensityDataWidget : public SessionItemWidget
 {
     Q_OBJECT
 
 public:
-    RealDataEditorWidget(QWidget *parent = 0);
+    IntensityDataWidget(QWidget* parent = 0);
 
-//    QSize sizeHint() const { return QSize(200, 400); }
-//    QSize minimumSizeHint() const { return QSize(200, 200); }
+    void setItem(SessionItem* item);
 
-    void setItem(class SessionItem *item);
-
-    QList<QAction *> actionList();
+    QList<QAction*> actionList();
 
 private:
-    IntensityDataCanvas *m_intensityWidget;
-    IntensityDataPropertyWidget *m_propertyWidget;
-    IntensityDataItem *m_currentItem;
+    IntensityDataCanvas* m_intensityWidget;
+    IntensityDataPropertyWidget* m_propertyWidget;
+    IntensityDataItem* m_currentItem;
 };
 
-#endif // REALDATAEDITORWIDGET_H
+#endif // INTENSITYDATAWIDGET_H