GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r884:e439cb403ff9

Drop of variable, graph and zones on the time widget

trabillard -

r884:e439cb403ff9

parent child

Context file:

r884:e439cb403ff9

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/src/DataSource/DataSourceController.cpp +2 -2

                 }
             }
-            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};

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 +22 -7

             #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;
             }
                 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());

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

                 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);
                 /// 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;

gui/src/TimeWidget/TimeWidget.cpp +46 0

@@ -2,9 +2,15
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
5	#include <SqpApplication.h>	7	#include <SqpApplication.h>
6	#include <Time/TimeController.h>	8	#include <Time/TimeController.h>
7		9
		10	#include <QDragEnterEvent>
		11	#include <QDropEvent>
		12	#include <QMimeData>
		13
8	TimeWidget::TimeWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::TimeWidget}	14	TimeWidget::TimeWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::TimeWidget}
9	{	15	{
10	ui->setupUi(this);	16	ui->setupUi(this);
@@ -41,6 +47,15 TimeWidget::~TimeWidget()
41	delete ui;	47	delete ui;
42	}	48	}
43		49
		50	void TimeWidget::setTimeRange(SqpRange time)
		51	{
		52	auto startDateTime = DateUtils::dateTime(time.m_TStart);
		53	auto endDateTime = DateUtils::dateTime(time.m_TEnd);
		54
		55	ui->startDateTimeEdit->setDateTime(startDateTime);
		56	ui->endDateTimeEdit->setDateTime(endDateTime);
		57	}
		58
44	void TimeWidget::onTimeUpdateRequested()	59	void TimeWidget::onTimeUpdateRequested()
45	{	60	{
46	auto dateTime = SqpRange{DateUtils::secondsSinceEpoch(ui->startDateTimeEdit->dateTime()),	61	auto dateTime = SqpRange{DateUtils::secondsSinceEpoch(ui->startDateTimeEdit->dateTime()),
@@ -48,3 +63,34 void TimeWidget::onTimeUpdateRequested()
48		63
49	emit timeUpdated(std::move(dateTime));	64	emit timeUpdated(std::move(dateTime));
50	}	65	}
		66
		67	void TimeWidget::dragEnterEvent(QDragEnterEvent *event)
		68	{
		69	if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE)) {
		70	event->acceptProposedAction();
		71	setStyleSheet("QDateTimeEdit{background-color: #BBD5EE; border:2px solid #2A7FD4}");
		72	}
		73	else {
		74	event->ignore();
		75	}
		76	}
		77
		78	void TimeWidget::dragLeaveEvent(QDragLeaveEvent *event)
		79	{
		80	setStyleSheet(QString());
		81	}
		82
		83	void TimeWidget::dropEvent(QDropEvent *event)
		84	{
		85	if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE)) {
		86	auto mimeData = event->mimeData()->data(MIME_TYPE_TIME_RANGE);
		87	auto timeRange = TimeController::timeRangeForMimeData(mimeData);
		88
		89	setTimeRange(timeRange);
		90	}
		91	else {
		92	event->ignore();
		93	}
		94
		95	setStyleSheet(QString());
		96	}

gui/src/Visualization/VisualizationGraphWidget.cpp +4 0

             #include <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;
             }

gui/src/Visualization/VisualizationZoneWidget.cpp +23 -8

             #include "Common/VisualizationDef.h"
             #include <Data/SqpRange.h>
+            #include <Time/TimeController.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
                 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);
                         &VisualizationZoneWidget::onVariableAboutToBeRemoved);
                 auto range = SqpRange{};
+                if (auto firstGraph = impl->firstGraph(this)) {
-                // Apply visitor to graph children
-                auto layout = ui->dragDropContainer->layout();
-                if (layout->count() > 0) {
                     // Case of a new graph in a existant zone
-                    if (auto visualizationGraphWidget
+                    range = firstGraph->graphRange();
-                        = dynamic_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
-                        range = visualizationGraphWidget->graphRange();
                 }
                 else {
                     // Case of a new graph as the first of the zone
                 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;
             }

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">

General Comments 3

trabillard

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 1 added
  * 0 removed

Changed files:
  * A core/tests/meson.build

Write
Preview

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

	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