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

Revert "Fix clazy-non-pod-global-static warning" 

This broke unity build, so it has to be reverted in this form.

This reverts commit 6ba5d8f00c.

Pick-to: 6.9 6.10
Change-Id: I58719cd79c53af764e973b47e115e0f4f02af917
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
This commit is contained in:
Tomi Korpipaa 2025-07-30 10:17:39 +03:00 committed by Tomi Korpipää
parent dc2ea3144e
commit ee46f585d9
9 changed files with 22 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/global/qgraphsglobal_p.h
View File

@ -14,7 +14,6 @@
#ifndef QGRAPHSGLOBAL_P_H
#define QGRAPHSGLOBAL_P_H
#include <QtCore/qglobalstatic.h>
#include <QtCore/qstringliteral.h>
#include <QtGraphs/qgraphsglobal.h>
#include <QtGraphs/qtgraphsexports.h>
@ -33,6 +32,9 @@ static const float itemAlpha = 0.0f;
static const qreal gradientTextureHeight = 1.;
// Default to 4096 just in case we don't get real max from rhi
static const qreal gradientTextureWidth = 4096.;
// Tag to be used to hide a log axis label when edgeLabelsVisible is set to false
// or when an item selection label should not be shown
static const QString hiddenLabelTag = QStringLiteral("õ");
QT_END_NAMESPACE

10
src/graphs3d/axis/qlogvalue3daxisformatter.cpp
View File

@ -8,10 +8,6 @@
QT_BEGIN_NAMESPACE
// Tag to be used to hide a log axis label when edgeLabelsVisible is set to false
// or when an item selection label should not be shown
Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ"));
/*!
* \class QLogValue3DAxisFormatter
* \inmodule QtGraphs
@ -354,7 +350,7 @@ void QLogValue3DAxisFormatterPrivate::recalculate()
if (m_edgeLabelsVisible)
m_labelStrings << q->stringForValue(qreal(m_min), labelFormat);
else
m_labelStrings << *hiddenLabelTag;
m_labelStrings << hiddenLabelTag;
index++;
}
for (int i = 0; i < segmentCount; i++) {
@ -365,14 +361,14 @@ void QLogValue3DAxisFormatterPrivate::recalculate()
m_labelStrings << q->stringForValue(qPow(m_base, minDiff + qreal(i) + logMin),
labelFormat);
} else {
m_labelStrings << *hiddenLabelTag;
m_labelStrings << hiddenLabelTag;
}
index++;
}
// Ensure max value doesn't suffer from any rounding errors
m_gridPositions[segmentCount] = 1.0f;
m_labelPositions[segmentCount] = 1.0f;
QString finalLabel = *hiddenLabelTag;
QString finalLabel = hiddenLabelTag;
if (m_edgeLabelsVisible || m_evenMaxSegment)
finalLabel = q->stringForValue(qreal(m_max), labelFormat);

6
src/graphs3d/data/qbar3dseries.cpp
View File

@ -13,10 +13,6 @@
QT_BEGIN_NAMESPACE
// Tag to be used to hide a log axis label when edgeLabelsVisible is set to false
// or when an item selection label should not be shown
Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ"));
/*!
* \class QBar3DSeries
* \inmodule QtGraphs
@ -734,7 +730,7 @@ void QBar3DSeriesPrivate::createItemLabel()
static const QString seriesNameTag(QStringLiteral("@seriesName"));
if (m_selectedBar == QBar3DSeries::invalidSelectionPosition()) {
m_itemLabel = *hiddenLabelTag;
m_itemLabel = hiddenLabelTag;
return;
}

6
src/graphs3d/data/qscatter3dseries.cpp
View File

@ -9,10 +9,6 @@
QT_BEGIN_NAMESPACE
// Tag to be used to hide a log axis label when edgeLabelsVisible is set to false
// or when an item selection label should not be shown
Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ"));
/*!
* \class QScatter3DSeries
* \inmodule QtGraphs
@ -492,7 +488,7 @@ void QScatter3DSeriesPrivate::createItemLabel()
static const QString seriesNameTag(QStringLiteral("@seriesName"));
if (m_selectedItem == QScatter3DSeries::invalidSelectionIndex()) {
m_itemLabel = *hiddenLabelTag;
m_itemLabel = hiddenLabelTag;
return;
}

6
src/graphs3d/data/qsurface3dseries.cpp
View File

@ -9,10 +9,6 @@
QT_BEGIN_NAMESPACE
// Tag to be used to hide a log axis label when edgeLabelsVisible is set to false
// or when an item selection label should not be shown
Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ"));
/*!
* \class QSurface3DSeries
* \inmodule QtGraphs
@ -671,7 +667,7 @@ void QSurface3DSeriesPrivate::createItemLabel()
static const QString seriesNameTag(QStringLiteral("@seriesName"));
if (m_selectedPoint == QSurface3DSeries::invalidSelectionPosition()) {
m_itemLabel = *hiddenLabelTag;
m_itemLabel = hiddenLabelTag;
return;
}

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

@ -21,12 +21,6 @@
#include <QtGui/qquaternion.h>
QT_BEGIN_NAMESPACE
// Tag to be used to hide a log axis label when edgeLabelsVisible is set to false
// or when an item selection label should not be shown
Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ"));
/*!
* \qmltype Bars3D
* \inherits GraphsItem3D
@ -2508,7 +2502,7 @@ void QQuickGraphsBars::updateSelectedBar()
updateItemLabel(m_selectedBarPos);
itemLabel()->setVisible(theme()->labelsVisible());
itemLabel()->setProperty("labelText", label);
if (!label.compare(*hiddenLabelTag))
if (!label.compare(hiddenLabelTag))
itemLabel()->setVisible(false);
if (isSliceEnabled())
updateSliceItemLabel(label, m_selectedBarPos);
@ -2580,7 +2574,7 @@ void QQuickGraphsBars::updateSliceItemLabel(const QString &label, QVector3D posi
slicePos.setZ(.1f);
sliceItemLabel()->setPosition(slicePos);
sliceItemLabel()->setProperty("labelText", label);
if (!label.compare(*hiddenLabelTag))
if (!label.compare(hiddenLabelTag))
sliceItemLabel()->setVisible(false);
sliceItemLabel()->setEulerRotation(QVector3D(0.0f, 0.0f, 90.0f));
sliceItemLabel()->setVisible(theme()->labelsVisible());
@ -2872,7 +2866,7 @@ void QQuickGraphsBars::createBarItemHolders(QBar3DSeries *series,
updateItemLabel(m_selectedBarPos);
itemLabel()->setVisible(theme()->labelsVisible());
itemLabel()->setProperty("labelText", label);
if (!label.compare(*hiddenLabelTag))
if (!label.compare(hiddenLabelTag))
itemLabel()->setVisible(false);
if (isSliceEnabled())
updateSliceItemLabel(label, m_selectedBarPos);
@ -3002,4 +2996,3 @@ void QQuickGraphsBars::updateBarSeriesMargin(QSizeF margin)
calculateSceneScalingFactors();
setSeriesVisualsDirty(true);
}
QT_END_NAMESPACE

15
src/graphs3d/qml/qquickgraphsitem.cpp
View File

@ -45,9 +45,6 @@ QT_BEGIN_NAMESPACE
constexpr float doublePi = static_cast<float>(M_PI) * 2.0f;
constexpr float polarRoundness = 64.0f;
// Tag to be used to hide a log axis label when edgeLabelsVisible is set to false
// or when an item selection label should not be shown
Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ"));
/*!
* \qmltype GraphsItem3D
@ -3901,7 +3898,7 @@ void QQuickGraphsItem::updateLabels()
obj->setProperty("labelText", labels[labelIndex]);
obj->setProperty("labelWidth", labelsMaxWidth);
obj->setProperty("labelHeight", labelHeight);
if (!labels[i].compare(*hiddenLabelTag))
if (!labels[i].compare(hiddenLabelTag))
obj->setVisible(false);
}
} else if (axisX()->type() == QAbstract3DAxis::AxisType::Category) {
@ -4003,7 +4000,7 @@ void QQuickGraphsItem::updateLabels()
obj->setProperty("labelText", labels[labelIndex]);
obj->setProperty("labelWidth", labelsMaxWidth);
obj->setProperty("labelHeight", labelHeight);
if (!labels[i].compare(*hiddenLabelTag))
if (!labels[i].compare(hiddenLabelTag))
obj->setVisible(false);
}
@ -4147,7 +4144,7 @@ void QQuickGraphsItem::updateLabels()
obj->setProperty("labelText", labels[labelIndex]);
obj->setProperty("labelWidth", labelsMaxWidth);
obj->setProperty("labelHeight", labelHeight);
if (!labels[i].compare(*hiddenLabelTag))
if (!labels[i].compare(hiddenLabelTag))
obj->setVisible(false);
}
} else if (axisZ()->type() == QAbstract3DAxis::AxisType::Category) {
@ -4215,7 +4212,7 @@ void QQuickGraphsItem::updateLabels()
obj->setProperty("labelText", labels[labelIndex]);
obj->setProperty("labelWidth", labelsMaxWidth);
obj->setProperty("labelHeight", labelHeight);
if (!labels[i].compare(*hiddenLabelTag))
if (!labels[i].compare(hiddenLabelTag))
obj->setVisible(false);
}
@ -6907,7 +6904,7 @@ void QQuickGraphsItem::updateSliceLabels(QQuick3DRepeater *horizontalLabel,
obj->setProperty("backgroundVisible", backgroundVisible);
obj->setProperty("backgroundColor", backgroundColor);
obj->setEulerRotation(QVector3D(.0f, .0f, -45.0f));
if (!labels[i].compare(*hiddenLabelTag))
if (!labels[i].compare(hiddenLabelTag))
obj->setVisible(false);
}
} else if (horizontalAxis->type() == QAbstract3DAxis::AxisType::Category) {
@ -6963,7 +6960,7 @@ void QQuickGraphsItem::updateSliceLabels(QQuick3DRepeater *horizontalLabel,
obj->setProperty("labelTextColor", verticalLabelTextColor);
obj->setProperty("backgroundVisible", backgroundVisible);
obj->setProperty("backgroundColor", backgroundColor);
if (!labels[i].compare(*hiddenLabelTag))
if (!labels[i].compare(hiddenLabelTag))
obj->setVisible(false);
}
} else if (verticalAxis->type() == QAbstract3DAxis::AxisType::Category) {

7
src/graphs3d/qml/qquickgraphsscatter.cpp
View File

@ -25,9 +25,6 @@
QT_BEGIN_NAMESPACE
static const int insertRemoveRecordReserveSize = 31;
// Tag to be used to hide a log axis label when edgeLabelsVisible is set to false
// or when an item selection label should not be shown
Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ"));
/*!
* \qmltype Scatter3D
@ -1965,7 +1962,7 @@ void QQuickGraphsScatter::updateGraph()
updateItemLabel(selectionPosition);
QString label = m_selectedItemSeries->itemLabel();
itemLabel()->setProperty("labelText", label);
if (!label.compare(*hiddenLabelTag))
if (!label.compare(hiddenLabelTag))
itemLabel()->setVisible(false);
}
}
@ -2001,7 +1998,7 @@ void QQuickGraphsScatter::synchData()
if (m_selectedItem != invalidSelectionIndex()) {
QString itemLabelText = m_selectedItemSeries->itemLabel();
itemLabel()->setProperty("labelText", itemLabelText);
if (!itemLabelText.compare(*hiddenLabelTag))
if (!itemLabelText.compare(hiddenLabelTag))
itemLabel()->setVisible(false);
}
setSelectedItemChanged(false);

8
src/graphs3d/qml/qquickgraphssurface.cpp
View File

@ -24,10 +24,6 @@
QT_BEGIN_NAMESPACE
// Tag to be used to hide a log axis label when edgeLabelsVisible is set to false
// or when an item selection label should not be shown
Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ"));
/*!
* \qmltype Surface3D
* \inherits GraphsItem3D
@ -2619,7 +2615,7 @@ void QQuickGraphsSurface::updateSelectedPoint()
updateItemLabel(labelPosition);
itemLabel()->setProperty("labelText", label);
if (!label.compare(*hiddenLabelTag))
if (!label.compare(hiddenLabelTag))
itemLabel()->setVisible(false);
labelVisible = model->series->isItemLabelVisible();
if (sliceView() && sliceView()->isVisible())
@ -3040,7 +3036,7 @@ void QQuickGraphsSurface::updateSliceItemLabel(const QString &label, QVector3D p
labelPosition.setY(position.y() + .05f);
sliceItemLabel()->setPosition(labelPosition);
sliceItemLabel()->setProperty("labelText", label);
if (!label.compare(*hiddenLabelTag))
if (!label.compare(hiddenLabelTag))
sliceItemLabel()->setVisible(false);
}