diff --git a/app/src/main.cpp b/app/src/Main.cpp similarity index 97% rename from app/src/main.cpp rename to app/src/Main.cpp index 0812bf2..cb3a380 100644 --- a/app/src/main.cpp +++ b/app/src/Main.cpp @@ -19,7 +19,7 @@ /*-- Author : Alexis Jeandet -- Mail : alexis.jeandet@member.fsf.org ----------------------------------------------------------------------------*/ -#include "mainwindow.h" +#include "MainWindow.h" #include #include #include diff --git a/core/include/Common/spimpl.h b/core/include/Common/spimpl.h index 7f6e8be..b4d5e04 100644 --- a/core/include/Common/spimpl.h +++ b/core/include/Common/spimpl.h @@ -89,9 +89,8 @@ using default_copier_t = typename default_copier::type; template struct is_default_manageable - : public std::integral_constant >::value - && std::is_same >::value> { + : public std::integral_constant >::value + && std::is_same >::value> { }; } @@ -132,11 +131,10 @@ public: } template - impl_ptr(U *u, - typename std::enable_if::value - && is_default_manageable::value, - dummy_t_>::type - = dummy_t_()) SPIMPL_NOEXCEPT + impl_ptr(U *u, typename std::enable_if::value + && is_default_manageable::value, + dummy_t_>::type + = dummy_t_()) SPIMPL_NOEXCEPT : impl_ptr(u, &details::default_delete, &details::default_copy) { } @@ -153,12 +151,12 @@ public: #ifdef SPIMPL_HAS_AUTO_PTR template - impl_ptr(std::auto_ptr &&u, - typename std::enable_if::value - && is_default_manageable::value, - dummy_t_>::type - = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(u.release(), &details::default_delete), - copier_(&details::default_copy) + impl_ptr(std::auto_ptr &&u, typename std::enable_if::value + && is_default_manageable::value, + dummy_t_>::type + = dummy_t_()) SPIMPL_NOEXCEPT + : ptr_(u.release(), &details::default_delete), + copier_(&details::default_copy) { } #endif diff --git a/core/src/DataSource/DataSourceController.cpp b/core/src/DataSource/DataSourceController.cpp index 0149694..f3def90 100644 --- a/core/src/DataSource/DataSourceController.cpp +++ b/core/src/DataSource/DataSourceController.cpp @@ -21,14 +21,14 @@ public: DataSourceController::DataSourceController(QObject *parent) : impl{spimpl::make_unique_impl()} { - qCDebug(LOG_DataSourceController()) - << tr("DataSourceController construction") << QThread::currentThread(); + qCDebug(LOG_DataSourceController()) << tr("DataSourceController construction") + << QThread::currentThread(); } DataSourceController::~DataSourceController() { - qCDebug(LOG_DataSourceController()) - << tr("DataSourceController destruction") << QThread::currentThread(); + qCDebug(LOG_DataSourceController()) << tr("DataSourceController destruction") + << QThread::currentThread(); this->waitForFinish(); } @@ -61,8 +61,8 @@ void DataSourceController::setDataSourceItem( void DataSourceController::initialize() { - qCDebug(LOG_DataSourceController()) - << tr("DataSourceController init") << QThread::currentThread(); + qCDebug(LOG_DataSourceController()) << tr("DataSourceController init") + << QThread::currentThread(); impl->m_WorkingMutex.lock(); qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END"); } diff --git a/core/src/Visualization/VisualizationController.cpp b/core/src/Visualization/VisualizationController.cpp index d4c246f..d87cbee 100644 --- a/core/src/Visualization/VisualizationController.cpp +++ b/core/src/Visualization/VisualizationController.cpp @@ -16,21 +16,21 @@ public: VisualizationController::VisualizationController(QObject *parent) : impl{spimpl::make_unique_impl()} { - qCDebug(LOG_VisualizationController()) - << tr("VisualizationController construction") << QThread::currentThread(); + qCDebug(LOG_VisualizationController()) << tr("VisualizationController construction") + << QThread::currentThread(); } VisualizationController::~VisualizationController() { - qCDebug(LOG_VisualizationController()) - << tr("VisualizationController destruction") << QThread::currentThread(); + qCDebug(LOG_VisualizationController()) << tr("VisualizationController destruction") + << QThread::currentThread(); this->waitForFinish(); } void VisualizationController::initialize() { - qCDebug(LOG_VisualizationController()) - << tr("VisualizationController init") << QThread::currentThread(); + qCDebug(LOG_VisualizationController()) << tr("VisualizationController init") + << QThread::currentThread(); impl->m_WorkingMutex.lock(); qCDebug(LOG_VisualizationController()) << tr("VisualizationController init END"); } diff --git a/gui/src/visualization/VisualizationGraphWidget.cpp b/gui/src/visualization/VisualizationGraphWidget.cpp index 5f1c757..2b470af 100644 --- a/gui/src/visualization/VisualizationGraphWidget.cpp +++ b/gui/src/visualization/VisualizationGraphWidget.cpp @@ -1,4 +1,4 @@ -#include "visualization\VisualizationGraphWidget.h" +#include "visualization/VisualizationGraphWidget.h" #include "ui_VisualizationGraphWidget.h" VisualizationGraphWidget::VisualizationGraphWidget(QWidget *parent) diff --git a/gui/src/visualization/VisualizationTabWidget.cpp b/gui/src/visualization/VisualizationTabWidget.cpp index 636d41b..ec83c62 100644 --- a/gui/src/visualization/VisualizationTabWidget.cpp +++ b/gui/src/visualization/VisualizationTabWidget.cpp @@ -1,4 +1,4 @@ -#include "visualization\VisualizationTabWidget.h" +#include "visualization/VisualizationTabWidget.h" #include "ui_VisualizationTabWidget.h" VisualizationTabWidget::VisualizationTabWidget(QWidget *parent) diff --git a/gui/src/visualization/VisualizationWidget.cpp b/gui/src/visualization/VisualizationWidget.cpp index b8bbaac..ccea179 100644 --- a/gui/src/visualization/VisualizationWidget.cpp +++ b/gui/src/visualization/VisualizationWidget.cpp @@ -1,4 +1,4 @@ -#include "visualization\VisualizationWidget.h" +#include "visualization/VisualizationWidget.h" #include "ui_VisualizationWidget.h" VisualizationWidget::VisualizationWidget(QWidget *parent) diff --git a/gui/src/visualization/VisualizationZoneWidget.cpp b/gui/src/visualization/VisualizationZoneWidget.cpp index 7998665..2d213c9 100644 --- a/gui/src/visualization/VisualizationZoneWidget.cpp +++ b/gui/src/visualization/VisualizationZoneWidget.cpp @@ -1,4 +1,4 @@ -#include "visualization\VisualizationZoneWidget.h" +#include "visualization/VisualizationZoneWidget.h" #include "ui_VisualizationZoneWidget.h" VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent) diff --git a/gui/src/visualization/qcustomplot.cpp b/gui/src/visualization/qcustomplot.cpp index c6b041e..457a019 100644 --- a/gui/src/visualization/qcustomplot.cpp +++ b/gui/src/visualization/qcustomplot.cpp @@ -1574,7 +1574,10 @@ void QCPLayerable::applyAntialiasingHint(QCPPainter *painter, bool localAntialia \see initializeParentPlot */ -void QCPLayerable::parentPlotInitialized(QCustomPlot *parentPlot){Q_UNUSED(parentPlot)} +void QCPLayerable::parentPlotInitialized(QCustomPlot *parentPlot) +{ + Q_UNUSED(parentPlot) +} /*! \internal @@ -9254,16 +9257,14 @@ void QCPAxisPainterPrivate::draw(QCPPainter *painter) painter->setBrush(QBrush(basePen.color())); QCPVector2D baseLineVector(baseLine.dx(), baseLine.dy()); if (lowerEnding.style() != QCPLineEnding::esNone) - lowerEnding.draw(painter, - QCPVector2D(baseLine.p1()) - - baseLineVector.normalized() * lowerEnding.realLength() - * (lowerEnding.inverted() ? -1 : 1), + lowerEnding.draw(painter, QCPVector2D(baseLine.p1()) + - baseLineVector.normalized() * lowerEnding.realLength() + * (lowerEnding.inverted() ? -1 : 1), -baseLineVector); if (upperEnding.style() != QCPLineEnding::esNone) - upperEnding.draw(painter, - QCPVector2D(baseLine.p2()) - + baseLineVector.normalized() * upperEnding.realLength() - * (upperEnding.inverted() ? -1 : 1), + upperEnding.draw(painter, QCPVector2D(baseLine.p2()) + + baseLineVector.normalized() * upperEnding.realLength() + * (upperEnding.inverted() ? -1 : 1), baseLineVector); painter->setAntialiasing(antialiasingBackup); @@ -16468,9 +16469,8 @@ void QCPColorGradient::updateColorBuffer() hue -= 1.0; if (useAlpha) { const QRgb rgb - = QColor::fromHsvF(hue, - (1 - t) * lowHsv.saturationF() - + t * highHsv.saturationF(), + = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF() + + t * highHsv.saturationF(), (1 - t) * lowHsv.valueF() + t * highHsv.valueF()) .rgb(); const float alpha = (1 - t) * lowHsv.alphaF() + t * highHsv.alphaF(); @@ -16479,9 +16479,8 @@ void QCPColorGradient::updateColorBuffer() } else { mColorBuffer[i] - = QColor::fromHsvF(hue, - (1 - t) * lowHsv.saturationF() - + t * highHsv.saturationF(), + = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF() + + t * highHsv.saturationF(), (1 - t) * lowHsv.valueF() + t * highHsv.valueF()) .rgb(); } @@ -19839,14 +19838,12 @@ void QCPColorScale::update(UpdatePhase phase) switch (phase) { case upMargins: { if (mType == QCPAxis::atBottom || mType == QCPAxis::atTop) { - setMaximumSize(QWIDGETSIZE_MAX, - mBarWidth + mAxisRect.data()->margins().top() - + mAxisRect.data()->margins().bottom() + margins().top() - + margins().bottom()); - setMinimumSize(0, - mBarWidth + mAxisRect.data()->margins().top() - + mAxisRect.data()->margins().bottom() + margins().top() - + margins().bottom()); + setMaximumSize(QWIDGETSIZE_MAX, mBarWidth + mAxisRect.data()->margins().top() + + mAxisRect.data()->margins().bottom() + + margins().top() + margins().bottom()); + setMinimumSize(0, mBarWidth + mAxisRect.data()->margins().top() + + mAxisRect.data()->margins().bottom() + margins().top() + + margins().bottom()); } else { setMaximumSize(mBarWidth + mAxisRect.data()->margins().left()