GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r914:c27e75f2f261

Merge branch 'feature/MacDragDropBug' into develop

trabillard -

r914:c27e75f2f261

parent child

Context file:

r914:c27e75f2f261

core/tests/Data/TestOptionalAxis.cpp +4 -4

                  QTest::newRow("data1") << axis({}) << 0;
                  QTest::newRow("data2") << axis({1, 2, 3}) << 3;
                  QTest::newRow("data3") << axis({1, 2, 3, 4}) << 4;
-                 QTest::newRow("data4 (axis not defined)")
-                     << OptionalAxis{} << 0; // Expects 0 for undefined axis
+                 QTest::newRow("data4 (axis not defined)") << OptionalAxis{}
+                                                           << 0; // Expects 0 for undefined axis
              }
              void TestOptionalAxis::testSize()
                  QTest::newRow("data1") << axis(Unit{"Hz"}) << Unit{"Hz"};
                  QTest::newRow("data2") << axis(Unit{"t", true}) << Unit{"t", true};
-                 QTest::newRow("data3 (axis not defined)")
-                     << OptionalAxis{} << Unit{}; // Expects default unit for undefined axis
+                 QTest::newRow("data3 (axis not defined)") << OptionalAxis{}
+                                                           << Unit{}; // Expects default unit for undefined axis
              }
              void TestOptionalAxis::testUnit()

core/tests/Data/TestScalarSeries.cpp +28 -28

              {
                  testMergeDifferentTypes_struct<VectorSeries, ScalarSeries>();
-                 QTest::newRow("mergeVectorInScalar")
-                     << ScalarBuilder{}
-                            .setX({1., 2., 3., 4., 5.})
-                            .setValues({100., 200., 300., 400., 500.})
-                            .build()
-                     << VectorBuilder{}
-                            .setX({6., 7., 8., 9., 10.})
-                            .setXValues({600., 700., 800., 900., 1000.})
-                            .setYValues({610., 710., 810., 910., 1010.})
-                            .setZValues({620., 720., 820., 920., 1020.})
-                            .build()
-                     << DataContainer{1., 2., 3., 4., 5.} << DataContainer{100., 200., 300., 400., 500.};
+                 QTest::newRow("mergeVectorInScalar") << ScalarBuilder{}
+                                                             .setX({1., 2., 3., 4., 5.})
+                                                             .setValues({100., 200., 300., 400., 500.})
+                                                             .build()
+                                                      << VectorBuilder{}
+                                                             .setX({6., 7., 8., 9., 10.})
+                                                             .setXValues({600., 700., 800., 900., 1000.})
+                                                             .setYValues({610., 710., 810., 910., 1010.})
+                                                             .setZValues({620., 720., 820., 920., 1020.})
+                                                             .build()
+                                                      << DataContainer{1., 2., 3., 4., 5.}
+                                                      << DataContainer{100., 200., 300., 400., 500.};
              }
              void TestScalarSeries::testMergeWithVector()
                                                      .build()
                                               << 2. << 4. << DataContainer{2., 3., 4.}
                                               << std::vector<DataContainer>{{200., 300., 400.}};
-                 QTest::newRow("purgeScalar1 (min/max swap)")
-                     << ScalarBuilder{}
-                            .setX({1., 2., 3., 4., 5.})
-                            .setValues({100., 200., 300., 400., 500.})
-                            .build()
-                     << 4. << 2. << DataContainer{2., 3., 4.} << std::vector<DataContainer>{{200., 300., 400.}};
+                 QTest::newRow("purgeScalar1 (min/max swap)") << ScalarBuilder{}
+                                                                     .setX({1., 2., 3., 4., 5.})
+                                                                     .setValues({100., 200., 300., 400., 500.})
+                                                                     .build()
+                                                              << 4. << 2. << DataContainer{2., 3., 4.}
+                                                              << std::vector<DataContainer>{{200., 300., 400.}};
                  QTest::newRow("purgeScalar2") << ScalarBuilder{}
                                                       .setX({1., 2., 3., 4., 5.})
                                                       .setValues({100., 200., 300., 400., 500.})
                                                     .build()
                                              << -1. << 3.2 << DataContainer{1., 2., 3.}
                                              << DataContainer{100., 200., 300.};
-                 QTest::newRow("xAxisRange1 (min/max swap)")
-                     << ScalarBuilder{}
-                            .setX({1., 2., 3., 4., 5.})
-                            .setValues({100., 200., 300., 400., 500.})
-                            .build()
-                     << 3.2 << -1. << DataContainer{1., 2., 3.} << DataContainer{100., 200., 300.};
+                 QTest::newRow("xAxisRange1 (min/max swap)") << ScalarBuilder{}
+                                                                    .setX({1., 2., 3., 4., 5.})
+                                                                    .setValues({100., 200., 300., 400., 500.})
+                                                                    .build()
+                                                             << 3.2 << -1. << DataContainer{1., 2., 3.}
+                                                             << DataContainer{100., 200., 300.};
                  QTest::newRow("xAxisRange2") << ScalarBuilder{}
                                                      .setX({1., 2., 3., 4., 5.})
                                                      .setValues({100., 200., 300., 400., 500.})
                                                        .setValues({100., 200., 300., 400., 500.})
                                                        .build()
                                                 << 5.1 << 6. << false << nan << nan;
-                 QTest::newRow("scalarBounds5")
-                     << ScalarBuilder{}.setX({1.}).setValues({100.}).build() << 0. << 2. << true << 100. << 100.;
-                 QTest::newRow("scalarBounds6")
-                     << ScalarBuilder{}.setX({}).setValues({}).build() << 0. << 2. << false << nan << nan;
+                 QTest::newRow("scalarBounds5") << ScalarBuilder{}.setX({1.}).setValues({100.}).build() << 0.
+                                                << 2. << true << 100. << 100.;
+                 QTest::newRow("scalarBounds6") << ScalarBuilder{}.setX({}).setValues({}).build() << 0. << 2.
+                                                << false << nan << nan;
                  // Tests with NaN values: NaN values are not included in min/max search
                  QTest::newRow("scalarBounds7") << ScalarBuilder{}

gui/include/DragAndDrop/DragDropHelper.h +4 0

                  void setHightlightedDragWidget(VisualizationDragWidget *dragWidget);
                  VisualizationDragWidget *getHightlightedDragWidget() const;
+                 /// Delays the closing of a widget during a drag&drop operation
+                 void delayedCloseWidget(QWidget *widget);
+                 void doCloseWidgets();
              private:
                  class DragDropHelperPrivate;
                  spimpl::unique_impl_ptr<DragDropHelperPrivate> impl;

gui/src/DataSource/DataSourceTreeWidget.cpp +3 -1

              #include <QMimeData>
-             DataSourceTreeWidget::DataSourceTreeWidget(QWidget *parent) : QTreeWidget(parent) {}
+             DataSourceTreeWidget::DataSourceTreeWidget(QWidget *parent) : QTreeWidget(parent)
+             {
+             }
              QMimeData *DataSourceTreeWidget::mimeData(const QList<QTreeWidgetItem *> items) const
              {

gui/src/DragAndDrop/DragDropHelper.cpp +20 -1

                  QMetaObject::Connection m_DragWidgetDestroyedConnection;
                  QMetaObject::Connection m_HighlightedWidgetDestroyedConnection;
+                 QList<QWidget *> m_WidgetToClose;
                  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()
              {
                  return impl->m_HighlightedDragWidget;
              }
+             void DragDropHelper::delayedCloseWidget(QWidget *widget)
+             {
+                 widget->hide();
+                 impl->m_WidgetToClose << widget;
+             }
+             void DragDropHelper::doCloseWidgets()
+             {
+                 for (auto widget : impl->m_WidgetToClose) {
+                     widget->close();
+                 }
+                 impl->m_WidgetToClose.clear();
+             }
              bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData,
                                                                 VisualizationDragDropContainer *dropContainer)
              {

gui/src/Variable/VariableInspectorTableView.cpp +3 -1

              #include "DragAndDrop/DragDropHelper.h"
              #include "SqpApplication.h"
-             VariableInspectorTableView::VariableInspectorTableView(QWidget *parent) : QTableView(parent) {}
+             VariableInspectorTableView::VariableInspectorTableView(QWidget *parent) : QTableView(parent)
+             {
+             }
              void VariableInspectorTableView::startDrag(Qt::DropActions supportedActions)
              {

gui/src/Visualization/VisualizationDragDropContainer.cpp +3 -2

                          // do not add the placeHolder
                      }
-                     // Note: The exec() is blocking on windows but not on linux and macOS
-                     drag->exec(Qt::MoveAction | Qt::CopyAction);
+                     drag->exec(Qt::MoveAction | Qt::CopyAction, Qt::MoveAction);
+                     helper.doCloseWidgets();
                  }
                  else {
                      qCWarning(LOG_VisualizationDragDropContainer())

gui/src/Visualization/VisualizationTabWidget.cpp +3 -3

                      if (nbGraph == 1) {
                          // This is the only graph in the previous zone, close the zone
-                         graphWidget->parentZoneWidget()->close();
+                         helper.delayedCloseWidget(graphWidget->parentZoneWidget());
                      }
                      else {
                          // Close the graph
-                         graphWidget->close();
+                         helper.delayedCloseWidget(graphWidget);
                      }
                      tabWidget->createZone(variables, index);
                      // Close the old zone if it was the only graph inside
                      if (nbGraph == 1) {
-                         parentZoneWidget->close();
+                         helper.delayedCloseWidget(parentZoneWidget);
                      }
                  }
              }

gui/src/Visualization/VisualizationZoneWidget.cpp +2 -2

                      auto nbGraph = parentDragDropContainer->countDragWidget();
                      if (nbGraph == 1) {
                          // This is the only graph in the previous zone, close the zone
-                         previousParentZoneWidget->close();
+                         helper.delayedCloseWidget(previousParentZoneWidget);
                      }
                      else {
                          // Close the graph
-                         graphWidget->close();
+                         helper.delayedCloseWidget(graphWidget);
                      }
                      // Creates the new graph in the zone

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