New DetectorMaskDelegate is introduced

GUI/coregui/Models/DetectorItems.cpp

@@ -26,6 +26,13 @@ DetectorItem::DetectorItem(ParameterizedItem *parent)
 {
     setItemName(Constants::DetectorType);
     registerGroupProperty(P_DETECTOR, Constants::DetectorGroup);
+
+    addToValidChildren(Constants::RectangleMaskType);
+    addToValidChildren(Constants::PolygonMaskType);
+    addToValidChildren(Constants::EllipseMaskType);
+    addToValidChildren(Constants::VerticalLineMaskType);
+    addToValidChildren(Constants::HorizontalLineMaskType);
+    addToValidChildren(Constants::MaskAllType);
 }
 
 // -------------------------------------------------------------------------- //

GUI/coregui/Views/InstrumentView.cpp

@@ -166,9 +166,10 @@ void InstrumentView::onRowsAboutToBeRemoved(QModelIndex parent, int first, int /
     delete widget;
 }
 
-void InstrumentView::onExtendedDetectorEditorRequest(DetectorItem *)
+void InstrumentView::onExtendedDetectorEditorRequest(DetectorItem *detectorItem)
 {
     ExtendedDetectorDialog *dialog = new ExtendedDetectorDialog(this);
+    dialog->setDetectorItem(detectorItem);
     dialog->show();
 }
 

GUI/coregui/Views/InstrumentView.h

@@ -52,7 +52,7 @@ public slots:
     void onAddInstrument();
     void onRemoveInstrument();
     void onRowsAboutToBeRemoved(QModelIndex,int,int);
-    void onExtendedDetectorEditorRequest(DetectorItem *);
+    void onExtendedDetectorEditorRequest(DetectorItem *detectorItem);
 
 private:
     void setupConnections();

GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp

+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+//! @brief     Implements class DetectorMaskDelegate
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
+#include "DetectorMaskDelegate.h"
+#include "InstrumentModel.h"
+#include "MaskModel.h"
+#include "DetectorItems.h"
+#include "IntensityDataItem.h"
+#include "OutputData.h"
+#include "AxesItems.h"
+#include <QDebug>
+
+DetectorMaskDelegate::DetectorMaskDelegate(QObject *parent)
+    : QObject(parent)
+    , m_maskModel(0)
+    , m_detectorItem(0)
+{
+
+}
+
+void DetectorMaskDelegate::setDetectorItem(DetectorItem *detectorItem)
+{
+    m_detectorItem = detectorItem;
+    init_mask_model();
+}
+
+
+MaskModel *DetectorMaskDelegate::getMaskModel()
+{
+    return m_maskModel;
+}
+
+
+void DetectorMaskDelegate::init_mask_model()
+{
+    delete m_maskModel;
+    m_maskModel = new MaskModel(this);
+
+    IntensityDataItem *intensityItem = dynamic_cast<IntensityDataItem *>(
+        m_maskModel->insertNewItem(Constants::IntensityDataType));
+    Q_ASSERT(intensityItem);
+
+    intensityItem->setOutputData(createOutputData(m_detectorItem));
+}
+
+OutputData<double> *DetectorMaskDelegate::createOutputData(DetectorItem *detectorItem)
+{
+    OutputData<double> *result = new OutputData<double>;
+
+
+    auto subDetector = detectorItem->getSubItems()[DetectorItem::P_DETECTOR];
+    Q_ASSERT(subDetector);
+
+
+    Q_ASSERT(subDetector->modelType() == Constants::SphericalDetectorType);
+
+    auto x_axis = dynamic_cast<BasicAxisItem *>(
+         subDetector->getSubItems()[PhiAlphaDetectorItem::P_PHI_AXIS]);
+    Q_ASSERT(x_axis);
+    int n_x = x_axis->getRegisteredProperty(BasicAxisItem::P_NBINS).toInt();
+    double x_min
+        = Units::deg2rad(x_axis->getRegisteredProperty(BasicAxisItem::P_MIN).toDouble());
+    double x_max
+        = Units::deg2rad(x_axis->getRegisteredProperty(BasicAxisItem::P_MAX).toDouble());
+
+    auto y_axis = dynamic_cast<BasicAxisItem *>(
+        subDetector->getSubItems()[PhiAlphaDetectorItem::P_ALPHA_AXIS]);
+    Q_ASSERT(y_axis);
+    int n_y = y_axis->getRegisteredProperty(BasicAxisItem::P_NBINS).toInt();
+    double y_min
+        = Units::deg2rad(y_axis->getRegisteredProperty(BasicAxisItem::P_MIN).toDouble());
+    double y_max
+        = Units::deg2rad(y_axis->getRegisteredProperty(BasicAxisItem::P_MAX).toDouble());
+
+
+    result->addAxis("x", n_x, x_min, x_max);
+    result->addAxis("y", n_y, y_min, y_max);
+
+
+    return result;
+
+}

GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h

+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
+//! @brief     Defines class DetectorMaskDelegate
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2015
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
+#ifndef DETECTORMASKDELEGATE_H
+#define DETECTORMASKDELEGATE_H
+
+#include "WinDllMacros.h"
+#include <QObject>
+#include <QModelIndex>
+
+template <class T> class OutputData;
+
+class MaskModel;
+class DetectorItem;
+
+//! The DetectorMaskDelegate class provides syncronization between DetectorItem (defined
+//! in InstrumentModel) and temporary IntensityDataItem (defined in temporary SessionModel).
+//! The later one is used by MaskEditor for mask drawing.
+
+class BA_CORE_API_ DetectorMaskDelegate : public QObject
+{
+    Q_OBJECT
+public:
+    DetectorMaskDelegate(QObject *parent);
+
+    void setDetectorItem(DetectorItem *detectorItem);
+
+    MaskModel *getMaskModel();
+
+private:
+    void init_mask_model();
+    OutputData<double> *createOutputData(DetectorItem *detectorItem);
+
+    MaskModel *m_maskModel;
+    QModelIndex m_intensityItemIndex;
+
+    DetectorItem *m_detectorItem;
+};
+
+
+#endif
+

GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp

@@ -15,13 +15,16 @@
 
 #include "ExtendedDetectorDialog.h"
 #include "MaskEditor.h"
-#include "SessionModel.h"
+#include "MaskModel.h"
+#include "DetectorMaskDelegate.h"
 #include <QPushButton>
+#include <QModelIndex>
 #include <QVBoxLayout>
 
 ExtendedDetectorDialog::ExtendedDetectorDialog(QWidget *parent)
     : QDialog(parent)
     , m_maskEditor(new MaskEditor)
+    , m_detectorMaskDelegate(new DetectorMaskDelegate(this))
 {
     setMinimumSize(256, 256);
     resize(800, 600);
@@ -46,11 +49,12 @@ ExtendedDetectorDialog::ExtendedDetectorDialog(QWidget *parent)
     layout->setContentsMargins(0, 0, 0, 0);
     setLayout(layout);
 
-    m_maskEditor->init_test_model();
+//    m_maskEditor->init_test_model();
 
 }
 
-void ExtendedDetectorDialog::setModel(SessionModel *model, const QModelIndex &rootIndex)
+void ExtendedDetectorDialog::setDetectorItem(DetectorItem *detectorItem)
 {
-    m_maskEditor->setModel(model, rootIndex);
+    m_detectorMaskDelegate->setDetectorItem(detectorItem);
+    m_maskEditor->setModel(m_detectorMaskDelegate->getMaskModel());
 }

GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h

@@ -19,10 +19,11 @@
 #include <QDialog>
 
 class MaskEditor;
-class SetModel;
-class SessionModel;
+class DetectorItem;
+class DetectorMaskDelegate;
+
+//! The dialog which shows a MaskEditor
 
-//! The dialog which shows an editor to change parameters of DistributionItem
 class ExtendedDetectorDialog : public QDialog
 {
     Q_OBJECT
@@ -32,10 +33,11 @@ public:
     virtual ~ExtendedDetectorDialog(){}
 
 public slots:
-    void setModel(SessionModel *model, const QModelIndex &rootIndex);
+    void setDetectorItem(DetectorItem *detectorItem);
 
 private:
     MaskEditor *m_maskEditor;
+    DetectorMaskDelegate *m_detectorMaskDelegate;
 };
 
 #endif

GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp

@@ -71,9 +71,9 @@ void InstrumentSelectorWidget::setInstrumentModel(InstrumentModel *model)
             m_listView->setModel(model);
 
             connect(m_listView->selectionModel(),
-                    SIGNAL( selectionChanged(const QItemSelection&, const QItemSelection&) ),
+                    SIGNAL( selectionChanged(const QItemSelection&, const QItemSelection&)),
                     this,
-                    SIGNAL( selectionChanged(const QItemSelection&, const QItemSelection&) ),
+                    SIGNAL( selectionChanged(const QItemSelection&, const QItemSelection&)),
                     Qt::UniqueConnection
             );
         }

GUI/coregui/Views/MaskWidgets/MaskEditor.cpp

@@ -57,12 +57,20 @@ MaskEditor::MaskEditor(QWidget *parent)
 
 void MaskEditor::setModel(SessionModel *model, const QModelIndex &rootIndex)
 {
-    m_editorPropertyPanel->setModel(model, rootIndex);
+    QModelIndex intensityItemIndex = rootIndex;
+    if(!intensityItemIndex.isValid()) {
+        if(ParameterizedItem *intensityItem = model->getTopItem(Constants::IntensityDataType)) {
+            intensityItemIndex = model->indexOfItem(intensityItem);
+        }
+    }
+    Q_ASSERT(intensityItemIndex.isValid());
 
-    m_editorCanvas->setModel(model, rootIndex);
+    m_editorPropertyPanel->setModel(model, intensityItemIndex);
+
+    m_editorCanvas->setModel(model, intensityItemIndex);
     m_editorCanvas->setSelectionModel(m_editorPropertyPanel->selectionModel());
 
-    m_itemActions->setModel(model, rootIndex);
+    m_itemActions->setModel(model, intensityItemIndex);
     m_itemActions->setSelectionModel(m_editorPropertyPanel->selectionModel());
 }
 
@@ -135,7 +143,8 @@ void MaskEditor::init_test_model()
 
 //    MaskAllItem *rect = dynamic_cast<MaskAllItem *>(m_maskModel->insertNewItem(Constants::MaskAllType, m_maskModel->indexOfItem(item)));
 
-    setModel(maskModel, maskModel->indexOfItem(item));
+//    setModel(maskModel, maskModel->indexOfItem(item));
+    setModel(maskModel);
 }
 
 void MaskEditor::setup_connections()

GUI/coregui/Views/MaskWidgets/MaskEditor.h

@@ -19,6 +19,7 @@
 #include "WinDllMacros.h"
 #include <QWidget>
 #include <QMainWindow>
+#include <QModelIndex>
 
 class MaskEditorPropertyPanel;
 class MaskEditorActions;
@@ -36,7 +37,7 @@ public:
     MaskEditor(QWidget *parent = 0);
 
 public slots:
-    void setModel(SessionModel *model, const QModelIndex &rootIndex);
+    void setModel(SessionModel *model, const QModelIndex &rootIndex = QModelIndex());
     void onPropertyPanelRequest();
     void init_test_model();
 

GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp

@@ -116,6 +116,7 @@ OutputData<double> *MaskResultsPresenter::createMaskPresentation() const
     IntensityDataItem *origItem
         = dynamic_cast<IntensityDataItem *>(m_maskModel->itemForIndex(m_rootIndex));
     Q_ASSERT(origItem);
+    Q_ASSERT(origItem->getOutputData());
 
     OutputData<double> *result = origItem->getOutputData()->clone();