GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r337:557d1cdcb95a

Correction clang format

perrinel -

r337:557d1cdcb95a

parent child

Context file:

r337:557d1cdcb95a

core/src/DataSource/DataSourceController.cpp +6 -6

             DataSourceController::DataSourceController(QObject *parent)
                     : impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}
             {
-                qCDebug(LOG_DataSourceController())
+                qCDebug(LOG_DataSourceController()) << tr("DataSourceController construction")
-                    << tr("DataSourceController construction") << QThread::currentThread();
+                                                    << QThread::currentThread();
             }
             DataSourceController::~DataSourceController()
             {
-                qCDebug(LOG_DataSourceController())
+                qCDebug(LOG_DataSourceController()) << tr("DataSourceController destruction")
-                    << tr("DataSourceController destruction") << QThread::currentThread();
+                                                    << QThread::currentThread();
                 this->waitForFinish();
             }
             void DataSourceController::initialize()
             {
-                qCDebug(LOG_DataSourceController())
+                qCDebug(LOG_DataSourceController()) << tr("DataSourceController init")
-                    << tr("DataSourceController init") << QThread::currentThread();
+                                                    << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END");
             }

core/src/Variable/VariableCacheController.cpp +6 -6

             void VariableCacheController::addDateTime(std::shared_ptr<Variable> variable,
                                                       const SqpDateTime &dateTime)
             {
-                qCInfo(LOG_VariableCacheController())
+                qCInfo(LOG_VariableCacheController()) << "VariableCacheController::addDateTime"
-                    << "VariableCacheController::addDateTime" << QThread::currentThread()->objectName();
+                                                      << QThread::currentThread()->objectName();
                 if (variable) {
                     auto findVariableIte = impl->m_VariableToSqpDateTimeListMap.find(variable);
                     if (findVariableIte == impl->m_VariableToSqpDateTimeListMap.end()) {
             QVector<SqpDateTime>
             VariableCacheController::dateCacheList(std::shared_ptr<Variable> variable) const noexcept
             {
-                qCInfo(LOG_VariableCacheController())
+                qCInfo(LOG_VariableCacheController()) << "VariableCacheController::dateCacheList"
-                    << "VariableCacheController::dateCacheList" << QThread::currentThread()->objectName();
+                                                      << QThread::currentThread()->objectName();
                 try {
                     return impl->m_VariableToSqpDateTimeListMap.at(variable);
                 }
             {
                 auto variableDateTimeList = impl->m_VariableToSqpDateTimeListMap.find(variable);
                 if (variableDateTimeList != impl->m_VariableToSqpDateTimeListMap.end()) {
-                    qCInfo(LOG_VariableCacheController())
+                    qCInfo(LOG_VariableCacheController()) << tr("VariableCacheController::displayCache")
-                        << tr("VariableCacheController::displayCache") << variableDateTimeList->second;
+                                                          << variableDateTimeList->second;
                 }
                 else {
                     qCWarning(LOG_VariableCacheController())

core/src/Variable/VariableController.cpp +8 -8

             VariableController::VariableController(QObject *parent)
                     : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}
             {
-                qCDebug(LOG_VariableController())
+                qCDebug(LOG_VariableController()) << tr("VariableController construction")
-                    << tr("VariableController construction") << QThread::currentThread();
+                                                  << QThread::currentThread();
             }
             VariableController::~VariableController()
             {
-                qCDebug(LOG_VariableController())
+                qCDebug(LOG_VariableController()) << tr("VariableController destruction")
-                    << tr("VariableController destruction") << QThread::currentThread();
+                                                  << QThread::currentThread();
                 this->waitForFinish();
             }
             void VariableController::onDateTimeOnSelection(const SqpDateTime &dateTime)
             {
-                qCDebug(LOG_VariableController())
+                qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
-                    << "VariableController::onDateTimeOnSelection" << QThread::currentThread()->objectName();
+                                                  << QThread::currentThread()->objectName();
                 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
                 for (const auto &selectedRow : qAsConst(selectedRows)) {
             void VariableController::onRequestDataLoading(std::shared_ptr<Variable> variable,
                                                           const SqpDateTime &dateTime)
             {
-                qCDebug(LOG_VariableController())
+                qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
-                    << "VariableController::onRequestDataLoading" << QThread::currentThread()->objectName();
+                                                  << QThread::currentThread()->objectName();
                 // we want to load data of the variable for the dateTime.
                 // First we check if the cache contains some of them.
                 // For the other, we ask the provider to give them.

gui/src/Visualization/VisualizationGraphHelper.cpp +6 -6

             void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries,
                                   const SqpDateTime &dateTime)
             {
-                qCInfo(LOG_VisualizationGraphHelper())
+                qCInfo(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData"
-                    << "TORM: updateScalarData" << QThread::currentThread()->objectName();
+                                                       << QThread::currentThread()->objectName();
                 if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
                     // Clean the graph
                     // NAIVE approch
                         const auto xData = scalarSeries.xAxisData()->data();
                         const auto valuesData = scalarSeries.valuesData()->data();
                         const auto count = xData.count();
-                        qCInfo(LOG_VisualizationGraphHelper())
+                        qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache"
-                            << "TORM: Current points in cache" << xData.count();
+                                                               << xData.count();
                         auto dataContainer = qcpGraph->data();
                         dataContainer->clear();
                             }
                         }
                         sqpDataContainer->sort();
-                        qCInfo(LOG_VisualizationGraphHelper())
+                        qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed"
-                            << "TORM: Current points displayed" << sqpDataContainer->size();
+                                                               << sqpDataContainer->size();
                     }
                     scalarSeries.unlock();

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

             void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1)
             {
-                qCDebug(LOG_VisualizationGraphWidget())
+                qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
-                    << tr("VisualizationGraphWidget::onRangeChanged") << QThread::currentThread()->objectName();
+                                                        << QThread::currentThread()->objectName();
                 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
                      it != impl->m_VariableToPlotMultiMap.cend(); ++it) {

gui/src/Visualization/qcustomplot.cpp +31 -40

                     mChildren.last()->setLayer(0); // removes itself from mChildren via removeChild()
                 if (mParentPlot->currentLayer() == this)
-                    qDebug() << Q_FUNC_INFO
+                    qDebug() << Q_FUNC_INFO << "The parent plot's mCurrentLayer will be a dangling pointer. "
-                             << "The parent plot's mCurrentLayer will be a dangling pointer. "
+                                               "Should have been set to a valid layer or 0 beforehand.";
-                                "Should have been set to a valid layer or 0 beforehand.";
             }
             /*!
               \see initializeParentPlot
             */
-            void QCPLayerable::parentPlotInitialized(QCustomPlot *parentPlot){Q_UNUSED(parentPlot)}
+            void QCPLayerable::parentPlotInitialized(QCustomPlot *parentPlot)
+            {
+                Q_UNUSED(parentPlot)
+            }
             /*! \internal
                             mRange = newRange.sanitizedForLogScale();
                     }
                     else
-                        qDebug() << Q_FUNC_INFO
+                        qDebug() << Q_FUNC_INFO << "Center of scaling operation doesn't lie in same "
-                                 << "Center of scaling operation doesn't lie in same "
+                                                   "logarithmic sign domain as range:"
-                                    "logarithmic sign domain as range:"
                                  << center;
                 }
                 emit rangeChanged(mRange);
                 painter->setBrush(QBrush(basePen.color()));
                 QCPVector2D baseLineVector(baseLine.dx(), baseLine.dy());
                 if (lowerEnding.style() != QCPLineEnding::esNone)
-                    lowerEnding.draw(painter,
+                    lowerEnding.draw(painter, QCPVector2D(baseLine.p1())
-                                     QCPVector2D(baseLine.p1())
+                                                  - baseLineVector.normalized() * lowerEnding.realLength()
-                                         - baseLineVector.normalized() * lowerEnding.realLength()
+                                                        * (lowerEnding.inverted() ? -1 : 1),
-                                               * (lowerEnding.inverted() ? -1 : 1),
                                      -baseLineVector);
                 if (upperEnding.style() != QCPLineEnding::esNone)
-                    upperEnding.draw(painter,
+                    upperEnding.draw(painter, QCPVector2D(baseLine.p2())
-                                     QCPVector2D(baseLine.p2())
+                                                  + baseLineVector.normalized() * upperEnding.realLength()
-                                         + baseLineVector.normalized() * upperEnding.realLength()
+                                                        * (upperEnding.inverted() ? -1 : 1),
-                                               * (upperEnding.inverted() ? -1 : 1),
                                      baseLineVector);
                 painter->setAntialiasing(antialiasingBackup);
                     bool labelClippedByBorder = false;
                     if (tickLabelSide == QCPAxis::lsOutside) {
                         if (QCPAxis::orientation(type) == Qt::Horizontal)
-                            labelClippedByBorder = finalPosition.x()
+                            labelClippedByBorder = finalPosition.x() + (labelData.rotatedTotalBounds.width()
-                                                           + (labelData.rotatedTotalBounds.width()
+                                                                        + labelData.rotatedTotalBounds.left())
-                                                              + labelData.rotatedTotalBounds.left())
                                                        > viewportRect.right()
                                                    || finalPosition.x() + labelData.rotatedTotalBounds.left()
                                                           < viewportRect.left();
                         else
-                            labelClippedByBorder = finalPosition.y()
+                            labelClippedByBorder = finalPosition.y() + (labelData.rotatedTotalBounds.height()
-                                                           + (labelData.rotatedTotalBounds.height()
+                                                                        + labelData.rotatedTotalBounds.top())
-                                                              + labelData.rotatedTotalBounds.top())
                                                        > viewportRect.bottom()
                                                    || finalPosition.y() + labelData.rotatedTotalBounds.top()
                                                           < viewportRect.top();
             */
             QPointF QCPAbstractItem::anchorPixelPosition(int anchorId) const
             {
-                qDebug() << Q_FUNC_INFO
+                qDebug() << Q_FUNC_INFO << "called on item which shouldn't have any anchors (this method not "
-                         << "called on item which shouldn't have any anchors (this method not "
+                                           "reimplemented). anchorId"
-                            "reimplemented). anchorId"
                          << anchorId;
                 return QPointF();
             }
                 setupPaintBuffers();
             #else
                 Q_UNUSED(enabled)
-                qDebug() << Q_FUNC_INFO
+                qDebug() << Q_FUNC_INFO << "QCustomPlot can't use OpenGL because QCUSTOMPLOT_USE_OPENGL was "
-                         << "QCustomPlot can't use OpenGL because QCUSTOMPLOT_USE_OPENGL was "
+                                           "not defined during compilation (add 'DEFINES += "
-                            "not defined during compilation (add 'DEFINES += "
+                                           "QCUSTOMPLOT_USE_OPENGL' to your qmake .pro file)";
-                            "QCUSTOMPLOT_USE_OPENGL' to your qmake .pro file)";
             #endif
             }
                 if (!valueAxis)
                     valueAxis = yAxis;
                 if (!keyAxis || !valueAxis) {
-                    qDebug() << Q_FUNC_INFO
+                    qDebug() << Q_FUNC_INFO << "can't use default QCustomPlot xAxis or yAxis, because at least "
-                             << "can't use default QCustomPlot xAxis or yAxis, because at least "
+                                               "one is invalid (has been deleted)";
-                                "one is invalid (has been deleted)";
                     return 0;
                 }
                 if (keyAxis->parentPlot() != this || valueAxis->parentPlot() != this) {
                     return new QCPPaintBufferGlPbuffer(viewport().size(), mBufferDevicePixelRatio,
                                                        mOpenGlMultisamples);
             #else
-                    qDebug() << Q_FUNC_INFO
+                    qDebug() << Q_FUNC_INFO << "OpenGL enabled even though no support for it compiled in, this "
-                             << "OpenGL enabled even though no support for it compiled in, this "
+                                               "shouldn't have happened. Falling back to pixmap paint buffer.";
-                                "shouldn't have happened. Falling back to pixmap paint buffer.";
                     return new QCPPaintBufferPixmap(viewport().size(), mBufferDevicePixelRatio);
             #endif
                 }
                                         hue -= 1.0;
                                     if (useAlpha) {
                                         const QRgb rgb
-                                            = QColor::fromHsvF(hue,
+                                            = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF()
-                                                               (1 - t) * lowHsv.saturationF()
+                                                                        + t * highHsv.saturationF(),
-                                                                   + t * highHsv.saturationF(),
                                                                (1 - t) * lowHsv.valueF() + t * highHsv.valueF())
                                                   .rgb();
                                         const float alpha = (1 - t) * lowHsv.alphaF() + t * highHsv.alphaF();
                                     }
                                     else {
                                         mColorBuffer[i]
-                                            = QColor::fromHsvF(hue,
+                                            = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF()
-                                                               (1 - t) * lowHsv.saturationF()
+                                                                        + t * highHsv.saturationF(),
-                                                                   + t * highHsv.saturationF(),
                                                                (1 - t) * lowHsv.valueF() + t * highHsv.valueF())
                                                   .rgb();
                                     }

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