HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r889:756d7fefd6f4

Merge pull request from SciQLop-fork develop...

leroux -

r889:756d7fefd6f4

parent child

Context file:

r889:756d7fefd6f4

Expand all files

gui/include/DragAndDrop/DragDropScroller.h created 644 +32 0

@@ -0,0 +1,32
	1	#ifndef SCIQLOP_DRAGDROPSCROLLER_H
	2	#define SCIQLOP_DRAGDROPSCROLLER_H
	3
	4	#include <Common/spimpl.h>
	5	#include <QScrollArea>
	6
	7	/**
	8	* @brief Event filter class which manage the scroll of QScrollArea during a drag&drop operation.
	9	* @note A QScrollArea inside an other QScrollArea is not fully supported.
	10	*/
	11	class DragDropScroller : public QObject {
	12	Q_OBJECT
	13
	14	public:
	15	DragDropScroller(QObject *parent = nullptr);
	16
	17	void addScrollArea(QScrollArea *scrollArea);
	18	void removeScrollArea(QScrollArea *scrollArea);
	19
	20	protected:
	21	bool eventFilter(QObject obj, QEvent event);
	22
	23	private:
	24	class DragDropScrollerPrivate;
	25	spimpl::unique_impl_ptr<DragDropScrollerPrivate> impl;
	26
	27	private slots:
	28	void onTimer();
	29	};
	30
	31
	32	#endif // SCIQLOP_DRAGDROPSCROLLER_H

gui/include/DragAndDrop/DragDropTabSwitcher.h created 644 +29 0

@@ -0,0 +1,29
	1	#ifndef SCIQLOP_DRAGDROPTABSWITCHER_H
	2	#define SCIQLOP_DRAGDROPTABSWITCHER_H
	3
	4	#include <Common/spimpl.h>
	5
	6	#include <QLoggingCategory>
	7	#include <QTabBar>
	8
	9	Q_DECLARE_LOGGING_CATEGORY(LOG_DragDropTabSwitcher)
	10
	11	class DragDropTabSwitcher : public QObject {
	12	Q_OBJECT
	13
	14	public:
	15	DragDropTabSwitcher(QObject *parent = nullptr);
	16
	17	void addTabBar(QTabBar *tabBar);
	18	void removeTabBar(QTabBar *tabBar);
	19
	20	protected:
	21	bool eventFilter(QObject obj, QEvent event);
	22
	23	private:
	24	class DragDropTabSwitcherPrivate;
	25	spimpl::unique_impl_ptr<DragDropTabSwitcherPrivate> impl;
	26	};
	27
	28
	29	#endif // SCIQLOP_DRAGDROPTABSWITCHER_H

gui/include/Variable/VariableInspectorTableView.h created 644 +14 0

@@ -0,0 +1,14
	1	#ifndef SCIQLOP_VARIABLEINSPECTORTABLEVIEW_H
	2	#define SCIQLOP_VARIABLEINSPECTORTABLEVIEW_H
	3
	4	#include <QTableView>
	5
	6	class VariableInspectorTableView : public QTableView {
	7	public:
	8	VariableInspectorTableView(QWidget *parent = nullptr);
	9
	10	protected:
	11	void startDrag(Qt::DropActions supportedActions);
	12	};
	13
	14	#endif // SCIQLOP_VARIABLEINSPECTORTABLEVIEW_H

gui/src/DragAndDrop/DragDropHelper.cpp created 644 +275 0

@@ -0,0 +1,275
	1	#include "DragAndDrop/DragDropHelper.h"
	2	#include "DragAndDrop/DragDropScroller.h"
	3	#include "DragAndDrop/DragDropTabSwitcher.h"
	4	#include "SqpApplication.h"
	5	#include "Visualization/VisualizationDragDropContainer.h"
	6	#include "Visualization/VisualizationDragWidget.h"
	7	#include "Visualization/VisualizationWidget.h"
	8	#include "Visualization/operations/FindVariableOperation.h"
	9
	10	#include "Variable/Variable.h"
	11	#include "Variable/VariableController.h"
	12
	13	#include "Common/MimeTypesDef.h"
	14	#include "Common/VisualizationDef.h"
	15
	16	#include <QDir>
	17	#include <QLabel>
	18	#include <QUrl>
	19	#include <QVBoxLayout>
	20
	21
	22	Q_LOGGING_CATEGORY(LOG_DragDropHelper, "DragDropHelper")
	23
	24
	25	struct DragDropHelper::DragDropHelperPrivate {
	26
	27	VisualizationDragWidget *m_CurrentDragWidget = nullptr;
	28	std::unique_ptr<QWidget> m_PlaceHolder = nullptr;
	29	QLabel *m_PlaceHolderLabel;
	30	QWidget *m_PlaceBackground;
	31	std::unique_ptr<DragDropScroller> m_DragDropScroller = nullptr;
	32	std::unique_ptr<DragDropTabSwitcher> m_DragDropTabSwitcher = nullptr;
	33	QString m_ImageTempUrl; // Temporary file for image url generated by the drag & drop. Not using
	34	// QTemporaryFile to have a name which is not generated.
	35
	36	VisualizationDragWidget *m_HighlightedDragWidget = nullptr;
	37
	38	QMetaObject::Connection m_DragWidgetDestroyedConnection;
	39	QMetaObject::Connection m_HighlightedWidgetDestroyedConnection;
	40
	41	explicit DragDropHelperPrivate()
	42	: m_PlaceHolder{std::make_unique<QWidget>()},
	43	m_DragDropScroller{std::make_unique<DragDropScroller>()},
	44	m_DragDropTabSwitcher{std::make_unique<DragDropTabSwitcher>()}
	45	{
	46
	47	auto layout = new QVBoxLayout{m_PlaceHolder.get()};
	48	layout->setSpacing(0);
	49	layout->setContentsMargins(0, 0, 0, 0);
	50
	51	m_PlaceHolderLabel = new QLabel{"", m_PlaceHolder.get()};
	52	m_PlaceHolderLabel->setMinimumHeight(25);
	53	layout->addWidget(m_PlaceHolderLabel);
	54
	55	m_PlaceBackground = new QWidget{m_PlaceHolder.get()};
	56	m_PlaceBackground->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
	57	layout->addWidget(m_PlaceBackground);
	58
	59	sqpApp->installEventFilter(m_DragDropScroller.get());
	60	sqpApp->installEventFilter(m_DragDropTabSwitcher.get());
	61
	62	m_ImageTempUrl = QDir::temp().absoluteFilePath("Sciqlop_graph.png");
	63	}
	64
	65	void preparePlaceHolder(DragDropHelper::PlaceHolderType type, const QString &topLabelText) const
	66	{
	67	if (m_CurrentDragWidget) {
	68	m_PlaceHolder->setMinimumSize(m_CurrentDragWidget->size());
	69	m_PlaceHolder->setSizePolicy(m_CurrentDragWidget->sizePolicy());
	70	}
	71	else {
	72	// Configuration of the placeHolder when there is no dragWidget
	73	// (for instance with a drag from a variable)
	74
	75	m_PlaceHolder->setMinimumSize(0, GRAPH_MINIMUM_HEIGHT);
	76	m_PlaceHolder->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
	77	}
	78
	79	switch (type) {
	80	case DragDropHelper::PlaceHolderType::Graph:
	81	m_PlaceBackground->setStyleSheet(
	82	"background-color: #BBD5EE; border: 1px solid #2A7FD4");
	83	break;
	84	case DragDropHelper::PlaceHolderType::Zone:
	85	case DragDropHelper::PlaceHolderType::Default:
	86	m_PlaceBackground->setStyleSheet(
	87	"background-color: #BBD5EE; border: 2px solid #2A7FD4");
	88	m_PlaceHolderLabel->setStyleSheet("color: #2A7FD4");
	89	break;
	90	}
	91
	92	m_PlaceHolderLabel->setText(topLabelText);
	93	m_PlaceHolderLabel->setVisible(!topLabelText.isEmpty());
	94	}
	95	};
	96
	97
	98	DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()} {}
	99
	100	DragDropHelper::~DragDropHelper()
	101	{
	102	QFile::remove(impl->m_ImageTempUrl);
	103	}
	104
	105	void DragDropHelper::resetDragAndDrop()
	106	{
	107	setCurrentDragWidget(nullptr);
	108	impl->m_HighlightedDragWidget = nullptr;
	109	}
	110
	111	void DragDropHelper::setCurrentDragWidget(VisualizationDragWidget *dragWidget)
	112	{
	113	if (impl->m_CurrentDragWidget) {
	114
	115	QObject::disconnect(impl->m_DragWidgetDestroyedConnection);
	116	}
	117
	118	if (dragWidget) {
	119	// ensures the impl->m_CurrentDragWidget is reset when the widget is destroyed
	120	impl->m_DragWidgetDestroyedConnection
	121	= QObject::connect(dragWidget, &VisualizationDragWidget::destroyed,
	122	[this]() { impl->m_CurrentDragWidget = nullptr; });
	123	}
	124
	125	impl->m_CurrentDragWidget = dragWidget;
	126	}
	127
	128	VisualizationDragWidget *DragDropHelper::getCurrentDragWidget() const
	129	{
	130	return impl->m_CurrentDragWidget;
	131	}
	132
	133	QWidget &DragDropHelper::placeHolder() const
	134	{
	135	return *impl->m_PlaceHolder;
	136	}
	137
	138	void DragDropHelper::insertPlaceHolder(QVBoxLayout *layout, int index, PlaceHolderType type,
	139	const QString &topLabelText)
	140	{
	141	removePlaceHolder();
	142	impl->preparePlaceHolder(type, topLabelText);
	143	layout->insertWidget(index, impl->m_PlaceHolder.get());
	144	impl->m_PlaceHolder->show();
	145	}
	146
	147	void DragDropHelper::removePlaceHolder()
	148	{
	149	auto parentWidget = impl->m_PlaceHolder->parentWidget();
	150	if (parentWidget) {
	151	parentWidget->layout()->removeWidget(impl->m_PlaceHolder.get());
	152	impl->m_PlaceHolder->setParent(nullptr);
	153	impl->m_PlaceHolder->hide();
	154	}
	155	}
	156
	157	bool DragDropHelper::isPlaceHolderSet() const
	158	{
	159	return impl->m_PlaceHolder->parentWidget();
	160	}
	161
	162	void DragDropHelper::addDragDropScrollArea(QScrollArea *scrollArea)
	163	{
	164	impl->m_DragDropScroller->addScrollArea(scrollArea);
	165	}
	166
	167	void DragDropHelper::removeDragDropScrollArea(QScrollArea *scrollArea)
	168	{
	169	impl->m_DragDropScroller->removeScrollArea(scrollArea);
	170	}
	171
	172	void DragDropHelper::addDragDropTabBar(QTabBar *tabBar)
	173	{
	174	impl->m_DragDropTabSwitcher->addTabBar(tabBar);
	175	}
	176
	177	void DragDropHelper::removeDragDropTabBar(QTabBar *tabBar)
	178	{
	179	impl->m_DragDropTabSwitcher->removeTabBar(tabBar);
	180	}
	181
	182	QUrl DragDropHelper::imageTemporaryUrl(const QImage &image) const
	183	{
	184	image.save(impl->m_ImageTempUrl);
	185	return QUrl::fromLocalFile(impl->m_ImageTempUrl);
	186	}
	187
	188	void DragDropHelper::setHightlightedDragWidget(VisualizationDragWidget *dragWidget)
	189	{
	190	if (impl->m_HighlightedDragWidget) {
	191	impl->m_HighlightedDragWidget->highlightForMerge(false);
	192	QObject::disconnect(impl->m_HighlightedWidgetDestroyedConnection);
	193	}
	194
	195	if (dragWidget) {
	196	dragWidget->highlightForMerge(true);
	197
	198	// ensures the impl->m_HighlightedDragWidget is reset when the widget is destroyed
	199	impl->m_DragWidgetDestroyedConnection
	200	= QObject::connect(dragWidget, &VisualizationDragWidget::destroyed,
	201	[this]() { impl->m_HighlightedDragWidget = nullptr; });
	202	}
	203
	204	impl->m_HighlightedDragWidget = dragWidget;
	205	}
	206
	207	VisualizationDragWidget *DragDropHelper::getHightlightedDragWidget() const
	208	{
	209	return impl->m_HighlightedDragWidget;
	210	}
	211
	212	bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData,
	213	VisualizationDragDropContainer *dropContainer)
	214	{
	215	if (!mimeData \|\| !dropContainer) {
	216	qCWarning(LOG_DragDropHelper()) << QObject::tr(
	217	"DragDropHelper::checkMimeDataForVisualization, invalid input parameters.");
	218	Q_ASSERT(false);
	219	return false;
	220	}
	221
	222	auto result = false;
	223
	224	if (mimeData->hasFormat(MIME_TYPE_VARIABLE_LIST)) {
	225	auto variables = sqpApp->variableController().variablesForMimeData(
	226	mimeData->data(MIME_TYPE_VARIABLE_LIST));
	227
	228	if (variables.count() == 1) {
	229
	230	auto variable = variables.first();
	231	if (variable->dataSeries() != nullptr) {
	232
	233	// Check that the variable is not already in a graph
	234
	235	auto parent = dropContainer->parentWidget();
	236	while (parent && qobject_cast<VisualizationWidget *>(parent) == nullptr) {
	237	parent = parent->parentWidget(); // Search for the top level VisualizationWidget
	238	}
	239
	240	if (parent) {
	241	auto visualizationWidget = static_cast<VisualizationWidget *>(parent);
	242
	243	FindVariableOperation findVariableOperation{variable};
	244	visualizationWidget->accept(&findVariableOperation);
	245	auto variableContainers = findVariableOperation.result();
	246	if (variableContainers.empty()) {
	247	result = true;
	248	}
	249	else {
	250	// result = false: the variable already exist in the visualisation
	251	}
	252	}
	253	else {
	254	qCWarning(LOG_DragDropHelper()) << QObject::tr(
	255	"DragDropHelper::checkMimeDataForVisualization, the parent "
	256	"VisualizationWidget cannot be found. Cannot check if the variable is "
	257	"already used or not.");
	258	}
	259	}
	260	else {
	261	// result = false: the variable is not fully loaded
	262	}
	263	}
	264	else {
	265	// result = false: cannot drop multiple variables in the visualisation
	266	}
	267	}
	268	else {
	269	// Other MIME data
	270	// no special rules, accepted by default
	271	result = true;
	272	}
	273
	274	return result;
	275	}

gui/src/DragAndDrop/DragDropTabSwitcher.cpp created 644 +180 0

@@ -0,0 +1,180
	1	#include "DragAndDrop/DragDropTabSwitcher.h"
	2
	3	#include <QAbstractButton>
	4	#include <QDragEnterEvent>
	5	#include <QDragMoveEvent>
	6	#include <QTimer>
	7
	8	#include "SqpApplication.h"
	9
	10	Q_LOGGING_CATEGORY(LOG_DragDropTabSwitcher, "DragDropTabSwitcher")
	11
	12	const int CHANGE_TAB_INTERVAL = 400; // time necessary over a tab to accept the switch
	13	const int SCROLL_BUTTON_AUTO_CLICK_INTERVAL
	14	= 500; // time between 2 auto clicks on a scroll button of the tab bar
	15
	16	struct DragDropTabSwitcher::DragDropTabSwitcherPrivate {
	17
	18	QList<QTabBar *> m_TabBarList;
	19	QTabBar *m_CurrentTabBar = nullptr;
	20
	21	int m_HoveredTabIndex = -1;
	22	std::unique_ptr<QTimer> m_TabSwitchTimer = nullptr;
	23
	24	QAbstractButton *m_HoveredScrollButton = nullptr;
	25	std::unique_ptr<QTimer> m_ScrollButtonsTimer = nullptr;
	26
	27	explicit DragDropTabSwitcherPrivate()
	28	: m_TabSwitchTimer{std::make_unique<QTimer>()},
	29	m_ScrollButtonsTimer{std::make_unique<QTimer>()}
	30	{
	31	m_TabSwitchTimer->setSingleShot(true);
	32	m_TabSwitchTimer->setInterval(CHANGE_TAB_INTERVAL);
	33	QObject::connect(m_TabSwitchTimer.get(), &QTimer::timeout, [this]() {
	34	if (m_CurrentTabBar) {
	35	m_CurrentTabBar->setCurrentIndex(m_HoveredTabIndex);
	36	}
	37	else {
	38	qCWarning(LOG_DragDropTabSwitcher()) << "DragDropTabSwitcherPrivate::timeout: "
	39	"Cannot select a new tab: unknown current "
	40	"tab bar.";
	41	}
	42	});
	43
	44	m_ScrollButtonsTimer->setInterval(SCROLL_BUTTON_AUTO_CLICK_INTERVAL);
	45	QObject::connect(m_ScrollButtonsTimer.get(), &QTimer::timeout, [this]() {
	46	if (m_HoveredScrollButton) {
	47	m_HoveredScrollButton->animateClick();
	48	}
	49	else {
	50	qCWarning(LOG_DragDropTabSwitcher())
	51	<< "DragDropTabSwitcherPrivate::timeoutScroll: "
	52	"Unknown scroll button";
	53	}
	54	});
	55	}
	56
	57	bool isScrollTabButton(QAbstractButton button, QTabBar tabBar)
	58	{
	59	auto isNextOrPreviousTabButton = true;
	60
	61	if (tabBar->isAncestorOf(button)) {
	62	for (auto i = 0; i < tabBar->count(); ++i) {
	63	if (tabBar->tabButton(i, QTabBar::RightSide) == button
	64	\|\| tabBar->tabButton(i, QTabBar::LeftSide) == button) {
	65	isNextOrPreviousTabButton = false;
	66	break;
	67	}
	68	}
	69	}
	70	else {
	71	isNextOrPreviousTabButton = false;
	72	}
	73
	74	return isNextOrPreviousTabButton;
	75	}
	76
	77	QAbstractButton tabScrollButtonAt(const QPoint &pos, QTabBar tabBar)
	78	{
	79
	80	auto globalPos = tabBar->mapToGlobal(pos);
	81
	82	auto widgetUnderMouse = sqpApp->widgetAt(globalPos);
	83	if (auto btn = qobject_cast<QAbstractButton *>(widgetUnderMouse)) {
	84
	85	if (isScrollTabButton(btn, tabBar)) {
	86	return btn;
	87	}
	88	}
	89
	90	return nullptr;
	91	}
	92	};
	93
	94	DragDropTabSwitcher::DragDropTabSwitcher(QObject *parent)
	95	: QObject(parent), impl{spimpl::make_unique_impl<DragDropTabSwitcherPrivate>()}
	96	{
	97	}
	98
	99	void DragDropTabSwitcher::addTabBar(QTabBar *tabBar)
	100	{
	101	impl->m_TabBarList << tabBar;
	102	tabBar->setAcceptDrops(true);
	103	}
	104
	105	void DragDropTabSwitcher::removeTabBar(QTabBar *tabBar)
	106	{
	107	impl->m_TabBarList.removeAll(tabBar);
	108	tabBar->setAcceptDrops(false);
	109	}
	110
	111	bool DragDropTabSwitcher::eventFilter(QObject obj, QEvent event)
	112	{
	113	if (event->type() == QEvent::DragMove) {
	114
	115	if (impl->m_CurrentTabBar) {
	116
	117	QWidget w = static_cast<QWidget >(obj);
	118	if (!impl->m_CurrentTabBar->isAncestorOf(w)) {
	119	return false;
	120	}
	121
	122	auto moveEvent = static_cast<QDragMoveEvent *>(event);
	123
	124	auto scrollButton = impl->tabScrollButtonAt(moveEvent->pos(), impl->m_CurrentTabBar);
	125
	126	if (!scrollButton) {
	127
	128	auto tabIndex = impl->m_CurrentTabBar->tabAt(moveEvent->pos());
	129	if (tabIndex >= 0 && tabIndex != impl->m_CurrentTabBar->currentIndex()) {
	130	// The mouse is over an unselected tab
	131	if (!impl->m_TabSwitchTimer->isActive()
	132	\|\| tabIndex != impl->m_HoveredTabIndex) {
	133	impl->m_HoveredTabIndex = tabIndex;
	134	impl->m_TabSwitchTimer->start();
	135	}
	136	else {
	137	// do nothing, timer already running
	138	}
	139	}
	140	else {
	141	impl->m_TabSwitchTimer->stop();
	142	}
	143
	144	impl->m_ScrollButtonsTimer->stop();
	145	}
	146	else {
	147	// The mouse is over a scroll button
	148	// click it in a loop with a timer
	149	if (!impl->m_ScrollButtonsTimer->isActive()
	150	\|\| impl->m_HoveredScrollButton != scrollButton) {
	151	impl->m_HoveredScrollButton = scrollButton;
	152	impl->m_ScrollButtonsTimer->start();
	153	}
	154	}
	155	}
	156	}
	157	else if (event->type() == QEvent::DragEnter) {
	158	QWidget w = static_cast<QWidget >(obj);
	159
	160	for (auto tabBar : impl->m_TabBarList) {
	161	if (w == tabBar) {
	162	auto enterEvent = static_cast<QDragEnterEvent *>(event);
	163	enterEvent->acceptProposedAction();
	164	enterEvent->setDropAction(Qt::IgnoreAction);
	165	impl->m_CurrentTabBar = tabBar;
	166	break;
	167	}
	168	}
	169	}
	170	else if (event->type() == QEvent::DragLeave \|\| event->type() == QEvent::Drop) {
	171	if (impl->m_CurrentTabBar) {
	172	impl->m_HoveredTabIndex = -1;
	173	impl->m_TabSwitchTimer->stop();
	174	impl->m_CurrentTabBar = nullptr;
	175	impl->m_ScrollButtonsTimer->stop();
	176	}
	177	}
	178
	179	return false;
	180	}

gui/src/Variable/VariableInspectorTableView.cpp created 644 +13 0

@@ -0,0 +1,13
	1	#include "Variable/VariableInspectorTableView.h"
	2
	3	#include "DragAndDrop/DragDropHelper.h"
	4	#include "SqpApplication.h"
	5
	6	VariableInspectorTableView::VariableInspectorTableView(QWidget *parent) : QTableView(parent) {}
	7
	8	void VariableInspectorTableView::startDrag(Qt::DropActions supportedActions)
	9	{
	10	// Resets the drag&drop operations before it's starting
	11	sqpApp->dragDropHelper().resetDragAndDrop();
	12	QTableView::startDrag(supportedActions);
	13	}

core/include/DataSource/DataSourceController.h +5 -2

                  */
                 void loadProductItem(const QUuid &dataSourceUid, const DataSourceItem &productItem) noexcept;
-                QByteArray mimeDataForProductsData(const QVariantList &productsData) const;
+                /// Returns the MIME data associated to a list of product meta data
-                QVariantList productsDataForMimeData(const QByteArray &mimeData) const;
+                static QByteArray mimeDataForProductsData(const QVariantList &productsData);
+                /// Returns the list of meta data contained in a MIME data
+                static QVariantList productsDataForMimeData(const QByteArray &mimeData);
             public slots:
                 /// Manage init/end of the controller

core/include/Time/TimeController.h +6 0

                 SqpRange dateTime() const noexcept;
+                /// Returns the MIME data associated to a time range
+                static QByteArray mimeDataForTimeRange(const SqpRange &timeRange);
+                /// Returns the time range contained in a MIME data
+                static SqpRange timeRangeForMimeData(const QByteArray &mimeData);
             signals:
                 /// Signal emitted to notify that time parameters has beed updated
                 void timeUpdated(SqpRange time);

core/include/Variable/VariableController.h +3 0

                  */
                 void deleteVariables(const QVector<std::shared_ptr<Variable> > &variables) noexcept;
+                /// Returns the MIME data associated to a list of variables
                 QByteArray mimeDataForVariables(const QList<std::shared_ptr<Variable> > &variables) const;
+                /// Returns the list of variables contained in a MIME data
                 QList<std::shared_ptr<Variable> > variablesForMimeData(const QByteArray &mimeData) const;
                 static AcquisitionZoomType getZoomType(const SqpRange &range, const SqpRange &oldRange);

core/meson.build 0 -2

               'include/Data/IDataProvider.h',
               'include/DataSource/DataSourceController.h',
               'include/DataSource/DataSourceItemAction.h',
-              'include/DataSource/DataSourceWidget.h',
               'include/Network/NetworkController.h',
               'include/Time/TimeController.h',
               'include/Variable/Variable.h',
               'src/DataSource/DataSourceController.cpp',
               'src/DataSource/DataSourceItem.cpp',
               'src/DataSource/DataSourceItemAction.cpp',
-              'src/DataSource/DataSourceWidget.cpp',
               'src/Network/NetworkController.cpp',
               'src/Plugin/PluginManager.cpp',
               'src/Settings/SqpSettingsDefs.cpp',

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

                 }
             }
-            QByteArray DataSourceController::mimeDataForProductsData(const QVariantList &productsData) const
+            QByteArray DataSourceController::mimeDataForProductsData(const QVariantList &productsData)
             {
                 QByteArray encodedData;
                 QDataStream stream{&encodedData, QIODevice::WriteOnly};
                 return encodedData;
             }
-            QVariantList DataSourceController::productsDataForMimeData(const QByteArray &mimeData) const
+            QVariantList DataSourceController::productsDataForMimeData(const QByteArray &mimeData)
             {
                 QDataStream stream{mimeData};
             void DataSourceController::requestVariable(const QVariantHash &productData)
             {
-                DataSourceItem *sourceItem = impl->findDataSourceItem(productData);
+                auto sourceItem = impl->findDataSourceItem(productData);
                 if (sourceItem) {
                     auto sourceName = sourceItem->rootItem().name();

core/src/DataSource/DataSourceItem.cpp +1 -2

                     }
                     if (recursive) {
-                        auto foundItem = child->findItem(data, true);
+                        if (auto foundItem = child->findItem(data, true)) {
-                        if (foundItem) {
                             return foundItem;
                         }
                     }

core/src/Time/TimeController.cpp +22 0

@@ -1,5 +1,7
1	#include "Time/TimeController.h"	1	#include "Time/TimeController.h"
2		2
		3	#include <QDataStream>
		4
3	Q_LOGGING_CATEGORY(LOG_TimeController, "TimeController")	5	Q_LOGGING_CATEGORY(LOG_TimeController, "TimeController")
4		6
5	struct TimeController::TimeControllerPrivate {	7	struct TimeController::TimeControllerPrivate {
@@ -18,6 +20,26 SqpRange TimeController::dateTime() const noexcept
18	return impl->m_DateTime;	20	return impl->m_DateTime;
19	}	21	}
20		22
		23	QByteArray TimeController::mimeDataForTimeRange(const SqpRange &timeRange)
		24	{
		25	QByteArray encodedData;
		26	QDataStream stream{&encodedData, QIODevice::WriteOnly};
		27
		28	stream << timeRange.m_TStart << timeRange.m_TEnd;
		29
		30	return encodedData;
		31	}
		32
		33	SqpRange TimeController::timeRangeForMimeData(const QByteArray &mimeData)
		34	{
		35	QDataStream stream{mimeData};
		36
		37	SqpRange timeRange;
		38	stream >> timeRange.m_TStart >> timeRange.m_TEnd;
		39
		40	return timeRange;
		41	}
		42
21	void TimeController::onTimeToUpdate(SqpRange dateTime)	43	void TimeController::onTimeToUpdate(SqpRange dateTime)
22	{	44	{
23	impl->m_DateTime = dateTime;	45	impl->m_DateTime = dateTime;

core/src/Variable/VariableModel.cpp +23 -8

             #include <Data/IDataSeries.h>
-            #include <QDataStream>
+            #include <DataSource/DataSourceController.h>
+            #include <Time/TimeController.h>
             #include <QMimeData>
             #include <QSize>
             #include <unordered_map>
             QStringList VariableModel::mimeTypes() const
             {
-                return {MIME_TYPE_VARIABLE_LIST};
+                return {MIME_TYPE_VARIABLE_LIST, MIME_TYPE_TIME_RANGE};
             }
             QMimeData *VariableModel::mimeData(const QModelIndexList &indexes) const
                 QList<std::shared_ptr<Variable> > variableList;
+                SqpRange firstTimeRange;
                 for (const auto &index : indexes) {
                     if (index.column() == 0) { // only the first column
                         auto variable = impl->m_Variables.at(index.row());
                         if (variable.get() && index.isValid()) {
+                            if (variableList.isEmpty()) {
+                                // Gets the range of the first variable
+                                firstTimeRange = std::move(variable->range());
+                            }
                             variableList << variable;
                         }
                     }
                 }
-                auto encodedData = impl->m_VariableController->mimeDataForVariables(variableList);
+                auto variablesEncodedData = impl->m_VariableController->mimeDataForVariables(variableList);
-                mimeData->setData(MIME_TYPE_VARIABLE_LIST, encodedData);
+                mimeData->setData(MIME_TYPE_VARIABLE_LIST, variablesEncodedData);
+                if (variableList.count() == 1) {
+                    // No time range MIME data if multiple variables are dragged
+                    auto timeEncodedData = TimeController::mimeDataForTimeRange(firstTimeRange);
+                    mimeData->setData(MIME_TYPE_TIME_RANGE, timeEncodedData);
+                }
                 return mimeData;
             }
             bool VariableModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
                                              const QModelIndex &parent)
             {
-                bool dropDone = false;
+                auto dropDone = false;
                 if (data->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
-                    QDataStream stream(data->data(MIME_TYPE_PRODUCT_LIST));
-                    QVariantList productList;
+                    auto productList
-                    stream >> productList;
+                        = DataSourceController::productsDataForMimeData(data->data(MIME_TYPE_PRODUCT_LIST));
                     for (auto metaData : productList) {
                         emit requestVariable(metaData.toHash());

core/tests/meson.build +9 -1

               [['Variable/TestVariableSync.cpp'],'test_variable_sync','Variable synchronization test']
             ]
+            amdatest_sources = [
+              'Data/DataSeriesBuilders.h',
+              'Data/DataSeriesBuilders.cpp',
+              'Data/DataSeriesUtils.h',
+              'Data/DataSeriesUtils.cpp'
+            ]
             foreach unit_test : tests
               test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
               test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
-                                      dependencies : [sciqlop_core, qt5test])
+                                      dependencies : [sciqlop_core, qt5test],
+            						  sources : [amdatest_sources])
               test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])])
             endforeach

gui/include/DataSource/DataSourceTreeWidget.h +1 0

             protected:
                 QMimeData *mimeData(const QList<QTreeWidgetItem *> items) const override;
+                void startDrag(Qt::DropActions supportedActions) override;
             };
             #endif // SCIQLOP_DATASOURCETREEWIDGET_H

gui/include/DragAndDrop/DragDropHelper.h ~~gui/include/DragDropHelper.h~~ renamed +11 -25

             class QVBoxLayout;
             class QScrollArea;
+            class QTabBar;
             class VisualizationDragWidget;
             class VisualizationDragDropContainer;
             class QMimeData;
                 static const QString MIME_TYPE_GRAPH;
                 static const QString MIME_TYPE_ZONE;
+                enum class PlaceHolderType { Default, Graph, Zone };
                 DragDropHelper();
                 virtual ~DragDropHelper();
                 VisualizationDragWidget *getCurrentDragWidget() const;
                 QWidget &placeHolder() const;
-                void insertPlaceHolder(QVBoxLayout *layout, int index);
+                void insertPlaceHolder(QVBoxLayout *layout, int index, PlaceHolderType type,
+                                       const QString &topLabelText);
                 void removePlaceHolder();
                 bool isPlaceHolderSet() const;
                 void addDragDropScrollArea(QScrollArea *scrollArea);
                 void removeDragDropScrollArea(QScrollArea *scrollArea);
+                void addDragDropTabBar(QTabBar *tabBar);
+                void removeDragDropTabBar(QTabBar *tabBar);
                 QUrl imageTemporaryUrl(const QImage &image) const;
+                void setHightlightedDragWidget(VisualizationDragWidget *dragWidget);
+                VisualizationDragWidget *getHightlightedDragWidget() const;
             private:
                 class DragDropHelperPrivate;
                 spimpl::unique_impl_ptr<DragDropHelperPrivate> impl;
             };
-            /**
-             * @brief Event filter class which manage the scroll of QScrollArea during a drag&drop operation.
-             * @note A QScrollArea inside an other QScrollArea is not fully supported.
-             */
-            class DragDropScroller : public QObject {
-                Q_OBJECT
-            public:
-                DragDropScroller(QObject *parent = nullptr);
-                void addScrollArea(QScrollArea *scrollArea);
-                void removeScrollArea(QScrollArea *scrollArea);
-            protected:
-                bool eventFilter(QObject *obj, QEvent *event);
-            private:
-                class DragDropScrollerPrivate;
-                spimpl::unique_impl_ptr<DragDropScrollerPrivate> impl;
-            private slots:
-                void onTimer();
-            };
             #endif // SCIQLOP_DRAGDROPHELPER_H

gui/include/TimeWidget/TimeWidget.h +15 0

             #include <Data/SqpRange.h>
+            #include <Common/spimpl.h>
             namespace Ui {
             class TimeWidget;
             } // Ui
                 explicit TimeWidget(QWidget *parent = 0);
                 virtual ~TimeWidget();
+                void setTimeRange(SqpRange time);
+                SqpRange timeRange() const;
             signals:
                 /// Signal emitted when the time parameters has beed updated
                 void timeUpdated(SqpRange time);
                 /// slot called when time parameters update has ben requested
                 void onTimeUpdateRequested();
+            protected:
+                void dragEnterEvent(QDragEnterEvent *event) override;
+                void dragLeaveEvent(QDragLeaveEvent *event) override;
+                void dropEvent(QDropEvent *event) override;
+                void mousePressEvent(QMouseEvent *event) override;
+                void mouseMoveEvent(QMouseEvent *event) override;
             private:
                 Ui::TimeWidget *ui;
+                class TimeWidgetPrivate;
+                spimpl::unique_impl_ptr<TimeWidgetPrivate> impl;
             };
             #endif // SCIQLOP_ SQPSIDEPANE_H

gui/include/Visualization/VisualizationDragDropContainer.h +11 -5

             #define SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H
             #include <Common/spimpl.h>
+            #include <QFrame>
             #include <QLoggingCategory>
             #include <QMimeData>
             #include <QVBoxLayout>
-            #include <QWidget>
             #include <functional>
+            #include <DragAndDrop/DragDropHelper.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationDragDropContainer)
             class VisualizationDragWidget;
-            class VisualizationDragDropContainer : public QWidget {
+            class VisualizationDragDropContainer : public QFrame {
                 Q_OBJECT
             signals:
-                void dropOccured(int dropIndex, const QMimeData *mimeData);
+                void dropOccuredInContainer(int dropIndex, const QMimeData *mimeData);
+                void dropOccuredOnWidget(VisualizationDragWidget *dragWidget, const QMimeData *mimeData);
             public:
+                enum class DropBehavior { Inserted, Merged, InsertedAndMerged };
                 using AcceptMimeDataFunction = std::function<bool(const QMimeData *mimeData)>;
                 VisualizationDragDropContainer(QWidget *parent = nullptr);
                 void addDragWidget(VisualizationDragWidget *dragWidget);
                 void insertDragWidget(int index, VisualizationDragWidget *dragWidget);
-                void setAcceptedMimeTypes(const QStringList &mimeTypes);
+                void addAcceptedMimeType(const QString &mimeType, DropBehavior behavior);
-                void setMergeAllowedMimeTypes(const QStringList &mimeTypes);
                 int countDragWidget() const;
                 void setAcceptMimeDataFunction(AcceptMimeDataFunction fun);
+                void setPlaceHolderType(DragDropHelper::PlaceHolderType type,
+                                        const QString &placeHolderText = QString());
             protected:
                 void dragEnterEvent(QDragEnterEvent *event);
                 void dragLeaveEvent(QDragLeaveEvent *event);

gui/include/Visualization/VisualizationDragWidget.h +1 0

                 virtual QMimeData *mimeData() const = 0;
                 virtual bool isDragAllowed() const = 0;
+                virtual void highlightForMerge(bool highlighted) { Q_UNUSED(highlighted); };
             protected:
                 virtual void mousePressEvent(QMouseEvent *event) override;

gui/include/Visualization/VisualizationGraphWidget.h +1 0

                 // VisualisationDragWidget
                 QMimeData *mimeData() const override;
                 bool isDragAllowed() const override;
+                void highlightForMerge(bool highlighted) override;
             signals:
                 void synchronize(const SqpRange &range, const SqpRange &oldRange);

gui/include/Visualization/VisualizationZoneWidget.h +1 0

                 void onVariableAboutToBeRemoved(std::shared_ptr<Variable> variable);
                 void dropMimeData(int index, const QMimeData *mimeData);
+                void dropMimeDataOnGraph(VisualizationDragWidget *dragWidget, const QMimeData *mimeData);
             };
             #endif // SCIQLOP_VISUALIZATIONZONEWIDGET_H

gui/meson.build +10 -2

             gui_moc_headers = [
               'include/DataSource/DataSourceWidget.h',
+              'include/DataSource/DataSourceTreeWidget.h',
               'include/Settings/SqpSettingsDialog.h',
               'include/Settings/SqpSettingsGeneralWidget.h',
               'include/SidePane/SqpSidePane.h',
               'include/SqpApplication.h',
-              'include/DragDropHelper.h',
+              'include/DragAndDrop/DragDropHelper.h',
+              'include/DragAndDrop/DragDropScroller.h',
+              'include/DragAndDrop/DragDropTabSwitcher.h',
               'include/TimeWidget/TimeWidget.h',
               'include/Variable/VariableInspectorWidget.h',
+              'include/Variable/VariableInspectorTableView.h',
               'include/Variable/RenameVariableDialog.h',
               'include/Visualization/qcustomplot.h',
               'include/Visualization/VisualizationGraphWidget.h',
             gui_sources = [
               'src/SqpApplication.cpp',
-              'src/DragDropHelper.cpp',
+              'src/DragAndDrop/DragDropHelper.cpp',
+              'src/DragAndDrop/DragDropScroller.cpp',
+              'src/DragAndDrop/DragDropTabSwitcher.cpp',
               'src/Common/ColorUtils.cpp',
               'src/Common/VisualizationDef.cpp',
               'src/DataSource/DataSourceTreeWidgetItem.cpp',
               'src/DataSource/DataSourceTreeWidgetHelper.cpp',
               'src/DataSource/DataSourceWidget.cpp',
+              'src/DataSource/DataSourceTreeWidget.cpp',
               'src/Settings/SqpSettingsDialog.cpp',
               'src/Settings/SqpSettingsGeneralWidget.cpp',
               'src/SidePane/SqpSidePane.cpp',
               'src/TimeWidget/TimeWidget.cpp',
               'src/Variable/VariableInspectorWidget.cpp',
+              'src/Variable/VariableInspectorTableView.cpp',
               'src/Variable/VariableMenuHeaderWidget.cpp',
               'src/Variable/RenameVariableDialog.cpp',
               'src/Visualization/VisualizationGraphHelper.cpp',

gui/src/DataSource/DataSourceTreeWidget.cpp +8 0

             #include "DataSource/DataSourceItem.h"
             #include "DataSource/DataSourceTreeWidgetItem.h"
+            #include "DragAndDrop/DragDropHelper.h"
             #include "SqpApplication.h"
             #include <QMimeData>
                 return mimeData;
             }
+            void DataSourceTreeWidget::startDrag(Qt::DropActions supportedActions)
+            {
+                // Resets the drag&drop operations before it's starting
+                sqpApp->dragDropHelper().resetDragAndDrop();
+                QTreeWidget::startDrag(supportedActions);
+            }

gui/src/DragAndDrop/DragDropScroller.cpp ~~gui/src/DragDropHelper.cpp~~ renamed +1 -171

@@ -1,35 +1,19
1	#include "Drag~~DropHelp~~er.h"	1	#include "DragAndDrop/DragDropScroller.h"
2	#include "SqpApplication.h"
3	#include "Visualization/VisualizationDragDropContainer.h"
4	#include "Visualization/VisualizationDragWidget.h"
5	#include "Visualization/VisualizationWidget.h"
6	#include "Visualization/operations/FindVariableOperation.h"
7		2
8	#include "Variable/VariableController.h"
9
10	#include "Common/MimeTypesDef.h"
11	#include "Common/VisualizationDef.h"
12
13	#include <QDir>
14	#include <QDragEnterEvent>	3	#include <QDragEnterEvent>
15	#include <QDragMoveEvent>	4	#include <QDragMoveEvent>
16	#include <QScrollArea>
17	#include <QScrollBar>	5	#include <QScrollBar>
18	#include <QTimer>	6	#include <QTimer>
19	#include <QVBoxLayout>
20		7
21	const int SCROLL_SPEED = 5;	8	const int SCROLL_SPEED = 5;
22	const int SCROLL_ZONE_SIZE = 50;	9	const int SCROLL_ZONE_SIZE = 50;
23		10
24	Q_LOGGING_CATEGORY(LOG_DragDropHelper, "DragDrophelper")
25
26	struct DragDropScroller::DragDropScrollerPrivate {	11	struct DragDropScroller::DragDropScrollerPrivate {
27		12
28	QList<QScrollArea *> m_ScrollAreas;	13	QList<QScrollArea *> m_ScrollAreas;
29	QScrollArea *m_CurrentScrollArea = nullptr;	14	QScrollArea *m_CurrentScrollArea = nullptr;
30	std::unique_ptr<QTimer> m_Timer = nullptr;	15	std::unique_ptr<QTimer> m_Timer = nullptr;
31		16
32
33	enum class ScrollDirection { up, down, unknown };	17	enum class ScrollDirection { up, down, unknown };
34	ScrollDirection m_Direction = ScrollDirection::unknown;	18	ScrollDirection m_Direction = ScrollDirection::unknown;
35		19
@@ -139,157 +123,3 void DragDropScroller::onTimer()
139	impl->m_CurrentScrollArea->verticalScrollBar()->value() + mvt);	123	impl->m_CurrentScrollArea->verticalScrollBar()->value() + mvt);
140	}	124	}
141	}	125	}
142
143	struct DragDropHelper::DragDropHelperPrivate {
144
145	VisualizationDragWidget *m_CurrentDragWidget = nullptr;
146	std::unique_ptr<QWidget> m_PlaceHolder = nullptr;
147	std::unique_ptr<DragDropScroller> m_DragDropScroller = nullptr;
148	QString m_ImageTempUrl; // Temporary file for image url generated by the drag & drop. Not using
149	// QTemporaryFile to have a name which is not generated.
150
151	explicit DragDropHelperPrivate()
152	: m_PlaceHolder{std::make_unique<QWidget>()},
153	m_DragDropScroller{std::make_unique<DragDropScroller>()}
154	{
155	m_PlaceHolder->setStyleSheet("background-color: #BBD5EE; border:2px solid #2A7FD4");
156	sqpApp->installEventFilter(m_DragDropScroller.get());
157
158
159	m_ImageTempUrl = QDir::temp().absoluteFilePath("Scqlop_graph.png");
160	}
161
162	void preparePlaceHolder() const
163	{
164	if (m_CurrentDragWidget) {
165	m_PlaceHolder->setMinimumSize(m_CurrentDragWidget->size());
166	m_PlaceHolder->setSizePolicy(m_CurrentDragWidget->sizePolicy());
167	}
168	else {
169	// Configuration of the placeHolder when there is no dragWidget
170	// (for instance with a drag from a variable)
171
172	m_PlaceHolder->setMinimumSize(0, GRAPH_MINIMUM_HEIGHT);
173	m_PlaceHolder->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
174	}
175	}
176	};
177
178
179	DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()}
180	{
181	}
182
183	DragDropHelper::~DragDropHelper()
184	{
185	QFile::remove(impl->m_ImageTempUrl);
186	}
187
188	void DragDropHelper::resetDragAndDrop()
189	{
190	setCurrentDragWidget(nullptr);
191	}
192
193	void DragDropHelper::setCurrentDragWidget(VisualizationDragWidget *dragWidget)
194	{
195	impl->m_CurrentDragWidget = dragWidget;
196	}
197
198	VisualizationDragWidget *DragDropHelper::getCurrentDragWidget() const
199	{
200	return impl->m_CurrentDragWidget;
201	}
202
203
204	QWidget &DragDropHelper::placeHolder() const
205	{
206	return *impl->m_PlaceHolder;
207	}
208
209	void DragDropHelper::insertPlaceHolder(QVBoxLayout *layout, int index)
210	{
211	removePlaceHolder();
212	impl->preparePlaceHolder();
213	layout->insertWidget(index, impl->m_PlaceHolder.get());
214	impl->m_PlaceHolder->show();
215	}
216
217	void DragDropHelper::removePlaceHolder()
218	{
219	auto parentWidget = impl->m_PlaceHolder->parentWidget();
220	if (parentWidget) {
221	parentWidget->layout()->removeWidget(impl->m_PlaceHolder.get());
222	impl->m_PlaceHolder->setParent(nullptr);
223	impl->m_PlaceHolder->hide();
224	}
225	}
226
227	bool DragDropHelper::isPlaceHolderSet() const
228	{
229	return impl->m_PlaceHolder->parentWidget();
230	}
231
232	void DragDropHelper::addDragDropScrollArea(QScrollArea *scrollArea)
233	{
234	impl->m_DragDropScroller->addScrollArea(scrollArea);
235	}
236
237	void DragDropHelper::removeDragDropScrollArea(QScrollArea *scrollArea)
238	{
239	impl->m_DragDropScroller->removeScrollArea(scrollArea);
240	}
241
242	QUrl DragDropHelper::imageTemporaryUrl(const QImage &image) const
243	{
244	image.save(impl->m_ImageTempUrl);
245	return QUrl::fromLocalFile(impl->m_ImageTempUrl);
246	}
247
248	bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData,
249	VisualizationDragDropContainer *dropContainer)
250	{
251	if (!mimeData \|\| !dropContainer) {
252	qCWarning(LOG_DragDropHelper()) << QObject::tr(
253	"DragDropHelper::checkMimeDataForVisualization, invalid input parameters.");
254	Q_ASSERT(false);
255	}
256
257	auto result = true;
258
259	if (mimeData->hasFormat(MIME_TYPE_VARIABLE_LIST)) {
260	auto variables = sqpApp->variableController().variablesForMimeData(
261	mimeData->data(MIME_TYPE_VARIABLE_LIST));
262
263	if (variables.count() == 1) {
264	// Check that the viariable is not already in a graph
265
266	// Search for the top level VisualizationWidget
267	auto parent = dropContainer->parentWidget();
268	while (parent && qobject_cast<VisualizationWidget *>(parent) == nullptr) {
269	parent = parent->parentWidget();
270	}
271
272	if (parent) {
273	auto visualizationWidget = static_cast<VisualizationWidget *>(parent);
274
275	FindVariableOperation findVariableOperation{variables.first()};
276	visualizationWidget->accept(&findVariableOperation);
277	auto variableContainers = findVariableOperation.result();
278	if (!variableContainers.empty()) {
279	result = false;
280	}
281	}
282	else {
283	qCWarning(LOG_DragDropHelper()) << QObject::tr(
284	"DragDropHelper::checkMimeDataForVisualization, the parent "
285	"VisualizationWidget cannot be found.");
286	result = false;
287	}
288	}
289	else {
290	result = false;
291	}
292	}
293
294	return result;
295	}

gui/src/SqpApplication.cpp +1 -1

             #include <Data/IDataProvider.h>
             #include <DataSource/DataSourceController.h>
-            #include <DragDropHelper.h>
+            #include <DragAndDrop/DragDropHelper.h>
             #include <Network/NetworkController.h>
             #include <QThread>
             #include <Time/TimeController.h>

gui/src/TimeWidget/TimeWidget.cpp +110 -4

@@ -2,10 +2,29
2	#include "ui_TimeWidget.h"	2	#include "ui_TimeWidget.h"
3		3
4	#include <Common/DateUtils.h>	4	#include <Common/DateUtils.h>
		5	#include <Common/MimeTypesDef.h>
		6
		7	#include <DragAndDrop/DragDropHelper.h>
5	#include <SqpApplication.h>	8	#include <SqpApplication.h>
6	#include <Time/TimeController.h>	9	#include <Time/TimeController.h>
7		10
8	TimeWidget::TimeWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::TimeWidget}	11	#include <QDrag>
		12	#include <QDragEnterEvent>
		13	#include <QDropEvent>
		14	#include <QMimeData>
		15
		16
		17	struct TimeWidget::TimeWidgetPrivate {
		18
		19	explicit TimeWidgetPrivate() {}
		20
		21	QPoint m_DragStartPosition;
		22	};
		23
		24	TimeWidget::TimeWidget(QWidget *parent)
		25	: QWidget{parent},
		26	ui{new Ui::TimeWidget},
		27	impl{spimpl::make_unique_impl<TimeWidgetPrivate>()}
9	{	28	{
10	ui->setupUi(this);	29	ui->setupUi(this);
11		30
@@ -41,10 +60,97 TimeWidget::~TimeWidget()
41	delete ui;	60	delete ui;
42	}	61	}
43		62
44	void TimeWidget::~~onTimeUpdateRequested~~()	63	void TimeWidget::setTimeRange(SqpRange time)
		64	{
		65	auto startDateTime = DateUtils::dateTime(time.m_TStart);
		66	auto endDateTime = DateUtils::dateTime(time.m_TEnd);
		67
		68	ui->startDateTimeEdit->setDateTime(startDateTime);
		69	ui->endDateTimeEdit->setDateTime(endDateTime);
		70	}
		71
		72	SqpRange TimeWidget::timeRange() const
45	{	73	{
46	~~auto~~ ~~dateTime~~ = SqpRange{DateUtils::secondsSinceEpoch(ui->startDateTimeEdit->dateTime()),	74	return SqpRange{DateUtils::secondsSinceEpoch(ui->startDateTimeEdit->dateTime()),
47	DateUtils::secondsSinceEpoch(ui->endDateTimeEdit->dateTime())};	75	DateUtils::secondsSinceEpoch(ui->endDateTimeEdit->dateTime())};
		76	}
48		77
		78	void TimeWidget::onTimeUpdateRequested()
		79	{
		80	auto dateTime = timeRange();
49	emit timeUpdated(std::move(dateTime));	81	emit timeUpdated(std::move(dateTime));
50	}	82	}
		83
		84	void TimeWidget::dragEnterEvent(QDragEnterEvent *event)
		85	{
		86	if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE)) {
		87	event->acceptProposedAction();
		88	setStyleSheet("QDateTimeEdit{background-color: #BBD5EE; border:2px solid #2A7FD4}");
		89	}
		90	else {
		91	event->ignore();
		92	}
		93	}
		94
		95	void TimeWidget::dragLeaveEvent(QDragLeaveEvent *event)
		96	{
		97	setStyleSheet(QString());
		98	}
		99
		100	void TimeWidget::dropEvent(QDropEvent *event)
		101	{
		102	if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE)) {
		103	auto mimeData = event->mimeData()->data(MIME_TYPE_TIME_RANGE);
		104	auto timeRange = TimeController::timeRangeForMimeData(mimeData);
		105
		106	setTimeRange(timeRange);
		107	}
		108	else {
		109	event->ignore();
		110	}
		111
		112	setStyleSheet(QString());
		113	}
		114
		115
		116	void TimeWidget::mousePressEvent(QMouseEvent *event)
		117	{
		118	if (event->button() == Qt::LeftButton) {
		119	impl->m_DragStartPosition = event->pos();
		120	}
		121
		122	QWidget::mousePressEvent(event);
		123	}
		124
		125	void TimeWidget::mouseMoveEvent(QMouseEvent *event)
		126	{
		127	if (!(event->buttons() & Qt::LeftButton)) {
		128	return;
		129	}
		130
		131	if ((event->pos() - impl->m_DragStartPosition).manhattanLength()
		132	< QApplication::startDragDistance()) {
		133	return;
		134	}
		135
		136	// Note: The management of the drag object is done by Qt
		137	auto drag = new QDrag{this};
		138
		139	auto mimeData = new QMimeData;
		140	auto timeData = TimeController::mimeDataForTimeRange(timeRange());
		141	mimeData->setData(MIME_TYPE_TIME_RANGE, timeData);
		142
		143	drag->setMimeData(mimeData);
		144
		145	auto pixmap = QPixmap(size());
		146	render(&pixmap);
		147	drag->setPixmap(pixmap);
		148	drag->setHotSpot(impl->m_DragStartPosition);
		149
		150	sqpApp->dragDropHelper().resetDragAndDrop();
		151
		152	// Note: The exec() is blocking on windows but not on linux and macOS
		153	drag->exec(Qt::MoveAction \| Qt::CopyAction);
		154
		155	QWidget::mouseMoveEvent(event);
		156	}

gui/src/Variable/VariableInspectorWidget.cpp +1 -6

             #include <QStyledItemDelegate>
             #include <QWidgetAction>
-            #include <DragDropHelper.h>
+            #include <DragAndDrop/DragDropHelper.h>
             #include <SqpApplication.h>
             Q_LOGGING_CATEGORY(LOG_VariableInspectorWidget, "VariableInspectorWidget")
                 ui->tableView->setContextMenuPolicy(Qt::CustomContextMenu);
                 connect(ui->tableView, &QTableView::customContextMenuRequested, this,
                         &VariableInspectorWidget::onTableMenuRequested);
-                // Resets the drag&drop operation on a left-click (the drag&drop is also started by a left
-                // click).
-                connect(ui->tableView, &QTableView::clicked,
-                        [](const auto &modelIndex) { sqpApp->dragDropHelper().resetDragAndDrop(); });
             }
             VariableInspectorWidget::~VariableInspectorWidget()

gui/src/Visualization/VisualizationDragDropContainer.cpp +207 -116

@@ -1,5 +1,5
1	#include "Visualization/VisualizationDragDropContainer.h"	1	#include "Visualization/VisualizationDragDropContainer.h"
2	#include "DragDropHelper.h"	2	#include "DragAndDrop/DragDropHelper.h"
3	#include "SqpApplication.h"	3	#include "SqpApplication.h"
4	#include "Visualization/VisualizationDragWidget.h"	4	#include "Visualization/VisualizationDragWidget.h"
5		5
@@ -17,11 +17,15 Q_LOGGING_CATEGORY(LOG_VisualizationDragDropContainer, "VisualizationDragDropCon
17	struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {	17	struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
18		18
19	QVBoxLayout *m_Layout;	19	QVBoxLayout *m_Layout;
20	QStringList m_AcceptedMimeTypes;	20	QHash<QString, VisualizationDragDropContainer::DropBehavior> m_AcceptedMimeTypes;
21	QStringList m_MergeAllowedMimeTypes;	21	QString m_PlaceHolderText;
		22	DragDropHelper::PlaceHolderType m_PlaceHolderType = DragDropHelper::PlaceHolderType::Graph;
		23
22	VisualizationDragDropContainer::AcceptMimeDataFunction m_AcceptMimeDataFun	24	VisualizationDragDropContainer::AcceptMimeDataFunction m_AcceptMimeDataFun
23	= [](auto mimeData) { return true; };	25	= [](auto mimeData) { return true; };
24		26
		27	int m_MinContainerHeight = 0;
		28
25	explicit VisualizationDragDropContainerPrivate(QWidget *widget)	29	explicit VisualizationDragDropContainerPrivate(QWidget *widget)
26	{	30	{
27	m_Layout = new QVBoxLayout(widget);	31	m_Layout = new QVBoxLayout(widget);
@@ -30,7 +34,7 struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
30		34
31	bool acceptMimeData(const QMimeData *data) const	35	bool acceptMimeData(const QMimeData *data) const
32	{	36	{
33	for (const auto &type : m_AcceptedMimeTypes) {	37	for (const auto &type : m_AcceptedMimeTypes.keys()) {
34	if (data->hasFormat(type) && m_AcceptMimeDataFun(data)) {	38	if (data->hasFormat(type) && m_AcceptMimeDataFun(data)) {
35	return true;	39	return true;
36	}	40	}
@@ -39,10 +43,38 struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
39	return false;	43	return false;
40	}	44	}
41		45
42	bool allowMergeMimeData(const QMimeData *data) const	46	bool allowMergeForMimeData(const QMimeData *data) const
		47	{
		48	bool result = false;
		49	for (auto it = m_AcceptedMimeTypes.constBegin(); it != m_AcceptedMimeTypes.constEnd();
		50	++it) {
		51
		52	if (data->hasFormat(it.key())
		53	&& (it.value() == VisualizationDragDropContainer::DropBehavior::Merged
		54	\|\| it.value()
		55	== VisualizationDragDropContainer::DropBehavior::InsertedAndMerged)) {
		56	result = true;
		57	}
		58	else if (data->hasFormat(it.key())
		59	&& it.value() == VisualizationDragDropContainer::DropBehavior::Inserted) {
		60	// Merge is forbidden if the mime data contain an acceptable type which cannot be
		61	// merged
		62	result = false;
		63	break;
		64	}
		65	}
		66
		67	return result;
		68	}
		69
		70	bool allowInsertForMimeData(const QMimeData *data) const
43	{	71	{
44	for (const auto &type : m_MergeAllowedMimeTypes) {	72	for (auto it = m_AcceptedMimeTypes.constBegin(); it != m_AcceptedMimeTypes.constEnd();
45	if (data->hasFormat(type)) {	73	++it) {
		74	if (data->hasFormat(it.key())
		75	&& (it.value() == VisualizationDragDropContainer::DropBehavior::Inserted
		76	\|\| it.value()
		77	== VisualizationDragDropContainer::DropBehavior::InsertedAndMerged)) {
46	return true;	78	return true;
47	}	79	}
48	}	80	}
@@ -55,7 +87,7 struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
55	return sqpApp->dragDropHelper().placeHolder().parentWidget() == m_Layout->parentWidget();	87	return sqpApp->dragDropHelper().placeHolder().parentWidget() == m_Layout->parentWidget();
56	}	88	}
57		89
58	VisualizationDragWidget getChildDragWidgetAt(QWidget parent, const QPoint &pos) const	90	VisualizationDragWidget getChildDragWidgetAt(const QWidget parent, const QPoint &pos) const
59	{	91	{
60	VisualizationDragWidget *dragWidget = nullptr;	92	VisualizationDragWidget *dragWidget = nullptr;
61		93
@@ -74,15 +106,29 struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
74		106
75	bool cursorIsInContainer(QWidget *container) const	107	bool cursorIsInContainer(QWidget *container) const
76	{	108	{
77	auto adustNum = 18; // to be safe, in case of scrollbar on the side	109	return container->isAncestorOf(sqpApp->widgetAt(QCursor::pos()));
78	auto containerRect = QRect(QPoint(), container->contentsRect().size())	110	}
79	.adjusted(adustNum, adustNum, -adustNum, -adustNum);	111
80	return containerRect.contains(container->mapFromGlobal(QCursor::pos()));	112	int countDragWidget(const QWidget *parent, bool onlyVisible = false) const
		113	{
		114	auto nbGraph = 0;
		115	for (auto child : parent->children()) {
		116	if (qobject_cast<VisualizationDragWidget *>(child)) {
		117	if (!onlyVisible \|\| qobject_cast<VisualizationDragWidget *>(child)->isVisible()) {
		118	nbGraph += 1;
		119	}
		120	}
		121	}
		122
		123	return nbGraph;
81	}	124	}
		125
		126	void findPlaceHolderPosition(const QPoint &pos, bool canInsert, bool canMerge,
		127	const VisualizationDragDropContainer *container);
82	};	128	};
83		129
84	VisualizationDragDropContainer::VisualizationDragDropContainer(QWidget *parent)	130	VisualizationDragDropContainer::VisualizationDragDropContainer(QWidget *parent)
85	: Q~~Widget~~{parent},	131	: QFrame{parent},
86	impl{spimpl::make_unique_impl<VisualizationDragDropContainerPrivate>(this)}	132	impl{spimpl::make_unique_impl<VisualizationDragDropContainerPrivate>(this)}
87	{	133	{
88	setAcceptDrops(true);	134	setAcceptDrops(true);
@@ -105,26 +151,15 void VisualizationDragDropContainer::insertDragWidget(int index,
105	&VisualizationDragDropContainer::startDrag);	151	&VisualizationDragDropContainer::startDrag);
106	}	152	}
107		153
108	void VisualizationDragDropContainer::~~set~~AcceptedMimeTypes(~~const~~ ~~QStringList~~ &~~mimeTypes~~)	154	void VisualizationDragDropContainer::addAcceptedMimeType(
109	{	155	const QString &mimeType, VisualizationDragDropContainer::DropBehavior behavior)
110	impl->m_AcceptedMimeTypes = mimeTypes;
111	}
112
113	void VisualizationDragDropContainer::setMergeAllowedMimeTypes(const QStringList &mimeTypes)
114	{	156	{
115	impl->m_~~MergeAllow~~edMimeTypes = ~~mimeTypes~~;	157	impl->m_AcceptedMimeTypes[mimeType] = behavior;
116	}	158	}
117		159
118	int VisualizationDragDropContainer::countDragWidget() const	160	int VisualizationDragDropContainer::countDragWidget() const
119	{	161	{
120	auto nbGraph = 0;	162	return impl->countDragWidget(this);
121	for (auto child : children()) {
122	if (qobject_cast<VisualizationDragWidget *>(child)) {
123	nbGraph += 1;
124	}
125	}
126
127	return nbGraph;
128	}	163	}
129		164
130	void VisualizationDragDropContainer::setAcceptMimeDataFunction(	165	void VisualizationDragDropContainer::setAcceptMimeDataFunction(
@@ -133,6 +168,13 void VisualizationDragDropContainer::setAcceptMimeDataFunction(
133	impl->m_AcceptMimeDataFun = fun;	168	impl->m_AcceptMimeDataFun = fun;
134	}	169	}
135		170
		171	void VisualizationDragDropContainer::setPlaceHolderType(DragDropHelper::PlaceHolderType type,
		172	const QString &placeHolderText)
		173	{
		174	impl->m_PlaceHolderType = type;
		175	impl->m_PlaceHolderText = placeHolderText;
		176	}
		177
136	void VisualizationDragDropContainer::startDrag(VisualizationDragWidget *dragWidget,	178	void VisualizationDragDropContainer::startDrag(VisualizationDragWidget *dragWidget,
137	const QPoint &dragPosition)	179	const QPoint &dragPosition)
138	{	180	{
@@ -159,9 +201,14 void VisualizationDragDropContainer::startDrag(VisualizationDragWidget *dragWidg
159		201
160	if (impl->cursorIsInContainer(this)) {	202	if (impl->cursorIsInContainer(this)) {
161	auto dragWidgetIndex = impl->m_Layout->indexOf(dragWidget);	203	auto dragWidgetIndex = impl->m_Layout->indexOf(dragWidget);
162	helper.insertPlaceHolder(impl->m_Layout, dragWidgetIndex);	204	helper.insertPlaceHolder(impl->m_Layout, dragWidgetIndex, impl->m_PlaceHolderType,
		205	impl->m_PlaceHolderText);
163	dragWidget->setVisible(false);	206	dragWidget->setVisible(false);
164	}	207	}
		208	else {
		209	// The drag starts directly outside the drop zone
		210	// do not add the placeHolder
		211	}
165		212
166	// Note: The exec() is blocking on windows but not on linux and macOS	213	// Note: The exec() is blocking on windows but not on linux and macOS
167	drag->exec(Qt::MoveAction \| Qt::CopyAction);	214	drag->exec(Qt::MoveAction \| Qt::CopyAction);
@@ -185,7 +232,7 void VisualizationDragDropContainer::dragEnterEvent(QDragEnterEvent *event)
185		232
186	if (dragWidget) {	233	if (dragWidget) {
187	// If the drag&drop is internal to the visualization, entering the container hide	234	// If the drag&drop is internal to the visualization, entering the container hide
188	// the dragWidget which was ~~hidden~~ by the dragLeaveEvent	235	// the dragWidget which was made visible by the dragLeaveEvent
189	auto parentWidget	236	auto parentWidget
190	= qobject_cast<VisualizationDragDropContainer *>(dragWidget->parentWidget());	237	= qobject_cast<VisualizationDragDropContainer *>(dragWidget->parentWidget());
191	if (parentWidget) {	238	if (parentWidget) {
@@ -193,26 +240,9 void VisualizationDragDropContainer::dragEnterEvent(QDragEnterEvent *event)
193	}	240	}
194	}	241	}
195		242
196	auto dragWidgetHovered = impl->getChildDragWidgetAt(this, event->pos());	243	auto canMerge = impl->allowMergeForMimeData(event->mimeData());
197		244	auto canInsert = impl->allowInsertForMimeData(event->mimeData());
198	if (dragWidgetHovered) {	245	impl->findPlaceHolderPosition(event->pos(), canInsert, canMerge, this);
199	auto hoveredWidgetIndex = impl->m_Layout->indexOf(dragWidgetHovered);
200
201	if (dragWidget) {
202	auto dragWidgetIndex = impl->m_Layout->indexOf(helper.getCurrentDragWidget());
203	if (dragWidgetIndex >= 0 && dragWidgetIndex <= hoveredWidgetIndex) {
204	// Correction of the index if the drop occurs in the same container
205	// and if the drag is started from the visualization (in that case, the
206	// dragWidget is hidden)
207	hoveredWidgetIndex += 1;
208	}
209	}
210
211	helper.insertPlaceHolder(impl->m_Layout, hoveredWidgetIndex);
212	}
213	else {
214	helper.insertPlaceHolder(impl->m_Layout, 0);
215	}
216	}	246	}
217	else {	247	else {
218	// do nothing	248	// do nothing
@@ -233,6 +263,8 void VisualizationDragDropContainer::dragLeaveEvent(QDragLeaveEvent *event)
233		263
234	if (!impl->cursorIsInContainer(this)) {	264	if (!impl->cursorIsInContainer(this)) {
235	helper.removePlaceHolder();	265	helper.removePlaceHolder();
		266	helper.setHightlightedDragWidget(nullptr);
		267	impl->m_MinContainerHeight = 0;
236		268
237	auto dragWidget = helper.getCurrentDragWidget();	269	auto dragWidget = helper.getCurrentDragWidget();
238	if (dragWidget) {	270	if (dragWidget) {
@@ -258,105 +290,164 void VisualizationDragDropContainer::dragLeaveEvent(QDragLeaveEvent *event)
258	void VisualizationDragDropContainer::dragMoveEvent(QDragMoveEvent *event)	290	void VisualizationDragDropContainer::dragMoveEvent(QDragMoveEvent *event)
259	{	291	{
260	if (impl->acceptMimeData(event->mimeData())) {	292	if (impl->acceptMimeData(event->mimeData())) {
261	auto dragWidgetHovered = impl->getChildDragWidgetAt(this, event->pos());	293	auto canMerge = impl->allowMergeForMimeData(event->mimeData());
262	if (dragWidgetHovered) {	294	auto canInsert = impl->allowInsertForMimeData(event->mimeData());
263	auto canMerge = impl->allowMergeMimeData(event->mimeData());	295	impl->findPlaceHolderPosition(event->pos(), canInsert, canMerge, this);
264		296	}
265	auto nbDragWidget = countDragWidget();	297	else {
266	if (nbDragWidget > 0) {	298	event->ignore();
267	auto graphHeight = qMax(size().height() / nbDragWidget, GRAPH_MINIMUM_HEIGHT);	299	}
268		300
269	auto dropIndex = floor(event->pos().y() / graphHeight);	301	QWidget::dragMoveEvent(event);
270	auto zoneSize = qMin(graphHeight / 3.0, 150.0);	302	}
271		303
272	auto isOnTop = event->pos().y() < dropIndex * graphHeight + zoneSize;	304	void VisualizationDragDropContainer::dropEvent(QDropEvent *event)
273	auto isOnBottom = event->pos().y() > (dropIndex + 1) * graphHeight - zoneSize;	305	{
		306	auto &helper = sqpApp->dragDropHelper();
274		307
275	auto &helper = sqpApp->dragDropHelper();	308	if (impl->acceptMimeData(event->mimeData())) {
276	auto placeHolderIndex = impl->m_Layout->indexOf(&(helper.placeHolder()));	309	auto dragWidget = helper.getCurrentDragWidget();
		310	if (impl->hasPlaceHolder()) {
		311	// drop where the placeHolder is located
277		312
278	if (isOnTop \|\| isOnBottom) {	313	auto canInsert = impl->allowInsertForMimeData(event->mimeData());
279	if (~~isOnBottom~~) {	314	if (canInsert) {
280	dropIndex += 1;	315	auto droppedIndex = impl->m_Layout->indexOf(&helper.placeHolder());
281	}
282		316
283	if (~~helper~~.~~getCurrentD~~ragWidget()) {	317	if (dragWidget) {
284	auto dragWidgetIndex	318	auto dragWidgetIndex = impl->m_Layout->indexOf(dragWidget);
285	= impl->m_Layout->indexOf(helper.getCurrentDragWidget());	319	if (dragWidgetIndex >= 0 && dragWidgetIndex < droppedIndex) {
286	if (dragWidgetIndex >= 0 && dragWidgetIndex <= dropIndex) {	320	// Correction of the index if the drop occurs in the same container
287	// Correction of the index if the drop occurs in the same container	321	// and if the drag is started from the visualization (in that case, the
288	// and if the drag is started from the visualization (in that case, the	322	// dragWidget is hidden)
289	~~// dragWidget is hidden)~~	323	droppedIndex -= 1;
290	dropIndex += 1;
291	}
292	}	324	}
293		325
294	if (dropIndex != placeHolderIndex) {	326	dragWidget->setVisible(true);
295	helper.insertPlaceHolder(impl->m_Layout, dropIndex);
296	}
297	}
298	else if (canMerge) {
299	// drop on the middle -> merge
300	if (impl->hasPlaceHolder()) {
301	helper.removePlaceHolder();
302	}
303	}	327	}
		328
		329	event->acceptProposedAction();
		330
		331	helper.removePlaceHolder();
		332
		333	emit dropOccuredInContainer(droppedIndex, event->mimeData());
304	}	334	}
305	else {	335	else {
306	qCWarning(LOG_VisualizationDragDropContainer())	336	qCWarning(LOG_VisualizationDragDropContainer()) << tr(
307	<< tr("VisualizationDragDropContainer::dr~~agMoveEvent, no widget found i~~n the "	337	"VisualizationDragDropContainer::dropEvent, dropping on the placeHolder, but "
308	"~~container~~");	338	"the insertion is forbidden.");
		339	Q_ASSERT(false);
309	}	340	}
310	}	341	}
311	else {	342	else if (helper.getHightlightedDragWidget()) {
312	// No hovered drag widget, the mouse is probably hover the placeHolder	343	// drop on the highlighted widget
313	// Do nothing	344
		345	auto canMerge = impl->allowMergeForMimeData(event->mimeData());
		346	if (canMerge) {
		347	event->acceptProposedAction();
		348	emit dropOccuredOnWidget(helper.getHightlightedDragWidget(), event->mimeData());
		349	}
		350	else {
		351	qCWarning(LOG_VisualizationDragDropContainer())
		352	<< tr("VisualizationDragDropContainer::dropEvent, dropping on a widget, but "
		353	"the merge is forbidden.");
		354	Q_ASSERT(false);
		355	}
314	}	356	}
315	}	357	}
316	else {	358	else {
317	event->ignore();	359	event->ignore();
318	}	360	}
319		361
320	QWidget::dragMoveEvent(event);	362	sqpApp->dragDropHelper().setHightlightedDragWidget(nullptr);
		363	impl->m_MinContainerHeight = 0;
		364
		365	QWidget::dropEvent(event);
321	}	366	}
322		367
323	void VisualizationDragDropContainer::dropEvent(QDropEvent *event)	368
		369	void VisualizationDragDropContainer::VisualizationDragDropContainerPrivate::findPlaceHolderPosition(
		370	const QPoint &pos, bool canInsert, bool canMerge,
		371	const VisualizationDragDropContainer *container)
324	{	372	{
325	if (impl->acceptMimeData(event->mimeData())) {	373	auto &helper = sqpApp->dragDropHelper();
326	auto dragWidget = sqpApp->dragDropHelper().getCurrentDragWidget();
327	if (impl->hasPlaceHolder()) {
328	auto &helper = sqpApp->dragDropHelper();
329		374
330	auto droppedIndex = impl->m_Layout->indexOf(&helper.placeHolder());	375	auto absPos = container->mapToGlobal(pos);
		376	auto isOnPlaceHolder = sqpApp->widgetAt(absPos) == &(helper.placeHolder());
331		377
332	if (dragWidget) {	378	if (countDragWidget(container, true) == 0) {
333	auto dragWidgetIndex = impl->m_Layout->indexOf(dragWidget);	379	// Drop on an empty container, just add the placeHolder at the top
334	if (dragWidgetIndex >= 0 && dragWidgetIndex < droppedIndex) {	380	helper.insertPlaceHolder(m_Layout, 0, m_PlaceHolderType, m_PlaceHolderText);
335	// Correction of the index if the drop occurs in the same container	381	}
336	// and if the drag is started from the visualization (in that case, the	382	else if (!isOnPlaceHolder) {
337	// dragWidget is hidden)	383	auto nbDragWidget = countDragWidget(container);
338	droppedIndex -= 1;	384	if (nbDragWidget > 0) {
339	}
340		385
341	dragWidget->setVisible(true);	386	if (m_MinContainerHeight == 0) {
		387	m_MinContainerHeight = container->size().height();
342	}	388	}
343		389
344	event->acceptProposedAction();	390	m_MinContainerHeight = qMin(m_MinContainerHeight, container->size().height());
		391	auto graphHeight = qMax(m_MinContainerHeight / nbDragWidget, GRAPH_MINIMUM_HEIGHT);
		392
		393	auto posY = pos.y();
		394	auto dropIndex = floor(posY / graphHeight);
		395	auto zoneSize = qMin(graphHeight / 4.0, 75.0);
		396
		397
		398	auto isOnTop = posY < dropIndex * graphHeight + zoneSize;
		399	auto isOnBottom = posY > (dropIndex + 1) * graphHeight - zoneSize;
		400
		401	auto placeHolderIndex = m_Layout->indexOf(&(helper.placeHolder()));
		402
		403	auto dragWidgetHovered = getChildDragWidgetAt(container, pos);
345		404
346	helper.removePlaceHolder();	405	if (canInsert && (isOnTop \|\| isOnBottom \|\| !canMerge)) {
		406	if (isOnBottom) {
		407	dropIndex += 1;
		408	}
347		409
348	emit dropOccured(droppedIndex, event->mimeData());	410	if (helper.getCurrentDragWidget()) {
		411	auto dragWidgetIndex = m_Layout->indexOf(helper.getCurrentDragWidget());
		412	if (dragWidgetIndex >= 0 && dragWidgetIndex <= dropIndex) {
		413	// Correction of the index if the drop occurs in the same container
		414	// and if the drag is started from the visualization (in that case, the
		415	// dragWidget is hidden)
		416	dropIndex += 1;
		417	}
		418	}
		419
		420	if (dropIndex != placeHolderIndex) {
		421	helper.insertPlaceHolder(m_Layout, dropIndex, m_PlaceHolderType,
		422	m_PlaceHolderText);
		423	}
		424
		425	helper.setHightlightedDragWidget(nullptr);
		426	}
		427	else if (canMerge && dragWidgetHovered) {
		428	// drop on the middle -> merge
		429	if (hasPlaceHolder()) {
		430	helper.removePlaceHolder();
		431	}
		432
		433	helper.setHightlightedDragWidget(dragWidgetHovered);
		434	}
		435	else {
		436	qCWarning(LOG_VisualizationDragDropContainer())
		437	<< tr("VisualizationDragDropContainer::findPlaceHolderPosition, no valid drop "
		438	"action.");
		439	Q_ASSERT(false);
		440	}
349	}	441	}
350	else {	442	else {
351	qCWarning(LOG_VisualizationDragDropContainer())	443	qCWarning(LOG_VisualizationDragDropContainer())
352	<< tr("VisualizationDragDropContainer::~~dropEvent, couldn't drop because the~~ "	444	<< tr("VisualizationDragDropContainer::findPlaceHolderPosition, no widget "
353	"~~placeHolder is not found.~~");	445	"found in the "
354	Q_ASSERT(false);	446	"container");
355	}	447	}
356	}	448	}
357	else {	449	else {
358	event->ignore();	450	// the mouse is hover the placeHolder
		451	// Do nothing
359	}	452	}
360
361	QWidget::dropEvent(event);
362	}	453	}

gui/src/Visualization/VisualizationGraphWidget.cpp +17 -1

             #include <Common/MimeTypesDef.h>
             #include <Data/ArrayData.h>
             #include <Data/IDataSeries.h>
-            #include <DragDropHelper.h>
+            #include <DragAndDrop/DragDropHelper.h>
             #include <Settings/SqpSettingsDefs.h>
             #include <SqpApplication.h>
+            #include <Time/TimeController.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
                 auto mimeData = new QMimeData;
                 mimeData->setData(MIME_TYPE_GRAPH, QByteArray{});
+                auto timeRangeData = TimeController::mimeDataForTimeRange(graphRange());
+                mimeData->setData(MIME_TYPE_TIME_RANGE, timeRangeData);
                 return mimeData;
             }
                 return true;
             }
+            void VisualizationGraphWidget::highlightForMerge(bool highlighted)
+            {
+                if (highlighted) {
+                    plot().setBackground(QBrush(QColor("#BBD5EE")));
+                }
+                else {
+                    plot().setBackground(QBrush(Qt::white));
+                }
+                plot().update();
+            }
             void VisualizationGraphWidget::closeEvent(QCloseEvent *event)
             {
                 Q_UNUSED(event);

gui/src/Visualization/VisualizationTabWidget.cpp +14 -5

             #include "Common/MimeTypesDef.h"
-            #include "DragDropHelper.h"
+            #include "DragAndDrop/DragDropHelper.h"
             #include "SqpApplication.h"
             Q_LOGGING_CATEGORY(LOG_VisualizationTabWidget, "VisualizationTabWidget")
             {
                 ui->setupUi(this);
-                ui->dragDropContainer->setAcceptedMimeTypes(
+                ui->dragDropContainer->setPlaceHolderType(DragDropHelper::PlaceHolderType::Zone, "Zone");
-                    {MIME_TYPE_GRAPH, MIME_TYPE_ZONE, MIME_TYPE_VARIABLE_LIST});
+                ui->dragDropContainer->layout()->setContentsMargins(0, 0, 0, 5);
-                connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccured, this,
+                ui->dragDropContainer->addAcceptedMimeType(
-                        &VisualizationTabWidget::dropMimeData);
+                    MIME_TYPE_GRAPH, VisualizationDragDropContainer::DropBehavior::Inserted);
+                ui->dragDropContainer->addAcceptedMimeType(
+                    MIME_TYPE_ZONE, VisualizationDragDropContainer::DropBehavior::Inserted);
+                ui->dragDropContainer->addAcceptedMimeType(
+                    MIME_TYPE_VARIABLE_LIST, VisualizationDragDropContainer::DropBehavior::Inserted);
                 ui->dragDropContainer->setAcceptMimeDataFunction([this](auto mimeData) {
                     return sqpApp->dragDropHelper().checkMimeDataForVisualization(mimeData,
                                                                                   ui->dragDropContainer);
                 });
+                connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredInContainer, this,
+                        &VisualizationTabWidget::dropMimeData);
                 sqpApp->dragDropHelper().addDragDropScrollArea(ui->scrollArea);
                 // Widget is deleted when closed

gui/src/Visualization/VisualizationWidget.cpp +6 0

             #include "ui_VisualizationWidget.h"
+            #include "DragAndDrop/DragDropHelper.h"
+            #include "SqpApplication.h"
             #include <QToolButton>
             Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget")
                 connect(addTabViewButton, &QToolButton::clicked, addTabView);
                 connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView);
+                sqpApp->dragDropHelper().addDragDropTabBar(ui->tabWidget->tabBar());
                 // Adds default tab
                 addTabView();
             }
             VisualizationWidget::~VisualizationWidget()
             {
+                sqpApp->dragDropHelper().removeDragDropTabBar(ui->tabWidget->tabBar());
                 delete ui;
             }

gui/src/Visualization/VisualizationZoneWidget.cpp +59 -11

@@ -10,12 +10,13
10	#include "Common/VisualizationDef.h"	10	#include "Common/VisualizationDef.h"
11		11
12	#include <Data/SqpRange.h>	12	#include <Data/SqpRange.h>
		13	#include <Time/TimeController.h>
13	#include <Variable/Variable.h>	14	#include <Variable/Variable.h>
14	#include <Variable/VariableController.h>	15	#include <Variable/VariableController.h>
15		16
16	#include <Visualization/operations/FindVariableOperation.h>	17	#include <Visualization/operations/FindVariableOperation.h>
17		18
18	#include <DragDropHelper.h>	19	#include <DragAndDrop/DragDropHelper.h>
19	#include <QUuid>	20	#include <QUuid>
20	#include <SqpApplication.h>	21	#include <SqpApplication.h>
21	#include <cmath>	22	#include <cmath>
@@ -71,6 +72,21 struct VisualizationZoneWidget::VisualizationZoneWidgetPrivate {
71	QUuid m_SynchronisationGroupId;	72	QUuid m_SynchronisationGroupId;
72	std::unique_ptr<IGraphSynchronizer> m_Synchronizer;	73	std::unique_ptr<IGraphSynchronizer> m_Synchronizer;
73		74
		75	// Returns the first graph in the zone or nullptr if there is no graph inside
		76	VisualizationGraphWidget firstGraph(const VisualizationZoneWidget zoneWidget) const
		77	{
		78	VisualizationGraphWidget *firstGraph = nullptr;
		79	auto layout = zoneWidget->ui->dragDropContainer->layout();
		80	if (layout->count() > 0) {
		81	if (auto visualizationGraphWidget
		82	= qobject_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
		83	firstGraph = visualizationGraphWidget;
		84	}
		85	}
		86
		87	return firstGraph;
		88	}
		89
74	void dropGraph(int index, VisualizationZoneWidget *zoneWidget);	90	void dropGraph(int index, VisualizationZoneWidget *zoneWidget);
75	void dropVariables(const QList<std::shared_ptr<Variable> > &variables, int index,	91	void dropVariables(const QList<std::shared_ptr<Variable> > &variables, int index,
76	VisualizationZoneWidget *zoneWidget);	92	VisualizationZoneWidget *zoneWidget);
@@ -85,13 +101,22 VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *p
85		101
86	ui->zoneNameLabel->setText(name);	102	ui->zoneNameLabel->setText(name);
87		103
88	ui->dragDropContainer->setAcceptedMimeTypes({MIME_TYPE_GRAPH, MIME_TYPE_VARIABLE_LIST});	104	ui->dragDropContainer->setPlaceHolderType(DragDropHelper::PlaceHolderType::Graph);
		105	ui->dragDropContainer->addAcceptedMimeType(
		106	MIME_TYPE_GRAPH, VisualizationDragDropContainer::DropBehavior::Inserted);
		107	ui->dragDropContainer->addAcceptedMimeType(
		108	MIME_TYPE_VARIABLE_LIST, VisualizationDragDropContainer::DropBehavior::InsertedAndMerged);
		109	ui->dragDropContainer->addAcceptedMimeType(
		110	MIME_TYPE_TIME_RANGE, VisualizationDragDropContainer::DropBehavior::Merged);
89	ui->dragDropContainer->setAcceptMimeDataFunction([this](auto mimeData) {	111	ui->dragDropContainer->setAcceptMimeDataFunction([this](auto mimeData) {
90	return sqpApp->dragDropHelper().checkMimeDataForVisualization(mimeData,	112	return sqpApp->dragDropHelper().checkMimeDataForVisualization(mimeData,
91	ui->dragDropContainer);	113	ui->dragDropContainer);
92	});	114	});
93	connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccured, this,	115
		116	connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredInContainer, this,
94	&VisualizationZoneWidget::dropMimeData);	117	&VisualizationZoneWidget::dropMimeData);
		118	connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredOnWidget, this,
		119	&VisualizationZoneWidget::dropMimeDataOnGraph);
95		120
96	// 'Close' options : widget is deleted when closed	121	// 'Close' options : widget is deleted when closed
97	setAttribute(Qt::WA_DeleteOnClose);	122	setAttribute(Qt::WA_DeleteOnClose);
@@ -234,15 +259,9 VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<V
234	&VisualizationZoneWidget::onVariableAboutToBeRemoved);	259	&VisualizationZoneWidget::onVariableAboutToBeRemoved);
235		260
236	auto range = SqpRange{};	261	auto range = SqpRange{};
237		262	if (auto firstGraph = impl->firstGraph(this)) {
238	// Apply visitor to graph children
239	auto layout = ui->dragDropContainer->layout();
240	if (layout->count() > 0) {
241	// Case of a new graph in a existant zone	263	// Case of a new graph in a existant zone
242	if (auto visualizationGraphWidget	264	range = firstGraph->graphRange();
243	= dynamic_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
244	range = visualizationGraphWidget->graphRange();
245	}
246	}	265	}
247	else {	266	else {
248	// Case of a new graph as the first of the zone	267	// Case of a new graph as the first of the zone
@@ -380,6 +399,35 void VisualizationZoneWidget::dropMimeData(int index, const QMimeData *mimeData)
380	}	399	}
381	}	400	}
382		401
		402	void VisualizationZoneWidget::dropMimeDataOnGraph(VisualizationDragWidget *dragWidget,
		403	const QMimeData *mimeData)
		404	{
		405	auto graphWidget = qobject_cast<VisualizationGraphWidget *>(dragWidget);
		406	if (!graphWidget) {
		407	qCWarning(LOG_VisualizationZoneWidget())
		408	<< tr("VisualizationZoneWidget::dropMimeDataOnGraph, dropping in an unknown widget, "
		409	"drop aborted");
		410	Q_ASSERT(false);
		411	return;
		412	}
		413
		414	if (mimeData->hasFormat(MIME_TYPE_VARIABLE_LIST)) {
		415	auto variables = sqpApp->variableController().variablesForMimeData(
		416	mimeData->data(MIME_TYPE_VARIABLE_LIST));
		417	for (const auto &var : variables) {
		418	graphWidget->addVariable(var, graphWidget->graphRange());
		419	}
		420	}
		421	else if (mimeData->hasFormat(MIME_TYPE_TIME_RANGE)) {
		422	auto range = TimeController::timeRangeForMimeData(mimeData->data(MIME_TYPE_TIME_RANGE));
		423	graphWidget->setGraphRange(range);
		424	}
		425	else {
		426	qCWarning(LOG_VisualizationZoneWidget())
		427	<< tr("VisualizationZoneWidget::dropMimeDataOnGraph, unknown MIME data received.");
		428	}
		429	}
		430
383	void VisualizationZoneWidget::VisualizationZoneWidgetPrivate::dropGraph(	431	void VisualizationZoneWidget::VisualizationZoneWidgetPrivate::dropGraph(
384	int index, VisualizationZoneWidget *zoneWidget)	432	int index, VisualizationZoneWidget *zoneWidget)
385	{	433	{

gui/ui/TimeWidget/TimeWidget.ui +6 0

                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="acceptDrops">
+               <bool>true</bool>
+              </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
+              <property name="styleSheet">
+               <string notr="true">b</string>
+              </property>
               <layout class="QHBoxLayout" name="horizontalLayout_2">
                <item>
                 <widget class="QLabel" name="label">

gui/ui/Variable/VariableInspectorWidget.ui +8 -1

               </property>
               <layout class="QGridLayout" name="gridLayout">
                <item row="0" column="0">
-                <widget class="QTableView" name="tableView">
+                <widget class="VariableInspectorTableView" name="tableView">
                  <property name="acceptDrops">
                   <bool>true</bool>
                  </property>
                </item>
               </layout>
              </widget>
+             <customwidgets>
+              <customwidget>
+               <class>VariableInspectorTableView</class>
+               <extends>QTableView</extends>
+               <header>Variable/VariableInspectorTableView.h</header>
+              </customwidget>
+             </customwidgets>
              <resources/>
              <connections/>
             </ui>

gui/ui/Visualization/VisualizationTabWidget.ui +6 -2

                     <number>0</number>
                    </property>
                    <item>
-                    <widget class="VisualizationDragDropContainer" name="dragDropContainer" native="true"/>
+                    <widget class="VisualizationDragDropContainer" name="dragDropContainer">
+                     <property name="lineWidth">
+                      <number>0</number>
+                     </property>
+                    </widget>
                    </item>
                   </layout>
                  </widget>
              <customwidgets>
               <customwidget>
                <class>VisualizationDragDropContainer</class>
-               <extends>QWidget</extends>
+               <extends>QFrame</extends>
                <header>Visualization/VisualizationDragDropContainer.h</header>
                <container>1</container>
               </customwidget>

gui/ui/Visualization/VisualizationZoneWidget.ui +2 -5

                 </widget>
                </item>
                <item>
-                <widget class="QFrame" name="visualizationZoneFrame">
+                <widget class="VisualizationDragDropContainer" name="dragDropContainer">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                    <horstretch>0</horstretch>
                   <property name="bottomMargin">
                    <number>0</number>
                   </property>
-                  <item>
-                   <widget class="VisualizationDragDropContainer" name="dragDropContainer" native="true"/>
-                  </item>
                  </layout>
                 </widget>
                </item>
              <customwidgets>
               <customwidget>
                <class>VisualizationDragDropContainer</class>
-               <extends>QWidget</extends>
+               <extends>QFrame</extends>
                <header>Visualization/VisualizationDragDropContainer.h</header>
                <container>1</container>
               </customwidget>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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