From 16a4c06248f4367138e959932f1b286b27cf8f37 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Mon, 13 Nov 2017 15:00:33 +0100
Subject: [PATCH] TestComponentView switched to SampleModel.
---
.../Views/PropertyEditor/TestComponentView.cpp | 12 +++++++++++-
GUI/coregui/Views/PropertyEditor/TestComponentView.h | 4 ++--
GUI/coregui/mainwindow/mainwindow.cpp | 2 +-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
index 58b3b11e9c8..3e5faf24a6c 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
@@ -21,6 +21,11 @@
#include "item_constants.h"
#include "SessionModelDelegate.h"
#include "StyleUtils.h"
+#include "SampleBuilderFactory.h"
+#include "ISample.h"
+#include "GUIObjectBuilder.h"
+#include "MultiLayer.h"
+#include "SampleModel.h"
#include <QTreeView>
#include <QBoxLayout>
#include <QPushButton>
@@ -28,7 +33,7 @@
TestComponentView::TestComponentView(MainWindow* mainWindow)
: m_mainWindow(mainWindow)
- , m_sourceModel(new SessionModel("TestModel", this))
+ , m_sourceModel(new SampleModel(this))
, m_proxyModel(new ComponentProxyModel(this))
, m_sourceTree(new QTreeView)
, m_proxyTree(new QTreeView)
@@ -83,5 +88,10 @@ void TestComponentView::onAddItemRequest()
void TestComponentView::init_source()
{
+ SampleBuilderFactory factory;
+ const std::unique_ptr<ISample> sample(factory.createSample("CylindersAndPrismsBuilder"));
+ GUIObjectBuilder guiBuilder;
+ guiBuilder.populateSampleModel(m_sourceModel, *sample);
+
m_sourceModel->insertNewItem(Constants::VectorType);
}
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.h b/GUI/coregui/Views/PropertyEditor/TestComponentView.h
index 40adfa1f6ae..16730802370 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.h
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.h
@@ -24,7 +24,7 @@ class MainWindow;
class QPushButton;
class ComponentProxyModel;
class QTreeView;
-class SessionModel;
+class SampleModel;
class SessionModelDelegate;
//! View to tests QListView working with ComponentProxyModel.
@@ -43,7 +43,7 @@ private:
void init_source();
MainWindow* m_mainWindow;
- SessionModel* m_sourceModel;
+ SampleModel* m_sourceModel;
ComponentProxyModel* m_proxyModel;
QTreeView* m_sourceTree;
QTreeView* m_proxyTree;
diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/coregui/mainwindow/mainwindow.cpp
index 779074bedeb..2516056e616 100644
--- a/GUI/coregui/mainwindow/mainwindow.cpp
+++ b/GUI/coregui/mainwindow/mainwindow.cpp
@@ -63,7 +63,7 @@ MainWindow::MainWindow(QWidget *parent)
initViews();
initConnections();
- m_applicationModels->createTestSample();
+// m_applicationModels->createTestSample();
// m_applicationModels->createTestJob();
// m_applicationModels->createTestRealData();
}
--
GitLab