SampleView ...

GUI/View/Main/MainWindow.cpp

@@ -226,7 +226,7 @@ void MainWindow::initViews()
 
     if (gDoc) {
         m_instrumentView = new InstrumentView;
-        m_sampleView = new SampleView(this, gDoc.get());
+        m_sampleView = new SampleView;
         m_importDataView = new DataView(this, gDoc.get());
         m_simulationView = new SimulationView(this, gDoc.get());
         m_jobView = new JobView(progressBar(), gDoc.get());

GUI/View/Sample/SampleEditor.cpp

@@ -25,10 +25,8 @@
 #include <QBoxLayout>
 #include <QPushButton>
 
-SampleEditor::SampleEditor(QWidget* parent, ProjectDocument* document)
-    : QScrollArea(parent)
-    , m_currentSampleWidget(nullptr)
-    , m_document(document)
+SampleEditor::SampleEditor()
+    : m_currentSampleWidget(nullptr)
 {
     QScrollArea::setWidgetResizable(true);
     QScrollArea::setWidget(new QWidget());
@@ -54,8 +52,7 @@ void SampleEditor::setCurrentSample(SampleItem* sampleItem)
     }
 
     if (!m_editControllers.contains(m_currentSample))
-        m_editControllers.insert(m_currentSample,
-                                 new SampleEditorController(m_document, m_currentSample));
+        m_editControllers.insert(m_currentSample, new SampleEditorController(m_currentSample));
     auto* ec = m_editControllers[m_currentSample];
     connect(ec, &SampleEditorController::requestViewInRealspace, this,
             &SampleEditor::requestViewInRealspace);

GUI/View/Sample/SampleEditor.h

@@ -19,7 +19,6 @@
 #include <QScrollArea>
 
 class Item3D;
-class ProjectDocument;
 class SampleEditorController;
 class SampleForm;
 class SampleItem;
@@ -28,7 +27,7 @@ class SampleItem;
 class SampleEditor : public QScrollArea {
     Q_OBJECT
 public:
-    SampleEditor(QWidget* parent, ProjectDocument* document);
+    SampleEditor();
     ~SampleEditor() override;
 
     void setCurrentSample(SampleItem* sampleItem);
@@ -45,7 +44,6 @@ private:
     SampleForm* m_currentSampleWidget;
     SampleItem* m_currentSample = nullptr;
     QMap<SampleItem*, SampleEditorController*> m_editControllers;
-    ProjectDocument* m_document;
 };
 
 

GUI/View/Sample/SampleEditorController.cpp

@@ -35,10 +35,9 @@
 #include "GUI/View/Sample/ParticleLayoutForm.h"
 #include "GUI/View/Sample/SampleForm.h"
 
-SampleEditorController::SampleEditorController(ProjectDocument* document, SampleItem* multi)
+SampleEditorController::SampleEditorController(SampleItem* multi)
     : m_sampleItem(multi)
     , m_sampleForm(nullptr)
-    , m_document(document)
 {
 }
 

GUI/View/Sample/SampleEditorController.h

@@ -35,7 +35,6 @@ class LayerItem;
 class MaterialModel;
 class MesocrystalForm;
 class ParticleLayoutItem;
-class ProjectDocument;
 class SampleForm;
 class SampleItem;
 class SelectionContainerForm;
@@ -50,7 +49,7 @@ class SelectionContainerForm;
 class SampleEditorController : public QObject {
     Q_OBJECT
 public:
-    SampleEditorController(ProjectDocument* document, SampleItem* multi);
+    SampleEditorController(SampleItem* multi);
 
     //! Set the current form.
     //!
@@ -64,9 +63,6 @@ public:
     //! The materials of the current document
     MaterialModel* materialModel() const;
 
-    //! The current document
-    ProjectDocument* projectDocument() const { return m_document; }
-
     void addLayerItem(LayerItem* before);
     QColor findColor(int atIndex);
     void onLayerAdded(LayerItem* layer);
@@ -131,7 +127,6 @@ private:
 
     SampleItem* m_sampleItem;
     SampleForm* m_sampleForm;
-    ProjectDocument* m_document;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_SAMPLE_SAMPLEEDITORCONTROLLER_H

GUI/View/Sample/SampleView.cpp

@@ -35,11 +35,9 @@
 #include <QToolButton>
 #include <QWidgetAction>
 
-SampleView::SampleView(QWidget* parent, ProjectDocument* document)
-    : QWidget(parent)
-    , m_document(document)
-    , m_realspacePanel(new RealspacePanel(this))
-    , m_listing(new SampleListing(this, m_document))
+SampleView::SampleView()
+    : m_realspacePanel(new RealspacePanel(this))
+    , m_listing(new SampleListing(this, gDoc.get()))
 {
     auto* layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -64,7 +62,7 @@ SampleView::SampleView(QWidget* parent, ProjectDocument* document)
     vSplitter->setOrientation(Qt::Vertical);
     hLayout->addWidget(vSplitter);
 
-    auto* editor = new SampleEditor(this, document);
+    auto* editor = new SampleEditor;
     vSplitter->addWidget(editor);
 
     //... Below central widget: realspace and script panels
@@ -125,7 +123,7 @@ SampleView::SampleView(QWidget* parent, ProjectDocument* document)
     connect(editor, &SampleEditor::modified, m_realspacePanel->widget(),
             &RealspaceWidget::updateScene);
 
-    connect(editor, &SampleEditor::modified, m_document, &ProjectDocument::setModified,
+    connect(editor, &SampleEditor::modified, gDoc.get(), &ProjectDocument::setModified,
             Qt::UniqueConnection);
 }
 

GUI/View/Sample/SampleView.h

@@ -15,18 +15,17 @@
 #ifndef BORNAGAIN_GUI_VIEW_SAMPLE_SAMPLEVIEW_H
 #define BORNAGAIN_GUI_VIEW_SAMPLE_SAMPLEVIEW_H
 
-#include <QMenu>
+#include <QShowEvent>
 #include <QWidget>
 
 class Item3D;
-class ProjectDocument;
 class RealspacePanel;
 class SampleListing;
 
 class SampleView : public QWidget {
     Q_OBJECT
 public:
-    SampleView(QWidget* parent, ProjectDocument* document);
+    SampleView();
     ~SampleView();
 
 private:
@@ -42,7 +41,6 @@ private:
     void applySplitterPos();
     void saveSplitterPos();
 
-    ProjectDocument* m_document;
     RealspacePanel* m_realspacePanel;
     SampleListing* m_listing;
 };