qiurui
/
qtgraphs
mirror of https://github.com/qt/qtgraphs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix horizontal orientation for non-bar series 

Fixes: QTBUG-138740
Pick-to: 6.10
Change-Id: I328a1fd22a66d53643b0e81be1b832e5cee9bac5
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
This commit is contained in:
Jere Tuliniemi 2025-07-28 14:05:01 +03:00
parent 88fa4d12ed
commit 13e23a8337
5 changed files with 75 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/graphs2d/qsgrenderer/arearenderer.cpp
View File

@ -39,11 +39,16 @@ void AreaRenderer::resetShapePathCount()
m_currentShapePathIndex = 0;
}
void AreaRenderer::calculateRenderCoordinates(qreal origX,
qreal origY,
qreal *renderX,
qreal *renderY) const
void AreaRenderer::calculateRenderCoordinates(
QAreaSeries *series, qreal origX, qreal origY, qreal *renderX, qreal *renderY) const
{
auto &axY = m_graph->m_axisRenderer->getAxisY(series);
if (m_graph->orientation() != Qt::Vertical) {
std::swap(origX, origY);
origY = axY.maxValue - origY;
}
*renderX = m_areaWidth * origX * m_maxHorizontal - m_horizontalOffset;
*renderY = m_areaHeight - m_areaHeight * origY * m_maxVertical
+ m_verticalOffset;
@ -54,6 +59,11 @@ void AreaRenderer::calculateAxisCoordinates(
{
auto &axY = m_graph->m_axisRenderer->getAxisY(series);
if (m_graph->orientation() != Qt::Vertical) {
std::swap(origX, origY);
origY = axY.maxValue - origY;
}
*axisX = origX / m_areaWidth / m_maxHorizontal;
*axisY = axY.valueRange - origY / m_areaHeight / m_maxVertical;
}
@ -162,13 +172,17 @@ void AreaRenderer::handlePolish(QAreaSeries *series)
qreal x;
qreal y;
if (i == upperPoints.size())
calculateRenderCoordinates(upperPoints[upperPoints.size() - 1].x(), 0, &x, &y);
calculateRenderCoordinates(series,
upperPoints[upperPoints.size() - 1].x(),
0,
&x,
&y);
else if (i == upperPoints.size() + 1)
calculateRenderCoordinates(upperPoints[0].x(), 0, &x, &y);
calculateRenderCoordinates(series, upperPoints[0].x(), 0, &x, &y);
else if (i == upperPoints.size() + 2)
calculateRenderCoordinates(upperPoints[0].x(), upperPoints[0].y(), &x, &y);
calculateRenderCoordinates(series, upperPoints[0].x(), upperPoints[0].y(), &x, &y);
else
calculateRenderCoordinates(upperPoints[i].x(), upperPoints[i].y(), &x, &y);
calculateRenderCoordinates(series, upperPoints[i].x(), upperPoints[i].y(), &x, &y);
if (i == 0) {
painterPath.moveTo(x, y);
@ -176,11 +190,16 @@ void AreaRenderer::handlePolish(QAreaSeries *series)
if (i < upper->points().size()
&& upper->type() == QAbstractSeries::SeriesType::Spline) {
qreal x1, y1, x2, y2;
calculateRenderCoordinates(fittedPoints[j - 1].x(),
calculateRenderCoordinates(series,
fittedPoints[j - 1].x(),
fittedPoints[j - 1].y(),
&x1,
&y1);
calculateRenderCoordinates(fittedPoints[j].x(), fittedPoints[j].y(), &x2, &y2);
calculateRenderCoordinates(series,
fittedPoints[j].x(),
fittedPoints[j].y(),
&x2,
&y2);
painterPath.cubicTo(x1, y1, x2, y2, x, y);
++j;
@ -201,18 +220,21 @@ void AreaRenderer::handlePolish(QAreaSeries *series)
for (int i = 0, j = 0; i < lowerPoints.size(); ++i, ++j) {
qreal x, y;
calculateRenderCoordinates(lowerPoints[lowerPoints.size() - 1 - i].x(),
calculateRenderCoordinates(series,
lowerPoints[lowerPoints.size() - 1 - i].x(),
lowerPoints[lowerPoints.size() - 1 - i].y(),
&x,
&y);
if (i > 0 && lower->type() == QAbstractSeries::SeriesType::Spline) {
qreal x1, y1, x2, y2;
calculateRenderCoordinates(fittedPoints[fittedPoints.size() - 1 - j + 1].x(),
calculateRenderCoordinates(series,
fittedPoints[fittedPoints.size() - 1 - j + 1].x(),
fittedPoints[fittedPoints.size() - 1 - j + 1].y(),
&x1,
&y1);
calculateRenderCoordinates(fittedPoints[fittedPoints.size() - 1 - j].x(),
calculateRenderCoordinates(series,
fittedPoints[fittedPoints.size() - 1 - j].x(),
fittedPoints[fittedPoints.size() - 1 - j].y(),
&x2,
&y2);
@ -225,7 +247,7 @@ void AreaRenderer::handlePolish(QAreaSeries *series)
}
qreal x, y;
calculateRenderCoordinates(upperPoints[0].x(), upperPoints[0].y(), &x, &y);
calculateRenderCoordinates(series, upperPoints[0].x(), upperPoints[0].y(), &x, &y);
painterPath.lineTo(x, y);
}
@ -298,8 +320,12 @@ bool AreaRenderer::pointInArea(QPoint pt, QAreaSeries *series) const
for (int i = 0; i < firstPoints->size() - 1; ++i) {
qreal x1, y1, x2, y2, x3, y3, x4, y4;
calculateRenderCoordinates((*firstPoints)[i].x(), (*firstPoints)[i].y(), &x1, &y1);
calculateRenderCoordinates((*firstPoints)[i + 1].x(), (*firstPoints)[i + 1].y(), &x2, &y2);
calculateRenderCoordinates(series, (*firstPoints)[i].x(), (*firstPoints)[i].y(), &x1, &y1);
calculateRenderCoordinates(series,
(*firstPoints)[i + 1].x(),
(*firstPoints)[i + 1].y(),
&x2,
&y2);
bool needSecondTriangleTest = true;
if (series->lowerSeries()) {
@ -315,13 +341,15 @@ bool AreaRenderer::pointInArea(QPoint pt, QAreaSeries *series) const
if (secondIndex >= secondPoints->size())
needSecondTriangleTest = false;
calculateRenderCoordinates((*secondPoints)[firstIndex].x(),
calculateRenderCoordinates(series,
(*secondPoints)[firstIndex].x(),
(*secondPoints)[firstIndex].y(),
&x3,
&y3);
if (needSecondTriangleTest) {
calculateRenderCoordinates((*secondPoints)[secondIndex].x(),
calculateRenderCoordinates(series,
(*secondPoints)[secondIndex].x(),
(*secondPoints)[secondIndex].y(),
&x4,
&y4);
@ -330,8 +358,8 @@ bool AreaRenderer::pointInArea(QPoint pt, QAreaSeries *series) const
y4 = 0.0;
}
} else {
calculateRenderCoordinates(upperPoints[i].x(), 0, &x3, &y3);
calculateRenderCoordinates(upperPoints[i + 1].x(), 0, &x4, &y4);
calculateRenderCoordinates(series, upperPoints[i].x(), 0, &x3, &y3);
calculateRenderCoordinates(series, upperPoints[i + 1].x(), 0, &x4, &y4);
}
QPoint point1(x1, y1);

3
src/graphs2d/qsgrenderer/arearenderer_p.h
View File

@ -73,7 +73,8 @@ private:
QQuickTapHandler *m_tapHandler = nullptr;
void calculateRenderCoordinates(qreal origX, qreal origY, qreal *renderX, qreal *renderY) const;
void calculateRenderCoordinates(
QAreaSeries *series, qreal origX, qreal origY, qreal *renderX, qreal *renderY) const;
void calculateAxisCoordinates(
QAreaSeries *series, qreal origX, qreal origY, qreal *axisX, qreal *axisY) const;
bool pointInArea(QPoint pt, QAreaSeries *series) const;

16
src/graphs2d/qsgrenderer/axisrenderer.cpp
View File

@ -1281,10 +1281,18 @@ void AxisRenderer::updateValueYAxisLabels(AxisProperties &ax, const QRectF rect)
// Create label values in the range
QList<double> yAxisLabelValues;
const int MAX_LABELS_COUNT = 100;
for (double i = ax.minLabel; i <= ax.maxValue; i += ax.valueStep) {
yAxisLabelValues << i;
if (yAxisLabelValues.size() >= MAX_LABELS_COUNT)
break;
if (m_graph->orientation() == Qt::Vertical) {
for (double i = ax.minLabel; i <= ax.maxValue; i += ax.valueStep) {
yAxisLabelValues << i;
if (yAxisLabelValues.size() >= MAX_LABELS_COUNT)
break;
}
} else {
for (double i = ax.maxValue; i >= ax.minLabel; i -= ax.valueStep) {
yAxisLabelValues << i;
if (yAxisLabelValues.size() >= MAX_LABELS_COUNT)
break;
}
}
qsizetype categoriesCount = yAxisLabelValues.size();

10
src/graphs2d/qsgrenderer/pointrenderer.cpp
View File

@ -107,6 +107,11 @@ void PointRenderer::calculateRenderCoordinates(AxisRenderer *axisRenderer,
auto &axisX = axisRenderer->getAxisX(series);
auto &axisY = axisRenderer->getAxisY(series);
if (m_graph->orientation() != Qt::Vertical) {
std::swap(origX, origY);
origY = axisY.maxValue - origY;
}
auto flipX = axisX.maxValue < axisX.minValue ? -1 : 1;
auto flipY = axisY.maxValue < axisY.minValue ? -1 : 1;
@ -125,6 +130,11 @@ void PointRenderer::reverseRenderCoordinates(AxisRenderer *axisRenderer,
auto &axisX = axisRenderer->getAxisX(series);
auto &axisY = axisRenderer->getAxisY(series);
if (m_graph->orientation() != Qt::Vertical) {
std::swap(renderX, renderY);
renderY = m_areaHeight - renderY;
}
auto flipX = axisX.maxValue < axisX.minValue ? -1 : 1;
auto flipY = axisY.maxValue < axisY.minValue ? -1 : 1;

6
tests/manual/qmltestbed/qml/qmltestbed/MultiAxis.qml
View File

@ -168,9 +168,9 @@ Rectangle {
XYPoint { x: 0; y: 2.6 }
XYPoint { x: 0.2; y: 3.1 }
XYPoint { x: 1.3; y: 6.3 }
XYPoint { x: 2.4; y: 5.1 }
XYPoint { x: 3.5; y: 6.9 }
XYPoint { x: 1.3; y: 8.3 }
XYPoint { x: 2.4; y: 9.1 }
XYPoint { x: 3.5; y: 10.9 }
XYPoint { x: 3.6; y: 5.2 }
XYPoint { x: 4.0; y: 3.3 }
}