GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r874:7d2f05cda6a0

drop of product on the variables

trabillard -

r874:7d2f05cda6a0

parent child

Context file:

r874:7d2f05cda6a0

core/include/DataSource/DataSourceController.h +5 0

                  */
                 void loadProductItem(const QUuid &dataSourceUid, const DataSourceItem &productItem) noexcept;
+                QByteArray mimeDataForProductsData(const QVariantList &productsData) const;
+                QVariantList productsDataForMimeData(const QByteArray &mimeData) const;
             public slots:
                 /// Manage init/end of the controller
                 void initialize();
                 void finalize();
+                void requestVariable(const QVariantHash &productData);
             signals:
                 /// Signal emitted when a structure has been set for a data source
                 void dataSourceItemSet(DataSourceItem *dataSourceItem);

core/include/DataSource/DataSourceItem.h +8 0

                 DataSourceItemType type() const noexcept;
+                /**
+                 * @brief Searches the first child matching the specified data.
+                 * @param data The data to search.
+                 * @param recursive So the search recursively.
+                 * @return the item matching the data or nullptr if it was not found.
+                 */
+                DataSourceItem *findItem(const QVariantHash &data, bool recursive);
                 bool operator==(const DataSourceItem &other);
                 bool operator!=(const DataSourceItem &other);

core/include/Variable/VariableModel.h +1 0

             signals:
                 void abortProgessRequested(std::shared_ptr<Variable> variable);
+                void requestVariable(const QVariantHash &productData);
             private:
                 class VariableModelPrivate;

core/src/DataSource/DataSourceController.cpp +49 0

@@ -6,6 +6,7
6	#include <QMutex>	6	#include <QMutex>
7	#include <QThread>	7	#include <QThread>
8		8
		9	#include <QDataStream>
9	#include <QDir>	10	#include <QDir>
10	#include <QStandardPaths>	11	#include <QStandardPaths>
11		12
@@ -44,6 +45,20 public:
44	/// @remarks Data providers are stored as shared_ptr as they can be sent to a variable and	45	/// @remarks Data providers are stored as shared_ptr as they can be sent to a variable and
45	/// continue to live without necessarily the data source controller	46	/// continue to live without necessarily the data source controller
46	std::map<QUuid, std::shared_ptr<IDataProvider> > m_DataProviders;	47	std::map<QUuid, std::shared_ptr<IDataProvider> > m_DataProviders;
		48
		49	// Search for the first datasource item matching the specified data
		50	DataSourceItem *findDataSourceItem(const QVariantHash &data)
		51	{
		52	DataSourceItem *sourceItem = nullptr;
		53	for (const auto &item : m_DataSourceItems) {
		54	sourceItem = item.second->findItem(data, true);
		55	if (sourceItem) {
		56	break;
		57	}
		58	}
		59
		60	return sourceItem;
		61	}
47	};	62	};
48		63
49	DataSourceController::DataSourceController(QObject *parent)	64	DataSourceController::DataSourceController(QObject *parent)
@@ -124,6 +139,26 void DataSourceController::loadProductItem(const QUuid &dataSourceUid,
124	}	139	}
125	}	140	}
126		141
		142	QByteArray DataSourceController::mimeDataForProductsData(const QVariantList &productsData) const
		143	{
		144	QByteArray encodedData;
		145	QDataStream stream(&encodedData, QIODevice::WriteOnly);
		146
		147	stream << productsData;
		148
		149	return encodedData;
		150	}
		151
		152	QVariantList DataSourceController::productsDataForMimeData(const QByteArray &mimeData) const
		153	{
		154	QDataStream stream(mimeData);
		155
		156	QVariantList productList;
		157	stream >> productList;
		158
		159	return productList;
		160	}
		161
127	void DataSourceController::initialize()	162	void DataSourceController::initialize()
128	{	163	{
129	qCDebug(LOG_DataSourceController())	164	qCDebug(LOG_DataSourceController())
@@ -137,6 +172,20 void DataSourceController::finalize()
137	impl->m_WorkingMutex.unlock();	172	impl->m_WorkingMutex.unlock();
138	}	173	}
139		174
		175	void DataSourceController::requestVariable(const QVariantHash &productData)
		176	{
		177	DataSourceItem *sourceItem = impl->findDataSourceItem(productData);
		178
		179	if (sourceItem) {
		180	auto sourceName = sourceItem->rootItem().name();
		181	auto sourceId = impl->m_DataSources.key(sourceName);
		182	loadProductItem(sourceId, *sourceItem);
		183	}
		184	else {
		185	qCWarning(LOG_DataSourceController()) << tr("requestVariable, product data not found");
		186	}
		187	}
		188
140	void DataSourceController::waitForFinish()	189	void DataSourceController::waitForFinish()
141	{	190	{
142	QMutexLocker locker{&impl->m_WorkingMutex};	191	QMutexLocker locker{&impl->m_WorkingMutex};

core/src/DataSource/DataSourceItem.cpp +18 0

@@ -123,6 +123,24 DataSourceItemType DataSourceItem::type() const noexcept
123	return impl->m_Type;	123	return impl->m_Type;
124	}	124	}
125		125
		126	DataSourceItem *DataSourceItem::findItem(const QVariantHash &data, bool recursive)
		127	{
		128	for (const auto &child : impl->m_Children) {
		129	if (child->impl->m_Data == data) {
		130	return child.get();
		131	}
		132
		133	if (recursive) {
		134	auto foundItem = child->findItem(data, true);
		135	if (foundItem) {
		136	return foundItem;
		137	}
		138	}
		139	}
		140
		141	return nullptr;
		142	}
		143
126	bool DataSourceItem::operator==(const DataSourceItem &other)	144	bool DataSourceItem::operator==(const DataSourceItem &other)
127	{	145	{
128	// Compares items' attributes	146	// Compares items' attributes

core/src/Variable/VariableModel.cpp +20 -3

             #include <Data/IDataSeries.h>
+            #include <QDataStream>
             #include <QMimeData>
             #include <QSize>
             #include <unordered_map>
             Qt::DropActions VariableModel::supportedDropActions() const
             {
-                return Qt::MoveAction;
+                return Qt::CopyAction | Qt::MoveAction;
             }
             Qt::DropActions VariableModel::supportedDragActions() const
             bool VariableModel::canDropMimeData(const QMimeData *data, Qt::DropAction action, int row,
                                                 int column, const QModelIndex &parent) const
             {
-                return false;
+                // drop of a product
+                return data->hasFormat(MIME_TYPE_PRODUCT_LIST);
             }
             bool VariableModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
                                              const QModelIndex &parent)
             {
-                return false;
+                bool dropDone = false;
+                if (data->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
+                    QDataStream stream(data->data(MIME_TYPE_PRODUCT_LIST));
+                    QVariantList productList;
+                    stream >> productList;
+                    for (auto metaData : productList) {
+                        emit requestVariable(metaData.toHash());
+                    }
+                    dropDone = true;
+                }
+                return dropDone;
             }
             void VariableModel::abortProgress(const QModelIndex &index)

gui/src/DataSource/DataSourceTreeWidget.cpp +4 -5

             #include "DataSource/DataSourceTreeWidget.h"
             #include "Common/MimeTypesDef.h"
+            #include "DataSource/DataSourceController.h"
             #include "DataSource/DataSourceItem.h"
             #include "DataSource/DataSourceTreeWidgetItem.h"
+            #include "SqpApplication.h"
             #include <QMimeData>
             DataSourceTreeWidget::DataSourceTreeWidget(QWidget *parent) : QTreeWidget(parent) {}
                     }
                 }
-                QByteArray encodedData;
+                auto encodedData = sqpApp->dataSourceController().mimeDataForProductsData(productData);
-                QDataStream stream(&encodedData, QIODevice::WriteOnly);
-                stream << productData;
                 mimeData->setData(MIME_TYPE_PRODUCT_LIST, encodedData);
                 return mimeData;

gui/src/SqpApplication.cpp +4 0

             #include <Time/TimeController.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
+            #include <Variable/VariableModel.h>
             #include <Visualization/VisualizationController.h>
             Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
                             SLOT(createVariable(const QString &, const QVariantHash &,
                                                 std::shared_ptr<IDataProvider>)));
+                    connect(m_VariableController->variableModel(), &VariableModel::requestVariable,
+                            m_DataSourceController.get(), &DataSourceController::requestVariable);
                     // VariableController <-> VisualizationController
                     connect(m_VariableController.get(),
                             SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),

gui/ui/DataSource/DataSourceWidget.ui +3 0

                  <property name="dragDropMode">
                   <enum>QAbstractItemView::DragOnly</enum>
                  </property>
+                 <property name="selectionMode">
+                  <enum>QAbstractItemView::ExtendedSelection</enum>
+                 </property>
                  <column>
                   <property name="text">
                    <string notr="true">1</string>

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