GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r696:450aab29f079

update clang format for qcustomplot

perrinel -

r696:450aab29f079

parent child

Context file:

r696:450aab29f079

gui/src/Visualization/qcustomplot.cpp +12 -15

               \see initializeParentPlot
             */
-            void QCPLayerable::parentPlotInitialized(QCustomPlot *parentPlot){Q_UNUSED(parentPlot)}
+            void QCPLayerable::parentPlotInitialized(QCustomPlot *parentPlot)
+            {
+                Q_UNUSED(parentPlot)
+            }
             /*! \internal
                 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()
                                                         * (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()
                                                         * (upperEnding.inverted() ? -1 : 1),
                                      baseLineVector);
                                         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(),
                                                                (1 - t) * lowHsv.valueF() + t * highHsv.valueF())
                                                   .rgb();
                                     }
                                     else {
                                         mColorBuffer[i]
-                                            = QColor::fromHsvF(hue,
+                                            = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF()
-                                                               (1 - t) * lowHsv.saturationF()
                                                                         + t * highHsv.saturationF(),
                                                                (1 - t) * lowHsv.valueF() + t * highHsv.valueF())
                                                   .rgb();
                 switch (phase) {
                     case upMargins: {
                         if (mType == QCPAxis::atBottom || mType == QCPAxis::atTop) {
-                            setMaximumSize(QWIDGETSIZE_MAX,
+                            setMaximumSize(QWIDGETSIZE_MAX, mBarWidth + mAxisRect.data()->margins().top()
-                                           mBarWidth + mAxisRect.data()->margins().top()
+                                                                + mAxisRect.data()->margins().bottom()
-                                               + mAxisRect.data()->margins().bottom() + margins().top()
+                                                                + margins().top() + margins().bottom());
-                                               + margins().bottom());
+                            setMinimumSize(0, mBarWidth + mAxisRect.data()->margins().top()
-                            setMinimumSize(0,
-                                           mBarWidth + mAxisRect.data()->margins().top()
                                                   + mAxisRect.data()->margins().bottom() + margins().top()
                                                   + margins().bottom());
                         }

General Comments 2

perrinel

|

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

Changed commits:
  * 2 added
  * 0 removed

Changed files:
  * A core/include/Variable/VariableAcquisitionWorker.h
  * M core/include/Data/IDataProvider.h
  * M core/include/Variable/VariableController.h
  * M core/src/Network/NetworkController.cpp
  * M core/src/Variable/VariableAcquisitionWorker.cpp
  * M core/src/Variable/VariableController.cpp
  * M plugins/amda/src/AmdaProvider.cpp

Write
Preview

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

	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