GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r974:ba45dcc66c3a

Drop TIME mime data on a variable

trabillard -

r974:ba45dcc66c3a

parent child

Context file:

r974:ba45dcc66c3a

core/include/Variable/VariableController.h +3 0

                 /// Update the temporal parameters of every selected variable to dateTime
                 void onDateTimeOnSelection(const SqpRange &dateTime);
+                /// Update the temporal parameters of the specified variable
+                void onUpdateDateTime(std::shared_ptr<Variable> variable, const SqpRange &dateTime);
                 void onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
                                     const SqpRange &cacheRangeRequested,

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

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

core/src/Variable/VariableController.cpp +22 -15

@@ -187,6 +187,8 VariableController::VariableController(QObject *parent)
187	connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::finished,	187	connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::finished,
188	impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::finalize);	188	impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::finalize);
189		189
		190	connect(impl->m_VariableModel, &VariableModel::requestVariableRangeUpdate, this,
		191	&VariableController::onUpdateDateTime);
190		192
191	impl->m_VariableAcquisitionWorkerThread.start();	193	impl->m_VariableAcquisitionWorkerThread.start();
192	}	194	}
@@ -385,21 +387,7 void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
385	if (auto selectedVariable	387	if (auto selectedVariable
386	= impl->m_VariableModel->variable(qAsConst(selectedRows).first().row())) {	388	= impl->m_VariableModel->variable(qAsConst(selectedRows).first().row())) {
387		389
388	auto itVar = impl->m_VariableToIdentifierMap.find(selectedVariable);	390	onUpdateDateTime(selectedVariable, dateTime);
389	if (itVar == impl->m_VariableToIdentifierMap.cend()) {
390	qCCritical(LOG_VariableController())
391	<< tr("Impossible to onDateTimeOnSelection request for unknown variable");
392	return;
393	}
394
395	// notify that rescale operation has to be done
396	emit rangeChanged(selectedVariable, dateTime);
397
398	auto synchro = impl->m_VariableIdGroupIdMap.find(itVar->second)
399	!= impl->m_VariableIdGroupIdMap.cend();
400
401	this->onRequestDataLoading(QVector<std::shared_ptr<Variable> >{selectedVariable},
402	dateTime, synchro);
403	}	391	}
404	}	392	}
405	else if (selectedRows.size() > 1) {	393	else if (selectedRows.size() > 1) {
@@ -412,6 +400,25 void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
412	}	400	}
413	}	401	}
414		402
		403	void VariableController::onUpdateDateTime(std::shared_ptr<Variable> variable,
		404	const SqpRange &dateTime)
		405	{
		406	auto itVar = impl->m_VariableToIdentifierMap.find(variable);
		407	if (itVar == impl->m_VariableToIdentifierMap.cend()) {
		408	qCCritical(LOG_VariableController())
		409	<< tr("Impossible to onDateTimeOnSelection request for unknown variable");
		410	return;
		411	}
		412
		413	// notify that rescale operation has to be done
		414	emit rangeChanged(variable, dateTime);
		415
		416	auto synchro
		417	= impl->m_VariableIdGroupIdMap.find(itVar->second) != impl->m_VariableIdGroupIdMap.cend();
		418
		419	this->onRequestDataLoading(QVector<std::shared_ptr<Variable> >{variable}, dateTime, synchro);
		420	}
		421
415	void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,	422	void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
416	const SqpRange &cacheRangeRequested,	423	const SqpRange &cacheRangeRequested,
417	QVector<AcquisitionDataPacket> dataAcquired)	424	QVector<AcquisitionDataPacket> dataAcquired)

core/src/Variable/VariableModel.cpp +12 -1

             #include <QMimeData>
             #include <QSize>
+            #include <QTimer>
             #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_VariableModel, "VariableModel")
                                                 int column, const QModelIndex &parent) const
             {
                 // drop of a product
-                return data->hasFormat(MIME_TYPE_PRODUCT_LIST);
+                return data->hasFormat(MIME_TYPE_PRODUCT_LIST)
+                       || (data->hasFormat(MIME_TYPE_TIME_RANGE) && parent.isValid()
+                           && !data->hasFormat(MIME_TYPE_VARIABLE_LIST));
             }
             bool VariableModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
                     dropDone = true;
                 }
+                else if (data->hasFormat(MIME_TYPE_TIME_RANGE) && parent.isValid()) {
+                    auto variable = this->variable(parent.row());
+                    auto range = TimeController::timeRangeForMimeData(data->data(MIME_TYPE_TIME_RANGE));
+                    emit requestVariableRangeUpdate(variable, range);
+                    dropDone = true;
+                }
                 return dropDone;
             }

General Comments 1

trabillard

|

Auto status change to "Under Review"

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