From 6a575e1ae0ea66bc2fcca06f44eaca90bcdc791c 2017-06-07 15:34:53
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-06-07 15:34:53
Subject: [PATCH] Correction for Linux compilation again
---

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()