+ class OffspecDetectorEditor

GUI/View/Instrument/DetectorEditor.cpp

@@ -45,21 +45,6 @@ DetectorEditor::DetectorEditor(QWidget* parent, GISASInstrumentItem* instrument)
     createDetectorWidgets();
 }
 
-DetectorEditor::DetectorEditor(QWidget* parent, OffspecInstrumentItem* instrument)
-    : QGroupBox("Detector parameters", parent)
-    , m_instrument(instrument)
-{
-    ASSERT(instrument);
-    m_formLayout = new QFormLayout(this);
-
-    auto* collapser = GroupBoxCollapser::installIntoGroupBox(this);
-    collapser->setExpanded(instrument->isExpandDetector());
-    connect(collapser, &GroupBoxCollapser::toggled, this,
-            [instrument](bool b) { instrument->setExpandDetector(b); });
-
-    createDetectorWidgets();
-}
-
 void DetectorEditor::createDetectorWidgets()
 {
     while (m_formLayout->rowCount() > 1)

GUI/View/Instrument/DetectorEditor.h

@@ -19,7 +19,6 @@
 
 class Instrument2DItem;
 class GISASInstrumentItem;
-class OffspecInstrumentItem;
 class QFormLayout;
 
 //! Contains stack of detector editors and the logic to show proper editor for certain type
@@ -30,7 +29,6 @@ class DetectorEditor : public QGroupBox {
 
 public:
     DetectorEditor(QWidget* parent, GISASInstrumentItem* item);
-    DetectorEditor(QWidget* parent, OffspecInstrumentItem* item);
 
 signals:
     void dataChanged();
@@ -38,7 +36,7 @@ signals:
 private:
     void createDetectorWidgets();
 
-    Instrument2DItem* m_instrument;
+    GISASInstrumentItem* m_instrument;
     QFormLayout* m_formLayout;
 };
 

GUI/View/Instrument/OffspecDetectorEditor.cpp

+//  ************************************************************************************************
+//
+//  BornAgain: simulate and fit reflection and scattering
+//
+//! @file      GUI/View/Instrument/OffspecDetectorEditor.cpp
+//! @brief     Implements class DetectorEditor
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+//  ************************************************************************************************
+
+#include "GUI/View/Instrument/OffspecDetectorEditor.h"
+#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RectangularDetectorItem.h"
+#include "GUI/Model/Device/SphericalDetectorItem.h"
+#include "GUI/View/Instrument/RectangularDetectorEditor.h"
+#include "GUI/View/Instrument/SphericalDetectorEditor.h"
+#include "GUI/View/Tool/GroupBoxCollapser.h"
+#include "GUI/View/Tool/WidgetUtils.h"
+#include <QFormLayout>
+
+
+OffspecDetectorEditor::OffspecDetectorEditor(QWidget* parent, OffspecInstrumentItem* instrument)
+    : QGroupBox("Detector parameters", parent)
+    , m_instrument(instrument)
+{
+    ASSERT(instrument);
+    m_formLayout = new QFormLayout(this);
+
+    auto* collapser = GroupBoxCollapser::installIntoGroupBox(this);
+    collapser->setExpanded(instrument->isExpandDetector());
+    connect(collapser, &GroupBoxCollapser::toggled, this,
+            [instrument](bool b) { instrument->setExpandDetector(b); });
+
+    createDetectorWidgets();
+}
+
+void OffspecDetectorEditor::createDetectorWidgets()
+{
+    while (m_formLayout->rowCount() > 1)
+        m_formLayout->removeRow(1);
+
+    SphericalDetectorItem* detectorItem = m_instrument->detectorItem();
+    auto* editor = new SphericalDetectorEditor(this, detectorItem);
+    m_formLayout->addRow(editor);
+    connect(editor, &SphericalDetectorEditor::dataChanged, this,
+            &OffspecDetectorEditor::dataChanged);
+}

GUI/View/Instrument/OffspecDetectorEditor.h

+//  ************************************************************************************************
+//
+//  BornAgain: simulate and fit reflection and scattering
+//
+//! @file      GUI/View/Instrument/OffspecDetectorEditor.h
+//! @brief     Defines class DetectorEditor
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+//  ************************************************************************************************
+
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_OFFSPECDETECTOREDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENT_OFFSPECDETECTOREDITOR_H
+
+#include <QGroupBox>
+
+class Instrument2DItem;
+class OffspecInstrumentItem;
+class QFormLayout;
+
+//! Contains stack of detector editors and the logic to show proper editor for certain type
+//! of detector item (SphericalDetectorEditor or RectangularDetectorEditor).
+
+class OffspecDetectorEditor : public QGroupBox {
+    Q_OBJECT
+
+public:
+    OffspecDetectorEditor(QWidget* parent, OffspecInstrumentItem* item);
+
+signals:
+    void dataChanged();
+
+private:
+    void createDetectorWidgets();
+
+    OffspecInstrumentItem* m_instrument;
+    QFormLayout* m_formLayout;
+};
+
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_OFFSPECDETECTOREDITOR_H

GUI/View/Instrument/OffspecInstrumentEditor.cpp

@@ -14,8 +14,8 @@
 
 #include "GUI/View/Instrument/OffspecInstrumentEditor.h"
 #include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/View/Instrument/DetectorEditor.h"
 #include "GUI/View/Instrument/OffspecBeamEditor.h"
+#include "GUI/View/Instrument/OffspecDetectorEditor.h"
 #include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
 
 #include <QVBoxLayout>
@@ -30,7 +30,7 @@ OffspecInstrumentEditor::OffspecInstrumentEditor(QWidget* parent, OffspecInstrum
     auto* beamEditor = new OffspecBeamEditor(this, instrument);
     layout->addWidget(beamEditor);
 
-    auto* detectorEditor = new DetectorEditor(this, instrument);
+    auto* detectorEditor = new OffspecDetectorEditor(this, instrument);
     layout->addWidget(detectorEditor);
 
     auto* polMatricesAnalysisEditor = new PolarizationAnalysisEditor(this, instrument);
@@ -40,7 +40,7 @@ OffspecInstrumentEditor::OffspecInstrumentEditor(QWidget* parent, OffspecInstrum
 
     connect(beamEditor, &OffspecBeamEditor::dataChanged, this,
             &OffspecInstrumentEditor::dataChanged);
-    connect(detectorEditor, &DetectorEditor::dataChanged, this,
+    connect(detectorEditor, &OffspecDetectorEditor::dataChanged, this,
             &OffspecInstrumentEditor::dataChanged);
     connect(polMatricesAnalysisEditor, &PolarizationAnalysisEditor::dataChanged, this,
             &OffspecInstrumentEditor::dataChanged);