HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Pull Request !141

Closed

Pull request !141 Created on by

perrinel

- Merge pull request #140 from SCIQLOP-Initialisation feature/VisualizationWidget
- Widget of the tab widget are now of type VisualizationTabWidget
- Merge branch 'feature/PluginTreeItem' into develop
- Adds vera exclusions
- Loads SciQlop plugins

Commit flow:

branch:develop of GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation → branch:develop of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Versions:

Pull request versions not available.

Expand 17 commits

ver	Time	Author	Commit	Description
`latest`	Thu, 08 Jun 2017 09:30:04	perrinel	`r94:bc430a638f57`	Merge branch 'develop' of https://perrinel@hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation into develop
`latest`	Thu, 08 Jun 2017 09:29:53	perrinel	`r93:5eeffba24c85`	mv visualization -> Visualization mv sidepane-> SidePane
`latest`	Thu, 08 Jun 2017 09:14:01	Alexandre Leroux	`r92:b0a8cbf325bf`	Merge branch 'develop' of https://hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation into develop
`latest`	Thu, 08 Jun 2017 09:13:23	Alexandre Leroux	`r91:1f6db623b170`	Add warnings if the icon of a data source can't be set
`latest`	Thu, 08 Jun 2017 09:13:03	Alexandre Leroux	`r90:afb77b3143a6`	Change signal/slot signature for data source
`latest`	Thu, 08 Jun 2017 09:12:00	perrinel	`r89:dbb343f70ba9`	Modify construction of objects to use initializer list Add missing Tr
`v1`	Thu, 08 Jun 2017 08:13:11	perrinel	`r88:626323acfce7`	Merge pull request 140 from SCIQLOP-Initialisation feature/VisualizationWidget Widget of the tab widget are now of type VisualizationTabWidget
`v1`	Thu, 08 Jun 2017 08:06:30	perrinel	`r87:a08c6215b1ad`	Widget of the tab widget are now of type VisualizationTabWidget Add addTabView and removeTabView lambda method connecter to their correspondant button in the VisuaizationWidget
`v1`	Thu, 08 Jun 2017 07:38:59	Alexandre Leroux	`r86:d88ff9772a05`	Merge branch 'feature/PluginTreeItem' into develop
`v1`	Thu, 08 Jun 2017 07:38:17	Alexandre Leroux	`r85:87f9ad03d785`	Adds vera exclusions
`v1`	Wed, 07 Jun 2017 16:06:57	Alexandre Leroux	`r84:34decf396cd1`	Loads SciQlop plugins
`v1`	Wed, 07 Jun 2017 16:06:57	Alexandre Leroux	`r83:05a4d7964d8e`	Connects data source widget to data source controller
`v1`	Wed, 07 Jun 2017 16:06:57	Alexandre Leroux	`r82:49b6273d9035`	Implements method to add a data source in the widget The method is a slot that will be connected with data source controller in the aim to create the data source representation in the widget when a new data source is set in the contoller
`v1`	Wed, 07 Jun 2017 16:06:57	Alexandre Leroux	`r81:8a7c6c676eea`	Creates the data source widget The widget contains a tree that will contains all the data sources attached to SciQlop (by the plugins)
`v1`	Wed, 07 Jun 2017 16:06:57	Alexandre Leroux	`r80:0c5b0960e82e`	Handles the icon of a DataSourceTreeWidgetItem (depending of the type of the data source item)
`v1`	Wed, 07 Jun 2017 16:06:57	Alexandre Leroux	`r79:084c81f48928`	Defines the QTreeWidgetItem for a data source item
`v1`	Wed, 07 Jun 2017 16:06:57	Alexandre Leroux	`r78:0afc39d45cc4`	Adds type for a data source item An item can be a node or a product. The type will be useful for various operations, like setting the item icon in the data source widget
17 commits hidden, click expand to show them.

Expand all files

app/src/MainWindow.cpp +2 -2

                 mainToolBar->addAction("A1");
                 // Widgets / controllers connections
-                connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem &)),
+                connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)),
-                        m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem &)));
+                        m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *)));
                 /*    QLopGUI::registerMenuBar(menuBar());
                     this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));

core/include/DataSource/DataSourceController.h +1 -1

             signals:
                 /// Signal emitted when a structure has been set for a data source
-                void dataSourceItemSet(DataSourceItem &dataSourceItem);
+                void dataSourceItemSet(DataSourceItem *dataSourceItem);
             private:
                 void waitForFinish();

core/src/DataSource/DataSourceController.cpp +1 -1

                     // Retrieves the data source item to emit the signal with it
                     auto it = impl->m_DataSourceItems.find(dataSourceUid);
                     if (it != impl->m_DataSourceItems.end()) {
-                        emit dataSourceItemSet(*it->second);
+                        emit dataSourceItemSet(it->second.get());
                     }
                 }
                 else {

core/tests/DataSource/TestDataSourceController.cpp +1 -1

                 DataSourceController dataSourceController{};
                 // Spy to test controllers' signals
-                QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(const DataSourceItem &))};
+                QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(DataSourceItem *))};
                 // Create a data source item
                 auto source1Name = QStringLiteral("Source1");

gui/include/DataSource/DataSourceWidget.h +2 -2

                 /**
                  * Adds a data source. An item associated to the data source is created and then added to the
                  * representation tree
-                 * @param dataSource the data source to add
+                 * @param dataSource the data source to add. The pointer has to be not null
                  */
-                void addDataSource(DataSourceItem &dataSource) noexcept;
+                void addDataSource(DataSourceItem *dataSource) noexcept;
             private:
                 class DataSourceWidgetPrivate;

gui/src/DataSource/DataSourceTreeWidgetItem.cpp +7 0

                             // No action
                             break;
                     }
+                    qCWarning(LOG_DataSourceTreeWidgetItem())
+                        << QObject::tr("Can't set data source icon : unknown data source type");
+                }
+                else {
+                    qCWarning(LOG_DataSourceTreeWidgetItem())
+                        << QObject::tr("Can't set data source icon : the data source is null");
                 }
                 // Default cases

gui/src/DataSource/DataSourceWidget.cpp +4 -2

             {
             }
-            void DataSourceWidget::addDataSource(DataSourceItem &dataSource) noexcept
+            void DataSourceWidget::addDataSource(DataSourceItem *dataSource) noexcept
             {
                 // Creates the item associated to the source and adds it to the tree widget. The tree widget
                 // takes the ownership of the item
-                impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(&dataSource));
+                if (dataSource) {
+                    impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(dataSource));
+                }
             }

Expand all files

Collapse all files

app/src/MainWindow.cpp +1 -1

             #include <QAction>
             #include <QToolBar>
             #include <memory.h>
-            MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::MainWindow)
+            MainWindow::MainWindow(QWidget *parent) : QMainWindow{parent}, m_Ui{new Ui::MainWindow}
             {
                 m_Ui->setupUi(this);

gui/src/sidepane/SqpSidePane.cpp +1 -1

                   " }";
             }
-            SqpSidePane::SqpSidePane(QWidget *parent) : QWidget(parent), ui(new Ui::SqpSidePane)
+            SqpSidePane::SqpSidePane(QWidget *parent) : QWidget{parent}, ui{new Ui::SqpSidePane}
             {
                 QVBoxLayout *sidePaneLayout = new QVBoxLayout(this);
                 sidePaneLayout->setContentsMargins(0, 0, 0, 0);

gui/src/visualization/VisualizationTabWidget.cpp +1 -1

             #include "ui_VisualizationTabWidget.h"
             VisualizationTabWidget::VisualizationTabWidget(QWidget *parent)
-                    : QWidget(parent), ui(new Ui::VisualizationTabWidget)
+                    : QWidget{parent}, ui{new Ui::VisualizationTabWidget}
             {
                 ui->setupUi(this);
             }

gui/src/visualization/VisualizationWidget.cpp +3 -3

             Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget")
             VisualizationWidget::VisualizationWidget(QWidget *parent)
-                    : QWidget(parent), ui(new Ui::VisualizationWidget)
+                    : QWidget{parent}, ui{new Ui::VisualizationWidget}
             {
                 ui->setupUi(this);
-                auto *addTabViewButton = new QToolButton(ui->tabWidget);
+                auto addTabViewButton = new QToolButton{ui->tabWidget};
-                addTabViewButton->setText("Add View");
+                addTabViewButton->setText(tr("Add View"));
                 addTabViewButton->setCursor(Qt::ArrowCursor);
                 addTabViewButton->setAutoRaise(true);
                 ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner);

gui/src/visualization/VisualizationZoneWidget.cpp +1 -1

             #include "ui_VisualizationZoneWidget.h"
             VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent)
-                    : QWidget(parent), ui(new Ui::VisualizationZoneWidget)
+                    : QWidget{parent}, ui{new Ui::VisualizationZoneWidget}
             {
                 ui->setupUi(this);
             }

Collapse all files

gui/src/DataSource/DataSourceTreeWidgetItem.cpp +7 0

                             // No action
                             break;
                     }
+                    qCWarning(LOG_DataSourceTreeWidgetItem())
+                        << QObject::tr("Can't set data source icon : unknown data source type");
+                }
+                else {
+                    qCWarning(LOG_DataSourceTreeWidgetItem())
+                        << QObject::tr("Can't set data source icon : the data source is null");
                 }
                 // Default cases

Expand all files

app/src/MainWindow.cpp +2 -2

                 mainToolBar->addAction("A1");
                 // Widgets / controllers connections
-                connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem &)),
+                connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)),
-                        m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem &)));
+                        m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *)));
                 /*    QLopGUI::registerMenuBar(menuBar());
                     this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));

core/include/DataSource/DataSourceController.h +1 -1

             signals:
                 /// Signal emitted when a structure has been set for a data source
-                void dataSourceItemSet(DataSourceItem &dataSourceItem);
+                void dataSourceItemSet(DataSourceItem *dataSourceItem);
             private:
                 void waitForFinish();

core/src/DataSource/DataSourceController.cpp +1 -1

                     // Retrieves the data source item to emit the signal with it
                     auto it = impl->m_DataSourceItems.find(dataSourceUid);
                     if (it != impl->m_DataSourceItems.end()) {
-                        emit dataSourceItemSet(*it->second);
+                        emit dataSourceItemSet(it->second.get());
                     }
                 }
                 else {

core/tests/DataSource/TestDataSourceController.cpp +1 -1

                 DataSourceController dataSourceController{};
                 // Spy to test controllers' signals
-                QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(const DataSourceItem &))};
+                QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(DataSourceItem *))};
                 // Create a data source item
                 auto source1Name = QStringLiteral("Source1");

gui/include/DataSource/DataSourceWidget.h +2 -2

                 /**
                  * Adds a data source. An item associated to the data source is created and then added to the
                  * representation tree
-                 * @param dataSource the data source to add
+                 * @param dataSource the data source to add. The pointer has to be not null
                  */
-                void addDataSource(DataSourceItem &dataSource) noexcept;
+                void addDataSource(DataSourceItem *dataSource) noexcept;
             private:
                 class DataSourceWidgetPrivate;

gui/src/DataSource/DataSourceWidget.cpp +4 -2

             {
             }
-            void DataSourceWidget::addDataSource(DataSourceItem &dataSource) noexcept
+            void DataSourceWidget::addDataSource(DataSourceItem *dataSource) noexcept
             {
                 // Creates the item associated to the source and adds it to the tree widget. The tree widget
                 // takes the ownership of the item
-                impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(&dataSource));
+                if (dataSource) {
+                    impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(dataSource));
+                }
             }

Collapse all files

app/src/MainWindow.cpp +1 -1

             #include <QAction>
             #include <QToolBar>
             #include <memory.h>
-            MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::MainWindow)
+            MainWindow::MainWindow(QWidget *parent) : QMainWindow{parent}, m_Ui{new Ui::MainWindow}
             {
                 m_Ui->setupUi(this);

gui/src/sidepane/SqpSidePane.cpp +1 -1

                   " }";
             }
-            SqpSidePane::SqpSidePane(QWidget *parent) : QWidget(parent), ui(new Ui::SqpSidePane)
+            SqpSidePane::SqpSidePane(QWidget *parent) : QWidget{parent}, ui{new Ui::SqpSidePane}
             {
                 QVBoxLayout *sidePaneLayout = new QVBoxLayout(this);
                 sidePaneLayout->setContentsMargins(0, 0, 0, 0);

gui/src/visualization/VisualizationTabWidget.cpp +1 -1

             #include "ui_VisualizationTabWidget.h"
             VisualizationTabWidget::VisualizationTabWidget(QWidget *parent)
-                    : QWidget(parent), ui(new Ui::VisualizationTabWidget)
+                    : QWidget{parent}, ui{new Ui::VisualizationTabWidget}
             {
                 ui->setupUi(this);
             }

gui/src/visualization/VisualizationWidget.cpp +3 -3

             Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget")
             VisualizationWidget::VisualizationWidget(QWidget *parent)
-                    : QWidget(parent), ui(new Ui::VisualizationWidget)
+                    : QWidget{parent}, ui{new Ui::VisualizationWidget}
             {
                 ui->setupUi(this);
-                auto *addTabViewButton = new QToolButton(ui->tabWidget);
+                auto addTabViewButton = new QToolButton{ui->tabWidget};
-                addTabViewButton->setText("Add View");
+                addTabViewButton->setText(tr("Add View"));
                 addTabViewButton->setCursor(Qt::ArrowCursor);
                 addTabViewButton->setAutoRaise(true);
                 ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner);

gui/src/visualization/VisualizationZoneWidget.cpp +1 -1

             #include "ui_VisualizationZoneWidget.h"
             VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent)
-                    : QWidget(parent), ui(new Ui::VisualizationZoneWidget)
+                    : QWidget{parent}, ui{new Ui::VisualizationZoneWidget}
             {
                 ui->setupUi(this);
             }

Collapse all files

gui/include/visualization/VisualizationWidget.h +3 0

             #ifndef SCIQLOP_VISUALIZATIONWIDGET_H
             #define SCIQLOP_VISUALIZATIONWIDGET_H
+            #include <QLoggingCategory>
             #include <QWidget>
+            Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationWidget)
             namespace Ui {
             class VisualizationWidget;
             } // namespace Ui

gui/src/visualization/VisualizationWidget.cpp +30 0

@@ -1,10 +1,40
1	#include "visualization/VisualizationWidget.h"	1	#include "visualization/VisualizationWidget.h"
2	#include "ui_VisualizationWidget.h"	2	#include "ui_VisualizationWidget.h"
		3	#include "visualization/VisualizationTabWidget.h"
		4
		5	#include <QDebug>
		6	#include <QToolButton>
		7
		8	#include "iostream"
		9
		10	Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget")
3		11
4	VisualizationWidget::VisualizationWidget(QWidget *parent)	12	VisualizationWidget::VisualizationWidget(QWidget *parent)
5	: QWidget(parent), ui(new Ui::VisualizationWidget)	13	: QWidget(parent), ui(new Ui::VisualizationWidget)
6	{	14	{
7	ui->setupUi(this);	15	ui->setupUi(this);
		16
		17	auto *addTabViewButton = new QToolButton(ui->tabWidget);
		18	addTabViewButton->setText("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);
8	}	38	}
9		39
10	VisualizationWidget::~VisualizationWidget()	40	VisualizationWidget::~VisualizationWidget()

gui/ui/visualization/VisualizationWidget.ui +9 -6

                  <property name="currentIndex">
                   <number>0</number>
                  </property>
-                 <widget class="QWidget" name="firstView">
+                 <widget class="VisualizationTabWidget" name="firstView">
                   <attribute name="title">
                    <string>View 1</string>
                   </attribute>
                  </widget>
-                 <widget class="QWidget" name="secondView">
-                  <attribute name="title">
-                   <string>+</string>
-                  </attribute>
-                 </widget>
                 </widget>
                </item>
               </layout>
              </widget>
+             <customwidgets>
+              <customwidget>
+               <class>VisualizationTabWidget</class>
+               <extends>QWidget</extends>
+               <header location="global">visualization/VisualizationTabWidget.h</header>
+               <container>1</container>
+              </customwidget>
+             </customwidgets>
              <resources/>
              <connections/>
             </ui>

Collapse all files

gui/include/visualization/VisualizationWidget.h +3 0

             #ifndef SCIQLOP_VISUALIZATIONWIDGET_H
             #define SCIQLOP_VISUALIZATIONWIDGET_H
+            #include <QLoggingCategory>
             #include <QWidget>
+            Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationWidget)
             namespace Ui {
             class VisualizationWidget;
             } // namespace Ui

gui/src/visualization/VisualizationWidget.cpp +30 0

@@ -1,10 +1,40
1	#include "visualization/VisualizationWidget.h"	1	#include "visualization/VisualizationWidget.h"
2	#include "ui_VisualizationWidget.h"	2	#include "ui_VisualizationWidget.h"
		3	#include "visualization/VisualizationTabWidget.h"
		4
		5	#include <QDebug>
		6	#include <QToolButton>
		7
		8	#include "iostream"
		9
		10	Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget")
3		11
4	VisualizationWidget::VisualizationWidget(QWidget *parent)	12	VisualizationWidget::VisualizationWidget(QWidget *parent)
5	: QWidget(parent), ui(new Ui::VisualizationWidget)	13	: QWidget(parent), ui(new Ui::VisualizationWidget)
6	{	14	{
7	ui->setupUi(this);	15	ui->setupUi(this);
		16
		17	auto *addTabViewButton = new QToolButton(ui->tabWidget);
		18	addTabViewButton->setText("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);
8	}	38	}
9		39
10	VisualizationWidget::~VisualizationWidget()	40	VisualizationWidget::~VisualizationWidget()

gui/ui/visualization/VisualizationWidget.ui +9 -6

                  <property name="currentIndex">
                   <number>0</number>
                  </property>
-                 <widget class="QWidget" name="firstView">
+                 <widget class="VisualizationTabWidget" name="firstView">
                   <attribute name="title">
                    <string>View 1</string>
                   </attribute>
                  </widget>
-                 <widget class="QWidget" name="secondView">
-                  <attribute name="title">
-                   <string>+</string>
-                  </attribute>
-                 </widget>
                 </widget>
                </item>
               </layout>
              </widget>
+             <customwidgets>
+              <customwidget>
+               <class>VisualizationTabWidget</class>
+               <extends>QWidget</extends>
+               <header location="global">visualization/VisualizationTabWidget.h</header>
+               <container>1</container>
+              </customwidget>
+             </customwidgets>
              <resources/>
              <connections/>
             </ui>

Expand all files

Collapse all files

core/vera-exclusions/exclusions.txt +3 0

             # On ignore toutes les règles vera++ pour le fichier spimpl
             Common/spimpl\.h:\d+:.*
+            # Ignore false positive relative to two class definitions in a same file
+            DataSourceItem\.h:\d+:.*IPSIS_S01.*

formatting/vera-exclusions/exclusions.txt +4 0

@@ -6,3 +6,7
6	# Ignore false positive relative to 'noexcept' keyword	6	# Ignore false positive relative to 'noexcept' keyword
7	.IPSIS_S04_VARIABLE.found: noexcept	7	.IPSIS_S04_VARIABLE.found: noexcept
8	.IPSIS_S06.found: noexcept	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

gui/vera-exclusions/exclusions.txt +4 -1

-            # Ignore false positive relative to App macro
             \.h:\d+:.IPSIS_S04.*found: ui
             qcustomplot\.h:\d+:.IPSIS
             qcustomplot\.cpp:\d+:.IPSIS
+            # Ignore false positive relative to App macro
             SqpApplication\.h:\d+:.IPSIS_S03.*found: sqpApp
             SqpApplication\.h:\d+:.IPSIS_S04_VARIABLE.*found: sqpApp
+            # Ignore false positive relative to unnamed namespace
+            DataSourceTreeWidgetItem\.cpp:\d+:.*IPSIS_F13.*

Collapse all files

app/src/Main.cpp +21 0

@@ -25,6 +25,16
25	#include <SqpApplication.h>	25	#include <SqpApplication.h>
26	#include <qglobal.h>	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	int main(int argc, char *argv[])	38	int main(int argc, char *argv[])
29	{	39	{
30	SqpApplication a{argc, argv};	40	SqpApplication a{argc, argv};
@@ -34,5 +44,16 int main(int argc, char *argv[])
34	MainWindow w;	44	MainWindow w;
35	w.show();	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	return a.exec();	58	return a.exec();
38	}	59	}

Collapse all files

app/src/MainWindow.cpp +10 0

             ----------------------------------------------------------------------------*/
             #include "MainWindow.h"
             #include "ui_MainWindow.h"
+            #include <DataSource/DataSourceController.h>
+            #include <DataSource/DataSourceWidget.h>
+            #include <SqpApplication.h>
             #include <QAction>
             #include <QDate>
             #include <QDateTime>
                 this->menuBar()->addAction("File");
                 auto mainToolBar = this->addToolBar("MainToolBar");
                 mainToolBar->addAction("A1");
+                // Widgets / controllers connections
+                connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem &)),
+                        m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem &)));
                 /*    QLopGUI::registerMenuBar(menuBar());
                     this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
                     this->m_progressWidget = new QWidget();

core/include/DataSource/DataSourceController.h +1 -1

             signals:
                 /// Signal emitted when a structure has been set for a data source
-                void dataSourceItemSet(const DataSourceItem &dataSourceItem);
+                void dataSourceItemSet(DataSourceItem &dataSourceItem);
             private:
                 void waitForFinish();

Collapse all files

gui/include/DataSource/DataSourceWidget.h +8 0

             public:
                 explicit DataSourceWidget(QWidget *parent = 0);
+            public slots:
+                /**
+                 * Adds a data source. An item associated to the data source is created and then added to the
+                 * representation tree
+                 * @param dataSource the data source to add
+                 */
+                void addDataSource(DataSourceItem &dataSource) noexcept;
             private:
                 class DataSourceWidgetPrivate;
                 spimpl::unique_impl_ptr<DataSourceWidgetPrivate> impl;

gui/src/DataSource/DataSourceWidget.cpp +25 0

@@ -13,6 +13,24 const auto TREE_NB_COLUMNS = 1;
13	/// Header labels for the tree	13	/// Header labels for the tree
14	const auto TREE_HEADER_LABELS = QStringList{QObject::tr("Name")};	14	const auto TREE_HEADER_LABELS = QStringList{QObject::tr("Name")};
15		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
16	} // namespace	34	} // namespace
17		35
18	class DataSourceWidget::DataSourceWidgetPrivate {	36	class DataSourceWidget::DataSourceWidgetPrivate {
@@ -34,3 +52,10 DataSourceWidget::DataSourceWidget(QWidget *parent)
34	: QWidget{parent}, impl{spimpl::make_unique_impl<DataSourceWidgetPrivate>(*this)}	52	: QWidget{parent}, impl{spimpl::make_unique_impl<DataSourceWidgetPrivate>(*this)}
35	{	53	{
36	}	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	impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(&dataSource));
		61	}

Collapse all files

gui/include/DataSource/DataSourceWidget.h created 644 +25 0

@@ -0,0 +1,25
	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	private:
	21	class DataSourceWidgetPrivate;
	22	spimpl::unique_impl_ptr<DataSourceWidgetPrivate> impl;
	23	};
	24
	25	#endif // SCIQLOP_DATASOURCEWIDGET_H

gui/src/DataSource/DataSourceWidget.cpp created 644 +36 0

@@ -0,0 +1,36
	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	} // namespace
	17
	18	class DataSourceWidget::DataSourceWidgetPrivate {
	19	public:
	20	explicit DataSourceWidgetPrivate(DataSourceWidget &widget)
	21	: m_Ui{std::make_unique<Ui::DataSourceWidget>()}
	22	{
	23	m_Ui->setupUi(&widget);
	24
	25	// Set tree properties
	26	m_Ui->treeWidget->setColumnCount(TREE_NB_COLUMNS);
	27	m_Ui->treeWidget->setHeaderLabels(TREE_HEADER_LABELS);
	28	}
	29
	30	std::unique_ptr<Ui::DataSourceWidget> m_Ui;
	31	};
	32
	33	DataSourceWidget::DataSourceWidget(QWidget *parent)
	34	: QWidget{parent}, impl{spimpl::make_unique_impl<DataSourceWidgetPrivate>(*this)}
	35	{
	36	}

gui/ui/DataSource/DataSourceWidget.ui created 644 +24 0

@@ -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>

app/ui/MainWindow.ui +7 -1

                        <number>0</number>
                       </property>
                       <item>
-                       <widget class="QWidget" name="dateSourceWidget" native="true"/>
+                       <widget class="DataSourceWidget" name="dataSourceWidget" native="true"/>
                       </item>
                       <item>
                        <widget class="QWidget" name="dateTimeWidget" native="true"/>
                <header location="global">sidepane/SqpSidePane.h</header>
                <container>1</container>
               </customwidget>
+              <customwidget>
+               <class>DataSourceWidget</class>
+               <extends>QWidget</extends>
+               <header location="global">DataSource/DataSourceWidget.h</header>
+               <container>1</container>
+              </customwidget>
              </customwidgets>
              <resources/>
              <connections/>

Collapse all files

gui/src/DataSource/DataSourceTreeWidgetItem.cpp +27 0

@@ -1,8 +1,33
1	#include <DataSource/DataSourceItem.h>	1	#include <DataSource/DataSourceItem.h>
2	#include <DataSource/DataSourceTreeWidgetItem.h>	2	#include <DataSource/DataSourceTreeWidgetItem.h>
3		3
		4	#include <SqpApplication.h>
		5
4	Q_LOGGING_CATEGORY(LOG_DataSourceTreeWidgetItem, "DataSourceTreeWidgetItem")	6	Q_LOGGING_CATEGORY(LOG_DataSourceTreeWidgetItem, "DataSourceTreeWidgetItem")
5		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
		25	// Default cases
		26	return QIcon{};
		27	}
		28
		29	} // namespace
		30
6	struct DataSourceTreeWidgetItem::DataSourceTreeWidgetItemPrivate {	31	struct DataSourceTreeWidgetItem::DataSourceTreeWidgetItemPrivate {
7	explicit DataSourceTreeWidgetItemPrivate(const DataSourceItem *data) : m_Data{data} {}	32	explicit DataSourceTreeWidgetItemPrivate(const DataSourceItem *data) : m_Data{data} {}
8		33
@@ -20,6 +45,8 DataSourceTreeWidgetItem::DataSourceTreeWidgetItem(QTreeWidget *parent, const Da
20	: QTreeWidgetItem{parent, type},	45	: QTreeWidgetItem{parent, type},
21	impl{spimpl::make_unique_impl<DataSourceTreeWidgetItemPrivate>(data)}	46	impl{spimpl::make_unique_impl<DataSourceTreeWidgetItemPrivate>(data)}
22	{	47	{
		48	// Sets the icon depending on the data source
		49	setIcon(0, itemIcon(impl->m_Data));
23	}	50	}
24		51
25	QVariant DataSourceTreeWidgetItem::data(int column, int role) const	52	QVariant DataSourceTreeWidgetItem::data(int column, int role) const

Collapse all files

gui/include/DataSource/DataSourceTreeWidgetItem.h created 644 +32 0

@@ -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

gui/src/DataSource/DataSourceTreeWidgetItem.cpp created 644 +41 0

@@ -0,0 +1,41
	1	#include <DataSource/DataSourceItem.h>
	2	#include <DataSource/DataSourceTreeWidgetItem.h>
	3
	4	Q_LOGGING_CATEGORY(LOG_DataSourceTreeWidgetItem, "DataSourceTreeWidgetItem")
	5
	6	struct DataSourceTreeWidgetItem::DataSourceTreeWidgetItemPrivate {
	7	explicit DataSourceTreeWidgetItemPrivate(const DataSourceItem *data) : m_Data{data} {}
	8
	9	/// Model used to retrieve data source information
	10	const DataSourceItem *m_Data;
	11	};
	12
	13	DataSourceTreeWidgetItem::DataSourceTreeWidgetItem(const DataSourceItem *data, int type)
	14	: DataSourceTreeWidgetItem{nullptr, data, type}
	15	{
	16	}
	17
	18	DataSourceTreeWidgetItem::DataSourceTreeWidgetItem(QTreeWidget parent, const DataSourceItem data,
	19	int type)
	20	: QTreeWidgetItem{parent, type},
	21	impl{spimpl::make_unique_impl<DataSourceTreeWidgetItemPrivate>(data)}
	22	{
	23	}
	24
	25	QVariant DataSourceTreeWidgetItem::data(int column, int role) const
	26	{
	27	if (role == Qt::DisplayRole) {
	28	return (impl->m_Data) ? impl->m_Data->data(column) : QVariant{};
	29	}
	30	else {
	31	return QTreeWidgetItem::data(column, role);
	32	}
	33	}
	34
	35	void DataSourceTreeWidgetItem::setData(int column, int role, const QVariant &value)
	36	{
	37	// Data can't be changed by edition
	38	if (role != Qt::EditRole) {
	39	QTreeWidgetItem::setData(column, role, value);
	40	}
	41	}

Collapse all files

core/include/DataSource/DataSourceItem.h +8 -1

             #include <QVector>
             /**
+             * Possible types of an item
+             */
+            enum class DataSourceItemType { NODE, PRODUCT };
+            /**
              * @brief The DataSourceItem class aims to represent a structure element of a data source.
              * A data source has a tree structure that is made up of a main DataSourceItem object (root)
              * containing other DataSourceItem objects (children).
              */
             class DataSourceItem {
             public:
-                explicit DataSourceItem(QVector<QVariant> data = {});
+                explicit DataSourceItem(DataSourceItemType type, QVector<QVariant> data = {});
                 /**
                  * Adds a child to the item. The item takes ownership of the child.
                  */
                 DataSourceItem *parentItem() const noexcept;
+                DataSourceItemType type() const noexcept;
             private:
                 class DataSourceItemPrivate;
                 spimpl::unique_impl_ptr<DataSourceItemPrivate> impl;

core/src/DataSource/DataSourceItem.cpp +10 -4

             #include <QVector>
             struct DataSourceItem::DataSourceItemPrivate {
-                explicit DataSourceItemPrivate(QVector<QVariant> data)
+                explicit DataSourceItemPrivate(DataSourceItemType type, QVector<QVariant> data)
-                        : m_Parent{nullptr}, m_Children{}, m_Data{std::move(data)}
+                        : m_Parent{nullptr}, m_Children{}, m_Type{type}, m_Data{std::move(data)}
                 {
                 }
                 DataSourceItem *m_Parent;
                 std::vector<std::unique_ptr<DataSourceItem> > m_Children;
+                DataSourceItemType m_Type;
                 QVector<QVariant> m_Data;
             };
-            DataSourceItem::DataSourceItem(QVector<QVariant> data)
+            DataSourceItem::DataSourceItem(DataSourceItemType type, QVector<QVariant> data)
-                    : impl{spimpl::make_unique_impl<DataSourceItemPrivate>(data)}
+                    : impl{spimpl::make_unique_impl<DataSourceItemPrivate>(type, std::move(data))}
             {
             }
             {
                 return impl->m_Parent;
             }
+            DataSourceItemType DataSourceItem::type() const noexcept
+            {
+                return impl->m_Type;
+            }

core/tests/DataSource/TestDataSourceController.cpp +4 -2

                 // Create a data source item
                 auto source1Name = QStringLiteral("Source1");
                 auto source1Values = QVector<QVariant>{source1Name};
-                auto source1Item = std::make_unique<DataSourceItem>(std::move(source1Values));
+                auto source1Item
+                    = std::make_unique<DataSourceItem>(DataSourceItemType::PRODUCT, std::move(source1Values));
                 // Add data source item to the controller and check that a signal has been emitted after setting
                 // data source item in the controller
                 // Try to a data source item with an unregistered uid and check that no signal has been emitted
                 auto unregisteredUid = QUuid::createUuid();
-                dataSourceController.setDataSourceItem(unregisteredUid, std::make_unique<DataSourceItem>());
+                dataSourceController.setDataSourceItem(
+                    unregisteredUid, std::make_unique<DataSourceItem>(DataSourceItemType::PRODUCT));
                 QCOMPARE(signalSpy.count(), 1);
             }

General Comments 3

there is 1 general comment from older versions, show it

perrinel

v2 |

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 6 added
  * 3 removed

Changed files:
  * A gui/src/Visualization/VisualizationWidget.cpp
  * A gui/include/SidePane/SqpSidePane.h
  * A gui/include/Visualization/VisualizationGraphWidget.h
  * A gui/include/Visualization/VisualizationTabWidget.h
  * A gui/include/Visualization/VisualizationWidget.h
  * A gui/include/Visualization/VisualizationZoneWidget.h
  * A gui/include/Visualization/qcustomplot.h
  * A gui/src/SidePane/SqpSidePane.cpp
  * A gui/src/Visualization/VisualizationGraphWidget.cpp
  * A gui/src/Visualization/VisualizationTabWidget.cpp
  * A gui/src/Visualization/VisualizationZoneWidget.cpp
  * A gui/src/Visualization/qcustomplot.cpp
  * M gui/include/DataSource/DataSourceWidget.h
  * M gui/src/DataSource/DataSourceTreeWidgetItem.cpp
  * M gui/src/DataSource/DataSourceWidget.cpp
  * M app/src/Main.cpp
  * M app/src/MainWindow.cpp
  * M app/ui/MainWindow.ui
  * M core/include/DataSource/DataSourceController.h
  * M core/src/DataSource/DataSourceController.cpp
  * M core/tests/DataSource/TestDataSourceController.cpp
  * M gui/ui/visualization/VisualizationWidget.ui
  * M gui/vera-exclusions/exclusions.txt
  * M gui/src/visualization/VisualizationWidget.cpp
  * R cmake/sciqlop_package_qt.cmake
  * R core/include/Plugin/PluginManager.h
  * R core/include/Visualization/VisualizationController.h
  * R core/src/Plugin/PluginManager.cpp
  * R core/src/Visualization/VisualizationController.cpp
  * R gui/include/sidepane/SqpSidePane.h
  * R gui/include/visualization/VisualizationGraphWidget.h
  * R gui/include/visualization/VisualizationTabWidget.h
  * R gui/include/visualization/VisualizationWidget.h
  * R gui/include/visualization/VisualizationZoneWidget.h
  * R gui/include/visualization/qcustomplot.h
  * R gui/src/sidepane/SqpSidePane.cpp
  * R gui/src/visualization/VisualizationGraphWidget.cpp
  * R gui/src/visualization/VisualizationTabWidget.cpp
  * R gui/src/visualization/VisualizationZoneWidget.cpp
  * R gui/src/visualization/qcustomplot.cpp
  * R gui/ui/sidepane/SqpSidePane.ui
  * R gui/ui/visualization/VisualizationGraphWidget.ui
  * R gui/ui/visualization/VisualizationTabWidget.ui
  * R gui/ui/visualization/VisualizationZoneWidget.ui
  * R plugin/CMakeLists.txt
  * R plugin/cmake/Findsciqlop-plugin.cmake
  * R plugin/include/Plugin/IPlugin.h
  * R app/CMakeLists.txt
  * R app/include/MainWindow.h
  * R app/vera-exclusions/exclusions.txt
  * R cmake/sciqlop_applications.cmake
  * R core/CMakeLists.txt
  * R core/include/Common/spimpl.h
  * R gui/CMakeLists.txt
  * R gui/include/SqpApplication.h
  * R gui/src/SqpApplication.cpp
  * R app/src/mainwindow.ui

perrinel

v2 |

|

Status change > Approved

No TODOs yet

		Status change > Approved
		Pull request updated. Auto status change to \|under_review\|...
`v1 Thu, 08 Jun 2017 11:31:20`
		Auto status change to \|new_status\|...

In pull request description:

No Ticket data found.

In commit messages:

140 - in 1 commit

-            #include "sidepane/SqpSidePane.h"
+            #include "SidePane/SqpSidePane.h"
             #include "ui_SqpSidePane.h"
             #include <QAction>

-            #include "visualization/VisualizationGraphWidget.h"
+            #include "Visualization/VisualizationGraphWidget.h"
             #include "ui_VisualizationGraphWidget.h"
             VisualizationGraphWidget::VisualizationGraphWidget(QWidget *parent)

-            #include "visualization/VisualizationWidget.h"
+            #include "Visualization/VisualizationWidget.h"
+            #include "Visualization/VisualizationTabWidget.h"
             #include "ui_VisualizationWidget.h"
-            #include "visualization/VisualizationTabWidget.h"
             #include <QDebug>
             #include <QToolButton>

             **          Version: 2.0.0-beta                                           **
             ****************************************************************************/
-            #include "visualization/qcustomplot.h"
+            #include "Visualization/qcustomplot.h"
             /* including file 'src/vector2d.cpp', size 7340                              */

@@ -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
	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,68
	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
	25	// Default cases
	26	return QIcon{};
	27	}
	28
	29	} // namespace
	30
	31	struct DataSourceTreeWidgetItem::DataSourceTreeWidgetItemPrivate {
	32	explicit DataSourceTreeWidgetItemPrivate(const DataSourceItem *data) : m_Data{data} {}
	33
	34	/// Model used to retrieve data source information
	35	const DataSourceItem *m_Data;
	36	};
	37
	38	DataSourceTreeWidgetItem::DataSourceTreeWidgetItem(const DataSourceItem *data, int type)
	39	: DataSourceTreeWidgetItem{nullptr, data, type}
	40	{
	41	}
	42
	43	DataSourceTreeWidgetItem::DataSourceTreeWidgetItem(QTreeWidget parent, const DataSourceItem data,
	44	int type)
	45	: QTreeWidgetItem{parent, type},
	46	impl{spimpl::make_unique_impl<DataSourceTreeWidgetItemPrivate>(data)}
	47	{
	48	// Sets the icon depending on the data source
	49	setIcon(0, itemIcon(impl->m_Data));
	50	}
	51
	52	QVariant DataSourceTreeWidgetItem::data(int column, int role) const
	53	{
	54	if (role == Qt::DisplayRole) {
	55	return (impl->m_Data) ? impl->m_Data->data(column) : QVariant{};
	56	}
	57	else {
	58	return QTreeWidgetItem::data(column, role);
	59	}
	60	}
	61
	62	void DataSourceTreeWidgetItem::setData(int column, int role, const QVariant &value)
	63	{
	64	// Data can't be changed by edition
	65	if (role != Qt::EditRole) {
	66	QTreeWidgetItem::setData(column, role, value);
	67	}
	68	}

@@ -0,0 +1,61
	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	impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(&dataSource));
	61	}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages