adopt for Qt6

This commit is contained in:
2023-11-01 20:59:22 +03:00
parent c73be2a29c
commit 106d7c6c93
4 changed files with 31 additions and 1 deletions

View File

@@ -25,18 +25,27 @@
#include <QAbstract3DSeries>
#include <QWidget>
#if QT_VERSION_MAJOR == 5
namespace QtDataVisualization {
#endif
class Q3DScatter;
class QScatterDataProxy;
class QScatter3DSeries;
class QScatterDataItem;
#if QT_VERSION_MAJOR == 5
} // namespace QtDataVisualization
#endif
class QAD_GRAPHIC3D_EXPORT Scatter3D: public QWidget {
Q_OBJECT
#if QT_VERSION_MAJOR == 6
using Mesh = QAbstract3DSeries::Mesh;
using DataArray = QVector<QScatterDataItem>;
#else
using Mesh = QtDataVisualization::QAbstract3DSeries::Mesh;
using DataArray = QVector<QtDataVisualization::QScatterDataItem>;
#endif
Q_PROPERTY(int currentGraphic READ currentGraphic WRITE setCurrentGraphic)
Q_PROPERTY(int graphicsCount READ graphicsCount WRITE setGraphicsCount)
@@ -86,12 +95,17 @@ public slots:
private:
struct Scatter3DGraphic {
#if QT_VERSION_MAJOR == 5
QtDataVisualization::QScatter3DSeries * series;
QtDataVisualization::QScatterDataProxy * data;
#else
QScatter3DSeries * series;
QScatterDataProxy * data;
#endif
};
QWidget * container;
QtDataVisualization::Q3DScatter * canvas;
Q3DScatter * canvas;
QVector<Scatter3DGraphic> graphics;
int curGraphic;