Auto status change to "Under Review"
| @@ -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 | |
| @@ -9391,16 +9394,14 void QCPAxisPainterPrivate::draw(QCPPainter *painter) | |||
|
|
9391 | 9394 | painter->setBrush(QBrush(basePen.color())); |
|
|
9392 | 9395 | QCPVector2D baseLineVector(baseLine.dx(), baseLine.dy()); |
|
|
9393 | 9396 | if (lowerEnding.style() != QCPLineEnding::esNone) |
|
|
9394 | lowerEnding.draw(painter, | |
|
|
9395 | QCPVector2D(baseLine.p1()) | |
|
|
9396 | - baseLineVector.normalized() * lowerEnding.realLength() | |
|
|
9397 | * (lowerEnding.inverted() ? -1 : 1), | |
|
|
9397 | lowerEnding.draw(painter, QCPVector2D(baseLine.p1()) | |
|
|
9398 | - baseLineVector.normalized() * lowerEnding.realLength() | |
|
|
9399 | * (lowerEnding.inverted() ? -1 : 1), | |
|
|
9398 | 9400 | -baseLineVector); |
|
|
9399 | 9401 | if (upperEnding.style() != QCPLineEnding::esNone) |
|
|
9400 | upperEnding.draw(painter, | |
|
|
9401 | QCPVector2D(baseLine.p2()) | |
|
|
9402 | + baseLineVector.normalized() * upperEnding.realLength() | |
|
|
9403 | * (upperEnding.inverted() ? -1 : 1), | |
|
|
9402 | upperEnding.draw(painter, QCPVector2D(baseLine.p2()) | |
|
|
9403 | + baseLineVector.normalized() * upperEnding.realLength() | |
|
|
9404 | * (upperEnding.inverted() ? -1 : 1), | |
|
|
9404 | 9405 | baseLineVector); |
|
|
9405 | 9406 | painter->setAntialiasing(antialiasingBackup); |
|
|
9406 | 9407 | |
| @@ -16629,9 +16630,8 void QCPColorGradient::updateColorBuffer() | |||
|
|
16629 | 16630 | hue -= 1.0; |
|
|
16630 | 16631 | if (useAlpha) { |
|
|
16631 | 16632 | const QRgb rgb |
|
|
16632 | = QColor::fromHsvF(hue, | |
|
|
16633 |
|
|
|
|
16634 | + t * highHsv.saturationF(), | |
|
|
16633 | = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF() | |
|
|
16634 | + t * highHsv.saturationF(), | |
|
|
16635 | 16635 | (1 - t) * lowHsv.valueF() + t * highHsv.valueF()) |
|
|
16636 | 16636 | .rgb(); |
|
|
16637 | 16637 | const float alpha = (1 - t) * lowHsv.alphaF() + t * highHsv.alphaF(); |
| @@ -16640,9 +16640,8 void QCPColorGradient::updateColorBuffer() | |||
|
|
16640 | 16640 | } |
|
|
16641 | 16641 | else { |
|
|
16642 | 16642 | mColorBuffer[i] |
|
|
16643 | = QColor::fromHsvF(hue, | |
|
|
16644 |
|
|
|
|
16645 | + t * highHsv.saturationF(), | |
|
|
16643 | = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF() | |
|
|
16644 | + t * highHsv.saturationF(), | |
|
|
16646 | 16645 | (1 - t) * lowHsv.valueF() + t * highHsv.valueF()) |
|
|
16647 | 16646 | .rgb(); |
|
|
16648 | 16647 | } |
| @@ -19999,14 +19998,12 void QCPColorScale::update(UpdatePhase phase) | |||
|
|
19999 | 19998 | switch (phase) { |
|
|
20000 | 19999 | case upMargins: { |
|
|
20001 | 20000 | if (mType == QCPAxis::atBottom || mType == QCPAxis::atTop) { |
|
|
20002 | setMaximumSize(QWIDGETSIZE_MAX, | |
|
|
20003 |
|
|
|
|
20004 |
+ |
|
|
|
20005 | + margins().bottom()); | |
|
|
20006 | setMinimumSize(0, | |
|
|
20007 |
|
|
|
|
20008 | + mAxisRect.data()->margins().bottom() + margins().top() | |
|
|
20009 | + margins().bottom()); | |
|
|
20001 | setMaximumSize(QWIDGETSIZE_MAX, mBarWidth + mAxisRect.data()->margins().top() | |
|
|
20002 | + mAxisRect.data()->margins().bottom() | |
|
|
20003 | + margins().top() + margins().bottom()); | |
|
|
20004 | setMinimumSize(0, mBarWidth + mAxisRect.data()->margins().top() | |
|
|
20005 | + mAxisRect.data()->margins().bottom() + margins().top() | |
|
|
20006 | + margins().bottom()); | |
|
|
20010 | 20007 | } |
|
|
20011 | 20008 | else { |
|
|
20012 | 20009 | setMaximumSize(mBarWidth + mAxisRect.data()->margins().left() |
General Comments 2
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
You need to be logged in to leave comments.
Login now