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

Fix endless sync loop in Bars3D 

Floor was updated in each sync, triggering some dirty flags
being set. Update floor only if something affecting it changes.

Pick-to: 6.9
Fixes: QTBUG-136174
Change-Id: I172a8b443fd6d65f9cac3390071329f95a731f47
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
(cherry picked from commit f62322d262)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tomi Korpipaa 2025-07-11 09:47:26 +03:00 committed by Qt Cherry-pick Bot
parent aadd8fd9e7
commit 7a25a45ced
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/graphs3d/qml/qquickgraphsbars.cpp
View File

@ -956,6 +956,7 @@ void QQuickGraphsBars::componentComplete()
m_floorBackground->setParentItem(m_floorBackgroundRotation); m_floorBackground->setParentItem(m_floorBackgroundRotation);
m_floorBackground->setSource(floorUrl); m_floorBackground->setSource(floorUrl);
m_floorBackground->setPickable(false);
setFloorGridInRange(true); setFloorGridInRange(true);
setVerticalSegmentLine(false); setVerticalSegmentLine(false);
@ -1007,13 +1008,24 @@ void QQuickGraphsBars::synchData()
QQuickGraphsItem::synchData(); QQuickGraphsItem::synchData();
// Draw floor if (m_selectedBarPos.isNull())
itemLabel()->setVisible(false);
//margin for a line to be fully visible on the edge in the grid shader // Draw floor
if (m_changeTracker.floorChanged) {
updateFloor();
m_changeTracker.floorChanged = false;
}
qCDebug(lcGraphs3D, "%s end syncing", qUtf8Printable(QLatin1String(__FUNCTION__)));
}
void QQuickGraphsBars::updateFloor()
{
// Margin for a line to be fully visible on the edge in the grid shader
const float halfLineWidth = 50.0; const float halfLineWidth = 50.0;
const float gridTextureSize = 4096.0; const float gridTextureSize = 4096.0;
const float gridMargin = halfLineWidth / gridTextureSize; const float gridMargin = halfLineWidth / gridTextureSize;
m_floorBackground->setPickable(false);
auto min = qMin(scaleWithBackground().x(), scaleWithBackground().z()); auto min = qMin(scaleWithBackground().x(), scaleWithBackground().z());
m_floorBackgroundScale->setScale(QVector3D(scaleWithBackground().x() + gridMargin, m_floorBackgroundScale->setScale(QVector3D(scaleWithBackground().x() + gridMargin,
min * gridOffset(), min * gridOffset(),
@ -1035,10 +1047,6 @@ void QQuickGraphsBars::synchData()
bgMatFloor = static_cast<QQuick3DCustomMaterial *>(bbRef.at(0)); bgMatFloor = static_cast<QQuick3DCustomMaterial *>(bbRef.at(0));
materialsRefF.append(bgMatFloor); materialsRefF.append(bgMatFloor);
} }
if (m_selectedBarPos.isNull())
itemLabel()->setVisible(false);
qCDebug(lcGraphs3D, "%s end syncing", qUtf8Printable(QLatin1String(__FUNCTION__)));
} }
void QQuickGraphsBars::updateParameters() void QQuickGraphsBars::updateParameters()
@ -1198,6 +1206,7 @@ void QQuickGraphsBars::calculateSceneScalingFactors()
setScaleWithBackground(scale); setScaleWithBackground(scale);
setBackgroundScaleMargin({m_hBackgroundMargin, m_vBackgroundMargin, m_hBackgroundMargin}); setBackgroundScaleMargin({m_hBackgroundMargin, m_vBackgroundMargin, m_hBackgroundMargin});
setScale(scale); setScale(scale);
m_changeTracker.floorChanged = true;
} }
void QQuickGraphsBars::calculateHeightAdjustment() void QQuickGraphsBars::calculateHeightAdjustment()

3
src/graphs3d/qml/qquickgraphsbars_p.h
View File

@ -35,6 +35,7 @@ struct Bars3DChangeBitField
bool floorLevelChanged : 1; bool floorLevelChanged : 1;
bool barSeriesMarginChanged : 1; bool barSeriesMarginChanged : 1;
bool axisRangeChanged : 1; bool axisRangeChanged : 1;
bool floorChanged : 1;
Bars3DChangeBitField() Bars3DChangeBitField()
: multiSeriesScalingChanged(true) : multiSeriesScalingChanged(true)
@ -45,6 +46,7 @@ struct Bars3DChangeBitField
, floorLevelChanged(false) , floorLevelChanged(false)
, barSeriesMarginChanged(false) , barSeriesMarginChanged(false)
, axisRangeChanged(false) , axisRangeChanged(false)
, floorChanged(true)
{} {}
}; };
@ -161,6 +163,7 @@ public:
protected: protected:
void componentComplete() override; void componentComplete() override;
void synchData() override; void synchData() override;
void updateFloor();
void updateParameters(); void updateParameters();
void updateFloorLevel(float level); void updateFloorLevel(float level);
void updateGraph() override; void updateGraph() override;