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

widgetgraphgallery: Fix some clang-tidy warnings 

Change-Id: I180ec5481b1eafc8a537f7b37cbea0567a2bbe52
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 1467296bfa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2025-05-09 09:37:43 +02:00 committed by Qt Cherry-pick Bot
parent e9c1512856
commit ed3893c5b1
16 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/graphs/3d/widgetgraphgallery/graphmodifier.cpp
View File

@ -257,7 +257,7 @@ void GraphModifier::changeLabelBackground()
void GraphModifier::changeSelectionMode(int selectionMode)
{
QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
const auto *comboBox = qobject_cast<QComboBox *>(sender());
if (comboBox) {
int flags = comboBox->itemData(selectionMode).toInt();
m_graph->setSelectionMode(QtGraphs3D::SelectionFlags(flags));
@ -266,8 +266,7 @@ void GraphModifier::changeSelectionMode(int selectionMode)
void GraphModifier::changeFont(const QFont &font)
{
QFont newFont = font;
m_graph->activeTheme()->setLabelFont(newFont);
m_graph->activeTheme()->setLabelFont(font);
}
void GraphModifier::changeFontSize(int fontsize)
@ -386,7 +385,7 @@ void GraphModifier::setDataModeToCustom(bool enabled)
void GraphModifier::changeShadowQuality(int quality)
{
QtGraphs3D::ShadowQuality sq = QtGraphs3D::ShadowQuality(quality);
const auto sq = QtGraphs3D::ShadowQuality(quality);
m_graph->setShadowQuality(sq);
emit shadowQualityChanged(quality);
}

4
examples/graphs/3d/widgetgraphgallery/graphmodifier.h
View File

@ -15,8 +15,10 @@ class GraphModifier : public QObject
{
Q_OBJECT
public:
Q_DISABLE_COPY_MOVE(GraphModifier)
explicit GraphModifier(Q3DBarsWidgetItem *bargraph, QObject *parent);
~GraphModifier();
~GraphModifier() override;
void resetTemperatureData();
void changePresetCamera();

2
examples/graphs/3d/widgetgraphgallery/highlightseries.cpp
View File

@ -18,7 +18,7 @@ HighlightSeries::HighlightSeries()
setVisible(false);
}
HighlightSeries::~HighlightSeries() {}
HighlightSeries::~HighlightSeries() = default;
//! [0]
void HighlightSeries::setTopographicSeries(TopographicSeries *series)

6
examples/graphs/3d/widgetgraphgallery/highlightseries.h
View File

@ -12,11 +12,13 @@ class HighlightSeries : public QSurface3DSeries
{
Q_OBJECT
public:
Q_DISABLE_COPY_MOVE(HighlightSeries)
explicit HighlightSeries();
~HighlightSeries() override;
void setTopographicSeries(TopographicSeries *series);
inline void setMinHeight(float height) { m_minHeight = height; }
void setMinHeight(float height) { m_minHeight = height; }
void handleZoomChange(float zoom);
public Q_SLOTS:
@ -28,7 +30,7 @@ private:
int m_height = 100;
int m_srcWidth = 0;
int m_srcHeight = 0;
QPoint m_position = {};
QPoint m_position;
TopographicSeries *m_topographicSeries = nullptr;
float m_minHeight = 0.f;
float m_heightAdjustment = 5.f;

2
examples/graphs/3d/widgetgraphgallery/main.cpp
View File

@ -49,5 +49,5 @@ int main(int argc, char **argv)
// surface.surfaceWidget()->show();
#endif
return app.exec();
return QCoreApplication::exec();
}

4
examples/graphs/3d/widgetgraphgallery/rainfalldata.h
View File

@ -12,8 +12,10 @@ class RainfallData : public QObject
{
Q_OBJECT
public:
Q_DISABLE_COPY_MOVE(RainfallData)
explicit RainfallData();
~RainfallData();
~RainfallData() override;
void addDataSet();

6
examples/graphs/3d/widgetgraphgallery/scatterdatamodifier.cpp
View File

@ -59,7 +59,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatterWidgetItem *scatter, QObject
//! [2]
}
ScatterDataModifier::~ScatterDataModifier() {}
ScatterDataModifier::~ScatterDataModifier() = default;
void ScatterDataModifier::addData()
{
@ -99,7 +99,7 @@ void ScatterDataModifier::addData()
void ScatterDataModifier::changeStyle(int style)
{
QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
const auto *comboBox = qobject_cast<QComboBox *>(sender());
if (comboBox) {
m_style = comboBox->itemData(style).value<QAbstract3DSeries::Mesh>();
if (!m_graph->seriesList().isEmpty())
@ -212,7 +212,7 @@ void ScatterDataModifier::handleAxisDragging(QVector2D delta)
void ScatterDataModifier::changeShadowQuality(int quality)
{
QtGraphs3D::ShadowQuality sq = QtGraphs3D::ShadowQuality(quality);
const auto sq = QtGraphs3D::ShadowQuality(quality);
m_graph->setShadowQuality(sq);
}

6
examples/graphs/3d/widgetgraphgallery/scatterdatamodifier.h
View File

@ -11,11 +11,13 @@ class ScatterDataModifier : public QObject
{
Q_OBJECT
enum InputState { StateNormal = 0, StateDraggingX, StateDraggingZ, StateDraggingY };
enum InputState : unsigned short { StateNormal = 0, StateDraggingX, StateDraggingZ, StateDraggingY };
public:
Q_DISABLE_COPY_MOVE(ScatterDataModifier)
explicit ScatterDataModifier(Q3DScatterWidgetItem *scatter, QObject *parent);
~ScatterDataModifier();
~ScatterDataModifier() override;
void addData();

4
examples/graphs/3d/widgetgraphgallery/scattergraphwidget.cpp
View File

@ -2,9 +2,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
#include "scattergraphwidget.h"
ScatterGraphWidget::ScatterGraphWidget() {}
ScatterGraphWidget::ScatterGraphWidget() = default;
ScatterGraphWidget::~ScatterGraphWidget() {}
ScatterGraphWidget::~ScatterGraphWidget() = default;
void ScatterGraphWidget::initialize()
{

2
examples/graphs/3d/widgetgraphgallery/scattergraphwidget.h
View File

@ -10,6 +10,8 @@ class ScatterGraphWidget : public QQuickWidget
{
Q_OBJECT
public:
Q_DISABLE_COPY_MOVE(ScatterGraphWidget)
ScatterGraphWidget();
~ScatterGraphWidget();
void initialize();

4
examples/graphs/3d/widgetgraphgallery/surfacegraphmodifier.cpp
View File

@ -28,6 +28,7 @@ SurfaceGraphModifier::SurfaceGraphModifier(Q3DSurfaceWidgetItem *surface, QLabel
: QObject(parent)
, m_graph(surface)
, m_textField(label)
, m_aspectRatio(aspectRatio)
{
m_graph->setCameraZoomLevel(85.f);
m_graph->setCameraPreset(QtGraphs3D::CameraPreset::IsometricRight);
@ -153,7 +154,6 @@ SurfaceGraphModifier::SurfaceGraphModifier(Q3DSurfaceWidgetItem *surface, QLabel
m_axisZMaxValue = m_areaMaxValue;
m_axisXMinRange = minRange;
m_axisZMinRange = minRange;
m_aspectRatio = aspectRatio;
QObject::connect(m_graph,
&Q3DGraphsWidgetItem::dragged,
@ -163,7 +163,7 @@ SurfaceGraphModifier::SurfaceGraphModifier(Q3DSurfaceWidgetItem *surface, QLabel
QObject::connect(m_graph, &Q3DGraphsWidgetItem::wheel, this, &SurfaceGraphModifier::onWheel);
}
SurfaceGraphModifier::~SurfaceGraphModifier() {}
SurfaceGraphModifier::~SurfaceGraphModifier() = default;
void SurfaceGraphModifier::fillSqrtSinProxy()
{

8
examples/graphs/3d/widgetgraphgallery/surfacegraphmodifier.h
View File

@ -21,11 +21,13 @@ class SurfaceGraphModifier : public QObject
{
Q_OBJECT
enum InputState { StateNormal = 0, StateDraggingX, StateDraggingZ, StateDraggingY };
enum InputState : unsigned short { StateNormal = 0, StateDraggingX, StateDraggingZ, StateDraggingY };
public:
Q_DISABLE_COPY_MOVE(SurfaceGraphModifier)
explicit SurfaceGraphModifier(Q3DSurfaceWidgetItem *surface, QLabel *label, QObject *parent);
~SurfaceGraphModifier();
~SurfaceGraphModifier() override;
//! [0]
void toggleModeNone() { m_graph->setSelectionMode(QtGraphs3D::SelectionFlag::None); }
@ -106,7 +108,7 @@ private:
QPropertyAnimation *m_selectionAnimation = nullptr;
QCustom3DLabel *m_titleLabel = nullptr;
QCustom3DItem *m_previouslyAnimatedItem = nullptr;
QVector3D m_previousScaling = {};
QVector3D m_previousScaling;
TopographicSeries *m_topography = nullptr;
HighlightSeries *m_highlight = nullptr;

4
examples/graphs/3d/widgetgraphgallery/surfacegraphwidget.cpp
View File

@ -2,9 +2,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
#include "surfacegraphwidget.h"
SurfaceGraphWidget::SurfaceGraphWidget() {}
SurfaceGraphWidget::SurfaceGraphWidget() = default;
SurfaceGraphWidget::~SurfaceGraphWidget() {}
SurfaceGraphWidget::~SurfaceGraphWidget() = default;
void SurfaceGraphWidget::initialize()
{

2
examples/graphs/3d/widgetgraphgallery/surfacegraphwidget.h
View File

@ -10,6 +10,8 @@ class SurfaceGraphWidget : public QQuickWidget
{
Q_OBJECT
public:
Q_DISABLE_COPY_MOVE(SurfaceGraphWidget)
SurfaceGraphWidget();
~SurfaceGraphWidget() override;

2
examples/graphs/3d/widgetgraphgallery/topographicseries.cpp
View File

@ -17,7 +17,7 @@ TopographicSeries::TopographicSeries()
TopographicSeries::~TopographicSeries() = default;
void TopographicSeries::setTopographyFile(const QString file, float width, float height)
void TopographicSeries::setTopographyFile(const QString &file, float width, float height)
{
//! [1]
QImage heightMapImage(file);

8
examples/graphs/3d/widgetgraphgallery/topographicseries.h
View File

@ -10,13 +10,15 @@ class TopographicSeries : public QSurface3DSeries
{
Q_OBJECT
public:
Q_DISABLE_COPY_MOVE(TopographicSeries)
TopographicSeries();
~TopographicSeries() override;
void setTopographyFile(const QString file, float width, float height);
void setTopographyFile(const QString &file, float width, float height);
float sampleCountX() { return m_sampleCountX; }
float sampleCountZ() { return m_sampleCountZ; }
float sampleCountX() const { return m_sampleCountX; }
float sampleCountZ() const { return m_sampleCountZ; }
private:
float m_sampleCountX = 0.f;