GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1341:36d2186e2f24

drop of products in visu

trabillard -

r1341:36d2186e2f24

parent child

Context file:

r1341:36d2186e2f24

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

                 void finalize();
                 /// Request the creation of a variable from the ID_DATA_KEY of a product
-                void requestVariable(const QString &datasourceIdKey);
+                void requestVariableFromProductIdKey(const QString &datasourceIdKey);
                 /// Request the creation of a variable from metadata of a product
                 void requestVariable(const QVariantHash &productData);

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

                 impl->m_WorkingMutex.unlock();
             }
-            void DataSourceController::requestVariable(const QString &datasourceIdKey)
+            void DataSourceController::requestVariableFromProductIdKey(const QString &datasourceIdKey)
             {
                 auto sourceItem = impl->findDataSourceItem(datasourceIdKey);

gui/src/DragAndDrop/DragDropGuiController.cpp +12 0

             #include "Visualization/VisualizationWidget.h"
             #include "Visualization/operations/FindVariableOperation.h"
+            #include "DataSource/DataSourceController.h"
             #include "Variable/Variable.h"
             #include "Variable/VariableController.h"
                         // result = false: cannot drop multiple variables in the visualisation
                     }
                 }
+                else if (mimeData->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
+                    auto productDataList = sqpApp->dataSourceController().productsDataForMimeData(
+                        mimeData->data(MIME_TYPE_PRODUCT_LIST));
+                    if (productDataList.count() == 1) {
+                        result = true;
+                    }
+                    else {
+                        // result = false: cannot drop multiple products in the visualisation
+                    }
+                }
                 else {
                     // Other MIME data
                     // no special rules, accepted by default
                     result = true;
                 }
                 return result;
             }

gui/src/Visualization/VisualizationTabWidget.cpp +30 0

             #include "Visualization/MacScrollBarStyle.h"
+            #include "DataSource/DataSourceController.h"
             #include "Variable/VariableController.h"
             #include "Common/MimeTypesDef.h"
                 void dropZone(int index, VisualizationTabWidget *tabWidget);
                 void dropVariables(const QList<std::shared_ptr<Variable> > &variables, int index,
                                    VisualizationTabWidget *tabWidget);
+                void dropProducts(const QVariantList &productsMetaData, int index,
+                                  VisualizationTabWidget *tabWidget);
             };
             VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *parent)
                                                    VisualizationDragDropContainer::DropBehavior::Inserted);
                 ui->dragDropContainer->setMimeType(MIME_TYPE_VARIABLE_LIST,
                                                    VisualizationDragDropContainer::DropBehavior::Inserted);
+                ui->dragDropContainer->setMimeType(MIME_TYPE_PRODUCT_LIST,
+                                                   VisualizationDragDropContainer::DropBehavior::Inserted);
                 ui->dragDropContainer->setAcceptMimeDataFunction([this](auto mimeData) {
                     return sqpApp->dragDropGuiController().checkMimeDataForVisualization(mimeData,
                         mimeData->data(MIME_TYPE_VARIABLE_LIST));
                     impl->dropVariables(variables, index, this);
                 }
+                else if (mimeData->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
+                    auto productsData = sqpApp->dataSourceController().productsDataForMimeData(
+                        mimeData->data(MIME_TYPE_PRODUCT_LIST));
+                    impl->dropProducts(productsData, index, this);
+                }
                 else {
                     qCWarning(LOG_VisualizationZoneWidget())
                         << tr("VisualizationTabWidget::dropMimeData, unknown MIME data received.");
                 tabWidget->createZone(variables, index);
             }
+            void VisualizationTabWidget::VisualizationTabWidgetPrivate::dropProducts(
+                const QVariantList &productsMetaData, int index, VisualizationTabWidget *tabWidget)
+            {
+                // Note: the AcceptMimeDataFunction (set on the drop container) ensure there is a single and
+                // compatible variable here
+                if (productsMetaData.count() != 1) {
+                    qCWarning(LOG_VisualizationZoneWidget())
+                        << tr("VisualizationTabWidget::dropProducts, dropping multiple products, operation "
+                              "aborted.");
+                    return;
+                }
+                auto productData = productsMetaData.first().toHash();
+                QMetaObject::invokeMethod(&sqpApp->dataSourceController(), "requestVariable",
+                                          Qt::QueuedConnection, Q_ARG(QVariantHash, productData));
+                // TODO: add graph
+            }

gui/src/Visualization/VisualizationZoneWidget.cpp +38 0

             #include "Common/VisualizationDef.h"
             #include <Data/SqpRange.h>
+            #include <DataSource/DataSourceController.h>
             #include <Time/TimeController.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 dropProducts(const QVariantList &productsData, int index,
+                                  VisualizationZoneWidget *zoneWidget);
             };
             VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent)
                                                    VisualizationDragDropContainer::DropBehavior::Inserted);
                 ui->dragDropContainer->setMimeType(
                     MIME_TYPE_VARIABLE_LIST, VisualizationDragDropContainer::DropBehavior::InsertedAndMerged);
+                ui->dragDropContainer->setMimeType(
+                    MIME_TYPE_PRODUCT_LIST, VisualizationDragDropContainer::DropBehavior::InsertedAndMerged);
                 ui->dragDropContainer->setMimeType(MIME_TYPE_TIME_RANGE,
                                                    VisualizationDragDropContainer::DropBehavior::Merged);
                 ui->dragDropContainer->setMimeType(MIME_TYPE_ZONE,
                         mimeData->data(MIME_TYPE_VARIABLE_LIST));
                     impl->dropVariables(variables, index, this);
                 }
+                else if (mimeData->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
+                    auto products = sqpApp->dataSourceController().productsDataForMimeData(
+                        mimeData->data(MIME_TYPE_PRODUCT_LIST));
+                    impl->dropProducts(products, index, this);
+                }
                 else {
                     qCWarning(LOG_VisualizationZoneWidget())
                         << tr("VisualizationZoneWidget::dropMimeData, unknown MIME data received.");
                         graphWidget->addVariable(var, graphWidget->graphRange());
                     }
                 }
+                else if (mimeData->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
+                    auto products = sqpApp->dataSourceController().productsDataForMimeData(
+                        mimeData->data(MIME_TYPE_PRODUCT_LIST));
+                    auto productData = products.first().toHash();
+                    QMetaObject::invokeMethod(&sqpApp->dataSourceController(), "requestVariable",
+                                              Qt::QueuedConnection, Q_ARG(QVariantHash, productData));
+                }
                 else if (mimeData->hasFormat(MIME_TYPE_TIME_RANGE)) {
                     auto range = TimeController::timeRangeForMimeData(mimeData->data(MIME_TYPE_TIME_RANGE));
                     graphWidget->setGraphRange(range);
                 zoneWidget->createGraph(variables, index);
             }
+            void VisualizationZoneWidget::VisualizationZoneWidgetPrivate::dropProducts(
+                const QVariantList &productsData, int index, VisualizationZoneWidget *zoneWidget)
+            {
+                // Note: the AcceptMimeDataFunction (set on the drop container) ensure there is a single and
+                // compatible variable here
+                if (productsData.count() != 1) {
+                    qCWarning(LOG_VisualizationZoneWidget())
+                        << tr("VisualizationTabWidget::dropProducts, dropping multiple products, operation "
+                              "aborted.");
+                    return;
+                }
+                auto productData = productsData.first().toHash();
+                QMetaObject::invokeMethod(&sqpApp->dataSourceController(), "requestVariable",
+                                          Qt::QueuedConnection, Q_ARG(QVariantHash, productData));
+                // TODO: add graph
+            }

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