DataPropertyWidget: class added

GUI/View/Plot2D/IntensityDataPropertyWidget.cpp

@@ -30,14 +30,13 @@
 
 IntensityDataPropertyWidget::IntensityDataPropertyWidget(QWidget* parent)
     : DataAccessWidget(parent)
-    , parent(parent)
 {
     setWindowTitle("Properties");
     setAttribute(Qt::WA_StyledBackground, true);
     setProperty("stylable", true); // for stylesheet addressing
 
     m_mainLayout = new QFormLayout(this);
-    m_mainLayout->setContentsMargins(8, 8, 8, 8);
+    m_mainLayout->setContentsMargins(8, 20, 8, 8);
     m_mainLayout->setSpacing(5);
 }
 

GUI/View/Plot2D/IntensityDataPropertyWidget.h

@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_PLOTUTIL_INTENSITYDATAPROPERTYWIDGET_H
-#define BORNAGAIN_GUI_VIEW_PLOTUTIL_INTENSITYDATAPROPERTYWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATAPROPERTYWIDGET_H
+#define BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATAPROPERTYWIDGET_H
 
 #include "GUI/View/Common/DataAccessWidget.h"
 
@@ -37,10 +37,8 @@ private:
     void updateItemCoords(DataItem* item);
     void updateUIValues();
 
-    QWidget* parent;
-    QVector<IntensityDataItem*> m_items;
     QFormLayout* m_mainLayout;
     QList<function<void()>> m_updaters;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_PLOTUTIL_INTENSITYDATAPROPERTYWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATAPROPERTYWIDGET_H

GUI/View/Plot2D/IntensityDataWidget.cpp

@@ -23,7 +23,7 @@
 
 IntensityDataWidget::IntensityDataWidget(QWidget* parent)
     : DataAccessWidget(parent)
-    , m_intensityCanvas(new IntensityDataCanvas)
+    , m_intensityCanvas(new IntensityDataCanvas(this))
     , m_propertyWidget(new IntensityDataPropertyWidget(this))
     , m_fftPresenter(new IntensityDataFFTPresenter(this))
 {

GUI/View/PlotSpecular/SpecularDataPropertyWidget.h

@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_SPECULARDATAPROPERTYWIDGET_H
-#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_SPECULARDATAPROPERTYWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_PLOTSPECULAR_SPECULARDATAPROPERTYWIDGET_H
+#define BORNAGAIN_GUI_VIEW_PLOTSPECULAR_SPECULARDATAPROPERTYWIDGET_H
 
 #include "GUI/View/Common/DataAccessWidget.h"
 #include <functional>
@@ -44,4 +44,4 @@ private:
     QList<function<void()>> m_updaters;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_SPECULARDATAPROPERTYWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_PLOTSPECULAR_SPECULARDATAPROPERTYWIDGET_H

GUI/View/PlotUtil/DataPropertyWidget.cpp

+#include "GUI/View/PlotUtil/DataPropertyWidget.h"
+#include "GUI/Model/Data/DataItem.h"
+#include <QFormLayout>
+
+DataPropertyWidget::DataPropertyWidget(QWidget* parent)
+    : DataAccessWidget(parent)
+{
+    setWindowTitle("Properties");
+    setAttribute(Qt::WA_StyledBackground, true);
+    setProperty("stylable", true); // for stylesheet addressing
+
+    m_mainLayout = new QFormLayout(this);
+    m_mainLayout->setContentsMargins(8, 20, 8, 8);
+    m_mainLayout->setSpacing(5);
+}
+
+void DataPropertyWidget::setJobOrRealItem(JobRealBase* job_or_real_Item)
+{
+    DataAccessWidget::setJobOrRealItem(job_or_real_Item);
+    createPanelElements();
+}
+
+void DataPropertyWidget::updateItemCoords(DataItem* item)
+{
+    // TODO change units for real item with linked instrument
+    if (!item || !jobItem())
+        return;
+
+//    InstrumentItem* instrument;
+//    if(jobItem())
+//        instrument = jobItem()->instrumentItem();
+//    else if(realItem())
+//        instrument = gSessionData->instrumentLibrary.collectedItems()
+//                ->findInstrumentById(realItem()->instrumentId());
+//    if(instrument) {
+        item->blockSignals(true);
+        item->updateCoords(jobItem()->instrumentItem());
+        item->blockSignals(false);
+        emit item->axesUnitsReplotRequested();
+//    }
+}
+
+void DataPropertyWidget::updateUIValues()
+{
+    for (const auto& updater : m_updaters)
+        updater();
+}

GUI/View/PlotUtil/DataPropertyWidget.h

+//  ************************************************************************************************
+//
+//  BornAgain: simulate and fit reflection and scattering
+//
+//! @file      GUI/View/PlotUtil/IntensityDataPropertyWidget.h
+//! @brief     Defines class IntensityDataPropertyWidget
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2022
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+//  ************************************************************************************************
+
+#ifndef BORNAGAIN_GUI_VIEW_PLOTUTIL_DATAPROPERTYWIDGET_H
+#define BORNAGAIN_GUI_VIEW_PLOTUTIL_DATAPROPERTYWIDGET_H
+
+#include "GUI/View/Common/DataAccessWidget.h"
+
+class QFormLayout;
+
+using std::function;
+
+class DataPropertyWidget : public DataAccessWidget {
+    Q_OBJECT
+public:
+    explicit DataPropertyWidget(QWidget* parent = nullptr);
+
+    void setJobOrRealItem(JobRealBase* job_or_real_Item) override;
+
+protected:
+    void updateItemCoords(DataItem* item);
+    void updateUIValues();
+    virtual void createPanelElements() = 0;
+
+    QFormLayout* m_mainLayout;
+    QList<function<void()>> m_updaters;
+};
+
+#endif // BORNAGAIN_GUI_VIEW_PLOTUTIL_DATAPROPERTYWIDGET_H