GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r875:4aae8a8d06e9

drop of product on the visu

trabillard -

r875:4aae8a8d06e9 DropProductOnVisu...

parent child

Context file:

r875:4aae8a8d06e9

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

                  */
                 void loadProductItem(const QUuid &dataSourceUid, const DataSourceItem &productItem) noexcept;
+                std::shared_ptr<IDataProvider> providerForProductData(const QVariantHash &productData);
                 QByteArray mimeDataForProductsData(const QVariantList &productsData) const;
                 QVariantList productsDataForMimeData(const QByteArray &mimeData) const;

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

@@ -139,6 +139,26 void DataSourceController::loadProductItem(const QUuid &dataSourceUid,
139	}	139	}
140	}	140	}
141		141
		142	std::shared_ptr<IDataProvider>
		143	DataSourceController::providerForProductData(const QVariantHash &productData)
		144	{
		145	DataSourceItem *sourceItem = impl->findDataSourceItem(productData);
		146
		147	if (sourceItem && sourceItem->type() == DataSourceItemType::PRODUCT
		148	\|\| sourceItem->type() == DataSourceItemType::COMPONENT) {
		149	auto sourceName = sourceItem->rootItem().name();
		150	auto sourceId = impl->m_DataSources.key(sourceName);
		151	auto it = impl->m_DataProviders.find(sourceId);
		152	auto dataProvider = (it != impl->m_DataProviders.end()) ? it->second : nullptr;
		153	return dataProvider;
		154	}
		155	else {
		156	qCWarning(LOG_DataSourceController()) << tr("requestVariable, product data not found");
		157	}
		158
		159	return nullptr;
		160	}
		161
142	QByteArray DataSourceController::mimeDataForProductsData(const QVariantList &productsData) const	162	QByteArray DataSourceController::mimeDataForProductsData(const QVariantList &productsData) const
143	{	163	{
144	QByteArray encodedData;	164	QByteArray encodedData;

gui/src/DragDropHelper.cpp +8 0

                         result = false;
                     }
                 }
+                else if (mimeData->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
+                    QDataStream stream(mimeData->data(MIME_TYPE_PRODUCT_LIST));
+                    QVariantList productList;
+                    stream >> productList;
+                    result = productList.count() == 1;
+                }
                 return result;
             }

gui/src/Visualization/VisualizationTabWidget.cpp +40 -4

             #include "Visualization/VisualizationGraphWidget.h"
             #include "Visualization/VisualizationZoneWidget.h"
+            #include "DataSource/DataSourceController.h"
+            #include "DataSource/DataSourceItem.h"
             #include "Variable/VariableController.h"
             #include "Common/MimeTypesDef.h"
             #include "DragDropHelper.h"
             #include "SqpApplication.h"
+            #include <QTimer>
             Q_LOGGING_CATEGORY(LOG_VisualizationTabWidget, "VisualizationTabWidget")
             namespace {
                 void dropZone(int index, VisualizationTabWidget *tabWidget);
                 void dropVariables(const QList<std::shared_ptr<Variable> > &variables, int index,
                                    VisualizationTabWidget *tabWidget);
+                void dropProduct(const QVariantList &productDataList, int index,
+                                 VisualizationTabWidget *tabWidget);
             };
             VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *parent)
                 ui->setupUi(this);
                 ui->dragDropContainer->setAcceptedMimeTypes(
-                    {MIME_TYPE_GRAPH, MIME_TYPE_ZONE, MIME_TYPE_VARIABLE_LIST});
+                    {MIME_TYPE_GRAPH, MIME_TYPE_ZONE, MIME_TYPE_VARIABLE_LIST, MIME_TYPE_PRODUCT_LIST});
                 connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccured, this,
                         &VisualizationTabWidget::dropMimeData);
                 ui->dragDropContainer->setAcceptMimeDataFunction([this](auto mimeData) {
                         mimeData->data(MIME_TYPE_VARIABLE_LIST));
                     impl->dropVariables(variables, index, this);
                 }
+                else if (mimeData->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
+                    auto productList = sqpApp->dataSourceController().productsDataForMimeData(
+                        mimeData->data(MIME_TYPE_PRODUCT_LIST));
+                    impl->dropProduct(productList, index, this);
+                }
                 else {
                     qCWarning(LOG_VisualizationZoneWidget())
                         << tr("VisualizationTabWidget::dropMimeData, unknown MIME data received.");
                 const QList<std::shared_ptr<Variable> > &variables, int index,
                 VisualizationTabWidget *tabWidget)
             {
-                // Note: we are sure that there is a single and compatible variable here
+                // Note: the AcceptMimeDataFunction (set on the drop container) ensure there is a single and
-                // because the AcceptMimeDataFunction, set on the drop container, makes the check before the
+                // compatible variable here
-                // drop can occur.
+                if (variables.count() > 1) {
+                    qCWarning(LOG_VisualizationZoneWidget())
+                        << tr("VisualizationTabWidget::dropVariables, dropping multiple variables, operation "
+                              "aborted.");
+                    return;
+                }
                 tabWidget->createZone(variables, index);
             }
+            void VisualizationTabWidget::VisualizationTabWidgetPrivate::dropProduct(
+                const QVariantList &productDataList, int index, VisualizationTabWidget *tabWidget)
+            {
+                // Note: the AcceptMimeDataFunction (set on the drop container) ensure there is a single and
+                // compatible product here
+                if (productDataList.count() > 1) {
+                    qCWarning(LOG_VisualizationZoneWidget()) << tr(
+                        "VisualizationTabWidget::dropProduct, dropping multiple products, operation aborted.");
+                    return;
+                }
+                auto productData = productDataList.first().toHash();
+                auto provider = sqpApp->dataSourceController().providerForProductData(productData);
+                auto name = productData.value(DataSourceItem::NAME_DATA_KEY).toString();
+                auto variable = sqpApp->variableController().createVariable(name, productData, provider);
+                QTimer::singleShot(
+, [tabWidget, variable, index]() { tabWidget->createZone({variable}, index); });
+            }

gui/src/Visualization/VisualizationZoneWidget.cpp +34 -21

             #include "Common/VisualizationDef.h"
             #include <Data/SqpRange.h>
+            #include <DataSource/DataSourceController.h>
+            #include <DataSource/DataSourceItem.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
                 void dropGraph(int index, VisualizationZoneWidget *zoneWidget);
                 void dropVariables(const QList<std::shared_ptr<Variable> > &variables, int index,
                                    VisualizationZoneWidget *zoneWidget);
+                void dropProduct(const QVariantList &productDataList, int index,
+                                 VisualizationZoneWidget *zoneWidget);
             };
             VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent)
                 ui->zoneNameLabel->setText(name);
-                ui->dragDropContainer->setAcceptedMimeTypes({MIME_TYPE_GRAPH, MIME_TYPE_VARIABLE_LIST});
+                ui->dragDropContainer->setAcceptedMimeTypes(
+                    {MIME_TYPE_GRAPH, MIME_TYPE_VARIABLE_LIST, MIME_TYPE_PRODUCT_LIST});
                 ui->dragDropContainer->setAcceptMimeDataFunction([this](auto mimeData) {
                     return sqpApp->dragDropHelper().checkMimeDataForVisualization(mimeData,
                                                                                   ui->dragDropContainer);
                         mimeData->data(MIME_TYPE_VARIABLE_LIST));
                     impl->dropVariables(variables, index, this);
                 }
+                else if (mimeData->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
+                    auto productList = sqpApp->dataSourceController().productsDataForMimeData(
+                        mimeData->data(MIME_TYPE_PRODUCT_LIST));
+                    impl->dropProduct(productList, index, this);
+                }
                 else {
                     qCWarning(LOG_VisualizationZoneWidget())
                         << tr("VisualizationZoneWidget::dropMimeData, unknown MIME data received.");
                 const QList<std::shared_ptr<Variable> > &variables, int index,
                 VisualizationZoneWidget *zoneWidget)
             {
-                // Search for the top level VisualizationWidget
+                // Note: the AcceptMimeDataFunction (set on the drop container) ensure there is a single and
-                auto parent = zoneWidget->parentWidget();
+                // compatible variable here
-                while (parent && qobject_cast<VisualizationWidget *>(parent) == nullptr) {
+                if (variables.count() > 1) {
-                    parent = parent->parentWidget();
-                if (!parent) {
                     qCWarning(LOG_VisualizationZoneWidget())
-                        << tr("VisualizationZoneWidget::dropVariables, drop aborted, the parent "
+                        << tr("VisualizationZoneWidget::dropVariables, dropping multiple variables, operation "
-                              "VisualizationWidget cannot be found.");
+                              "aborted.");
-                    Q_ASSERT(false);
                     return;
                 }
-                auto visualizationWidget = static_cast<VisualizationWidget *>(parent);
+                Q_ASSERT(variables.count() == 1);
+                zoneWidget->createGraph(variables, index);
+            }
-                // Search for the first variable which can be dropped
+            void VisualizationZoneWidget::VisualizationZoneWidgetPrivate::dropProduct(
-                for (auto variable : variables) {
+                const QVariantList &productDataList, int index, VisualizationZoneWidget *zoneWidget)
-                    FindVariableOperation findVariableOperation{variable};
-                    visualizationWidget->accept(&findVariableOperation);
+                // Note: the AcceptMimeDataFunction (set on the drop container) ensure there is a single and
-                    auto variableContainers = findVariableOperation.result();
+                // compatible product here
-                    if (variableContainers.empty()) {
+                if (productDataList.count() > 1) {
-                        zoneWidget->createGraph(variable, index);
+                    qCWarning(LOG_VisualizationZoneWidget()) << tr(
-                        break;
+                        "VisualizationZoneWidget::dropProduct, dropping multiple products, operation aborted.");
+                    return;
                 }
+                auto productData = productDataList.first().toHash();
+                auto provider = sqpApp->dataSourceController().providerForProductData(productData);
+                auto name = productData.value(DataSourceItem::NAME_DATA_KEY).toString();
+                auto variable = sqpApp->variableController().createVariable(name, productData, provider);
+                zoneWidget->createGraph(variable, index);
             }

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