| @@ -1,4 +1,4 | |||
|
|
1 |
#include "visualization |
|
|
|
1 | #include "visualization/VisualizationGraphWidget.h" | |
|
|
2 | 2 | #include "ui_VisualizationGraphWidget.h" |
|
|
3 | 3 | |
|
|
4 | 4 | VisualizationGraphWidget::VisualizationGraphWidget(QWidget *parent) |
| @@ -1,4 +1,4 | |||
|
|
1 |
#include "visualization |
|
|
|
1 | #include "visualization/VisualizationTabWidget.h" | |
|
|
2 | 2 | #include "ui_VisualizationTabWidget.h" |
|
|
3 | 3 | |
|
|
4 | 4 | VisualizationTabWidget::VisualizationTabWidget(QWidget *parent) |
| @@ -1,4 +1,4 | |||
|
|
1 |
#include "visualization |
|
|
|
1 | #include "visualization/VisualizationWidget.h" | |
|
|
2 | 2 | #include "ui_VisualizationWidget.h" |
|
|
3 | 3 | |
|
|
4 | 4 | VisualizationWidget::VisualizationWidget(QWidget *parent) |
| @@ -1,4 +1,4 | |||
|
|
1 |
#include "visualization |
|
|
|
1 | #include "visualization/VisualizationZoneWidget.h" | |
|
|
2 | 2 | #include "ui_VisualizationZoneWidget.h" |
|
|
3 | 3 | |
|
|
4 | 4 | VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent) |
| @@ -1574,7 +1574,10 void QCPLayerable::applyAntialiasingHint(QCPPainter *painter, bool localAntialia | |||
|
|
1574 | 1574 | |
|
|
1575 | 1575 | \see initializeParentPlot |
|
|
1576 | 1576 | */ |
|
|
1577 |
void QCPLayerable::parentPlotInitialized(QCustomPlot *parentPlot) |
|
|
|
1577 | void QCPLayerable::parentPlotInitialized(QCustomPlot *parentPlot) | |
|
|
1578 | { | |
|
|
1579 | Q_UNUSED(parentPlot) | |
|
|
1580 | } | |
|
|
1578 | 1581 | |
|
|
1579 | 1582 | /*! \internal |
|
|
1580 | 1583 | |
| @@ -9254,16 +9257,14 void QCPAxisPainterPrivate::draw(QCPPainter *painter) | |||
|
|
9254 | 9257 | painter->setBrush(QBrush(basePen.color())); |
|
|
9255 | 9258 | QCPVector2D baseLineVector(baseLine.dx(), baseLine.dy()); |
|
|
9256 | 9259 | if (lowerEnding.style() != QCPLineEnding::esNone) |
|
|
9257 | lowerEnding.draw(painter, | |
|
|
9258 | QCPVector2D(baseLine.p1()) | |
|
|
9259 | - baseLineVector.normalized() * lowerEnding.realLength() | |
|
|
9260 | * (lowerEnding.inverted() ? -1 : 1), | |
|
|
9260 | lowerEnding.draw(painter, QCPVector2D(baseLine.p1()) | |
|
|
9261 | - baseLineVector.normalized() * lowerEnding.realLength() | |
|
|
9262 | * (lowerEnding.inverted() ? -1 : 1), | |
|
|
9261 | 9263 | -baseLineVector); |
|
|
9262 | 9264 | if (upperEnding.style() != QCPLineEnding::esNone) |
|
|
9263 | upperEnding.draw(painter, | |
|
|
9264 | QCPVector2D(baseLine.p2()) | |
|
|
9265 | + baseLineVector.normalized() * upperEnding.realLength() | |
|
|
9266 | * (upperEnding.inverted() ? -1 : 1), | |
|
|
9265 | upperEnding.draw(painter, QCPVector2D(baseLine.p2()) | |
|
|
9266 | + baseLineVector.normalized() * upperEnding.realLength() | |
|
|
9267 | * (upperEnding.inverted() ? -1 : 1), | |
|
|
9267 | 9268 | baseLineVector); |
|
|
9268 | 9269 | painter->setAntialiasing(antialiasingBackup); |
|
|
9269 | 9270 | |
| @@ -16468,9 +16469,8 void QCPColorGradient::updateColorBuffer() | |||
|
|
16468 | 16469 | hue -= 1.0; |
|
|
16469 | 16470 | if (useAlpha) { |
|
|
16470 | 16471 | const QRgb rgb |
|
|
16471 | = QColor::fromHsvF(hue, | |
|
|
16472 |
|
|
|
|
16473 | + t * highHsv.saturationF(), | |
|
|
16472 | = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF() | |
|
|
16473 | + t * highHsv.saturationF(), | |
|
|
16474 | 16474 | (1 - t) * lowHsv.valueF() + t * highHsv.valueF()) |
|
|
16475 | 16475 | .rgb(); |
|
|
16476 | 16476 | const float alpha = (1 - t) * lowHsv.alphaF() + t * highHsv.alphaF(); |
| @@ -16479,9 +16479,8 void QCPColorGradient::updateColorBuffer() | |||
|
|
16479 | 16479 | } |
|
|
16480 | 16480 | else { |
|
|
16481 | 16481 | mColorBuffer[i] |
|
|
16482 | = QColor::fromHsvF(hue, | |
|
|
16483 |
|
|
|
|
16484 | + t * highHsv.saturationF(), | |
|
|
16482 | = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF() | |
|
|
16483 | + t * highHsv.saturationF(), | |
|
|
16485 | 16484 | (1 - t) * lowHsv.valueF() + t * highHsv.valueF()) |
|
|
16486 | 16485 | .rgb(); |
|
|
16487 | 16486 | } |
| @@ -19839,14 +19838,12 void QCPColorScale::update(UpdatePhase phase) | |||
|
|
19839 | 19838 | switch (phase) { |
|
|
19840 | 19839 | case upMargins: { |
|
|
19841 | 19840 | if (mType == QCPAxis::atBottom || mType == QCPAxis::atTop) { |
|
|
19842 | setMaximumSize(QWIDGETSIZE_MAX, | |
|
|
19843 |
|
|
|
|
19844 |
+ |
|
|
|
19845 | + margins().bottom()); | |
|
|
19846 | setMinimumSize(0, | |
|
|
19847 |
|
|
|
|
19848 | + mAxisRect.data()->margins().bottom() + margins().top() | |
|
|
19849 | + margins().bottom()); | |
|
|
19841 | setMaximumSize(QWIDGETSIZE_MAX, mBarWidth + mAxisRect.data()->margins().top() | |
|
|
19842 | + mAxisRect.data()->margins().bottom() | |
|
|
19843 | + margins().top() + margins().bottom()); | |
|
|
19844 | setMinimumSize(0, mBarWidth + mAxisRect.data()->margins().top() | |
|
|
19845 | + mAxisRect.data()->margins().bottom() + margins().top() | |
|
|
19846 | + margins().bottom()); | |
|
|
19850 | 19847 | } |
|
|
19851 | 19848 | else { |
|
|
19852 | 19849 | setMaximumSize(mBarWidth + mAxisRect.data()->margins().left() |
General Comments 0
You need to be logged in to leave comments.
Login now