@@ -0,0 +1,32 | |||
|
1 | #ifndef SCIQLOP_DATASOURCETREEWIDGETITEM_H | |
|
2 | #define SCIQLOP_DATASOURCETREEWIDGETITEM_H | |
|
3 | ||
|
4 | #include <Common/spimpl.h> | |
|
5 | ||
|
6 | #include <QLoggingCategory> | |
|
7 | #include <QTreeWidgetItem> | |
|
8 | ||
|
9 | Q_DECLARE_LOGGING_CATEGORY(LOG_DataSourceTreeWidgetItem) | |
|
10 | ||
|
11 | class DataSourceItem; | |
|
12 | ||
|
13 | /** | |
|
14 | * @brief The DataSourceTreeWidgetItem is the graphical representation of a data source item. It is | |
|
15 | * intended to be displayed in a QTreeWidget. | |
|
16 | * @sa DataSourceItem | |
|
17 | */ | |
|
18 | class DataSourceTreeWidgetItem : public QTreeWidgetItem { | |
|
19 | public: | |
|
20 | explicit DataSourceTreeWidgetItem(const DataSourceItem *data, int type = Type); | |
|
21 | explicit DataSourceTreeWidgetItem(QTreeWidget *parent, const DataSourceItem *data, | |
|
22 | int type = Type); | |
|
23 | ||
|
24 | virtual QVariant data(int column, int role) const override; | |
|
25 | virtual void setData(int column, int role, const QVariant &value) override; | |
|
26 | ||
|
27 | private: | |
|
28 | class DataSourceTreeWidgetItemPrivate; | |
|
29 | spimpl::unique_impl_ptr<DataSourceTreeWidgetItemPrivate> impl; | |
|
30 | }; | |
|
31 | ||
|
32 | #endif // SCIQLOP_DATASOURCETREEWIDGETITEM_H |
@@ -0,0 +1,33 | |||
|
1 | #ifndef SCIQLOP_DATASOURCEWIDGET_H | |
|
2 | #define SCIQLOP_DATASOURCEWIDGET_H | |
|
3 | ||
|
4 | #include <Common/spimpl.h> | |
|
5 | ||
|
6 | #include <QWidget> | |
|
7 | ||
|
8 | class DataSourceItem; | |
|
9 | ||
|
10 | /** | |
|
11 | * @brief The DataSourceWidget handles the graphical representation (as a tree) of the data sources | |
|
12 | * attached to SciQlop. | |
|
13 | */ | |
|
14 | class DataSourceWidget : public QWidget { | |
|
15 | Q_OBJECT | |
|
16 | ||
|
17 | public: | |
|
18 | explicit DataSourceWidget(QWidget *parent = 0); | |
|
19 | ||
|
20 | public slots: | |
|
21 | /** | |
|
22 | * Adds a data source. An item associated to the data source is created and then added to the | |
|
23 | * representation tree | |
|
24 | * @param dataSource the data source to add. The pointer has to be not null | |
|
25 | */ | |
|
26 | void addDataSource(DataSourceItem *dataSource) noexcept; | |
|
27 | ||
|
28 | private: | |
|
29 | class DataSourceWidgetPrivate; | |
|
30 | spimpl::unique_impl_ptr<DataSourceWidgetPrivate> impl; | |
|
31 | }; | |
|
32 | ||
|
33 | #endif // SCIQLOP_DATASOURCEWIDGET_H |
@@ -0,0 +1,75 | |||
|
1 | #include <DataSource/DataSourceItem.h> | |
|
2 | #include <DataSource/DataSourceTreeWidgetItem.h> | |
|
3 | ||
|
4 | #include <SqpApplication.h> | |
|
5 | ||
|
6 | Q_LOGGING_CATEGORY(LOG_DataSourceTreeWidgetItem, "DataSourceTreeWidgetItem") | |
|
7 | ||
|
8 | namespace { | |
|
9 | ||
|
10 | QIcon itemIcon(const DataSourceItem *dataSource) | |
|
11 | { | |
|
12 | if (dataSource) { | |
|
13 | auto dataSourceType = dataSource->type(); | |
|
14 | switch (dataSourceType) { | |
|
15 | case DataSourceItemType::NODE: | |
|
16 | return sqpApp->style()->standardIcon(QStyle::SP_DirIcon); | |
|
17 | case DataSourceItemType::PRODUCT: | |
|
18 | return sqpApp->style()->standardIcon(QStyle::SP_FileIcon); | |
|
19 | default: | |
|
20 | // No action | |
|
21 | break; | |
|
22 | } | |
|
23 | ||
|
24 | qCWarning(LOG_DataSourceTreeWidgetItem()) | |
|
25 | << QObject::tr("Can't set data source icon : unknown data source type"); | |
|
26 | } | |
|
27 | else { | |
|
28 | qCWarning(LOG_DataSourceTreeWidgetItem()) | |
|
29 | << QObject::tr("Can't set data source icon : the data source is null"); | |
|
30 | } | |
|
31 | ||
|
32 | // Default cases | |
|
33 | return QIcon{}; | |
|
34 | } | |
|
35 | ||
|
36 | } // namespace | |
|
37 | ||
|
38 | struct DataSourceTreeWidgetItem::DataSourceTreeWidgetItemPrivate { | |
|
39 | explicit DataSourceTreeWidgetItemPrivate(const DataSourceItem *data) : m_Data{data} {} | |
|
40 | ||
|
41 | /// Model used to retrieve data source information | |
|
42 | const DataSourceItem *m_Data; | |
|
43 | }; | |
|
44 | ||
|
45 | DataSourceTreeWidgetItem::DataSourceTreeWidgetItem(const DataSourceItem *data, int type) | |
|
46 | : DataSourceTreeWidgetItem{nullptr, data, type} | |
|
47 | { | |
|
48 | } | |
|
49 | ||
|
50 | DataSourceTreeWidgetItem::DataSourceTreeWidgetItem(QTreeWidget *parent, const DataSourceItem *data, | |
|
51 | int type) | |
|
52 | : QTreeWidgetItem{parent, type}, | |
|
53 | impl{spimpl::make_unique_impl<DataSourceTreeWidgetItemPrivate>(data)} | |
|
54 | { | |
|
55 | // Sets the icon depending on the data source | |
|
56 | setIcon(0, itemIcon(impl->m_Data)); | |
|
57 | } | |
|
58 | ||
|
59 | QVariant DataSourceTreeWidgetItem::data(int column, int role) const | |
|
60 | { | |
|
61 | if (role == Qt::DisplayRole) { | |
|
62 | return (impl->m_Data) ? impl->m_Data->data(column) : QVariant{}; | |
|
63 | } | |
|
64 | else { | |
|
65 | return QTreeWidgetItem::data(column, role); | |
|
66 | } | |
|
67 | } | |
|
68 | ||
|
69 | void DataSourceTreeWidgetItem::setData(int column, int role, const QVariant &value) | |
|
70 | { | |
|
71 | // Data can't be changed by edition | |
|
72 | if (role != Qt::EditRole) { | |
|
73 | QTreeWidgetItem::setData(column, role, value); | |
|
74 | } | |
|
75 | } |
@@ -0,0 +1,63 | |||
|
1 | #include <DataSource/DataSourceWidget.h> | |
|
2 | ||
|
3 | #include <ui_DataSourceWidget.h> | |
|
4 | ||
|
5 | #include <DataSource/DataSourceItem.h> | |
|
6 | #include <DataSource/DataSourceTreeWidgetItem.h> | |
|
7 | ||
|
8 | namespace { | |
|
9 | ||
|
10 | /// Number of columns displayed in the tree | |
|
11 | const auto TREE_NB_COLUMNS = 1; | |
|
12 | ||
|
13 | /// Header labels for the tree | |
|
14 | const auto TREE_HEADER_LABELS = QStringList{QObject::tr("Name")}; | |
|
15 | ||
|
16 | /** | |
|
17 | * Creates the item associated to a data source | |
|
18 | * @param dataSource the data source for which to create the item | |
|
19 | * @return the new item | |
|
20 | */ | |
|
21 | DataSourceTreeWidgetItem *createTreeWidgetItem(DataSourceItem *dataSource) | |
|
22 | { | |
|
23 | // Creates item for the data source | |
|
24 | auto item = new DataSourceTreeWidgetItem{dataSource}; | |
|
25 | ||
|
26 | // Generates items for the children of the data source | |
|
27 | for (auto i = 0; i < dataSource->childCount(); ++i) { | |
|
28 | item->addChild(createTreeWidgetItem(dataSource->child(i))); | |
|
29 | } | |
|
30 | ||
|
31 | return item; | |
|
32 | } | |
|
33 | ||
|
34 | } // namespace | |
|
35 | ||
|
36 | class DataSourceWidget::DataSourceWidgetPrivate { | |
|
37 | public: | |
|
38 | explicit DataSourceWidgetPrivate(DataSourceWidget &widget) | |
|
39 | : m_Ui{std::make_unique<Ui::DataSourceWidget>()} | |
|
40 | { | |
|
41 | m_Ui->setupUi(&widget); | |
|
42 | ||
|
43 | // Set tree properties | |
|
44 | m_Ui->treeWidget->setColumnCount(TREE_NB_COLUMNS); | |
|
45 | m_Ui->treeWidget->setHeaderLabels(TREE_HEADER_LABELS); | |
|
46 | } | |
|
47 | ||
|
48 | std::unique_ptr<Ui::DataSourceWidget> m_Ui; | |
|
49 | }; | |
|
50 | ||
|
51 | DataSourceWidget::DataSourceWidget(QWidget *parent) | |
|
52 | : QWidget{parent}, impl{spimpl::make_unique_impl<DataSourceWidgetPrivate>(*this)} | |
|
53 | { | |
|
54 | } | |
|
55 | ||
|
56 | void DataSourceWidget::addDataSource(DataSourceItem *dataSource) noexcept | |
|
57 | { | |
|
58 | // Creates the item associated to the source and adds it to the tree widget. The tree widget | |
|
59 | // takes the ownership of the item | |
|
60 | if (dataSource) { | |
|
61 | impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(dataSource)); | |
|
62 | } | |
|
63 | } |
@@ -0,0 +1,43 | |||
|
1 | #include "Visualization/VisualizationWidget.h" | |
|
2 | #include "Visualization/VisualizationTabWidget.h" | |
|
3 | #include "ui_VisualizationWidget.h" | |
|
4 | ||
|
5 | #include <QDebug> | |
|
6 | #include <QToolButton> | |
|
7 | ||
|
8 | #include "iostream" | |
|
9 | ||
|
10 | Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget") | |
|
11 | ||
|
12 | VisualizationWidget::VisualizationWidget(QWidget *parent) | |
|
13 | : QWidget{parent}, ui{new Ui::VisualizationWidget} | |
|
14 | { | |
|
15 | ui->setupUi(this); | |
|
16 | ||
|
17 | auto addTabViewButton = new QToolButton{ui->tabWidget}; | |
|
18 | addTabViewButton->setText(tr("Add View")); | |
|
19 | addTabViewButton->setCursor(Qt::ArrowCursor); | |
|
20 | addTabViewButton->setAutoRaise(true); | |
|
21 | ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner); | |
|
22 | ||
|
23 | auto addTabView = [&](bool checked) { | |
|
24 | auto index = ui->tabWidget->addTab(new VisualizationTabWidget(ui->tabWidget), | |
|
25 | QString("View %1").arg(ui->tabWidget->count() + 1)); | |
|
26 | qCInfo(LOG_VisualizationWidget()) << tr("add the tab of index %1").arg(index); | |
|
27 | }; | |
|
28 | ||
|
29 | auto removeTabView = [&](int index) { | |
|
30 | ui->tabWidget->removeTab(index); | |
|
31 | qCInfo(LOG_VisualizationWidget()) << tr("remove the tab of index %1").arg(index); | |
|
32 | }; | |
|
33 | ||
|
34 | ui->tabWidget->setTabsClosable(true); | |
|
35 | ||
|
36 | connect(addTabViewButton, &QToolButton::clicked, addTabView); | |
|
37 | connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView); | |
|
38 | } | |
|
39 | ||
|
40 | VisualizationWidget::~VisualizationWidget() | |
|
41 | { | |
|
42 | delete ui; | |
|
43 | } |
@@ -0,0 +1,24 | |||
|
1 | <?xml version="1.0" encoding="UTF-8"?> | |
|
2 | <ui version="4.0"> | |
|
3 | <class>DataSourceWidget</class> | |
|
4 | <widget class="QWidget" name="DataSourceWidget"> | |
|
5 | <property name="geometry"> | |
|
6 | <rect> | |
|
7 | <x>0</x> | |
|
8 | <y>0</y> | |
|
9 | <width>400</width> | |
|
10 | <height>300</height> | |
|
11 | </rect> | |
|
12 | </property> | |
|
13 | <property name="windowTitle"> | |
|
14 | <string>Data sources</string> | |
|
15 | </property> | |
|
16 | <layout class="QGridLayout" name="gridLayout"> | |
|
17 | <item row="0" column="0"> | |
|
18 | <widget class="QTreeWidget" name="treeWidget"/> | |
|
19 | </item> | |
|
20 | </layout> | |
|
21 | </widget> | |
|
22 | <resources/> | |
|
23 | <connections/> | |
|
24 | </ui> |
@@ -25,6 +25,16 | |||
|
25 | 25 | #include <SqpApplication.h> |
|
26 | 26 | #include <qglobal.h> |
|
27 | 27 | |
|
28 | #include <Plugin/PluginManager.h> | |
|
29 | #include <QDir> | |
|
30 | ||
|
31 | namespace { | |
|
32 | ||
|
33 | /// Name of the directory containing the plugins | |
|
34 | const auto PLUGIN_DIRECTORY_NAME = QStringLiteral("plugins"); | |
|
35 | ||
|
36 | } // namespace | |
|
37 | ||
|
28 | 38 | int main(int argc, char *argv[]) |
|
29 | 39 | { |
|
30 | 40 | SqpApplication a{argc, argv}; |
@@ -34,5 +44,16 int main(int argc, char *argv[]) | |||
|
34 | 44 | MainWindow w; |
|
35 | 45 | w.show(); |
|
36 | 46 | |
|
47 | // Loads plugins | |
|
48 | auto pluginDir = QDir{sqpApp->applicationDirPath()}; | |
|
49 | pluginDir.mkdir(PLUGIN_DIRECTORY_NAME); | |
|
50 | pluginDir.cd(PLUGIN_DIRECTORY_NAME); | |
|
51 | ||
|
52 | qCDebug(LOG_PluginManager()) | |
|
53 | << QObject::tr("Plugin directory: %1").arg(pluginDir.absolutePath()); | |
|
54 | ||
|
55 | PluginManager pluginManager{}; | |
|
56 | pluginManager.loadPlugins(pluginDir); | |
|
57 | ||
|
37 | 58 | return a.exec(); |
|
38 | 59 | } |
@@ -21,6 +21,11 | |||
|
21 | 21 | ----------------------------------------------------------------------------*/ |
|
22 | 22 | #include "MainWindow.h" |
|
23 | 23 | #include "ui_MainWindow.h" |
|
24 | ||
|
25 | #include <DataSource/DataSourceController.h> | |
|
26 | #include <DataSource/DataSourceWidget.h> | |
|
27 | #include <SqpApplication.h> | |
|
28 | ||
|
24 | 29 | #include <QAction> |
|
25 | 30 | #include <QDate> |
|
26 | 31 | #include <QDateTime> |
@@ -40,7 +45,7 | |||
|
40 | 45 | #include <QAction> |
|
41 | 46 | #include <QToolBar> |
|
42 | 47 | #include <memory.h> |
|
43 |
MainWindow::MainWindow(QWidget *parent) : QMainWindow |
|
|
48 | MainWindow::MainWindow(QWidget *parent) : QMainWindow{parent}, m_Ui{new Ui::MainWindow} | |
|
44 | 49 | { |
|
45 | 50 | m_Ui->setupUi(this); |
|
46 | 51 | |
@@ -57,6 +62,11 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::Main | |||
|
57 | 62 | this->menuBar()->addAction("File"); |
|
58 | 63 | auto mainToolBar = this->addToolBar("MainToolBar"); |
|
59 | 64 | mainToolBar->addAction("A1"); |
|
65 | ||
|
66 | // Widgets / controllers connections | |
|
67 | connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)), | |
|
68 | m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *))); | |
|
69 | ||
|
60 | 70 | /* QLopGUI::registerMenuBar(menuBar()); |
|
61 | 71 | this->setWindowIcon(QIcon(":/sciqlopLOGO.svg")); |
|
62 | 72 | this->m_progressWidget = new QWidget(); |
@@ -85,7 +85,7 | |||
|
85 | 85 | <number>0</number> |
|
86 | 86 | </property> |
|
87 | 87 | <item> |
|
88 |
<widget class=" |
|
|
88 | <widget class="DataSourceWidget" name="dataSourceWidget" native="true"/> | |
|
89 | 89 | </item> |
|
90 | 90 | <item> |
|
91 | 91 | <widget class="QWidget" name="dateTimeWidget" native="true"/> |
@@ -193,13 +193,19 | |||
|
193 | 193 | <customwidget> |
|
194 | 194 | <class>VisualizationWidget</class> |
|
195 | 195 | <extends>QWidget</extends> |
|
196 |
<header location="global"> |
|
|
196 | <header location="global">Visualization/VisualizationWidget.h</header> | |
|
197 | 197 | <container>1</container> |
|
198 | 198 | </customwidget> |
|
199 | 199 | <customwidget> |
|
200 | 200 | <class>SqpSidePane</class> |
|
201 | 201 | <extends>QWidget</extends> |
|
202 |
<header location="global"> |
|
|
202 | <header location="global">SidePane/SqpSidePane.h</header> | |
|
203 | <container>1</container> | |
|
204 | </customwidget> | |
|
205 | <customwidget> | |
|
206 | <class>DataSourceWidget</class> | |
|
207 | <extends>QWidget</extends> | |
|
208 | <header location="global">DataSource/DataSourceWidget.h</header> | |
|
203 | 209 | <container>1</container> |
|
204 | 210 | </customwidget> |
|
205 | 211 | </customwidgets> |
@@ -49,7 +49,7 public slots: | |||
|
49 | 49 | |
|
50 | 50 | signals: |
|
51 | 51 | /// Signal emitted when a structure has been set for a data source |
|
52 |
void dataSourceItemSet( |
|
|
52 | void dataSourceItemSet(DataSourceItem *dataSourceItem); | |
|
53 | 53 | |
|
54 | 54 | private: |
|
55 | 55 | void waitForFinish(); |
@@ -7,6 +7,11 | |||
|
7 | 7 | #include <QVector> |
|
8 | 8 | |
|
9 | 9 | /** |
|
10 | * Possible types of an item | |
|
11 | */ | |
|
12 | enum class DataSourceItemType { NODE, PRODUCT }; | |
|
13 | ||
|
14 | /** | |
|
10 | 15 | * @brief The DataSourceItem class aims to represent a structure element of a data source. |
|
11 | 16 | * A data source has a tree structure that is made up of a main DataSourceItem object (root) |
|
12 | 17 | * containing other DataSourceItem objects (children). |
@@ -14,7 +19,7 | |||
|
14 | 19 | */ |
|
15 | 20 | class DataSourceItem { |
|
16 | 21 | public: |
|
17 | explicit DataSourceItem(QVector<QVariant> data = {}); | |
|
22 | explicit DataSourceItem(DataSourceItemType type, QVector<QVariant> data = {}); | |
|
18 | 23 | |
|
19 | 24 | /** |
|
20 | 25 | * Adds a child to the item. The item takes ownership of the child. |
@@ -44,6 +49,8 public: | |||
|
44 | 49 | */ |
|
45 | 50 | DataSourceItem *parentItem() const noexcept; |
|
46 | 51 | |
|
52 | DataSourceItemType type() const noexcept; | |
|
53 | ||
|
47 | 54 | private: |
|
48 | 55 | class DataSourceItemPrivate; |
|
49 | 56 | spimpl::unique_impl_ptr<DataSourceItemPrivate> impl; |
@@ -49,7 +49,7 void DataSourceController::setDataSourceItem( | |||
|
49 | 49 | // Retrieves the data source item to emit the signal with it |
|
50 | 50 | auto it = impl->m_DataSourceItems.find(dataSourceUid); |
|
51 | 51 | if (it != impl->m_DataSourceItems.end()) { |
|
52 |
emit dataSourceItemSet( |
|
|
52 | emit dataSourceItemSet(it->second.get()); | |
|
53 | 53 | } |
|
54 | 54 | } |
|
55 | 55 | else { |
@@ -3,18 +3,19 | |||
|
3 | 3 | #include <QVector> |
|
4 | 4 | |
|
5 | 5 | struct DataSourceItem::DataSourceItemPrivate { |
|
6 | explicit DataSourceItemPrivate(QVector<QVariant> data) | |
|
7 | : m_Parent{nullptr}, m_Children{}, m_Data{std::move(data)} | |
|
6 | explicit DataSourceItemPrivate(DataSourceItemType type, QVector<QVariant> data) | |
|
7 | : m_Parent{nullptr}, m_Children{}, m_Type{type}, m_Data{std::move(data)} | |
|
8 | 8 | { |
|
9 | 9 | } |
|
10 | 10 | |
|
11 | 11 | DataSourceItem *m_Parent; |
|
12 | 12 | std::vector<std::unique_ptr<DataSourceItem> > m_Children; |
|
13 | DataSourceItemType m_Type; | |
|
13 | 14 | QVector<QVariant> m_Data; |
|
14 | 15 | }; |
|
15 | 16 | |
|
16 | DataSourceItem::DataSourceItem(QVector<QVariant> data) | |
|
17 | : impl{spimpl::make_unique_impl<DataSourceItemPrivate>(data)} | |
|
17 | DataSourceItem::DataSourceItem(DataSourceItemType type, QVector<QVariant> data) | |
|
18 | : impl{spimpl::make_unique_impl<DataSourceItemPrivate>(type, std::move(data))} | |
|
18 | 19 | { |
|
19 | 20 | } |
|
20 | 21 | |
@@ -48,3 +49,8 DataSourceItem *DataSourceItem::parentItem() const noexcept | |||
|
48 | 49 | { |
|
49 | 50 | return impl->m_Parent; |
|
50 | 51 | } |
|
52 | ||
|
53 | DataSourceItemType DataSourceItem::type() const noexcept | |
|
54 | { | |
|
55 | return impl->m_Type; | |
|
56 | } |
@@ -26,12 +26,13 void TestDataSourceController::testSetDataSourceItem() | |||
|
26 | 26 | DataSourceController dataSourceController{}; |
|
27 | 27 | |
|
28 | 28 | // Spy to test controllers' signals |
|
29 |
QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet( |
|
|
29 | QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(DataSourceItem *))}; | |
|
30 | 30 | |
|
31 | 31 | // Create a data source item |
|
32 | 32 | auto source1Name = QStringLiteral("Source1"); |
|
33 | 33 | auto source1Values = QVector<QVariant>{source1Name}; |
|
34 | auto source1Item = std::make_unique<DataSourceItem>(std::move(source1Values)); | |
|
34 | auto source1Item | |
|
35 | = std::make_unique<DataSourceItem>(DataSourceItemType::PRODUCT, std::move(source1Values)); | |
|
35 | 36 | |
|
36 | 37 | // Add data source item to the controller and check that a signal has been emitted after setting |
|
37 | 38 | // data source item in the controller |
@@ -41,7 +42,8 void TestDataSourceController::testSetDataSourceItem() | |||
|
41 | 42 | |
|
42 | 43 | // Try to a data source item with an unregistered uid and check that no signal has been emitted |
|
43 | 44 | auto unregisteredUid = QUuid::createUuid(); |
|
44 |
dataSourceController.setDataSourceItem( |
|
|
45 | dataSourceController.setDataSourceItem( | |
|
46 | unregisteredUid, std::make_unique<DataSourceItem>(DataSourceItemType::PRODUCT)); | |
|
45 | 47 | QCOMPARE(signalSpy.count(), 1); |
|
46 | 48 | } |
|
47 | 49 |
@@ -1,3 +1,6 | |||
|
1 | 1 | # On ignore toutes les règles vera++ pour le fichier spimpl |
|
2 | 2 | Common/spimpl\.h:\d+:.* |
|
3 | 3 | |
|
4 | # Ignore false positive relative to two class definitions in a same file | |
|
5 | DataSourceItem\.h:\d+:.*IPSIS_S01.* | |
|
6 |
@@ -6,3 +6,7 | |||
|
6 | 6 | # Ignore false positive relative to 'noexcept' keyword |
|
7 | 7 | .*IPSIS_S04_VARIABLE.*found: noexcept |
|
8 | 8 | .*IPSIS_S06.*found: noexcept |
|
9 | ||
|
10 | # Ignore false positive relative to 'override' keyword | |
|
11 | .*IPSIS_S04_VARIABLE.*found: override | |
|
12 | .*IPSIS_S06.*found: override |
|
1 | NO CONTENT: file renamed from gui/include/sidepane/SqpSidePane.h to gui/include/SidePane/SqpSidePane.h |
|
1 | NO CONTENT: file renamed from gui/include/visualization/VisualizationGraphWidget.h to gui/include/Visualization/VisualizationGraphWidget.h |
|
1 | NO CONTENT: file renamed from gui/include/visualization/VisualizationTabWidget.h to gui/include/Visualization/VisualizationTabWidget.h |
@@ -1,8 +1,11 | |||
|
1 | 1 | #ifndef SCIQLOP_VISUALIZATIONWIDGET_H |
|
2 | 2 | #define SCIQLOP_VISUALIZATIONWIDGET_H |
|
3 | 3 | |
|
4 | #include <QLoggingCategory> | |
|
4 | 5 | #include <QWidget> |
|
5 | 6 | |
|
7 | Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationWidget) | |
|
8 | ||
|
6 | 9 | namespace Ui { |
|
7 | 10 | class VisualizationWidget; |
|
8 | 11 | } // namespace Ui |
|
1 | NO CONTENT: file renamed from gui/include/visualization/VisualizationZoneWidget.h to gui/include/Visualization/VisualizationZoneWidget.h |
|
1 | NO CONTENT: file renamed from gui/include/visualization/qcustomplot.h to gui/include/Visualization/qcustomplot.h |
@@ -1,4 +1,4 | |||
|
1 |
#include " |
|
|
1 | #include "SidePane/SqpSidePane.h" | |
|
2 | 2 | #include "ui_SqpSidePane.h" |
|
3 | 3 | |
|
4 | 4 | #include <QAction> |
@@ -22,7 +22,7 static const QString SQPSIDEPANESTYLESHEET | |||
|
22 | 22 | " }"; |
|
23 | 23 | } |
|
24 | 24 | |
|
25 |
SqpSidePane::SqpSidePane(QWidget *parent) : QWidget |
|
|
25 | SqpSidePane::SqpSidePane(QWidget *parent) : QWidget{parent}, ui{new Ui::SqpSidePane} | |
|
26 | 26 | { |
|
27 | 27 | QVBoxLayout *sidePaneLayout = new QVBoxLayout(this); |
|
28 | 28 | sidePaneLayout->setContentsMargins(0, 0, 0, 0); |
@@ -1,4 +1,4 | |||
|
1 |
#include " |
|
|
1 | #include "Visualization/VisualizationGraphWidget.h" | |
|
2 | 2 | #include "ui_VisualizationGraphWidget.h" |
|
3 | 3 | |
|
4 | 4 | VisualizationGraphWidget::VisualizationGraphWidget(QWidget *parent) |
@@ -1,8 +1,8 | |||
|
1 |
#include " |
|
|
1 | #include "Visualization/VisualizationTabWidget.h" | |
|
2 | 2 | #include "ui_VisualizationTabWidget.h" |
|
3 | 3 | |
|
4 | 4 | VisualizationTabWidget::VisualizationTabWidget(QWidget *parent) |
|
5 |
: QWidget |
|
|
5 | : QWidget{parent}, ui{new Ui::VisualizationTabWidget} | |
|
6 | 6 | { |
|
7 | 7 | ui->setupUi(this); |
|
8 | 8 | } |
@@ -1,8 +1,8 | |||
|
1 |
#include " |
|
|
1 | #include "Visualization/VisualizationZoneWidget.h" | |
|
2 | 2 | #include "ui_VisualizationZoneWidget.h" |
|
3 | 3 | |
|
4 | 4 | VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent) |
|
5 |
: QWidget |
|
|
5 | : QWidget{parent}, ui{new Ui::VisualizationZoneWidget} | |
|
6 | 6 | { |
|
7 | 7 | ui->setupUi(this); |
|
8 | 8 | } |
@@ -23,7 +23,7 | |||
|
23 | 23 | ** Version: 2.0.0-beta ** |
|
24 | 24 | ****************************************************************************/ |
|
25 | 25 | |
|
26 |
#include " |
|
|
26 | #include "Visualization/qcustomplot.h" | |
|
27 | 27 | |
|
28 | 28 | |
|
29 | 29 | /* including file 'src/vector2d.cpp', size 7340 */ |
@@ -19,20 +19,23 | |||
|
19 | 19 | <property name="currentIndex"> |
|
20 | 20 | <number>0</number> |
|
21 | 21 | </property> |
|
22 |
<widget class=" |
|
|
22 | <widget class="VisualizationTabWidget" name="firstView"> | |
|
23 | 23 | <attribute name="title"> |
|
24 | 24 | <string>View 1</string> |
|
25 | 25 | </attribute> |
|
26 | 26 | </widget> |
|
27 | <widget class="QWidget" name="secondView"> | |
|
28 | <attribute name="title"> | |
|
29 | <string>+</string> | |
|
30 | </attribute> | |
|
31 | </widget> | |
|
32 | 27 | </widget> |
|
33 | 28 | </item> |
|
34 | 29 | </layout> |
|
35 | 30 | </widget> |
|
31 | <customwidgets> | |
|
32 | <customwidget> | |
|
33 | <class>VisualizationTabWidget</class> | |
|
34 | <extends>QWidget</extends> | |
|
35 | <header location="global">Visualization/VisualizationTabWidget.h</header> | |
|
36 | <container>1</container> | |
|
37 | </customwidget> | |
|
38 | </customwidgets> | |
|
36 | 39 | <resources/> |
|
37 | 40 | <connections/> |
|
38 | 41 | </ui> |
@@ -1,8 +1,11 | |||
|
1 | # Ignore false positive relative to App macro | |
|
2 | 1 | \.h:\d+:.IPSIS_S04.*found: ui |
|
3 | 2 | qcustomplot\.h:\d+:.IPSIS |
|
4 | 3 | qcustomplot\.cpp:\d+:.IPSIS |
|
4 | ||
|
5 | # Ignore false positive relative to App macro | |
|
5 | 6 | SqpApplication\.h:\d+:.IPSIS_S03.*found: sqpApp |
|
6 | 7 | SqpApplication\.h:\d+:.IPSIS_S04_VARIABLE.*found: sqpApp |
|
7 | 8 | |
|
9 | # Ignore false positive relative to unnamed namespace | |
|
10 | DataSourceTreeWidgetItem\.cpp:\d+:.*IPSIS_F13.* | |
|
8 | 11 |
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now