##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Merge branch 'feature/VariableModel2' into develop
Alexandre Leroux -
r155:d5549194a792 merge
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,39 +1,43
1 #ifndef SCIQLOP_VARIABLECONTROLLER_H
1 #ifndef SCIQLOP_VARIABLECONTROLLER_H
2 #define SCIQLOP_VARIABLECONTROLLER_H
2 #define SCIQLOP_VARIABLECONTROLLER_H
3
3
4 #include <QLoggingCategory>
4 #include <QLoggingCategory>
5 #include <QObject>
5 #include <QObject>
6
6
7 #include <Common/spimpl.h>
7 #include <Common/spimpl.h>
8
8
9 class Variable;
9 class Variable;
10 class VariableModel;
11
10 Q_DECLARE_LOGGING_CATEGORY(LOG_VariableController)
12 Q_DECLARE_LOGGING_CATEGORY(LOG_VariableController)
11
13
12 /**
14 /**
13 * @brief The VariableController class aims to handle the variables in SciQlop.
15 * @brief The VariableController class aims to handle the variables in SciQlop.
14 */
16 */
15 class VariableController : public QObject {
17 class VariableController : public QObject {
16 Q_OBJECT
18 Q_OBJECT
17 public:
19 public:
18 explicit VariableController(QObject *parent = 0);
20 explicit VariableController(QObject *parent = 0);
19 virtual ~VariableController();
21 virtual ~VariableController();
20
22
21 /**
23 /**
22 * Creates a new variable
24 * Creates a new variable
23 * @param name the name of the new variable
25 * @param name the name of the new variable
24 * @return the variable if it was created successfully, nullptr otherwise
26 * @return the variable if it was created successfully, nullptr otherwise
25 */
27 */
26 Variable *createVariable(const QString &name) noexcept;
28 Variable *createVariable(const QString &name) noexcept;
27
29
30 VariableModel *variableModel() noexcept;
31
28 public slots:
32 public slots:
29 void initialize();
33 void initialize();
30 void finalize();
34 void finalize();
31
35
32 private:
36 private:
33 void waitForFinish();
37 void waitForFinish();
34
38
35 class VariableControllerPrivate;
39 class VariableControllerPrivate;
36 spimpl::unique_impl_ptr<VariableControllerPrivate> impl;
40 spimpl::unique_impl_ptr<VariableControllerPrivate> impl;
37 };
41 };
38
42
39 #endif // SCIQLOP_VARIABLECONTROLLER_H
43 #endif // SCIQLOP_VARIABLECONTROLLER_H
Show file before | Show file after | Hide comments
@@ -1,31 +1,41
1 #ifndef SCIQLOP_VARIABLEMODEL_H
1 #ifndef SCIQLOP_VARIABLEMODEL_H
2 #define SCIQLOP_VARIABLEMODEL_H
2 #define SCIQLOP_VARIABLEMODEL_H
3
3
4 #include <Common/spimpl.h>
4 #include <Common/spimpl.h>
5
5
6 #include <QAbstractTableModel>
6 #include <QLoggingCategory>
7 #include <QLoggingCategory>
7
8
8 Q_DECLARE_LOGGING_CATEGORY(LOG_VariableModel)
9 Q_DECLARE_LOGGING_CATEGORY(LOG_VariableModel)
9
10
10 class Variable;
11 class Variable;
11
12
12 /**
13 /**
13 * @brief The VariableModel class aims to hold the variables that have been created in SciQlop
14 * @brief The VariableModel class aims to hold the variables that have been created in SciQlop
14 */
15 */
15 class VariableModel {
16 class VariableModel : public QAbstractTableModel {
16 public:
17 public:
17 explicit VariableModel();
18 explicit VariableModel(QObject *parent = nullptr);
18
19
19 /**
20 /**
20 * Creates a new variable in the model
21 * Creates a new variable in the model
21 * @param name the name of the new variable
22 * @param name the name of the new variable
22 * @return the variable if it was created successfully, nullptr otherwise
23 * @return the variable if it was created successfully, nullptr otherwise
23 */
24 */
24 Variable *createVariable(const QString &name) noexcept;
25 Variable *createVariable(const QString &name) noexcept;
25
26
27 // /////////////////////////// //
28 // QAbstractTableModel methods //
29 // /////////////////////////// //
30 virtual int columnCount(const QModelIndex &parent = QModelIndex{}) const override;
31 virtual int rowCount(const QModelIndex &parent = QModelIndex{}) const override;
32 virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
33 virtual QVariant headerData(int section, Qt::Orientation orientation,
34 int role = Qt::DisplayRole) const override;
35
26 private:
36 private:
27 class VariableModelPrivate;
37 class VariableModelPrivate;
28 spimpl::unique_impl_ptr<VariableModelPrivate> impl;
38 spimpl::unique_impl_ptr<VariableModelPrivate> impl;
29 };
39 };
30
40
31 #endif // SCIQLOP_VARIABLEMODEL_H
41 #endif // SCIQLOP_VARIABLEMODEL_H
Show file before | Show file after | Hide comments
@@ -1,53 +1,58
1 #include <Variable/VariableController.h>
1 #include <Variable/VariableController.h>
2 #include <Variable/VariableModel.h>
2 #include <Variable/VariableModel.h>
3
3
4 #include <QMutex>
4 #include <QMutex>
5 #include <QThread>
5 #include <QThread>
6
6
7 Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
7 Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
8
8
9 struct VariableController::VariableControllerPrivate {
9 struct VariableController::VariableControllerPrivate {
10 explicit VariableControllerPrivate()
10 explicit VariableControllerPrivate()
11 : m_WorkingMutex{}, m_VariableModel{std::make_unique<VariableModel>()}
11 : m_WorkingMutex{}, m_VariableModel{std::make_unique<VariableModel>()}
12 {
12 {
13 }
13 }
14
14
15 QMutex m_WorkingMutex;
15 QMutex m_WorkingMutex;
16 std::unique_ptr<VariableModel> m_VariableModel;
16 std::unique_ptr<VariableModel> m_VariableModel;
17 };
17 };
18
18
19 VariableController::VariableController(QObject *parent)
19 VariableController::VariableController(QObject *parent)
20 : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>()}
20 : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>()}
21 {
21 {
22 qCDebug(LOG_VariableController()) << tr("VariableController construction")
22 qCDebug(LOG_VariableController()) << tr("VariableController construction")
23 << QThread::currentThread();
23 << QThread::currentThread();
24 }
24 }
25
25
26 VariableController::~VariableController()
26 VariableController::~VariableController()
27 {
27 {
28 qCDebug(LOG_VariableController()) << tr("VariableController destruction")
28 qCDebug(LOG_VariableController()) << tr("VariableController destruction")
29 << QThread::currentThread();
29 << QThread::currentThread();
30 this->waitForFinish();
30 this->waitForFinish();
31 }
31 }
32
32
33 Variable *VariableController::createVariable(const QString &name) noexcept
33 Variable *VariableController::createVariable(const QString &name) noexcept
34 {
34 {
35 return impl->m_VariableModel->createVariable(name);
35 return impl->m_VariableModel->createVariable(name);
36 }
36 }
37
37
38 VariableModel *VariableController::variableModel() noexcept
39 {
40 return impl->m_VariableModel.get();
41 }
42
38 void VariableController::initialize()
43 void VariableController::initialize()
39 {
44 {
40 qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
45 qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
41 impl->m_WorkingMutex.lock();
46 impl->m_WorkingMutex.lock();
42 qCDebug(LOG_VariableController()) << tr("VariableController init END");
47 qCDebug(LOG_VariableController()) << tr("VariableController init END");
43 }
48 }
44
49
45 void VariableController::finalize()
50 void VariableController::finalize()
46 {
51 {
47 impl->m_WorkingMutex.unlock();
52 impl->m_WorkingMutex.unlock();
48 }
53 }
49
54
50 void VariableController::waitForFinish()
55 void VariableController::waitForFinish()
51 {
56 {
52 QMutexLocker locker{&impl->m_WorkingMutex};
57 QMutexLocker locker{&impl->m_WorkingMutex};
53 }
58 }
Show file before | Show file after | Hide comments
@@ -1,24 +1,117
1 #include <Variable/VariableModel.h>
1 #include <Variable/VariableModel.h>
2
2
3 #include <Variable/Variable.h>
3 #include <Variable/Variable.h>
4
4
5 Q_LOGGING_CATEGORY(LOG_VariableModel, "VariableModel")
5 Q_LOGGING_CATEGORY(LOG_VariableModel, "VariableModel")
6
6
7 namespace {
8
9 // Column indexes
10 const auto NAME_COLUMN = 0;
11 const auto UNIT_COLUMN = 1;
12 const auto MISSION_COLUMN = 2;
13 const auto NB_COLUMNS = 3;
14
15 } // namespace
16
7 struct VariableModel::VariableModelPrivate {
17 struct VariableModel::VariableModelPrivate {
8 /// Variables created in SciQlop
18 /// Variables created in SciQlop
9 std::vector<std::unique_ptr<Variable> > m_Variables;
19 std::vector<std::unique_ptr<Variable> > m_Variables;
10 };
20 };
11
21
12 VariableModel::VariableModel() : impl{spimpl::make_unique_impl<VariableModelPrivate>()}
22 VariableModel::VariableModel(QObject *parent)
23 : QAbstractTableModel{parent}, impl{spimpl::make_unique_impl<VariableModelPrivate>()}
13 {
24 {
14 }
25 }
15
26
16 Variable *VariableModel::createVariable(const QString &name) noexcept
27 Variable *VariableModel::createVariable(const QString &name) noexcept
17 {
28 {
29 auto insertIndex = rowCount();
30 beginInsertRows({}, insertIndex, insertIndex);
31
18 /// @todo For the moment, the other data of the variable is initialized with default values
32 /// @todo For the moment, the other data of the variable is initialized with default values
19 auto variable
33 auto variable
20 = std::make_unique<Variable>(name, QStringLiteral("unit"), QStringLiteral("mission"));
34 = std::make_unique<Variable>(name, QStringLiteral("unit"), QStringLiteral("mission"));
21 impl->m_Variables.push_back(std::move(variable));
35 impl->m_Variables.push_back(std::move(variable));
22
36
23 return impl->m_Variables.back().get();
37 endInsertRows();
38
39 return impl->m_Variables.at(insertIndex).get();
40 }
41
42 int VariableModel::columnCount(const QModelIndex &parent) const
43 {
44 Q_UNUSED(parent);
45
46 return NB_COLUMNS;
47 }
48
49 int VariableModel::rowCount(const QModelIndex &parent) const
50 {
51 Q_UNUSED(parent);
52
53 return impl->m_Variables.size();
54 }
55
56 QVariant VariableModel::data(const QModelIndex &index, int role) const
57 {
58 if (!index.isValid()) {
59 return QVariant{};
60 }
61
62 if (index.row() < 0 || index.row() >= rowCount()) {
63 return QVariant{};
64 }
65
66 if (role == Qt::DisplayRole) {
67 const auto &variable = impl->m_Variables.at(index.row());
68
69 if (variable) {
70 switch (index.column()) {
71 case NAME_COLUMN:
72 return variable->m_Name;
73 case UNIT_COLUMN:
74 return variable->m_Unit;
75 case MISSION_COLUMN:
76 return variable->m_Mission;
77 default:
78 // No action
79 break;
80 }
81
82 qWarning(LOG_VariableModel())
83 << tr("Can't get data (unknown column %1)").arg(index.column());
84 }
85 else {
86 qWarning(LOG_VariableModel()) << tr("Can't get data (no variable)");
87 }
88 }
89
90 return QVariant{};
91 }
92
93 QVariant VariableModel::headerData(int section, Qt::Orientation orientation, int role) const
94 {
95 if (role != Qt::DisplayRole) {
96 return QVariant{};
97 }
98
99 if (orientation == Qt::Horizontal) {
100 switch (section) {
101 case NAME_COLUMN:
102 return tr("Name");
103 case UNIT_COLUMN:
104 return tr("Unit");
105 case MISSION_COLUMN:
106 return tr("Mission");
107 default:
108 // No action
109 break;
110 }
111
112 qWarning(LOG_VariableModel())
113 << tr("Can't get header data (unknown column %1)").arg(section);
114 }
115
116 return QVariant{};
24 }
117 }
Show file before | Show file after | Hide comments
@@ -1,14 +1,26
1 #include <Variable/VariableController.h>
1 #include <Variable/VariableInspectorWidget.h>
2 #include <Variable/VariableInspectorWidget.h>
3 #include <Variable/VariableModel.h>
2
4
3 #include <ui_VariableInspectorWidget.h>
5 #include <ui_VariableInspectorWidget.h>
4
6
7 #include <QSortFilterProxyModel>
8
9 #include <SqpApplication.h>
10
5 VariableInspectorWidget::VariableInspectorWidget(QWidget *parent)
11 VariableInspectorWidget::VariableInspectorWidget(QWidget *parent)
6 : QWidget{parent}, ui{new Ui::VariableInspectorWidget}
12 : QWidget{parent}, ui{new Ui::VariableInspectorWidget}
7 {
13 {
8 ui->setupUi(this);
14 ui->setupUi(this);
15
16 // Sets model for table
17 auto sortFilterModel = new QSortFilterProxyModel{this};
18 sortFilterModel->setSourceModel(sqpApp->variableController().variableModel());
19
20 ui->tableView->setModel(sortFilterModel);
9 }
21 }
10
22
11 VariableInspectorWidget::~VariableInspectorWidget()
23 VariableInspectorWidget::~VariableInspectorWidget()
12 {
24 {
13 delete ui;
25 delete ui;
14 }
26 }
General Comments 0
You need to be logged in to leave comments. Login now