From e439cb403ff9b1b40db989b401bb8c5f0c427034 2017-11-03 16:36:58
From: Thibaud Rabillard <trabillard@itlink.fr>
Date: 2017-11-03 16:36:58
Subject: [PATCH] Drop of variable, graph and zones on the time widget

---

diff --git a/core/include/DataSource/DataSourceController.h b/core/include/DataSource/DataSourceController.h
index 13e89a2..cbf2d67 100644
--- a/core/include/DataSource/DataSourceController.h
+++ b/core/include/DataSource/DataSourceController.h
@@ -64,8 +64,11 @@ public:
      */
     void loadProductItem(const QUuid &dataSourceUid, const DataSourceItem &productItem) noexcept;
 
-    QByteArray mimeDataForProductsData(const QVariantList &productsData) const;
-    QVariantList productsDataForMimeData(const QByteArray &mimeData) const;
+    /// Returns the MIME data associated to a list of product meta data
+    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
diff --git a/core/include/Time/TimeController.h b/core/include/Time/TimeController.h
index 6f1f1fb..7c38e2c 100644
--- a/core/include/Time/TimeController.h
+++ b/core/include/Time/TimeController.h
@@ -23,6 +23,12 @@ public:
 
     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);
diff --git a/core/include/Variable/VariableController.h b/core/include/Variable/VariableController.h
index b198dcd..984e738 100644
--- a/core/include/Variable/VariableController.h
+++ b/core/include/Variable/VariableController.h
@@ -68,7 +68,10 @@ public:
      */
     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);
diff --git a/core/src/DataSource/DataSourceController.cpp b/core/src/DataSource/DataSourceController.cpp
index 94b62c8..81adfb3 100644
--- a/core/src/DataSource/DataSourceController.cpp
+++ b/core/src/DataSource/DataSourceController.cpp
@@ -139,7 +139,7 @@ void DataSourceController::loadProductItem(const QUuid &dataSourceUid,
     }
 }
 
-QByteArray DataSourceController::mimeDataForProductsData(const QVariantList &productsData) const
+QByteArray DataSourceController::mimeDataForProductsData(const QVariantList &productsData)
 {
     QByteArray encodedData;
     QDataStream stream{&encodedData, QIODevice::WriteOnly};
@@ -149,7 +149,7 @@ QByteArray DataSourceController::mimeDataForProductsData(const QVariantList &pro
     return encodedData;
 }
 
-QVariantList DataSourceController::productsDataForMimeData(const QByteArray &mimeData) const
+QVariantList DataSourceController::productsDataForMimeData(const QByteArray &mimeData)
 {
     QDataStream stream{mimeData};
 
diff --git a/core/src/Time/TimeController.cpp b/core/src/Time/TimeController.cpp
index fee9f73..66b9591 100644
--- a/core/src/Time/TimeController.cpp
+++ b/core/src/Time/TimeController.cpp
@@ -1,5 +1,7 @@
 #include "Time/TimeController.h"
 
+#include <QDataStream>
+
 Q_LOGGING_CATEGORY(LOG_TimeController, "TimeController")
 
 struct TimeController::TimeControllerPrivate {
@@ -18,6 +20,26 @@ SqpRange TimeController::dateTime() const noexcept
     return impl->m_DateTime;
 }
 
+QByteArray TimeController::mimeDataForTimeRange(const SqpRange &timeRange)
+{
+    QByteArray encodedData;
+    QDataStream stream{&encodedData, QIODevice::WriteOnly};
+
+    stream << timeRange.m_TStart << timeRange.m_TEnd;
+
+    return encodedData;
+}
+
+SqpRange TimeController::timeRangeForMimeData(const QByteArray &mimeData)
+{
+    QDataStream stream{mimeData};
+
+    SqpRange timeRange;
+    stream >> timeRange.m_TStart >> timeRange.m_TEnd;
+
+    return timeRange;
+}
+
 void TimeController::onTimeToUpdate(SqpRange dateTime)
 {
     impl->m_DateTime = dateTime;
diff --git a/core/src/Variable/VariableModel.cpp b/core/src/Variable/VariableModel.cpp
index dd26938..f85f179 100644
--- a/core/src/Variable/VariableModel.cpp
+++ b/core/src/Variable/VariableModel.cpp
@@ -8,7 +8,9 @@
 
 #include <Data/IDataSeries.h>
 
-#include <QDataStream>
+#include <DataSource/DataSourceController.h>
+#include <Time/TimeController.h>
+
 #include <QMimeData>
 #include <QSize>
 #include <unordered_map>
@@ -278,7 +280,7 @@ Qt::DropActions VariableModel::supportedDragActions() const
 
 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
@@ -287,17 +289,31 @@ 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);
-    mimeData->setData(MIME_TYPE_VARIABLE_LIST, encodedData);
+    auto variablesEncodedData = impl->m_VariableController->mimeDataForVariables(variableList);
+    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;
 }
@@ -315,10 +331,9 @@ bool VariableModel::dropMimeData(const QMimeData *data, Qt::DropAction action, i
     auto dropDone = false;
 
     if (data->hasFormat(MIME_TYPE_PRODUCT_LIST)) {
-        QDataStream stream(data->data(MIME_TYPE_PRODUCT_LIST));
 
-        QVariantList productList;
-        stream >> productList;
+        auto productList
+            = DataSourceController::productsDataForMimeData(data->data(MIME_TYPE_PRODUCT_LIST));
 
         for (auto metaData : productList) {
             emit requestVariable(metaData.toHash());
diff --git a/gui/include/TimeWidget/TimeWidget.h b/gui/include/TimeWidget/TimeWidget.h
index 575ebd7..561d5f2 100644
--- a/gui/include/TimeWidget/TimeWidget.h
+++ b/gui/include/TimeWidget/TimeWidget.h
@@ -16,6 +16,8 @@ public:
     explicit TimeWidget(QWidget *parent = 0);
     virtual ~TimeWidget();
 
+    void setTimeRange(SqpRange time);
+
 signals:
     /// Signal emitted when the time parameters has beed updated
     void timeUpdated(SqpRange time);
@@ -24,6 +26,11 @@ public slots:
     /// 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;
+
 
 private:
     Ui::TimeWidget *ui;
diff --git a/gui/src/TimeWidget/TimeWidget.cpp b/gui/src/TimeWidget/TimeWidget.cpp
index 08801fe..e5017af 100644
--- a/gui/src/TimeWidget/TimeWidget.cpp
+++ b/gui/src/TimeWidget/TimeWidget.cpp
@@ -2,9 +2,15 @@
 #include "ui_TimeWidget.h"
 
 #include <Common/DateUtils.h>
+#include <Common/MimeTypesDef.h>
+
 #include <SqpApplication.h>
 #include <Time/TimeController.h>
 
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QMimeData>
+
 TimeWidget::TimeWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::TimeWidget}
 {
     ui->setupUi(this);
@@ -41,6 +47,15 @@ TimeWidget::~TimeWidget()
     delete ui;
 }
 
+void TimeWidget::setTimeRange(SqpRange time)
+{
+    auto startDateTime = DateUtils::dateTime(time.m_TStart);
+    auto endDateTime = DateUtils::dateTime(time.m_TEnd);
+
+    ui->startDateTimeEdit->setDateTime(startDateTime);
+    ui->endDateTimeEdit->setDateTime(endDateTime);
+}
+
 void TimeWidget::onTimeUpdateRequested()
 {
     auto dateTime = SqpRange{DateUtils::secondsSinceEpoch(ui->startDateTimeEdit->dateTime()),
@@ -48,3 +63,34 @@ void TimeWidget::onTimeUpdateRequested()
 
     emit timeUpdated(std::move(dateTime));
 }
+
+void TimeWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE)) {
+        event->acceptProposedAction();
+        setStyleSheet("QDateTimeEdit{background-color: #BBD5EE; border:2px solid #2A7FD4}");
+    }
+    else {
+        event->ignore();
+    }
+}
+
+void TimeWidget::dragLeaveEvent(QDragLeaveEvent *event)
+{
+    setStyleSheet(QString());
+}
+
+void TimeWidget::dropEvent(QDropEvent *event)
+{
+    if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE)) {
+        auto mimeData = event->mimeData()->data(MIME_TYPE_TIME_RANGE);
+        auto timeRange = TimeController::timeRangeForMimeData(mimeData);
+
+        setTimeRange(timeRange);
+    }
+    else {
+        event->ignore();
+    }
+
+    setStyleSheet(QString());
+}
diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index 10d251b..a8cb3d7 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -12,6 +12,7 @@
 #include <DragDropHelper.h>
 #include <Settings/SqpSettingsDefs.h>
 #include <SqpApplication.h>
+#include <Time/TimeController.h>
 #include <Variable/Variable.h>
 #include <Variable/VariableController.h>
 
@@ -235,6 +236,9 @@ QMimeData *VisualizationGraphWidget::mimeData() const
     auto mimeData = new QMimeData;
     mimeData->setData(MIME_TYPE_GRAPH, QByteArray{});
 
+    auto timeRangeData = TimeController::mimeDataForTimeRange(graphRange());
+    mimeData->setData(MIME_TYPE_TIME_RANGE, timeRangeData);
+
     return mimeData;
 }
 
diff --git a/gui/src/Visualization/VisualizationZoneWidget.cpp b/gui/src/Visualization/VisualizationZoneWidget.cpp
index 9dff6bb..01fef79 100644
--- a/gui/src/Visualization/VisualizationZoneWidget.cpp
+++ b/gui/src/Visualization/VisualizationZoneWidget.cpp
@@ -10,6 +10,7 @@
 #include "Common/VisualizationDef.h"
 
 #include <Data/SqpRange.h>
+#include <Time/TimeController.h>
 #include <Variable/Variable.h>
 #include <Variable/VariableController.h>
 
@@ -71,6 +72,21 @@ struct VisualizationZoneWidget::VisualizationZoneWidgetPrivate {
     QUuid m_SynchronisationGroupId;
     std::unique_ptr<IGraphSynchronizer> m_Synchronizer;
 
+    // Returns the first graph in the zone or nullptr if there is no graph inside
+    VisualizationGraphWidget *firstGraph(const VisualizationZoneWidget *zoneWidget) const
+    {
+        VisualizationGraphWidget *firstGraph = nullptr;
+        auto layout = zoneWidget->ui->dragDropContainer->layout();
+        if (layout->count() > 0) {
+            if (auto visualizationGraphWidget
+                = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
+                firstGraph = visualizationGraphWidget;
+            }
+        }
+
+        return firstGraph;
+    }
+
     void dropGraph(int index, VisualizationZoneWidget *zoneWidget);
     void dropVariables(const QList<std::shared_ptr<Variable> > &variables, int index,
                        VisualizationZoneWidget *zoneWidget);
@@ -238,15 +254,9 @@ VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<V
             &VisualizationZoneWidget::onVariableAboutToBeRemoved);
 
     auto range = SqpRange{};
-
-    // Apply visitor to graph children
-    auto layout = ui->dragDropContainer->layout();
-    if (layout->count() > 0) {
+    if (auto firstGraph = impl->firstGraph(this)) {
         // Case of a new graph in a existant zone
-        if (auto visualizationGraphWidget
-            = dynamic_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
-            range = visualizationGraphWidget->graphRange();
-        }
+        range = firstGraph->graphRange();
     }
     else {
         // Case of a new graph as the first of the zone
@@ -333,6 +343,11 @@ QMimeData *VisualizationZoneWidget::mimeData() const
     auto mimeData = new QMimeData;
     mimeData->setData(MIME_TYPE_ZONE, QByteArray{});
 
+    if (const auto firstGraph = impl->firstGraph(this)) {
+        auto timeRangeData = TimeController::mimeDataForTimeRange(firstGraph->graphRange());
+        mimeData->setData(MIME_TYPE_TIME_RANGE, timeRangeData);
+    }
+
     return mimeData;
 }
 
diff --git a/gui/ui/TimeWidget/TimeWidget.ui b/gui/ui/TimeWidget/TimeWidget.ui
index afc7200..9f074ba 100644
--- a/gui/ui/TimeWidget/TimeWidget.ui
+++ b/gui/ui/TimeWidget/TimeWidget.ui
@@ -16,9 +16,15 @@
     <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">