GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r857:8c8decf98df7

Visual display when dropping on top of a existing graph

trabillard -

r857:8c8decf98df7

parent child

Context file:

r857:8c8decf98df7

gui/include/DragDropHelper.h +2 0

                  QUrl imageTemporaryUrl(const QImage &image) const;
+                 void setHightlightedDragWidget(VisualizationDragWidget *dragWidget);
              private:
                  class DragDropHelperPrivate;
                  spimpl::unique_impl_ptr<DragDropHelperPrivate> impl;

gui/include/Visualization/VisualizationDragWidget.h +1 0

                  virtual QMimeData *mimeData() const = 0;
                  virtual bool isDragAllowed() const = 0;
+                 virtual void highlightForMerge(bool highlighted) { Q_UNUSED(highlighted); };
              protected:
                  virtual void mousePressEvent(QMouseEvent *event) override;

gui/include/Visualization/VisualizationGraphWidget.h +1 0

                  // VisualisationDragWidget
                  QMimeData *mimeData() const override;
                  bool isDragAllowed() const override;
+                 void highlightForMerge(bool highlighted) override;
              signals:
                  void synchronize(const SqpRange &range, const SqpRange &oldRange);

gui/src/DragDropHelper.cpp +16 -4

                  QScrollArea *m_CurrentScrollArea = nullptr;
                  std::unique_ptr<QTimer> m_Timer = nullptr;
                  enum class ScrollDirection { up, down, unknown };
                  ScrollDirection m_Direction = ScrollDirection::unknown;
                  QString m_ImageTempUrl; // Temporary file for image url generated by the drag & drop. Not using
                                          // QTemporaryFile to have a name which is not generated.
+                 VisualizationDragWidget *m_HighlightedDragWidget = nullptr;
                  explicit DragDropHelperPrivate()
                          : m_PlaceHolder{std::make_unique<QWidget>()},
                            m_DragDropScroller{std::make_unique<DragDropScroller>()}
              };
-             DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()}
+             {
+             }
+             DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()} {}
              DragDropHelper::~DragDropHelper()
              {
              void DragDropHelper::resetDragAndDrop()
              {
                  setCurrentDragWidget(nullptr);
+                 impl->m_HighlightedDragWidget = nullptr;
              }
              void DragDropHelper::setCurrentDragWidget(VisualizationDragWidget *dragWidget)
                  return QUrl::fromLocalFile(impl->m_ImageTempUrl);
              }
+             void DragDropHelper::setHightlightedDragWidget(VisualizationDragWidget *dragWidget)
+             {
+                 if (impl->m_HighlightedDragWidget) {
+                     impl->m_HighlightedDragWidget->highlightForMerge(false);
+                 }
+                 if (dragWidget) {
+                     impl->m_HighlightedDragWidget = dragWidget;
+                     impl->m_HighlightedDragWidget->highlightForMerge(true);
+                 }
+             }
              bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData,
                                                                 VisualizationDragDropContainer *dropContainer)
              {

gui/src/Visualization/VisualizationDragDropContainer.cpp +7 -1

                                  if (dropIndex != placeHolderIndex) {
                                      helper.insertPlaceHolder(impl->m_Layout, dropIndex);
                                  }
+                                 helper.setHightlightedDragWidget(nullptr);
                              }
                              else if (canMerge) {
                                  // drop on the middle -> merge
                                  if (impl->hasPlaceHolder()) {
                                      helper.removePlaceHolder();
                                  }
+                                 helper.setHightlightedDragWidget(dragWidgetHovered);
                              }
                          }
                          else {
                          event->acceptProposedAction();
                          helper.removePlaceHolder();
+                         helper.setHightlightedDragWidget(nullptr);
                          emit dropOccured(droppedIndex, event->mimeData());
                      }
                          qCWarning(LOG_VisualizationDragDropContainer())
                              << tr("VisualizationDragDropContainer::dropEvent, couldn't drop because the "
                                    "placeHolder is not found.");
-                         Q_ASSERT(false);
+                         sqpApp->dragDropHelper().setHightlightedDragWidget(nullptr);
+                         // Q_ASSERT(false);
                      }
                  }
                  else {

gui/src/Visualization/VisualizationGraphWidget.cpp +16 -5

                          &VisualizationGraphWidget::onMouseRelease);
                  connect(ui->widget, &QCustomPlot::mouseMove, this, &VisualizationGraphWidget::onMouseMove);
                  connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
-                 connect(ui->widget->xAxis, static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(
-                                                &QCPAxis::rangeChanged),
+                 connect(
+                     ui->widget->xAxis,
+                     static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(&QCPAxis::rangeChanged),
-                         this, &VisualizationGraphWidget::onRangeChanged, Qt::DirectConnection);
                  // Activates menu when right clicking on the graph
                  return true;
              }
+             void VisualizationGraphWidget::highlightForMerge(bool highlighted)
+             {
+                 if (highlighted) {
+                     plot().setBackground(QBrush(QColor("#BBD5EE")));
+                 }
+                 else {
+                     plot().setBackground(QBrush(Qt::white));
+                 }
+             }
              void VisualizationGraphWidget::closeEvent(QCloseEvent *event)
              {
                  Q_UNUSED(event);
              void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2)
              {
-                 qCDebug(LOG_VisualizationGraphWidget()) << tr("TORM: VisualizationGraphWidget::onRangeChanged")
-                                                         << QThread::currentThread()->objectName() << "DoAcqui"
-                                                         << impl->m_DoAcquisition;
+                 qCDebug(LOG_VisualizationGraphWidget())
+                     << tr("TORM: VisualizationGraphWidget::onRangeChanged")
+                     << QThread::currentThread()->objectName() << "DoAcqui" << impl->m_DoAcquisition;
                  auto graphRange = SqpRange{t1.lower, t1.upper};
                  auto oldGraphRange = SqpRange{t2.lower, t2.upper};

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