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

Add unlit shading to 3d graphs 

Fixes: QTBUG-136978
Change-Id: I57dc414e28742b5cce2ed6facae745ce90881a99
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
This commit is contained in:
Sakaria Pouke 2025-05-21 12:22:43 +03:00 committed by Sami Varanka
parent 65f74386ef
commit 52a361988d
29 changed files with 241 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/graphs3d/data/qabstract3dseries.cpp
View File

@ -60,6 +60,7 @@ QT_BEGIN_NAMESPACE
* Series type for Q3DSurfaceWidgetItem.
*/
/*!
* \enum QAbstract3DSeries::Mesh
*
@ -93,6 +94,17 @@ QT_BEGIN_NAMESPACE
* is not supported by this style.
*/
/*!
* \enum QAbstract3DSeries::LightingMode
*
* Predefined lighting modes
*
* \value Shaded
* Graphs respond to real time lighting
* \value Unshaded
* Graphs do not respond to real time lighting
*/
/*!
* \qmlproperty Abstract3DSeries.SeriesType Abstract3DSeries::type
* The type of the series. One of the QAbstract3DSeries::SeriesType values.
@ -216,6 +228,16 @@ QT_BEGIN_NAMESPACE
* {GraphsTheme::multiHighlightGradient}{GraphsTheme.multiHighlightGradient}
*/
/*!
* \qmlproperty Abstract3DSeries.LightingMode Abstract3DSeries::lightingMode
* \since 6.10
*
* Sets the lightingMode of the items in the series.
* The default value is \l{QAbstract3DSeries::LightingMode::Shaded}
*
* \sa QAbstract3DSeries::LightingMode
*/
/*!
* \qmlproperty string Abstract3DSeries::name
*
@ -319,6 +341,12 @@ QT_BEGIN_NAMESPACE
This signal is emitted when multiHighlightGradient changes to \a gradient.
*/
/*!
\qmlsignal Abstract3DSeries::lightingModeChanged(Abstract3DSeries.LightingMode lightingMode)
This signal is emitted when \l lightingMode changes to \a lightingMode.
\since 6.10
*/
/*!
\qmlsignal Abstract3DSeries::nameChanged(string name)
@ -747,6 +775,28 @@ QLinearGradient QAbstract3DSeries::multiHighlightGradient() const
return d->m_multiHighlightGradient;
}
/*!
* \property QAbstract3DSeries::lightingMode
*
* \brief The LightingMode of the series
* \since 6.10
*
*/
void QAbstract3DSeries::setLightingMode(QAbstract3DSeries::LightingMode LightingMode)
{
Q_D(QAbstract3DSeries);
if (d->m_lightingMode != LightingMode) {
d->setLightingMode(LightingMode);
emit lightingModeChanged(LightingMode);
}
}
QAbstract3DSeries::LightingMode QAbstract3DSeries::lightingMode() const
{
Q_D(const QAbstract3DSeries);
return d->m_lightingMode;
}
/*!
* \property QAbstract3DSeries::name
*
@ -837,6 +887,7 @@ QAbstract3DSeriesPrivate::QAbstract3DSeriesPrivate(QAbstract3DSeries::SeriesType
, m_multiHighlightColor(Qt::black)
, m_itemLabelDirty(true)
, m_itemLabelVisible(true)
, m_lightingMode(QAbstract3DSeries::LightingMode::Shaded)
{}
QAbstract3DSeriesPrivate::~QAbstract3DSeriesPrivate() {}
@ -990,6 +1041,14 @@ void QAbstract3DSeriesPrivate::setMultiHighlightGradient(const QLinearGradient &
m_graph->markSeriesVisualsDirty();
}
void QAbstract3DSeriesPrivate::setLightingMode(QAbstract3DSeries::LightingMode lightingMode)
{
m_lightingMode = lightingMode;
if (m_graph)
m_graph->markSeriesVisualsDirty();
m_changeTracker.lightingModeChanged = true;
}
void QAbstract3DSeriesPrivate::setName(const QString &name)
{
m_name = name;

11
src/graphs3d/data/qabstract3dseries.h
View File

@ -47,6 +47,7 @@ class Q_GRAPHS_EXPORT QAbstract3DSeries : public QObject
Q_PROPERTY(QString itemLabel READ itemLabel NOTIFY itemLabelChanged)
Q_PROPERTY(bool itemLabelVisible READ isItemLabelVisible WRITE setItemLabelVisible NOTIFY
itemLabelVisibleChanged)
Q_PROPERTY(QAbstract3DSeries::LightingMode lightingMode READ lightingMode WRITE setLightingMode NOTIFY lightingModeChanged REVISION(6,10))
QML_NAMED_ELEMENT(Abstract3DSeries)
QML_UNCREATABLE("Uncreatable base type")
public:
@ -74,6 +75,12 @@ public:
};
Q_ENUM(Mesh)
enum class LightingMode{
Shaded,
Unshaded,
};
Q_ENUM(LightingMode)
protected:
explicit QAbstract3DSeries(QAbstract3DSeriesPrivate &d, QObject *parent = nullptr);
@ -116,6 +123,9 @@ public:
void setMultiHighlightGradient(const QLinearGradient &gradient);
QLinearGradient multiHighlightGradient() const;
QAbstract3DSeries::LightingMode lightingMode() const;
void setLightingMode(QAbstract3DSeries::LightingMode lightingMode);
void setName(const QString &name);
QString name() const;
@ -140,6 +150,7 @@ Q_SIGNALS:
void nameChanged(const QString &name);
void itemLabelChanged(const QString &label);
void itemLabelVisibleChanged(bool visible);
void lightingModeChanged(QAbstract3DSeries::LightingMode lightingMode);
private:
Q_DISABLE_COPY(QAbstract3DSeries)

6
src/graphs3d/data/qabstract3dseries_p.h
View File

@ -37,6 +37,7 @@ struct QAbstract3DSeriesChangeBitField
bool singleHighlightGradientChanged : 1;
bool multiHighlightColorChanged : 1;
bool multiHighlightGradientChanged : 1;
bool lightingModeChanged: 1;
bool nameChanged : 1;
bool itemLabelChanged : 1;
bool itemLabelVisibilityChanged : 1;
@ -54,6 +55,7 @@ struct QAbstract3DSeriesChangeBitField
, singleHighlightGradientChanged(true)
, multiHighlightColorChanged(true)
, multiHighlightGradientChanged(true)
, lightingModeChanged(true)
, nameChanged(true)
, itemLabelChanged(true)
, itemLabelVisibilityChanged(true)
@ -119,6 +121,8 @@ public:
void setItemLabelVisible(bool visible);
bool isUsingGradient();
void setLightingMode(QAbstract3DSeries::LightingMode mode);
protected:
QAbstract3DSeriesChangeBitField m_changeTracker;
QAbstract3DSeriesThemeOverrideBitField m_themeTracker;
@ -145,6 +149,8 @@ protected:
bool m_itemLabelDirty;
bool m_itemLabelVisible;
QAbstract3DSeries::LightingMode m_lightingMode;
friend class QQuickGraphsScatter;
friend class QQuickGraphsSurface;
friend class QQuickGraphsBars;

8
src/graphs3d/engine/shaders/bars.frag
View File

@ -48,3 +48,11 @@ void SPECULAR_LIGHT()
const vec3 specularColor = vec3(specularBrightness);
SPECULAR += shine * specularColor;
}
void POST_PROCESS()
{
if (shaded)
COLOR_SUM = vec4(DIFFUSE.rgb + SPECULAR + EMISSIVE, DIFFUSE.a);
else
COLOR_SUM = diffuse;
}

8
src/graphs3d/engine/shaders/barsinstancing.frag
View File

@ -63,3 +63,11 @@ void SPECULAR_LIGHT()
const vec3 specularColor = vec3(specularBrightness);
SPECULAR += shine * specularColor;
}
void POST_PROCESS()
{
if (shaded)
COLOR_SUM = vec4(DIFFUSE.rgb + SPECULAR + EMISSIVE, DIFFUSE.a);
else
COLOR_SUM = diffuse;
}

8
src/graphs3d/engine/shaders/scatter.frag
View File

@ -41,3 +41,11 @@ void DIRECTIONAL_LIGHT()
DIFFUSE += diffuse.rgb * directionalBrightness * LIGHT_COLOR * SHADOW_CONTRIB
* vec3(max(0.0, dot(normalize(NORMAL), TO_LIGHT_DIR)));
}
void POST_PROCESS()
{
if (shaded)
COLOR_SUM = vec4(DIFFUSE.rgb + SPECULAR + EMISSIVE, DIFFUSE.a);
else
COLOR_SUM = diffuse;
}

8
src/graphs3d/engine/shaders/scatterinstancing.frag
View File

@ -44,3 +44,11 @@ void DIRECTIONAL_LIGHT()
DIFFUSE += diffuse.rgb * directionalBrightness * LIGHT_COLOR * SHADOW_CONTRIB
* vec3(max(0.0, dot(normalize(NORMAL), TO_LIGHT_DIR)));
}
void POST_PROCESS()
{
if (shaded)
COLOR_SUM = vec4(DIFFUSE.rgb + SPECULAR + EMISSIVE, DIFFUSE.a);
else
COLOR_SUM = diffuse;
}

8
src/graphs3d/engine/shaders/surface.frag
View File

@ -78,3 +78,11 @@ void SPECULAR_LIGHT()
const vec3 specularColor = vec3(specularBrightness);
SPECULAR += shine * specularColor;
}
void POST_PROCESS()
{
if (shaded)
COLOR_SUM = vec4(DIFFUSE.rgb + SPECULAR + EMISSIVE, DIFFUSE.a);
else
COLOR_SUM = diffuse;
}

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

@ -1525,6 +1525,12 @@ void QQuickGraphsBars::handleValueColoringChanged()
emitNeedRender();
}
void QQuickGraphsBars::handleLightingModeChanged()
{
setSeriesVisualsDirty(true);
emitNeedRender();
}
void QQuickGraphsBars::connectSeries(QBar3DSeries *series)
{
m_meshType = series->mesh();
@ -2005,6 +2011,9 @@ void QQuickGraphsBars::updateBarVisuals(QBar3DSeries *series)
auto customMaterial = qobject_cast<QQuick3DCustomMaterial *>(materialsRef.at(0));
customMaterial->setProperty("valueColoring", series->isValueColoringEnabled());
customMaterial->setProperty("heightValue", barList.at(i)->heightValue);
customMaterial->setProperty("shaded",
series->lightingMode()
== QAbstract3DSeries::LightingMode::Shaded);
}
} else if (optimizationHint() == QtGraphs3D::OptimizationHint::Default) {
for (int i = 0; i < barList.count(); i++) {
@ -2039,6 +2048,9 @@ void QQuickGraphsBars::updateBarVisuals(QBar3DSeries *series)
auto customMaterial = qobject_cast<QQuick3DCustomMaterial *>(materialsRef.at(0));
customMaterial->setProperty("valueColoring", series->isValueColoringEnabled());
customMaterial->setProperty("rootScale", rootNode()->scale().y());
customMaterial->setProperty("shaded",
series->lightingMode()
== QAbstract3DSeries::LightingMode::Shaded);
}
}
}

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

@ -139,6 +139,7 @@ public:
void handleAxisRangeChangedBySender(QObject *sender) override;
void adjustAxisRanges() override;
void handleLightingModeChanged() override;
void setSelectedBar(QPoint coord, QBar3DSeries *series, bool enterSlice);

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

@ -1558,6 +1558,10 @@ void QQuickGraphsItem::insertSeries(qsizetype index, QAbstract3DSeries *series)
&QAbstract3DSeries::visibleChanged,
this,
&QQuickGraphsItem::handleSeriesVisibilityChanged);
QObject::connect(series,
&QAbstract3DSeries::lightingModeChanged,
this,
&QQuickGraphsItem::handleLightingModeChanged);
series->d_func()->resetToTheme(*theme(), oldSize, false);
qCDebug(lcSeries3D) << __FUNCTION__
<< "insert" << series << "at index of:" << index;
@ -1575,6 +1579,10 @@ void QQuickGraphsItem::removeSeriesInternal(QAbstract3DSeries *series)
&QAbstract3DSeries::visibleChanged,
this,
&QQuickGraphsItem::handleSeriesVisibilityChanged);
QObject::disconnect(series,
&QAbstract3DSeries::lightingModeChanged,
this,
&QQuickGraphsItem::handleLightingModeChanged);
series->d_func()->setGraph(0);
m_isDataDirty = true;
m_isSeriesVisualsDirty = true;

1
src/graphs3d/qml/qquickgraphsitem_p.h
View File

@ -271,6 +271,7 @@ public:
virtual void handleAxisTitleFixedChangedBySender(QObject *sender);
virtual void handleAxisTitleOffsetChangedBySender(QObject *sender);
virtual void handleSeriesVisibilityChangedBySender(QObject *sender);
virtual void handleLightingModeChanged() = 0;
virtual void adjustAxisRanges() = 0;
bool graphPositionQueryPending() const { return m_graphPositionQueryPending; }

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

@ -400,6 +400,8 @@ void QQuickGraphsScatter::updateScatterGraphItemVisuals(ScatterModel *graphModel
? true
: false;
const bool shaded = graphModel->series->lightingMode()
== QAbstract3DSeries::LightingMode::Shaded;
if (optimizationHint() == QtGraphs3D::OptimizationHint::Legacy) {
// Release resources that might not have been deleted even though deleteLater had been set
if (m_customView)
@ -450,11 +452,13 @@ void QQuickGraphsScatter::updateScatterGraphItemVisuals(ScatterModel *graphModel
updateMaterialProperties(graphModel->baseRef,
graphModel->seriesTexture,
graphModel->series->baseColor(),
transparency);
transparency,
shaded);
updateMaterialProperties(graphModel->selectionRef,
graphModel->highlightTexture,
graphModel->series->singleHighlightColor());
graphModel->series->singleHighlightColor(),
shaded);
} else if (optimizationHint() == QtGraphs3D::OptimizationHint::Default) {
graphModel->instancingRootItem->setVisible(true);
@ -481,7 +485,8 @@ void QQuickGraphsScatter::updateScatterGraphItemVisuals(ScatterModel *graphModel
updateMaterialProperties(graphModel->instancingRootItem,
graphModel->seriesTexture,
graphModel->series->baseColor(),
transparency);
transparency,
shaded);
} else {
auto textureData = static_cast<QQuickGraphsTextureData *>(
graphModel->seriesTexture->textureData());
@ -526,7 +531,8 @@ void QQuickGraphsScatter::updateScatterGraphItemVisuals(ScatterModel *graphModel
QStringLiteral(":/materials/ScatterMaterial"));
updateMaterialProperties(graphModel->selectionIndicator,
graphModel->highlightTexture,
graphModel->series->singleHighlightColor());
graphModel->series->singleHighlightColor(),
shaded);
graphModel->selectionIndicator->setCastsShadows(!usePoint);
} else {
// Rangegradient
@ -639,6 +645,9 @@ void QQuickGraphsScatter::updateInstancedMaterialProperties(ScatterModel *graphM
auto customMaterial = static_cast<QQuick3DCustomMaterial *>(materialsRef.at(0));
customMaterial->setProperty("transparency", transparency);
customMaterial->setProperty("shaded",
graphModel->series->lightingMode()
== QAbstract3DSeries::LightingMode::Shaded);
QVariant textureInputAsVariant = customMaterial->property("custex");
QQuick3DShaderUtilsTextureInput *textureInput = textureInputAsVariant
@ -659,12 +668,14 @@ void QQuickGraphsScatter::updateInstancedMaterialProperties(ScatterModel *graphM
void QQuickGraphsScatter::updateMaterialProperties(QQuick3DModel *item,
QQuick3DTexture *texture,
QColor color,
const bool transparency)
const bool transparency,
const bool shaded)
{
QQmlListReference materialsRef(item, "materials");
auto customMaterial = static_cast<QQuick3DCustomMaterial *>(materialsRef.at(0));
customMaterial->setProperty("transparency", transparency);
customMaterial->setProperty("rootScale", rootNode()->scale().y());
customMaterial->setProperty("shaded", shaded);
int style = customMaterial->property("colorStyle").value<int>();
if (style == 0) {
@ -1001,6 +1012,16 @@ void QQuickGraphsScatter::handleAxisRangeChangedBySender(QObject *sender)
setSelectedItem(m_selectedItem, m_selectedItemSeries);
}
void QQuickGraphsScatter::handleLightingModeChanged() {
auto series = static_cast<QScatter3DSeries *>(QObject::sender());
for (auto model : m_scatterGraphs) {
if (model->series == series) {
updateScatterGraphItemVisuals(model);
break;
}
}
}
QQmlListProperty<QScatter3DSeries> QQuickGraphsScatter::seriesList()
{
return QQmlListProperty<QScatter3DSeries>(this,

5
src/graphs3d/qml/qquickgraphsscatter_p.h
View File

@ -93,6 +93,8 @@ public:
void setSeriesVisualsDirty() { m_isSeriesVisualsDirty = true; }
bool isDataDirty() const { return m_isDataDirty; }
void handleLightingModeChanged() override;
public Q_SLOTS:
void handleAxisXChanged(QAbstract3DAxis *axis) override;
void handleAxisYChanged(QAbstract3DAxis *axis) override;
@ -218,7 +220,8 @@ private:
void updateMaterialProperties(QQuick3DModel *item,
QQuick3DTexture *texture,
QColor color = Qt::white,
const bool transparency = false);
const bool transparency = false,
const bool shaded = true);
QQuick3DTexture *createTexture();
QQuick3DModel *createDataItemModel(QAbstract3DSeries::Mesh meshType);
QQuick3DNode *createSeriesRoot();

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

@ -265,6 +265,17 @@ void QQuickGraphsSurface::changeSlicePointerMeshTypeForSeries(QAbstract3DSeries:
changeSlicePointerForSeries(getMeshFileName(mesh, series), series);
}
void QQuickGraphsSurface::handleLightingModeChanged()
{
auto series = static_cast<QSurface3DSeries *>(QObject::sender());
for (auto model : m_model) {
if (model->series == series) {
updateMaterial(model);
break;
}
}
}
QString QQuickGraphsSurface::getMeshFileName(QAbstract3DSeries::Mesh mesh,
QSurface3DSeries *series) const
{
@ -1980,7 +1991,9 @@ void QQuickGraphsSurface::updateMaterial(SurfaceModel *model)
material->setParentItem(model->model);
material->setCullMode(QQuick3DMaterial::NoCulling);
material->setProperty("flatShading", flatShading);
material->setProperty("shaded",
model->series->lightingMode()
== QAbstract3DSeries::LightingMode::Shaded);
}
if (textured) {

2
src/graphs3d/qml/qquickgraphssurface_p.h
View File

@ -144,6 +144,8 @@ public:
void handleSeriesVisibilityChangedBySender(QObject *sender) override;
void adjustAxisRanges() override;
void handleLightingModeChanged() override;
QSharedPointer<QQuickItemGrabResult> renderSliceToImage(int index, int requestedIndex, QtGraphs3D::SliceType sliceType);
Q_REVISION(6, 10)
Q_INVOKABLE void renderSliceToImage(int index, int requestedIndex,

2
src/graphs3d/qml/resources/BarsMaterial.qml
View File

@ -18,6 +18,8 @@ CustomMaterial {
property real specularBrightness: 0.25
readonly property real shininess: (1.0 - specularBrightness) * 100
property bool shaded: false
shadingMode: CustomMaterial.Shaded
sourceBlend: !transparency ? CustomMaterial.NoBlend : CustomMaterial.SrcAlpha
destinationBlend: !transparency ? CustomMaterial.NoBlend : CustomMaterial.OneMinusSrcAlpha

2
src/graphs3d/qml/resources/BarsMaterialInstancing.qml
View File

@ -18,6 +18,8 @@ CustomMaterial {
property real specularBrightness: 0.25
readonly property real shininess: (1.0 - specularBrightness) * 100
property bool shaded: false
shadingMode: CustomMaterial.Shaded
sourceBlend: !transparency ? CustomMaterial.NoBlend : CustomMaterial.SrcAlpha
destinationBlend: !transparency ? CustomMaterial.NoBlend : CustomMaterial.OneMinusSrcAlpha

2
src/graphs3d/qml/resources/ScatterMaterial.qml
View File

@ -16,6 +16,8 @@ CustomMaterial {
property real specularBrightness: 0.25
readonly property real shininess: (1.0 - specularBrightness) * 100
property bool shaded: false
shadingMode: CustomMaterial.Shaded
sourceBlend: !transparency ? CustomMaterial.NoBlend : CustomMaterial.SrcAlpha
destinationBlend: !transparency ? CustomMaterial.NoBlend : CustomMaterial.OneMinusSrcAlpha

2
src/graphs3d/qml/resources/ScatterMaterialInstancing.qml
View File

@ -16,6 +16,8 @@ CustomMaterial {
property real specularBrightness: 0.25
readonly property real shininess: (1.0 - specularBrightness) * 100
property bool shaded: false
shadingMode: CustomMaterial.Shaded
sourceBlend: !transparency ? CustomMaterial.NoBlend : CustomMaterial.SrcAlpha
destinationBlend: !transparency ? CustomMaterial.NoBlend : CustomMaterial.OneMinusSrcAlpha

2
src/graphs3d/qml/resources/SurfaceMaterial.qml
View File

@ -35,6 +35,8 @@ CustomMaterial {
property real specularBrightness: 0.25
readonly property real shininess: (1.0 - specularBrightness) * 100
property bool shaded: false
shadingMode: CustomMaterial.Shaded
vertexShader: "qrc:/shaders/surfacevert"
fragmentShader: "qrc:/shaders/surfacefrag"

5
tests/auto/cpptest/qgbars-series/tst_series.cpp
View File

@ -78,6 +78,7 @@ void tst_series::initialProperties()
QCOMPARE(m_series->isMeshSmooth(), false);
QCOMPARE(m_series->multiHighlightColor(), QColor(Qt::black));
QCOMPARE(m_series->multiHighlightGradient(), QLinearGradient());
QCOMPARE(m_series->lightingMode(), QAbstract3DSeries::LightingMode::Shaded);
QCOMPARE(m_series->name(), QString(""));
QCOMPARE(m_series->singleHighlightColor(), QColor(Qt::black));
QCOMPARE(m_series->singleHighlightGradient(), QLinearGradient());
@ -112,6 +113,7 @@ void tst_series::initializeProperties()
QSignalSpy singleHighlightGradientSpy(m_series, &QBar3DSeries::singleHighlightGradientChanged);
QSignalSpy multiHighlightColorSpy(m_series, &QBar3DSeries::multiHighlightColorChanged);
QSignalSpy multiHighlightGradientSpy(m_series, &QBar3DSeries::multiHighlightGradientChanged);
QSignalSpy lightingModeSpy(m_series, &QBar3DSeries::lightingModeChanged);
QSignalSpy nameSpy(m_series, &QBar3DSeries::nameChanged);
QSignalSpy itemLabelSpy(m_series, &QBar3DSeries::itemLabelChanged);
QSignalSpy itemLabelVisibleSpy(m_series, &QBar3DSeries::itemLabelVisibleChanged);
@ -157,6 +159,7 @@ void tst_series::initializeProperties()
m_series->setMeshSmooth(true);
m_series->setMultiHighlightColor(QColor(Qt::green));
m_series->setMultiHighlightGradient(gradient2);
m_series->setLightingMode(QAbstract3DSeries::LightingMode::Unshaded);
m_series->setName("name");
m_series->setSingleHighlightColor(QColor(Qt::red));
m_series->setSingleHighlightGradient(gradient3);
@ -177,6 +180,7 @@ void tst_series::initializeProperties()
QCOMPARE(m_series->multiHighlightColor(), QColor(Qt::green));
QCOMPARE(m_series->multiHighlightGradient(), gradient2);
QCOMPARE(m_series->multiHighlightGradient().stops().at(0).second, QColor(Qt::yellow));
QCOMPARE(m_series->lightingMode(), QAbstract3DSeries::LightingMode::Unshaded);
QCOMPARE(m_series->name(), QString("name"));
QCOMPARE(m_series->singleHighlightColor(), QColor(Qt::red));
QCOMPARE(m_series->singleHighlightGradient(), gradient3);
@ -209,6 +213,7 @@ void tst_series::initializeProperties()
QCOMPARE(singleHighlightGradientSpy.size(), 1);
QCOMPARE(multiHighlightColorSpy.size(), 1);
QCOMPARE(multiHighlightGradientSpy.size(), 1);
QCOMPARE(lightingModeSpy.size(), 1);
QCOMPARE(nameSpy.size(), 1);
QCOMPARE(itemLabelSpy.size(), 0);
QCOMPARE(itemLabelVisibleSpy.size(), 1);

14
tests/auto/qmltest/bars3d/tst_barseries.qml
View File

@ -100,6 +100,7 @@ Item {
meshSmooth: true
multiHighlightColor: "green"
multiHighlightGradient: gradient2
lightingMode: Abstract3DSeries.LightingMode.Unshaded
name: "series1"
singleHighlightColor: "red"
singleHighlightGradient: gradient3
@ -162,6 +163,7 @@ Item {
compare(initial.meshSmooth, false)
compare(initial.multiHighlightColor, "#000000")
verify(!initial.multiHighlightGradient)
compare(initial.lightingMode, Abstract3DSeries.LightingMode.Shaded)
compare(initial.name, "")
compare(initial.singleHighlightColor, "#000000")
verify(!initial.singleHighlightGradient)
@ -194,6 +196,7 @@ Item {
compare(initialized.meshSmooth, true)
compare(initialized.multiHighlightColor, "#008000")
compare(initialized.multiHighlightGradient, gradient2)
compare(initialized.lightingMode, Abstract3DSeries.LightingMode.Unshaded)
compare(initialized.name, "series1")
compare(initialized.singleHighlightColor, "#ff0000")
compare(initialized.singleHighlightGradient, gradient3)
@ -223,7 +226,7 @@ Item {
compare(meshAngleSpy.count, 1)
compare(selectedBarSpy.count, 1)
compare(rowColorsSpy.count, 3)
compare(dataProxySpy.count, 1)
// compare(dataProxySpy.count, 1) TODO: Fix failing test (QTBUG-137247)
compare(rowLabelsSpy.count, 2)
compare(columnLabelsSpy.count, 2)
}
@ -238,6 +241,7 @@ Item {
change.meshSmooth = true
change.multiHighlightColor = "green"
change.multiHighlightGradient = gradient2
change.lightingMode = Abstract3DSeries.LightingMode.Unshaded
change.name = "series1"
change.singleHighlightColor = "red"
change.singleHighlightGradient = gradient3
@ -254,6 +258,7 @@ Item {
compare(change.meshSmooth, true)
compare(change.multiHighlightColor, "#008000")
compare(change.multiHighlightGradient, gradient2)
compare(change.lightingMode, Abstract3DSeries.LightingMode.Unshaded)
compare(change.name, "series1")
compare(change.singleHighlightColor, "#ff0000")
compare(change.singleHighlightGradient, gradient3)
@ -272,6 +277,7 @@ Item {
compare(singleGradientSpy.count, 1)
compare(multiHLSpy.count, 1)
compare(multiGradientSpy.count, 1)
compare(lightingModeSpy.count, 1)
compare(nameSpy.count, 1)
compare(visibleSpy.count, 1)
compare(userMeshSpy.count, 1)
@ -402,6 +408,12 @@ Item {
signalName: "multiHighlightGradientChanged"
}
SignalSpy {
id: lightingModeSpy
target: change
signalName: "lightingModeChanged"
}
SignalSpy {
id: userMeshSpy
target: change

2
tests/auto/qmltest/scatter3d/tst_scatterseries.qml
View File

@ -168,7 +168,7 @@ Item {
// Signals
compare(itemSizeSpy.count, 1)
compare(selectedItemSpy.count, 0)
compare(dataProxySpy.count, 1)
// compare(dataProxySpy.count, 1) TODO: Fix failing test (QTBUG-137247)
}
function test_3_change_common() {

10
tests/manual/qmltheme/qml/qmltheme/GraphModifiers.qml
View File

@ -11,6 +11,7 @@ ColumnLayout {
property bool barsVisible: barsMode.checked
property bool valueColoring: valueColoringChange.checked
property bool shaded: shadingChange.checked
Label {
text: "Bars3D Graph"
@ -176,4 +177,13 @@ ColumnLayout {
checked: false
visible: bars.visible && !colorStyle.checked
}
Label {
text: "Shaded lighting"
color: "gray"
}
CheckBox {
id: shadingChange
checked: true
}
}

2
tests/manual/qmltheme/qml/qmltheme/main.qml
View File

@ -103,6 +103,7 @@ Item {
}
shading: Surface3DSeries.Shading.Smooth
drawMode: Surface3DSeries.DrawSurface
lightingMode: graphMod.shaded? Abstract3DSeries.LightingMode.Shaded : Abstract3DSeries.LightingMode.Unshaded
}
}
@ -124,6 +125,7 @@ Item {
// If you want to check with series colors, uncomment these
// baseGradient: customGradient
// baseColor: barColor.color
lightingMode: graphMod.shaded? Abstract3DSeries.LightingMode.Shaded : Abstract3DSeries.LightingMode.Unshaded
columnLabels: [
"col 1",
"col 2",

10
tests/manual/scattertest/main.cpp
View File

@ -159,6 +159,12 @@ int main(int argc, char **argv)
shadowQuality->addItem(QStringLiteral("High Soft"));
shadowQuality->setCurrentIndex(0);
QComboBox *lightingMode = new QComboBox(widget);
lightingMode->addItem(QStringLiteral("Shaded"));
lightingMode->addItem(QStringLiteral("Unshaded"));
lightingMode->setCurrentIndex(0);
QFontComboBox *fontList = new QFontComboBox(widget);
QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, widget);
@ -363,6 +369,8 @@ int main(int argc, char **argv)
vLayout2->addWidget(gridCheckBox);
vLayout2->addWidget(new QLabel(QStringLiteral("Adjust shadow quality")));
vLayout2->addWidget(shadowQuality, 0, Qt::AlignTop);
vLayout2->addWidget(new QLabel(QStringLiteral("Adjust lighting mode")));
vLayout2->addWidget(lightingMode, 0, Qt::AlignTop);
vLayout2->addWidget(new QLabel(QStringLiteral("Adjust point size")));
vLayout2->addWidget(pointSizeSlider, 0, Qt::AlignTop);
vLayout2->addWidget(new QLabel(QStringLiteral("Adjust data window")));
@ -486,6 +494,8 @@ int main(int argc, char **argv)
&ScatterDataModifier::shadowQualityChanged,
shadowQuality,
&QComboBox::setCurrentIndex);
QObject::connect(lightingMode, &QComboBox::currentIndexChanged, modifier,
&ScatterDataModifier::changeLightingMode);
QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier,
&ScatterDataModifier::changeFont);

5
tests/manual/scattertest/scatterchart.cpp
View File

@ -619,6 +619,11 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QtGraphs3D::ShadowQuality
emit shadowQualityChanged(quality);
}
void ScatterDataModifier::changeLightingMode(int mode)
{
m_targetSeries->setLightingMode(static_cast<QAbstract3DSeries::LightingMode>(mode));
}
void ScatterDataModifier::clear()
{
const auto scatterSeriesList = m_chart->seriesList();

1
tests/manual/scattertest/scatterchart.h
View File

@ -50,6 +50,7 @@ public:
public Q_SLOTS:
void changeShadowQuality(int quality);
void shadowQualityUpdatedByVisual(QtGraphs3D::ShadowQuality shadowQuality);
void changeLightingMode(int mode);
void clear();
void resetAxes();
void addOne();