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

                  connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::finished,
                          impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::finalize);
+                 connect(impl->m_VariableModel, &VariableModel::requestVariableRangeUpdate, this,
+                         &VariableController::onUpdateDateTime);
                  impl->m_VariableAcquisitionWorkerThread.start();
              }
                      if (auto selectedVariable
                          = impl->m_VariableModel->variable(qAsConst(selectedRows).first().row())) {
-                         auto itVar = impl->m_VariableToIdentifierMap.find(selectedVariable);
-                         if (itVar == impl->m_VariableToIdentifierMap.cend()) {
-                             qCCritical(LOG_VariableController())
-                                 << tr("Impossible to onDateTimeOnSelection request for unknown variable");
-                             return;
+                         }
-                         // notify that rescale operation has to be done
-                         emit rangeChanged(selectedVariable, dateTime);
-                         auto synchro = impl->m_VariableIdGroupIdMap.find(itVar->second)
-                                        != impl->m_VariableIdGroupIdMap.cend();
-                         this->onRequestDataLoading(QVector<std::shared_ptr<Variable> >{selectedVariable},
-                                                    dateTime, synchro);
+                         onUpdateDateTime(selectedVariable, dateTime);
                      }
                  }
                  else if (selectedRows.size() > 1) {
                  }
              }
+             void VariableController::onUpdateDateTime(std::shared_ptr<Variable> variable,
+                                                       const SqpRange &dateTime)
+             {
+                 auto itVar = impl->m_VariableToIdentifierMap.find(variable);
+                 if (itVar == impl->m_VariableToIdentifierMap.cend()) {
+                     qCCritical(LOG_VariableController())
+                         << tr("Impossible to onDateTimeOnSelection request for unknown variable");
+                     return;
+                 }
+                 // notify that rescale operation has to be done
+                 emit rangeChanged(variable, dateTime);
+                 auto synchro
+                     = impl->m_VariableIdGroupIdMap.find(itVar->second) != impl->m_VariableIdGroupIdMap.cend();
+                 this->onRequestDataLoading(QVector<std::shared_ptr<Variable> >{variable}, dateTime, synchro);
+             }
              void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
                                                      const SqpRange &cacheRangeRequested,
                                                      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