GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r848:89fbdd3d4a7b

MR for linux compilation

perrinel -

r848:89fbdd3d4a7b

parent child

Context file:

r848:89fbdd3d4a7b

gui/src/DragDropHelper.cpp +3 -3

                     }
                 }
                 else if (event->type() == QEvent::DragLeave) {
-                    auto w = static_cast<QWidget *>(obj);
                     if (impl->m_CurrentScrollArea) {
                         if (!QRect(QPoint(), impl->m_CurrentScrollArea->size())
                                  .contains(impl->m_CurrentScrollArea->mapFromGlobal(QCursor::pos()))) {
                     }
                 }
                 else if (event->type() == QEvent::Drop) {
-                    auto w = static_cast<QWidget *>(obj);
                     if (impl->m_CurrentScrollArea) {
                         impl->m_CurrentScrollArea = nullptr;
                         impl->m_Direction = DragDropScrollerPrivate::ScrollDirection::unknown;
             };
-            DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()} {}
+            DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()}
+            {
+            }
             DragDropHelper::~DragDropHelper()
             {

gui/src/SqpApplication.cpp +6 -2

                 impl->m_VisualizationControllerThread.start();
             }
-            SqpApplication::~SqpApplication() {}
+            SqpApplication::~SqpApplication()
+            {
+            }
-            void SqpApplication::initialize() {}
+            void SqpApplication::initialize()
+            {
+            }
             DataSourceController &SqpApplication::dataSourceController() noexcept
             {

gui/src/Visualization/VisualizationDragDropContainer.cpp +1 0

             #include <QDragEnterEvent>
             #include <QVBoxLayout>
+            #include <cmath>
             #include <memory>
             struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {

gui/src/Visualization/VisualizationGraphWidget.cpp +6 -7

                         &VisualizationGraphWidget::onMouseRelease);
                 connect(ui->widget, &QCustomPlot::mouseMove, this, &VisualizationGraphWidget::onMouseMove);
                 connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
-                connect(
+                connect(ui->widget->xAxis, static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(
-                    ui->widget->xAxis,
+                                               &QCPAxis::rangeChanged),
-                    static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(&QCPAxis::rangeChanged),
+                        this, &VisualizationGraphWidget::onRangeChanged, Qt::DirectConnection);
-                    this, &VisualizationGraphWidget::onRangeChanged, Qt::DirectConnection);
                 // Activates menu when right clicking on the graph
                 ui->widget->setContextMenuPolicy(Qt::CustomContextMenu);
             void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2)
             {
-                qCDebug(LOG_VisualizationGraphWidget())
+                qCDebug(LOG_VisualizationGraphWidget()) << tr("TORM: VisualizationGraphWidget::onRangeChanged")
-                    << tr("TORM: VisualizationGraphWidget::onRangeChanged")
+                                                        << QThread::currentThread()->objectName() << "DoAcqui"
-                    << QThread::currentThread()->objectName() << "DoAcqui" << impl->m_DoAcquisition;
+                                                        << impl->m_DoAcquisition;
                 auto graphRange = SqpRange{t1.lower, t1.upper};
                 auto oldGraphRange = SqpRange{t2.lower, t2.upper};

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

                                     graphChildRange.m_TStart += deltaLeft;
                                     graphChildRange.m_TEnd -= deltaRight;
                                     qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomIn");
-                                    qCDebug(LOG_VisualizationZoneWidget())
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
-                                        << tr("TORM: deltaLeft") << deltaLeft;
+                                                                           << deltaLeft;
-                                    qCDebug(LOG_VisualizationZoneWidget())
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
-                                        << tr("TORM: deltaRight") << deltaRight;
+                                                                           << deltaRight;
                                     qCDebug(LOG_VisualizationZoneWidget())
                                         << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart;
                                     qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomOut");
                                     auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
                                     auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
-                                    qCDebug(LOG_VisualizationZoneWidget())
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
-                                        << tr("TORM: deltaLeft") << deltaLeft;
+                                                                           << deltaLeft;
-                                    qCDebug(LOG_VisualizationZoneWidget())
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
-                                        << tr("TORM: deltaRight") << deltaRight;
+                                                                           << deltaRight;
                                     qCDebug(LOG_VisualizationZoneWidget())
                                         << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart;
                                     graphChildRange.m_TStart -= deltaLeft;
                                     break;
                             }
                             graphChild->enableAcquisition(false);
-                            qCDebug(LOG_VisualizationZoneWidget())
+                            qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range before: ")
-                                << tr("TORM: Range before: ") << graphChild->graphRange();
+                                                                   << graphChild->graphRange();
-                            qCDebug(LOG_VisualizationZoneWidget())
+                            qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range after : ")
-                                << tr("TORM: Range after : ") << graphChildRange;
+                                                                   << graphChildRange;
                             qCDebug(LOG_VisualizationZoneWidget())
                                 << tr("TORM: child dt") << graphChildRange.m_TEnd - graphChildRange.m_TStart;
                             graphChild->setGraphRange(graphChildRange);

General Comments 6

trabillard

|

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

Changed commits:
  * 1 added
  * 0 removed

Changed files:
  * M gui/include/DragDropHelper.h
  * M gui/include/Visualization/VisualizationDragDropContainer.h
  * M gui/include/Visualization/VisualizationDragWidget.h
  * M gui/src/DragDropHelper.cpp
  * M gui/src/Visualization/VisualizationDragDropContainer.cpp
  * M gui/src/Visualization/VisualizationDragWidget.cpp
  * M gui/include/SqpApplication.h
  * M gui/include/Visualization/VisualizationGraphWidget.h
  * M gui/include/Visualization/VisualizationTabWidget.h
  * M gui/include/Visualization/VisualizationZoneWidget.h
  * M gui/src/SqpApplication.cpp
  * M gui/src/Visualization/VisualizationGraphWidget.cpp
  * M gui/src/Visualization/VisualizationTabWidget.cpp
  * M gui/src/Visualization/VisualizationZoneWidget.cpp
  * R core/include/Variable/VariableCacheStrategyFactory.h
  * R core/include/Variable/VariableSingleThresholdCacheStrategy.h
  * R core/tests/Variable/TestVariableSync.cpp
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/FileNotFound.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NaNValue.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NaNX.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NoUnit.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/TooManyValues.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/ValidScalar1.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/ValidVector1.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongDate.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongUnit.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongValue.txt
  * R plugins/mockplugin/include/MockDefs.h
  * R plugins/mockplugin/src/MockDefs.cpp
  * R core/include/Data/DataSeries.h
  * R core/include/Data/IDataSeries.h
  * R core/include/Data/VariableRequest.h
  * R core/include/Variable/Variable.h
  * R core/include/Variable/VariableCacheStrategy.h
  * R core/include/Variable/VariableController.h
  * R core/meson.build
  * R core/src/Data/VectorSeries.cpp
  * R core/src/Variable/Variable.cpp
  * R core/src/Variable/VariableAcquisitionWorker.cpp
  * R core/src/Variable/VariableController.cpp
  * R core/tests/Data/TestDataSeries.cpp
  * R core/tests/Variable/TestVariable.cpp
  * R core/tests/meson.build
  * R gui/meson.build
  * R gui/src/Variable/VariableInspectorWidget.cpp
  * R gui/src/Visualization/operations/RescaleAxeOperation.cpp
  * R plugins/amda/src/AmdaProvider.cpp
  * R plugins/amda/src/AmdaResultParser.cpp
  * R plugins/amda/tests/TestAmdaAcquisition.cpp
  * R plugins/amda/tests/TestAmdaResultParser.cpp
  * R plugins/mockplugin/include/CosinusProvider.h
  * R plugins/mockplugin/meson.build
  * R plugins/mockplugin/src/CosinusProvider.cpp
  * R plugins/mockplugin/src/MockPlugin.cpp
  * R plugins/mockplugin/tests/TestCosinusAcquisition.cpp
  * R core/src/Variable/VariableCacheStrategy.cpp

trabillard

|

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

Changed commits:
  * 1 added
  * 0 removed

Changed files:
  * M gui/include/Visualization/VisualizationDragDropContainer.h
  * M gui/include/Visualization/VisualizationDragWidget.h
  * M gui/src/Visualization/VisualizationDragDropContainer.cpp
  * M gui/src/Visualization/VisualizationGraphWidget.cpp
  * M gui/src/Visualization/VisualizationZoneWidget.cpp

perrinel

|

Status change > Approved

Write
Preview

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

		Status change > Approved
		Pull request updated. Auto status change to \|under_review\|...
		Status change > Approved
		Pull request updated. Auto status change to \|under_review\|...
		Pull request updated. Auto status change to \|under_review\|...
		Auto status change to \|new_status\|...

	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