SampleView own list model

GUI/View/List/SamplesQListView.cpp

@@ -23,8 +23,8 @@
 #include "GUI/View/Widget/ListItemDelegate.h"
 #include <QAction>
 
-SamplesQListView::SamplesQListView()
-    : m_model(new SamplesQModel(this))
+SamplesQListView::SamplesQListView(SamplesQModel* model)
+    : m_model(model)
 {
     setMaximumWidth(200);
     setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);

GUI/View/List/SamplesQListView.h

@@ -24,7 +24,7 @@ class SamplesQModel;
 class SamplesQListView : public QListView {
     Q_OBJECT
 public:
-    SamplesQListView();
+    SamplesQListView(SamplesQModel*);
 
     void createNewSample();
     void createSampleFromLibrary(const QString& classname, const QString& title,

GUI/View/Views/SampleView.cpp

@@ -24,6 +24,7 @@
 #include "GUI/View/Layout/ApplicationSettings.h"
 #include "GUI/View/Layout/mainwindow_constants.h"
 #include "GUI/View/List/SamplesQListView.h"
+#include "GUI/View/List/SamplesQModel.h"
 #include "GUI/View/Realspace/RealspacePanel.h"
 #include "GUI/View/Realspace/RealspaceWidget.h"
 #include "GUI/View/Sample/SampleEditor.h"
@@ -40,8 +41,9 @@
 #include <QWidgetAction>
 
 SampleView::SampleView()
-    : m_realspace_panel(new RealspacePanel(this))
-    , m_listing(new SamplesQListView)
+    : m_qlistmodel(new SamplesQModel(this))
+    , m_qlistview(new SamplesQListView(m_qlistmodel))
+    , m_realspace_panel(new RealspacePanel(this))
 {
     auto* layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -57,8 +59,8 @@ SampleView::SampleView()
 
     //... Left margin: sample listing
 
-    hLayout->addWidget(m_listing);
-    m_listing->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    hLayout->addWidget(m_qlistview);
+    m_qlistview->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
     //... Right block: sample editor and bottom panels
 
@@ -99,7 +101,8 @@ SampleView::SampleView()
     new_sample_action->setToolTip("Create new sample");
     toolbar->addAction(new_sample_action);
 
-    connect(new_sample_action, &QAction::triggered, m_listing, &SamplesQListView::createNewSample);
+    connect(new_sample_action, &QAction::triggered, m_qlistview,
+            &SamplesQListView::createNewSample);
 
 #ifdef BORNAGAIN_PYTHON
     auto* import_sample_action = new QAction("Import", this);
@@ -108,7 +111,7 @@ SampleView::SampleView()
         "Import sample from a Python script that contains a function that returns a multi-layer");
     toolbar->addAction(import_sample_action);
 
-    connect(import_sample_action, &QAction::triggered, m_listing,
+    connect(import_sample_action, &QAction::triggered, m_qlistview,
             &SamplesQListView::importSampleFromPython);
 #endif
 
@@ -128,19 +131,19 @@ SampleView::SampleView()
         auto* action = import_menu->addAction(icon, title);
         action->setToolTip(description);
         connect(action, &QAction::triggered, [this, exampleName, title, description] {
-            m_listing->createSampleFromLibrary(exampleName, title, description);
+            m_qlistview->createSampleFromLibrary(exampleName, title, description);
         });
     }
 
     //... Finish
 
-    connect(m_listing, &SamplesQListView::currentSampleChanged, editor,
+    connect(m_qlistview, &SamplesQListView::currentSampleChanged, editor,
             &SampleEditor::setCurrentSample);
 
-    connect(m_listing, &SamplesQListView::currentSampleChanged,
+    connect(m_qlistview, &SamplesQListView::currentSampleChanged,
             [&](SampleItem* m) { onRequestViewInRealspace(m); });
 
-    connect(m_listing, &SamplesQListView::currentSampleChanged, scriptPanel,
+    connect(m_qlistview, &SamplesQListView::currentSampleChanged, scriptPanel,
             &ScriptPanel::setCurrentSample);
 
     connect(editor, &SampleEditor::modified, scriptPanel, &ScriptPanel::onSampleModified);

GUI/View/Views/SampleView.h

@@ -21,6 +21,7 @@
 class Item3D;
 class RealspacePanel;
 class SamplesQListView;
+class SamplesQModel;
 
 class SampleView : public QWidget {
     Q_OBJECT
@@ -39,8 +40,9 @@ private:
     void applySplitterPos();
     void saveSplitterPos();
 
+    SamplesQModel* m_qlistmodel;
+    SamplesQListView* m_qlistview;
     RealspacePanel* m_realspace_panel;
-    SamplesQListView* m_listing;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_VIEWS_SAMPLEVIEW_H