diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-24 10:25:01 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 10:11:51 +0200 |
| commit | 3c7d4de151d0d87b687644381c5d8aaef06f21b2 (patch) | |
| tree | 12c688048acac5f817b68dfbef088544a8ae946a | |
| parent | fcb44309e4cd228245d310bdbd622e7a2ff98283 (diff) | |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: I4dc064b70adb054ca4add2dd662e7227255ff970
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
68 files changed, 260 insertions, 277 deletions
diff --git a/examples/datavisualization/audiolevels/doc/src/audiolevels.qdoc b/examples/datavisualization/audiolevels/doc/src/audiolevels.qdoc index 2551c156..460715b3 100644 --- a/examples/datavisualization/audiolevels/doc/src/audiolevels.qdoc +++ b/examples/datavisualization/audiolevels/doc/src/audiolevels.qdoc @@ -88,7 +88,7 @@ the existing data array, as this allows us to avoid any extra memory allocations in our application code. This also means the data array dimensions do not change, which further improves efficiency in the bar graph renderer. - Secondly, since each row is a QVector of bar data items, which do not allocate any data that needs + Secondly, since each row is a QList of bar data items, which do not allocate any data that needs deletion, we can utilize \c memmove and \c memcpy functions to quickly move and copy data around. \note In the future versions of Qt Data Visualization, QBarDataItem might get extended so that diff --git a/examples/datavisualization/custominput/scatterdatamodifier.cpp b/examples/datavisualization/custominput/scatterdatamodifier.cpp index df36f5c6..3c6abd76 100644 --- a/examples/datavisualization/custominput/scatterdatamodifier.cpp +++ b/examples/datavisualization/custominput/scatterdatamodifier.cpp @@ -119,9 +119,9 @@ void ScatterDataModifier::start() void ScatterDataModifier::addData() { - QVector<QVector3D> itemList; + QList<QVector3D> itemList; - // Read data items from the file to QVector + // Read data items from the file to QList QTextStream stream; QFile dataFile(":/data/data.txt"); if (dataFile.open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -145,7 +145,7 @@ void ScatterDataModifier::addData() qWarning() << "Unable to open data file:" << dataFile.fileName(); } - // Add data from the QVector to datamodel + // Add data from the QList to datamodel QScatterDataArray *dataArray = new QScatterDataArray; dataArray->resize(itemList.count()); QScatterDataItem *ptrToDataArray = &dataArray->first(); diff --git a/examples/datavisualization/qmlaxisformatter/customformatter.h b/examples/datavisualization/qmlaxisformatter/customformatter.h index 3b9f4b08..aa9db422 100644 --- a/examples/datavisualization/qmlaxisformatter/customformatter.h +++ b/examples/datavisualization/qmlaxisformatter/customformatter.h @@ -32,7 +32,6 @@ #include <QtDataVisualization/QValue3DAxisFormatter> #include <QtCore/QDateTime> -#include <QtCore/QVector> using namespace QtDataVisualization; diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h index 682ad453..39a7f830 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.h +++ b/examples/datavisualization/qmloscilloscope/datasource.h @@ -51,7 +51,7 @@ public Q_SLOTS: private: void clearData(); - QVector<QSurfaceDataArray> m_data; + QList<QSurfaceDataArray> m_data; int m_index; QSurfaceDataArray *m_resetArray; }; diff --git a/examples/datavisualization/volumetric/volumetric.cpp b/examples/datavisualization/volumetric/volumetric.cpp index 702103b0..781081d1 100644 --- a/examples/datavisualization/volumetric/volumetric.cpp +++ b/examples/datavisualization/volumetric/volumetric.cpp @@ -117,9 +117,10 @@ VolumetricModifier::VolumetricModifier(Q3DScatter *scatter) toggleAreaAll(true); if (!isOpenGLES()) { - m_lowDetailData = new QVector<uchar>(lowDetailSize * lowDetailSize * lowDetailSize / 2); - m_mediumDetailData = new QVector<uchar>(mediumDetailSize * mediumDetailSize * mediumDetailSize / 2); - m_highDetailData = new QVector<uchar>(highDetailSize * highDetailSize * highDetailSize / 2); + m_lowDetailData = new QList<uchar>(lowDetailSize * lowDetailSize * lowDetailSize / 2); + m_mediumDetailData = + new QList<uchar>(mediumDetailSize * mediumDetailSize * mediumDetailSize / 2); + m_highDetailData = new QList<uchar>(highDetailSize * highDetailSize * highDetailSize / 2); initHeightMap(QStringLiteral(":/heightmaps/layer_ground.png"), m_groundLayer); initHeightMap(QStringLiteral(":/heightmaps/layer_water.png"), m_waterLayer); @@ -149,7 +150,7 @@ VolumetricModifier::VolumetricModifier(Q3DScatter *scatter) m_volumeItem->setTextureHeight(lowDetailSize / 2); m_volumeItem->setTextureDepth(lowDetailSize); m_volumeItem->setTextureFormat(QImage::Format_Indexed8); - m_volumeItem->setTextureData(new QVector<uchar>(*m_lowDetailData)); + m_volumeItem->setTextureData(new QList<uchar>(*m_lowDetailData)); //! [1] // Generate color tables. @@ -372,7 +373,7 @@ void VolumetricModifier::handleTimeout() void VolumetricModifier::toggleLowDetail(bool enabled) { if (enabled && m_volumeItem) { - m_volumeItem->setTextureData(new QVector<uchar>(*m_lowDetailData)); + m_volumeItem->setTextureData(new QList<uchar>(*m_lowDetailData)); m_volumeItem->setTextureDimensions(lowDetailSize, lowDetailSize / 2, lowDetailSize); adjustSliceX(m_sliceSliderX->value()); adjustSliceY(m_sliceSliderY->value()); @@ -383,7 +384,7 @@ void VolumetricModifier::toggleLowDetail(bool enabled) void VolumetricModifier::toggleMediumDetail(bool enabled) { if (enabled && m_volumeItem) { - m_volumeItem->setTextureData(new QVector<uchar>(*m_mediumDetailData)); + m_volumeItem->setTextureData(new QList<uchar>(*m_mediumDetailData)); m_volumeItem->setTextureDimensions(mediumDetailSize, mediumDetailSize / 2, mediumDetailSize); adjustSliceX(m_sliceSliderX->value()); adjustSliceY(m_sliceSliderY->value()); @@ -394,7 +395,7 @@ void VolumetricModifier::toggleMediumDetail(bool enabled) void VolumetricModifier::toggleHighDetail(bool enabled) { if (enabled && m_volumeItem) { - m_volumeItem->setTextureData(new QVector<uchar>(*m_highDetailData)); + m_volumeItem->setTextureData(new QList<uchar>(*m_highDetailData)); m_volumeItem->setTextureDimensions(highDetailSize, highDetailSize / 2, highDetailSize); adjustSliceX(m_sliceSliderX->value()); adjustSliceY(m_sliceSliderY->value()); @@ -550,14 +551,14 @@ void VolumetricModifier::setDrawSliceFrames(int enabled) m_volumeItem->setDrawSliceFrames(enabled); } -void VolumetricModifier::initHeightMap(QString fileName, QVector<uchar> &layerData) +void VolumetricModifier::initHeightMap(QString fileName, QList<uchar> &layerData) { QImage heightImage(fileName); layerData.resize(layerDataSize * layerDataSize); const uchar *bits = heightImage.bits(); int index = 0; - QVector<QRgb> colorTable = heightImage.colorTable(); + QList<QRgb> colorTable = heightImage.colorTable(); for (int i = 0; i < layerDataSize; i++) { for (int j = 0; j < layerDataSize; j++) { layerData[index] = qRed(colorTable.at(bits[index])); @@ -567,16 +568,16 @@ void VolumetricModifier::initHeightMap(QString fileName, QVector<uchar> &layerDa } int VolumetricModifier::createVolume(int textureSize, int startIndex, int count, - QVector<uchar> *textureData) + QList<uchar> *textureData) { // Generate volume from layer data. int index = startIndex * textureSize * textureSize / 2.0f; int endIndex = startIndex + count; if (endIndex > textureSize) endIndex = textureSize; - QVector<uchar> magmaHeights(textureSize); - QVector<uchar> waterHeights(textureSize); - QVector<uchar> groundHeights(textureSize); + QList<uchar> magmaHeights(textureSize); + QList<uchar> waterHeights(textureSize); + QList<uchar> groundHeights(textureSize); float multiplier = float(layerDataSize) / float(textureSize); for (int i = startIndex; i < endIndex; i++) { // Generate layer height arrays @@ -620,7 +621,7 @@ int VolumetricModifier::createVolume(int textureSize, int startIndex, int count, } int VolumetricModifier::excavateMineShaft(int textureSize, int startIndex, int count, - QVector<uchar> *textureData) + QList<uchar> *textureData) { int endIndex = startIndex + count; if (endIndex > m_mineShaftArray.size()) @@ -658,7 +659,7 @@ int VolumetricModifier::excavateMineShaft(int textureSize, int startIndex, int c } void VolumetricModifier::excavateMineBlock(int textureSize, int dataIndex, int size, - QVector<uchar> *textureData) + QList<uchar> *textureData) { for (int k = 0; k < size; k++) { int curIndex = dataIndex + (k * textureSize * textureSize / 2); diff --git a/examples/datavisualization/volumetric/volumetric.h b/examples/datavisualization/volumetric/volumetric.h index f9db6df7..f76884d6 100644 --- a/examples/datavisualization/volumetric/volumetric.h +++ b/examples/datavisualization/volumetric/volumetric.h @@ -78,14 +78,11 @@ public Q_SLOTS: void setDrawSliceFrames(int enabled); private: - - void initHeightMap(QString fileName, QVector<uchar> &layerData); + void initHeightMap(QString fileName, QList<uchar> &layerData); void initMineShaftArray(); - int createVolume(int textureSize, int startIndex, int count, - QVector<uchar> *textureData); - int excavateMineShaft(int textureSize, int startIndex, int count, - QVector<uchar> *textureData); - void excavateMineBlock(int textureSize, int dataIndex, int size, QVector<uchar> *textureData); + int createVolume(int textureSize, int startIndex, int count, QList<uchar> *textureData); + int excavateMineShaft(int textureSize, int startIndex, int count, QList<uchar> *textureData); + void excavateMineBlock(int textureSize, int dataIndex, int size, QList<uchar> *textureData); void handleSlicingChanges(); Q3DScatter *m_graph; @@ -99,9 +96,9 @@ private: QLabel *m_fpsLabel; QRadioButton *m_mediumDetailRB; QRadioButton *m_highDetailRB; - QVector<uchar> *m_lowDetailData; - QVector<uchar> *m_mediumDetailData; - QVector<uchar> *m_highDetailData; + QList<uchar> *m_lowDetailData; + QList<uchar> *m_mediumDetailData; + QList<uchar> *m_highDetailData; QTimer m_timer; int m_mediumDetailIndex; int m_highDetailIndex; @@ -110,17 +107,17 @@ private: QSlider *m_sliceSliderX; QSlider *m_sliceSliderY; QSlider *m_sliceSliderZ; - QVector<QRgb> m_colorTable1; - QVector<QRgb> m_colorTable2; + QList<QRgb> m_colorTable1; + QList<QRgb> m_colorTable2; bool m_usingPrimaryTable; QLabel *m_sliceLabelX; QLabel *m_sliceLabelY; QLabel *m_sliceLabelZ; QLabel *m_alphaMultiplierLabel; - QVector<uchar> m_magmaLayer; - QVector<uchar> m_waterLayer; - QVector<uchar> m_groundLayer; - QVector<QPair<QVector3D, QVector3D> > m_mineShaftArray; + QList<uchar> m_magmaLayer; + QList<uchar> m_waterLayer; + QList<uchar> m_groundLayer; + QList<QPair<QVector3D, QVector3D>> m_mineShaftArray; }; #endif diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter.cpp b/src/datavisualization/axis/qlogvalue3daxisformatter.cpp index 3e044ed5..77ea37c1 100644 --- a/src/datavisualization/axis/qlogvalue3daxisformatter.cpp +++ b/src/datavisualization/axis/qlogvalue3daxisformatter.cpp @@ -399,7 +399,7 @@ void QLogValue3DAxisFormatterPrivate::recalculate() // Since the logarithm has the same curvature across whole axis range, we can just calculate // subgrid positions for the first segment and replicate them to other segments. - QVector<float> actualSubSegmentSteps(subGridCount); + QList<float> actualSubSegmentSteps(subGridCount); for (int i = 0; i < subGridCount; i++) { float currentSubPosition = positionAt(m_min + ((i + 1) * subSegmentStep)); diff --git a/src/datavisualization/axis/qvalue3daxisformatter.cpp b/src/datavisualization/axis/qvalue3daxisformatter.cpp index 4bc3e7e3..68a73a1d 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter.cpp +++ b/src/datavisualization/axis/qvalue3daxisformatter.cpp @@ -242,7 +242,7 @@ QValue3DAxis *QValue3DAxisFormatter::axis() const * * \sa QValue3DAxis::segmentCount, recalculate() */ -QVector<float> &QValue3DAxisFormatter::gridPositions() const +QList<float> &QValue3DAxisFormatter::gridPositions() const { return d_ptr->m_gridPositions; } @@ -257,7 +257,7 @@ QVector<float> &QValue3DAxisFormatter::gridPositions() const * * \sa QValue3DAxis::segmentCount, QValue3DAxis::subSegmentCount, recalculate() */ -QVector<float> &QValue3DAxisFormatter::subGridPositions() const +QList<float> &QValue3DAxisFormatter::subGridPositions() const { return d_ptr->m_subGridPositions; } @@ -273,7 +273,7 @@ QVector<float> &QValue3DAxisFormatter::subGridPositions() const * * \sa QValue3DAxis::segmentCount, QAbstract3DAxis::labels, recalculate() */ -QVector<float> &QValue3DAxisFormatter::labelPositions() const +QList<float> &QValue3DAxisFormatter::labelPositions() const { return d_ptr->m_labelPositions; } diff --git a/src/datavisualization/axis/qvalue3daxisformatter.h b/src/datavisualization/axis/qvalue3daxisformatter.h index 2567721f..e4efd14e 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter.h +++ b/src/datavisualization/axis/qvalue3daxisformatter.h @@ -31,11 +31,11 @@ #define QVALUE3DAXISFORMATTER_H #include <QtDataVisualization/qdatavisualizationglobal.h> +#include <QtCore/QList> +#include <QtCore/QLocale> #include <QtCore/QObject> #include <QtCore/QScopedPointer> -#include <QtCore/QVector> #include <QtCore/QStringList> -#include <QtCore/QLocale> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -67,9 +67,9 @@ protected: void markDirty(bool labelsChange = false); QValue3DAxis *axis() const; - QVector<float> &gridPositions() const; - QVector<float> &subGridPositions() const; - QVector<float> &labelPositions() const; + QList<float> &gridPositions() const; + QList<float> &subGridPositions() const; + QList<float> &labelPositions() const; QStringList &labelStrings() const; void setLocale(const QLocale &locale); diff --git a/src/datavisualization/axis/qvalue3daxisformatter_p.h b/src/datavisualization/axis/qvalue3daxisformatter_p.h index 6d2538d7..d6abdb1b 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter_p.h +++ b/src/datavisualization/axis/qvalue3daxisformatter_p.h @@ -81,9 +81,9 @@ protected: float m_max; float m_rangeNormalizer; - QVector<float> m_gridPositions; - QVector<float> m_subGridPositions; - QVector<float> m_labelPositions; + QList<float> m_gridPositions; + QList<float> m_subGridPositions; + QList<float> m_labelPositions; QStringList m_labelStrings; QValue3DAxis *m_axis; diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp index aad01cd3..332d6861 100644 --- a/src/datavisualization/data/abstractitemmodelhandler.cpp +++ b/src/datavisualization/data/abstractitemmodelhandler.cpp @@ -137,7 +137,7 @@ void AbstractItemModelHandler::handleColumnsRemoved(const QModelIndex &parent, void AbstractItemModelHandler::handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector<int> &roles) + const QList<int> &roles) { Q_UNUSED(topLeft) Q_UNUSED(bottomRight) diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h index 20dceac3..62a78103 100644 --- a/src/datavisualization/data/abstractitemmodelhandler_p.h +++ b/src/datavisualization/data/abstractitemmodelhandler_p.h @@ -64,7 +64,7 @@ public Q_SLOTS: int destinationColumn); virtual void handleColumnsRemoved(const QModelIndex &parent, int start, int end); virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector<int> &roles = QVector<int> ()); + const QList<int> &roles = QList<int>()); virtual void handleLayoutChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint); virtual void handleModelReset(); diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp index 182a6247..5a2d92cd 100644 --- a/src/datavisualization/data/baritemmodelhandler.cpp +++ b/src/datavisualization/data/baritemmodelhandler.cpp @@ -50,8 +50,7 @@ BarItemModelHandler::~BarItemModelHandler() } void BarItemModelHandler::handleDataChanged(const QModelIndex &topLeft, - const QModelIndex &bottomRight, - const QVector<int> &roles) + const QModelIndex &bottomRight, const QList<int> &roles) { // Do nothing if full reset already pending if (!m_fullReset) { diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h index b297c5ab..20126bcc 100644 --- a/src/datavisualization/data/baritemmodelhandler_p.h +++ b/src/datavisualization/data/baritemmodelhandler_p.h @@ -54,7 +54,7 @@ public: public Q_SLOTS: virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector<int> &roles = QVector<int> ()); + const QList<int> &roles = QList<int>()); protected: void virtual resolveModel(); diff --git a/src/datavisualization/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h index c421d871..29147722 100644 --- a/src/datavisualization/data/barrenderitem_p.h +++ b/src/datavisualization/data/barrenderitem_p.h @@ -93,8 +93,8 @@ protected: bool m_isNull; }; -typedef QVector<BarRenderItem> BarRenderItemRow; -typedef QVector<BarRenderItemRow> BarRenderItemArray; +typedef QList<BarRenderItem> BarRenderItemRow; +typedef QList<BarRenderItemRow> BarRenderItemArray; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/customrenderitem.cpp b/src/datavisualization/data/customrenderitem.cpp index acdd27fe..ac998fba 100644 --- a/src/datavisualization/data/customrenderitem.cpp +++ b/src/datavisualization/data/customrenderitem.cpp @@ -73,7 +73,7 @@ void CustomRenderItem::setMesh(const QString &meshFile) ObjectHelper::resetObjectHelper(m_renderer, m_object, meshFile); } -void CustomRenderItem::setColorTable(const QVector<QRgb> &colors) +void CustomRenderItem::setColorTable(const QList<QRgb> &colors) { m_colorTable.resize(256); for (int i = 0; i < 256; i++) { diff --git a/src/datavisualization/data/customrenderitem_p.h b/src/datavisualization/data/customrenderitem_p.h index abf6e106..3ee423cb 100644 --- a/src/datavisualization/data/customrenderitem_p.h +++ b/src/datavisualization/data/customrenderitem_p.h @@ -99,9 +99,9 @@ public: inline void setTextureDepth(int depth) { m_textureDepth = depth; setSliceIndexZ(m_sliceIndexZ); } inline int textureDepth() const { return m_textureDepth; } inline int textureSize() const { return m_textureWidth * m_textureHeight * m_textureDepth; } - inline void setColorTable(const QVector<QVector4D> &colors) { m_colorTable = colors; } - void setColorTable(const QVector<QRgb> &colors); - inline const QVector<QVector4D> &colorTable() const { return m_colorTable; } + inline void setColorTable(const QList<QVector4D> &colors) { m_colorTable = colors; } + void setColorTable(const QList<QRgb> &colors); + inline const QList<QVector4D> &colorTable() const { return m_colorTable; } inline void setVolume(bool volume) { m_isVolume = volume; } inline bool isVolume() const { return m_isVolume; } inline void setTextureFormat(QImage::Format format) { m_textureFormat = format; } @@ -175,7 +175,7 @@ private: int m_textureWidth; int m_textureHeight; int m_textureDepth; - QVector<QVector4D> m_colorTable; + QList<QVector4D> m_colorTable; bool m_isVolume; QImage::Format m_textureFormat; int m_sliceIndexX; diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 14f36253..c5d33535 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \typedef QBarDataRow * \relates QBarDataProxy * - * A vector of \l {QBarDataItem} objects. + * A list of \l {QBarDataItem} objects. */ /*! diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h index 67d8cb59..155e5794 100644 --- a/src/datavisualization/data/qbardataproxy.h +++ b/src/datavisualization/data/qbardataproxy.h @@ -32,7 +32,7 @@ #include <QtDataVisualization/qabstractdataproxy.h> #include <QtDataVisualization/qbardataitem.h> -#include <QtCore/QVector> +#include <QtCore/QList> #include <QtCore/QStringList> Q_MOC_INCLUDE(<QtDataVisualization/qbar3dseries.h>) @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QBarDataProxyPrivate; class QBar3DSeries; -typedef QVector<QBarDataItem> QBarDataRow; +typedef QList<QBarDataItem> QBarDataRow; typedef QList<QBarDataRow *> QBarDataArray; class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy diff --git a/src/datavisualization/data/qcustom3dvolume.cpp b/src/datavisualization/data/qcustom3dvolume.cpp index d54f34d1..8f524c2b 100644 --- a/src/datavisualization/data/qcustom3dvolume.cpp +++ b/src/datavisualization/data/qcustom3dvolume.cpp @@ -278,13 +278,14 @@ QCustom3DVolume::QCustom3DVolume(QObject *parent) : * \sa textureData, setTextureFormat(), colorTable */ QCustom3DVolume::QCustom3DVolume(const QVector3D &position, const QVector3D &scaling, - const QQuaternion &rotation, int textureWidth, - int textureHeight, int textureDepth, - QVector<uchar> *textureData, QImage::Format textureFormat, - const QVector<QRgb> &colorTable, QObject *parent) : - QCustom3DItem(new QCustom3DVolumePrivate(this, position, scaling, rotation, textureWidth, - textureHeight, textureDepth, - textureData, textureFormat, colorTable), parent) + const QQuaternion &rotation, int textureWidth, int textureHeight, + int textureDepth, QList<uchar> *textureData, + QImage::Format textureFormat, const QList<QRgb> &colorTable, + QObject *parent) + : QCustom3DItem(new QCustom3DVolumePrivate(this, position, scaling, rotation, textureWidth, + textureHeight, textureDepth, textureData, + textureFormat, colorTable), + parent) { } @@ -526,7 +527,7 @@ void QCustom3DVolume::setSliceIndices(int x, int y, int z) * * \sa textureData, setTextureFormat(), QImage::colorTable() */ -void QCustom3DVolume::setColorTable(const QVector<QRgb> &colors) +void QCustom3DVolume::setColorTable(const QList<QRgb> &colors) { if (dptr()->m_colorTable != colors) { dptr()->m_colorTable = colors; @@ -536,7 +537,7 @@ void QCustom3DVolume::setColorTable(const QVector<QRgb> &colors) } } -QVector<QRgb> QCustom3DVolume::colorTable() const +QList<QRgb> QCustom3DVolume::colorTable() const { return dptrc()->m_colorTable; } @@ -570,7 +571,7 @@ QVector<QRgb> QCustom3DVolume::colorTable() const * * \sa colorTable, setTextureFormat(), setSubTextureData(), textureDataWidth() */ -void QCustom3DVolume::setTextureData(QVector<uchar> *data) +void QCustom3DVolume::setTextureData(QList<uchar> *data) { if (dptr()->m_textureData != data) delete dptr()->m_textureData; @@ -596,7 +597,7 @@ void QCustom3DVolume::setTextureData(QVector<uchar> *data) * * \sa textureData, textureWidth, textureHeight, textureDepth, setTextureFormat() */ -QVector<uchar> *QCustom3DVolume::createTextureData(const QVector<QImage *> &images) +QList<uchar> *QCustom3DVolume::createTextureData(const QList<QImage *> &images) { int imageCount = images.size(); if (imageCount) { @@ -631,7 +632,7 @@ QVector<uchar> *QCustom3DVolume::createTextureData(const QVector<QImage *> &imag int imageByteWidth = (imageFormat == QImage::Format_Indexed8) ? currentImage->bytesPerLine() : imageWidth; int frameSize = imageByteWidth * imageHeight * colorBytes; - QVector<uchar> *newTextureData = new QVector<uchar>; + QList<uchar> *newTextureData = new QList<uchar>; newTextureData->resize(frameSize * imageCount); uchar *texturePtr = newTextureData->data(); QImage convertedImage; @@ -662,7 +663,7 @@ QVector<uchar> *QCustom3DVolume::createTextureData(const QVector<QImage *> &imag return dptr()->m_textureData; } -QVector<uchar> *QCustom3DVolume::textureData() const +QList<uchar> *QCustom3DVolume::textureData() const { return dptrc()->m_textureData; } @@ -1177,32 +1178,30 @@ QCustom3DVolumePrivate::QCustom3DVolumePrivate(QCustom3DVolume *q) : m_meshFile = QStringLiteral(":/defaultMeshes/barFull"); } -QCustom3DVolumePrivate::QCustom3DVolumePrivate(QCustom3DVolume *q, const QVector3D &position, - const QVector3D &scaling, - const QQuaternion &rotation, - int textureWidth, int textureHeight, - int textureDepth, QVector<uchar> *textureData, - QImage::Format textureFormat, - const QVector<QRgb> &colorTable) : - QCustom3DItemPrivate(q, QStringLiteral(":/defaultMeshes/barFull"), position, scaling, rotation), - m_textureWidth(textureWidth), - m_textureHeight(textureHeight), - m_textureDepth(textureDepth), - m_sliceIndexX(-1), - m_sliceIndexY(-1), - m_sliceIndexZ(-1), - m_textureFormat(textureFormat), - m_colorTable(colorTable), - m_textureData(textureData), - m_alphaMultiplier(1.0f), - m_preserveOpacity(true), - m_useHighDefShader(true), - m_drawSlices(false), - m_drawSliceFrames(false), - m_sliceFrameColor(Qt::black), - m_sliceFrameWidths(QVector3D(0.01f, 0.01f, 0.01f)), - m_sliceFrameGaps(QVector3D(0.01f, 0.01f, 0.01f)), - m_sliceFrameThicknesses(QVector3D(0.01f, 0.01f, 0.01f)) +QCustom3DVolumePrivate::QCustom3DVolumePrivate( + QCustom3DVolume *q, const QVector3D &position, const QVector3D &scaling, + const QQuaternion &rotation, int textureWidth, int textureHeight, int textureDepth, + QList<uchar> *textureData, QImage::Format textureFormat, const QList<QRgb> &colorTable) + : QCustom3DItemPrivate(q, QStringLiteral(":/defaultMeshes/barFull"), position, scaling, + rotation), + m_textureWidth(textureWidth), + m_textureHeight(textureHeight), + m_textureDepth(textureDepth), + m_sliceIndexX(-1), + m_sliceIndexY(-1), + m_sliceIndexZ(-1), + m_textureFormat(textureFormat), + m_colorTable(colorTable), + m_textureData(textureData), + m_alphaMultiplier(1.0f), + m_preserveOpacity(true), + m_useHighDefShader(true), + m_drawSlices(false), + m_drawSliceFrames(false), + m_sliceFrameColor(Qt::black), + m_sliceFrameWidths(QVector3D(0.01f, 0.01f, 0.01f)), + m_sliceFrameGaps(QVector3D(0.01f, 0.01f, 0.01f)), + m_sliceFrameThicknesses(QVector3D(0.01f, 0.01f, 0.01f)) { m_isVolumeItem = true; m_shadowCasting = false; @@ -1268,7 +1267,7 @@ QImage QCustom3DVolumePrivate::renderSlice(Qt::Axis axis, int index) padding = x % 4; pixelWidth = 1; } - QVector<uchar> data((x + padding) * y * pixelWidth); + QList<uchar> data((x + padding) * y * pixelWidth); int frameSize = qptr()->textureDataWidth() * m_textureHeight; int dataIndex = 0; @@ -1309,7 +1308,7 @@ QImage QCustom3DVolumePrivate::renderSlice(Qt::Axis axis, int index) QImage image(data.constData(), x, y, x * pixelWidth, m_textureFormat); image.bits(); // Call bits() to detach the new image from local data if (m_textureFormat == QImage::Format_Indexed8) { - QVector<QRgb> colorTable = m_colorTable; + QList<QRgb> colorTable = m_colorTable; if (m_alphaMultiplier != 1.0f) { for (int i = 0; i < colorTable.size(); i++) { QRgb curCol = colorTable.at(i); diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h index 78e684d9..6967c608 100644 --- a/src/datavisualization/data/qcustom3dvolume.h +++ b/src/datavisualization/data/qcustom3dvolume.h @@ -48,8 +48,9 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DVolume : public QCustom3DItem Q_PROPERTY(int sliceIndexX READ sliceIndexX WRITE setSliceIndexX NOTIFY sliceIndexXChanged) Q_PROPERTY(int sliceIndexY READ sliceIndexY WRITE setSliceIndexY NOTIFY sliceIndexYChanged) Q_PROPERTY(int sliceIndexZ READ sliceIndexZ WRITE setSliceIndexZ NOTIFY sliceIndexZChanged) - Q_PROPERTY(QVector<QRgb> colorTable READ colorTable WRITE setColorTable NOTIFY colorTableChanged) - Q_PROPERTY(QVector<uchar> *textureData READ textureData WRITE setTextureData NOTIFY textureDataChanged) + Q_PROPERTY(QList<QRgb> colorTable READ colorTable WRITE setColorTable NOTIFY colorTableChanged) + Q_PROPERTY(QList<uchar> *textureData READ textureData WRITE setTextureData NOTIFY + textureDataChanged) Q_PROPERTY(float alphaMultiplier READ alphaMultiplier WRITE setAlphaMultiplier NOTIFY alphaMultiplierChanged) Q_PROPERTY(bool preserveOpacity READ preserveOpacity WRITE setPreserveOpacity NOTIFY preserveOpacityChanged) Q_PROPERTY(bool useHighDefShader READ useHighDefShader WRITE setUseHighDefShader NOTIFY useHighDefShaderChanged) @@ -64,10 +65,10 @@ public: explicit QCustom3DVolume(QObject *parent = nullptr); explicit QCustom3DVolume(const QVector3D &position, const QVector3D &scaling, - const QQuaternion &rotation, int textureWidth, - int textureHeight, int textureDepth, - QVector<uchar> *textureData, QImage::Format textureFormat, - const QVector<QRgb> &colorTable, QObject *parent = nullptr); + const QQuaternion &rotation, int textureWidth, int textureHeight, + int textureDepth, QList<uchar> *textureData, + QImage::Format textureFormat, const QList<QRgb> &colorTable, + QObject *parent = nullptr); virtual ~QCustom3DVolume(); void setTextureWidth(int value); @@ -87,12 +88,12 @@ public: int sliceIndexZ() const; void setSliceIndices(int x, int y, int z); - void setColorTable(const QVector<QRgb> &colors); - QVector<QRgb> colorTable() const; + void setColorTable(const QList<QRgb> &colors); + QList<QRgb> colorTable() const; - void setTextureData(QVector<uchar> *data); - QVector<uchar> *createTextureData(const QVector<QImage *> &images); - QVector<uchar> *textureData() const; + void setTextureData(QList<uchar> *data); + QList<uchar> *createTextureData(const QList<QImage *> &images); + QList<uchar> *textureData() const; void setSubTextureData(Qt::Axis axis, int index, const uchar *data); void setSubTextureData(Qt::Axis axis, int index, const QImage &image); @@ -131,7 +132,7 @@ Q_SIGNALS: void sliceIndexYChanged(int value); void sliceIndexZChanged(int value); void colorTableChanged(); - void textureDataChanged(QVector<uchar> *data); + void textureDataChanged(QList<uchar> *data); void textureFormatChanged(QImage::Format format); void alphaMultiplierChanged(float mult); void preserveOpacityChanged(bool enabled); diff --git a/src/datavisualization/data/qcustom3dvolume_p.h b/src/datavisualization/data/qcustom3dvolume_p.h index 7c802f62..e12b706d 100644 --- a/src/datavisualization/data/qcustom3dvolume_p.h +++ b/src/datavisualization/data/qcustom3dvolume_p.h @@ -73,9 +73,9 @@ class QCustom3DVolumePrivate : public QCustom3DItemPrivate public: QCustom3DVolumePrivate(QCustom3DVolume *q); QCustom3DVolumePrivate(QCustom3DVolume *q, const QVector3D &position, const QVector3D &scaling, - const QQuaternion &rotation, int textureWidth, - int textureHeight, int textureDepth, QVector<uchar> *textureData, - QImage::Format textureFormat, const QVector<QRgb> &colorTable); + const QQuaternion &rotation, int textureWidth, int textureHeight, + int textureDepth, QList<uchar> *textureData, + QImage::Format textureFormat, const QList<QRgb> &colorTable); virtual ~QCustom3DVolumePrivate(); void resetDirtyBits(); @@ -92,8 +92,8 @@ public: int m_sliceIndexZ; QImage::Format m_textureFormat; - QVector<QRgb> m_colorTable; - QVector<uchar> *m_textureData; + QList<QRgb> m_colorTable; + QList<uchar> *m_textureData; float m_alphaMultiplier; bool m_preserveOpacity; diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index 2d0e203a..884d2da9 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \typedef QScatterDataArray * \relates QScatterDataProxy * - * A vector of \l {QScatterDataItem} objects. + * A list of \l {QScatterDataItem} objects. */ /*! diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h index 086621e0..0a2f73ba 100644 --- a/src/datavisualization/data/qscatterdataproxy.h +++ b/src/datavisualization/data/qscatterdataproxy.h @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QScatterDataProxyPrivate; class QScatter3DSeries; -typedef QVector<QScatterDataItem> QScatterDataArray; +typedef QList<QScatterDataItem> QScatterDataArray; class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy { diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index 1c61084c..50514889 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * A surface data proxy handles surface related data in rows. For this it * provides two auxiliary typedefs: QtDataVisualization::QSurfaceDataArray and * QtDataVisualization::QSurfaceDataRow. \c QSurfaceDataArray is a QList that - * controls the rows. \c QSurfaceDataRow is a QVector that contains + * controls the rows. \c QSurfaceDataRow is a QList that contains * QSurfaceDataItem objects. For more information about how to feed the data to * the proxy, see the sample code in the Q3DSurface documentation. * @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \typedef QSurfaceDataRow * \relates QSurfaceDataProxy * - * A vector of \l {QSurfaceDataItem} objects. + * A list of \l {QSurfaceDataItem} objects. */ /*! diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h index 8284d9ba..9f767ce2 100644 --- a/src/datavisualization/data/qsurfacedataproxy.h +++ b/src/datavisualization/data/qsurfacedataproxy.h @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QSurfaceDataProxyPrivate; class QSurface3DSeries; -typedef QVector<QSurfaceDataItem> QSurfaceDataRow; +typedef QList<QSurfaceDataItem> QSurfaceDataRow; typedef QList<QSurfaceDataRow *> QSurfaceDataArray; class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp index 28a4f663..59fba44d 100644 --- a/src/datavisualization/data/scatteritemmodelhandler.cpp +++ b/src/datavisualization/data/scatteritemmodelhandler.cpp @@ -54,7 +54,7 @@ ScatterItemModelHandler::~ScatterItemModelHandler() void ScatterItemModelHandler::handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector<int> &roles) + const QList<int> &roles) { // Do nothing if full reset already pending if (!m_fullReset) { diff --git a/src/datavisualization/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h index 991a6c34..8573f675 100644 --- a/src/datavisualization/data/scatteritemmodelhandler_p.h +++ b/src/datavisualization/data/scatteritemmodelhandler_p.h @@ -54,7 +54,7 @@ public: public Q_SLOTS: virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector<int> &roles = QVector<int> ()); + const QList<int> &roles = QList<int>()); virtual void handleRowsInserted(const QModelIndex &parent, int start, int end); virtual void handleRowsRemoved(const QModelIndex &parent, int start, int end); diff --git a/src/datavisualization/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h index d7f38eed..4c0c30a4 100644 --- a/src/datavisualization/data/scatterrenderitem_p.h +++ b/src/datavisualization/data/scatterrenderitem_p.h @@ -65,7 +65,7 @@ protected: QVector3D m_position; bool m_visible; }; -typedef QVector<ScatterRenderItem> ScatterRenderItemArray; +typedef QList<ScatterRenderItem> ScatterRenderItemArray; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp index ad086e01..122499be 100644 --- a/src/datavisualization/data/surfaceitemmodelhandler.cpp +++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp @@ -52,7 +52,7 @@ SurfaceItemModelHandler::~SurfaceItemModelHandler() void SurfaceItemModelHandler::handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector<int> &roles) + const QList<int> &roles) { // Do nothing if full reset already pending if (!m_fullReset) { diff --git a/src/datavisualization/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h index aaa7a987..6304c822 100644 --- a/src/datavisualization/data/surfaceitemmodelhandler_p.h +++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h @@ -54,7 +54,7 @@ public: public Q_SLOTS: virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector<int> &roles = QVector<int> ()); + const QList<int> &roles = QList<int>()); protected: void virtual resolveModel(); diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index 5ee8cd87..726db582 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -150,7 +150,7 @@ When you have a data set that updates rapidly, it is important to handle data properly to ensure good performance. Since memory allocation is a costly operation, always use - QList::reserve() and QVector::resize() where possible to avoid unnecessary reallocations when + QList::reserve() and QList::resize() where possible to avoid unnecessary reallocations when constructing the array to give to the proxy. If you need to change the entire data set for each frame, it is in most cases best to reuse the existing array - especially if the array dimensions do not change. If you need to add, insert, remove, or change several diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index 97ea2bf5..48a71dd9 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -215,7 +215,7 @@ protected: int m_numFrames; qreal m_currentFps; - QVector<QAbstract3DSeries *> m_changedSeriesList; + QList<QAbstract3DSeries *> m_changedSeriesList; QList<QCustom3DItem *> m_customItems; diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index ab15605c..a52d6981 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -685,7 +685,7 @@ void Abstract3DRenderer::updateAxisTitleFixed(QAbstract3DAxis::AxisOrientation o cache.setTitleFixed(fixed); } -void Abstract3DRenderer::modifiedSeriesList(const QVector<QAbstract3DSeries *> &seriesList) +void Abstract3DRenderer::modifiedSeriesList(const QList<QAbstract3DSeries *> &seriesList) { foreach (QAbstract3DSeries *series, seriesList) { SeriesRenderCache *cache = m_renderCacheList.value(series, 0); @@ -1832,7 +1832,7 @@ void Abstract3DRenderer::drawRadialGrid(ShaderHelper *shader, float yFloorLinePo const QMatrix4x4 &projectionViewMatrix, const QMatrix4x4 &depthMatrix) { - static QVector<QQuaternion> lineRotations; + static QList<QQuaternion> lineRotations; if (!lineRotations.size()) { lineRotations.resize(polarGridRoundness); for (int j = 0; j < polarGridRoundness; j++) { @@ -1841,8 +1841,8 @@ void Abstract3DRenderer::drawRadialGrid(ShaderHelper *shader, float yFloorLinePo } } int gridLineCount = m_axisCacheZ.gridLineCount(); - const QVector<float> &gridPositions = m_axisCacheZ.formatter()->gridPositions(); - const QVector<float> &subGridPositions = m_axisCacheZ.formatter()->subGridPositions(); + const QList<float> &gridPositions = m_axisCacheZ.formatter()->gridPositions(); + const QList<float> &subGridPositions = m_axisCacheZ.formatter()->subGridPositions(); int mainSize = gridPositions.size(); QVector3D translateVector(0.0f, yFloorLinePos, 0.0f); QQuaternion finalRotation = m_xRightAngleRotationNeg; @@ -1896,8 +1896,8 @@ void Abstract3DRenderer::drawAngularGrid(ShaderHelper *shader, float yFloorLineP float halfRatio((m_polarRadius + (labelMargin / 2.0f)) / 2.0f); QVector3D gridLineScaler(gridLineWidth, gridLineWidth, halfRatio); int gridLineCount = m_axisCacheX.gridLineCount(); - const QVector<float> &gridPositions = m_axisCacheX.formatter()->gridPositions(); - const QVector<float> &subGridPositions = m_axisCacheX.formatter()->subGridPositions(); + const QList<float> &gridPositions = m_axisCacheX.formatter()->gridPositions(); + const QList<float> &subGridPositions = m_axisCacheX.formatter()->subGridPositions(); int mainSize = gridPositions.size(); QVector3D translateVector(0.0f, yFloorLinePos, -halfRatio); QQuaternion finalRotation; @@ -1946,7 +1946,7 @@ float Abstract3DRenderer::calculatePolarBackgroundMargin() { // Check each extents of each angular label // Calculate angular position - QVector<float> &labelPositions = m_axisCacheX.formatter()->labelPositions(); + QList<float> &labelPositions = m_axisCacheX.formatter()->labelPositions(); float actualLabelHeight = m_drawer->scaledFontSize() * 2.0f; // All labels are same height float maxNeededMargin = 0.0f; diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index d6ffb03c..affd0d69 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -142,7 +142,7 @@ public: bool visible); virtual void updateAxisTitleFixed(QAbstract3DAxis::AxisOrientation orientation, bool fixed); - virtual void modifiedSeriesList(const QVector<QAbstract3DSeries *> &seriesList); + virtual void modifiedSeriesList(const QList<QAbstract3DSeries *> &seriesList); virtual void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh); diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp index 06f6d9eb..cdf6c7ac 100644 --- a/src/datavisualization/engine/axisrendercache.cpp +++ b/src/datavisualization/engine/axisrendercache.cpp @@ -131,7 +131,7 @@ void AxisRenderCache::setLabels(const QStringList &labels) void AxisRenderCache::updateAllPositions() { // As long as grid and subgrid lines are drawn identically, we can further optimize - // by caching all grid and subgrid positions into a single vector. + // by caching all grid and subgrid positions into a single list. // If subgrid lines are ever themed separately, this array will probably become obsolete. if (m_formatter) { int gridCount = m_formatter->gridPositions().size(); diff --git a/src/datavisualization/engine/axisrendercache_p.h b/src/datavisualization/engine/axisrendercache_p.h index a02522cf..bf2e3f70 100644 --- a/src/datavisualization/engine/axisrendercache_p.h +++ b/src/datavisualization/engine/axisrendercache_p.h @@ -142,8 +142,8 @@ private: Drawer *m_drawer; // Not owned LabelItem m_titleItem; QList<LabelItem *> m_labelItems; - QVector<float> m_adjustedGridLinePositions; - QVector<float> m_adjustedLabelPositions; + QList<float> m_adjustedGridLinePositions; + QList<float> m_adjustedLabelPositions; bool m_positionsDirty; float m_translate; float m_scale; diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h index 11936e2c..74847ccd 100644 --- a/src/datavisualization/engine/bars3dcontroller_p.h +++ b/src/datavisualization/engine/bars3dcontroller_p.h @@ -83,8 +83,8 @@ public: private: Bars3DChangeBitField m_changeTracker; - QVector<ChangeItem> m_changedItems; - QVector<ChangeRow> m_changedRows; + QList<ChangeItem> m_changedItems; + QList<ChangeRow> m_changedRows; // Interaction QPoint m_selectedBar; // Points to row & column in data window. diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index c57339db..cf2eda4e 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -357,7 +357,7 @@ SeriesRenderCache *Bars3DRenderer::createNewCache(QAbstract3DSeries *series) return new BarSeriesRenderCache(series, this); } -void Bars3DRenderer::updateRows(const QVector<Bars3DController::ChangeRow> &rows) +void Bars3DRenderer::updateRows(const QList<Bars3DController::ChangeRow> &rows) { int minRow = m_axisCacheZ.min(); int maxRow = m_axisCacheZ.max(); @@ -390,7 +390,7 @@ void Bars3DRenderer::updateRows(const QVector<Bars3DController::ChangeRow> &rows } } -void Bars3DRenderer::updateItems(const QVector<Bars3DController::ChangeItem> &items) +void Bars3DRenderer::updateItems(const QList<Bars3DController::ChangeItem> &items) { int minRow = m_axisCacheZ.min(); int maxRow = m_axisCacheZ.max(); @@ -682,7 +682,7 @@ void Bars3DRenderer::drawSlicedScene() GLuint baseGradientTexture = 0; bool colorStyleIsUniform = true; int firstVisualIndex = m_renderCacheList.size(); - QVector<BarRenderSliceItem> *firstVisualSliceArray = 0; + QList<BarRenderSliceItem> *firstVisualSliceArray = 0; BarRenderSliceItem *selectedItem = 0; QQuaternion seriesRotation; @@ -691,7 +691,7 @@ void Bars3DRenderer::drawSlicedScene() && (baseCache == m_selectedSeriesCache || m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionMultiSeries))) { BarSeriesRenderCache *cache = static_cast<BarSeriesRenderCache *>(baseCache); - QVector<BarRenderSliceItem> &sliceArray = cache->sliceArray(); + QList<BarRenderSliceItem> &sliceArray = cache->sliceArray(); int sliceCount = sliceArray.size(); if (firstVisualIndex > cache->visualIndex()) { firstVisualIndex = cache->visualIndex(); @@ -853,7 +853,7 @@ void Bars3DRenderer::drawSlicedScene() foreach (SeriesRenderCache *baseCache, m_renderCacheList) { if (baseCache->isVisible()) { BarSeriesRenderCache *cache = static_cast<BarSeriesRenderCache *>(baseCache); - QVector<BarRenderSliceItem> &sliceArray = cache->sliceArray(); + QList<BarRenderSliceItem> &sliceArray = cache->sliceArray(); int sliceCount = sliceArray.size(); for (int col = 0; col < sliceCount; col++) { BarRenderSliceItem &item = sliceArray[col]; diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h index 0dad7dc3..3ca38e39 100644 --- a/src/datavisualization/engine/bars3drenderer_p.h +++ b/src/datavisualization/engine/bars3drenderer_p.h @@ -122,8 +122,8 @@ public: void updateData(); void updateSeries(const QList<QAbstract3DSeries *> &seriesList); SeriesRenderCache *createNewCache(QAbstract3DSeries *series); - void updateRows(const QVector<Bars3DController::ChangeRow> &rows); - void updateItems(const QVector<Bars3DController::ChangeItem> &items); + void updateRows(const QList<Bars3DController::ChangeRow> &rows); + void updateItems(const QList<Bars3DController::ChangeItem> &items); void updateScene(Q3DScene *scene); void render(GLuint defaultFboHandle = 0); diff --git a/src/datavisualization/engine/barseriesrendercache_p.h b/src/datavisualization/engine/barseriesrendercache_p.h index b911a65c..9b2ae1e1 100644 --- a/src/datavisualization/engine/barseriesrendercache_p.h +++ b/src/datavisualization/engine/barseriesrendercache_p.h @@ -57,13 +57,13 @@ public: inline BarRenderItemArray &renderArray() { return m_renderArray; } inline QBar3DSeries *series() const { return static_cast<QBar3DSeries *>(m_series); } - inline QVector<BarRenderSliceItem> &sliceArray() { return m_sliceArray; } + inline QList<BarRenderSliceItem> &sliceArray() { return m_sliceArray; } inline void setVisualIndex(int index) { m_visualIndex = index; } inline int visualIndex() {return m_visualIndex; } protected: BarRenderItemArray m_renderArray; - QVector<BarRenderSliceItem> m_sliceArray; + QList<BarRenderSliceItem> m_sliceArray; int m_visualIndex; // order of the series is relevant }; diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index 1150870d..5b359a4e 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -592,7 +592,7 @@ void Q3DCamera::setCameraPosition(float horizontal, float vertical, float zoom) * \property Q3DCamera::target * \since QtDataVisualization 1.2 * - * \brief The camera target as a a vector or vertex in the 3D space. + * \brief The camera target as a vector or vertex in the 3D space. * * Defaults to \c {QVector3D(0.0, 0.0, 0.0)}. * diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h index 030b6be9..46acd282 100644 --- a/src/datavisualization/engine/scatter3dcontroller_p.h +++ b/src/datavisualization/engine/scatter3dcontroller_p.h @@ -71,7 +71,7 @@ public: }; private: Scatter3DChangeBitField m_changeTracker; - QVector<ChangeItem> m_changedItems; + QList<ChangeItem> m_changedItems; // Rendering Scatter3DRenderer *m_renderer; @@ -100,7 +100,7 @@ private: {} }; - QVector<InsertRemoveRecord> m_insertRemoveRecords; + QList<InsertRemoveRecord> m_insertRemoveRecords; bool m_recordInsertsAndRemoves; public: diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index fbf2b2cf..e999827e 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -353,7 +353,7 @@ SeriesRenderCache *Scatter3DRenderer::createNewCache(QAbstract3DSeries *series) return new ScatterSeriesRenderCache(series, this); } -void Scatter3DRenderer::updateItems(const QVector<Scatter3DController::ChangeItem> &items) +void Scatter3DRenderer::updateItems(const QList<Scatter3DController::ChangeItem> &items) { ScatterSeriesRenderCache *cache = 0; const QScatter3DSeries *prevSeries = 0; @@ -1932,7 +1932,7 @@ void Scatter3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa } float offsetValue = 0.0f; bool showLastLabel = false; - QVector<float> &labelPositions = m_axisCacheX.formatter()->labelPositions(); + QList<float> &labelPositions = m_axisCacheX.formatter()->labelPositions(); int lastLabelPosIndex = labelPositions.size() - 1; if (labelPositions.size() && (labelPositions.at(lastLabelPosIndex) != 1.0f || labelPositions.at(0) != 0.0f)) { diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index b54571db..f0366e0c 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -100,7 +100,7 @@ public: void updateData(); void updateSeries(const QList<QAbstract3DSeries *> &seriesList); SeriesRenderCache *createNewCache(QAbstract3DSeries *series); - void updateItems(const QVector<Scatter3DController::ChangeItem> &items); + void updateItems(const QList<Scatter3DController::ChangeItem> &items); void updateScene(Q3DScene *scene); void updateAxisLabels(QAbstract3DAxis::AxisOrientation orientation, const QStringList &labels); diff --git a/src/datavisualization/engine/scatterseriesrendercache_p.h b/src/datavisualization/engine/scatterseriesrendercache_p.h index 02d0b3e7..8f858d0f 100644 --- a/src/datavisualization/engine/scatterseriesrendercache_p.h +++ b/src/datavisualization/engine/scatterseriesrendercache_p.h @@ -74,8 +74,8 @@ public: inline ScatterObjectBufferHelper *bufferObject() const { return m_scatterBufferObj; } inline void setBufferPoints(ScatterPointBufferHelper *object) { m_scatterBufferPoints = object; } inline ScatterPointBufferHelper *bufferPoints() const { return m_scatterBufferPoints; } - inline QVector<int> &updateIndices() { return m_updateIndices; } - inline QVector<int> &bufferIndices() { return m_bufferIndices; } + inline QList<int> &updateIndices() { return m_updateIndices; } + inline QList<int> &bufferIndices() { return m_bufferIndices; } inline void setVisibilityChanged(bool changed) { m_visibilityChanged = changed; } inline bool visibilityChanged() const { return m_visibilityChanged; } @@ -88,8 +88,8 @@ protected: QString m_oldMeshFileName; // Used to detect if full buffer change needed ScatterObjectBufferHelper *m_scatterBufferObj; ScatterPointBufferHelper *m_scatterBufferPoints; - QVector<int> m_updateIndices; // Used as temporary cache during item updates - QVector<int> m_bufferIndices; // Cache for mapping renderarray to mesh buffer + QList<int> m_updateIndices; // Used as temporary cache during item updates + QList<int> m_bufferIndices; // Cache for mapping renderarray to mesh buffer bool m_visibilityChanged; // Used to detect if full buffer change needed }; diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h index 0d70242c..8cbfeb60 100644 --- a/src/datavisualization/engine/surface3dcontroller_p.h +++ b/src/datavisualization/engine/surface3dcontroller_p.h @@ -86,10 +86,10 @@ private: QSurface3DSeries *m_selectedSeries; // Points to the series for which the point is selected in // single series selection cases. bool m_flatShadingSupported; - QVector<ChangeItem> m_changedItems; - QVector<ChangeRow> m_changedRows; + QList<ChangeItem> m_changedItems; + QList<ChangeRow> m_changedRows; bool m_flipHorizontalGrid; - QVector<QSurface3DSeries *> m_changedTextures; + QList<QSurface3DSeries *> m_changedTextures; public: explicit Surface3DController(QRect rect, Q3DScene *scene = 0); diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index be7ccf66..ea4f23e7 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -305,7 +305,7 @@ void Surface3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLis } } -void Surface3DRenderer::updateSurfaceTextures(QVector<QSurface3DSeries *> seriesList) +void Surface3DRenderer::updateSurfaceTextures(QList<QSurface3DSeries *> seriesList) { foreach (QSurface3DSeries *series, seriesList) { SurfaceSeriesRenderCache *cache = @@ -348,7 +348,7 @@ void Surface3DRenderer::cleanCache(SeriesRenderCache *cache) m_selectionTexturesDirty = true; } -void Surface3DRenderer::updateRows(const QVector<Surface3DController::ChangeRow> &rows) +void Surface3DRenderer::updateRows(const QList<Surface3DController::ChangeRow> &rows) { foreach (Surface3DController::ChangeRow item, rows) { SurfaceSeriesRenderCache *cache = @@ -389,7 +389,7 @@ void Surface3DRenderer::updateRows(const QVector<Surface3DController::ChangeRow> updateSelectedPoint(m_selectedPoint, m_selectedSeries); } -void Surface3DRenderer::updateItems(const QVector<Surface3DController::ChangeItem> &points) +void Surface3DRenderer::updateItems(const QList<Surface3DController::ChangeItem> &points) { foreach (Surface3DController::ChangeItem item, points) { SurfaceSeriesRenderCache *cache = @@ -2225,7 +2225,7 @@ void Surface3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa } float offsetValue = 0.0f; bool showLastLabel = false; - QVector<float> &labelPositions = m_axisCacheX.formatter()->labelPositions(); + QList<float> &labelPositions = m_axisCacheX.formatter()->labelPositions(); int lastLabelPosIndex = labelPositions.size() - 1; if (labelPositions.size() && (labelPositions.at(lastLabelPosIndex) != 1.0f || labelPositions.at(0) != 0.0f)) { diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index 5cda332f..d527f248 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -94,12 +94,12 @@ public: void updateData(); void updateSeries(const QList<QAbstract3DSeries *> &seriesList); - void updateSurfaceTextures(QVector<QSurface3DSeries *> seriesList); + void updateSurfaceTextures(QList<QSurface3DSeries *> seriesList); SeriesRenderCache *createNewCache(QAbstract3DSeries *series); void cleanCache(SeriesRenderCache *cache); void updateSelectionMode(QAbstract3DGraph::SelectionFlags mode); - void updateRows(const QVector<Surface3DController::ChangeRow> &rows); - void updateItems(const QVector<Surface3DController::ChangeItem> &points); + void updateRows(const QList<Surface3DController::ChangeRow> &rows); + void updateItems(const QList<Surface3DController::ChangeItem> &points); void updateScene(Q3DScene *scene); void updateSlicingActive(bool isSlicing); void updateSelectedPoint(const QPoint &position, QSurface3DSeries *series); diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp index 29c20210..2069b444 100644 --- a/src/datavisualization/utils/meshloader.cpp +++ b/src/datavisualization/utils/meshloader.cpp @@ -31,22 +31,20 @@ #include <QtCore/QFile> #include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QtCore/QList> #include <QtGui/QVector2D> QT_BEGIN_NAMESPACE_DATAVISUALIZATION QString slashTag = QStringLiteral("/"); -bool MeshLoader::loadOBJ(const QString &path, - QVector<QVector3D> &out_vertices, - QVector<QVector2D> &out_uvs, - QVector<QVector3D> &out_normals) +bool MeshLoader::loadOBJ(const QString &path, QList<QVector3D> &out_vertices, + QList<QVector2D> &out_uvs, QList<QVector3D> &out_normals) { - QVector<unsigned int> vertexIndices, uvIndices, normalIndices; - QVector<QVector3D> temp_vertices; - QVector<QVector2D> temp_uvs; - QVector<QVector3D> temp_normals; + QList<unsigned int> vertexIndices, uvIndices, normalIndices; + QList<QVector3D> temp_vertices; + QList<QVector2D> temp_uvs; + QList<QVector3D> temp_normals; QFile file(path); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { diff --git a/src/datavisualization/utils/meshloader_p.h b/src/datavisualization/utils/meshloader_p.h index 2ecf47f0..e8f60ffc 100644 --- a/src/datavisualization/utils/meshloader_p.h +++ b/src/datavisualization/utils/meshloader_p.h @@ -48,10 +48,8 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION class MeshLoader { public: - static bool loadOBJ(const QString &path, - QVector<QVector3D> &out_vertices, - QVector<QVector2D> &out_uvs, - QVector<QVector3D> &out_normals); + static bool loadOBJ(const QString &path, QList<QVector3D> &out_vertices, + QList<QVector2D> &out_uvs, QList<QVector3D> &out_normals); }; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp index 38ffe928..410a22d7 100644 --- a/src/datavisualization/utils/objecthelper.cpp +++ b/src/datavisualization/utils/objecthelper.cpp @@ -136,9 +136,9 @@ void ObjectHelper::load() m_normalbuffer = 0; m_elementbuffer = 0; } - QVector<QVector3D> vertices; - QVector<QVector2D> uvs; - QVector<QVector3D> normals; + QList<QVector3D> vertices; + QList<QVector2D> uvs; + QList<QVector3D> normals; bool loadOk = MeshLoader::loadOBJ(m_objectFile, vertices, uvs, normals); if (!loadOk) qFatal("loading failed"); diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h index 10820b52..d1c2ea78 100644 --- a/src/datavisualization/utils/objecthelper_p.h +++ b/src/datavisualization/utils/objecthelper_p.h @@ -59,10 +59,10 @@ public: static void releaseObjectHelper(const Abstract3DRenderer *cacheId, ObjectHelper *&obj); inline const QString &objectFile() { return m_objectFile; } - inline const QVector<GLuint> &indices() const { return m_indices; } - inline const QVector<QVector3D> &indexedvertices() const { return m_indexedVertices; } - inline const QVector<QVector2D> &indexedUVs() const { return m_indexedUVs; } - inline const QVector<QVector3D> &indexedNormals() const { return m_indexedNormals; } + inline const QList<GLuint> &indices() const { return m_indices; } + inline const QList<QVector3D> &indexedvertices() const { return m_indexedVertices; } + inline const QList<QVector2D> &indexedUVs() const { return m_indexedUVs; } + inline const QList<QVector3D> &indexedNormals() const { return m_indexedNormals; } private: static ObjectHelper *getObjectHelper(const Abstract3DRenderer *cacheId, @@ -70,10 +70,10 @@ private: void load(); QString m_objectFile; - QVector<GLuint> m_indices; - QVector<QVector3D> m_indexedVertices; - QVector<QVector2D> m_indexedUVs; - QVector<QVector3D> m_indexedNormals; + QList<GLuint> m_indices; + QList<QVector3D> m_indexedVertices; + QList<QVector2D> m_indexedUVs; + QList<QVector3D> m_indexedNormals; }; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/scatterobjectbufferhelper.cpp b/src/datavisualization/utils/scatterobjectbufferhelper.cpp index 579eff98..8e06617b 100644 --- a/src/datavisualization/utils/scatterobjectbufferhelper.cpp +++ b/src/datavisualization/utils/scatterobjectbufferhelper.cpp @@ -74,10 +74,10 @@ void ScatterObjectBufferHelper::fullLoad(ScatterSeriesRenderCache *cache, qreal } // Index vertices - const QVector<GLuint> indices = dotObj->indices(); - const QVector<QVector3D> indexed_vertices = dotObj->indexedvertices(); - const QVector<QVector2D> indexed_uvs = dotObj->indexedUVs(); - const QVector<QVector3D> indexed_normals = dotObj->indexedNormals(); + const QList<GLuint> indices = dotObj->indices(); + const QList<QVector3D> indexed_vertices = dotObj->indexedvertices(); + const QList<QVector2D> indexed_uvs = dotObj->indexedUVs(); + const QList<QVector3D> indexed_normals = dotObj->indexedNormals(); const int indicesCount = indices.count(); const int verticeCount = indexed_vertices.count(); const int uvsCount = indexed_uvs.count(); @@ -95,15 +95,15 @@ void ScatterObjectBufferHelper::fullLoad(ScatterSeriesRenderCache *cache, qreal } modelMatrix.scale(modelScaler); - QVector<QVector3D> scaled_vertices; + QList<QVector3D> scaled_vertices; scaled_vertices.resize(verticeCount); for (int i = 0; i < verticeCount; i++) scaled_vertices[i] = indexed_vertices[i] * modelMatrix; - QVector<GLuint> buffered_indices; - QVector<QVector3D> buffered_vertices; - QVector<QVector2D> buffered_uvs; - QVector<QVector3D> buffered_normals; + QList<GLuint> buffered_indices; + QList<QVector3D> buffered_vertices; + QList<QVector2D> buffered_uvs; + QList<QVector3D> buffered_normals; buffered_indices.resize(indicesCount * renderArraySize); buffered_vertices.resize(verticeCount * renderArraySize); @@ -204,14 +204,14 @@ void ScatterObjectBufferHelper::updateUVs(ScatterSeriesRenderCache *cache) if (!updateSize) return; - QVector<QVector2D> buffered_uvs; + QList<QVector2D> buffered_uvs; buffered_uvs.resize(uvsCount * updateSize); uint itemCount = 0; if (cache->colorStyle() == Q3DTheme::ColorStyleRangeGradient) { itemCount = createRangeGradientUVs(cache, buffered_uvs); } else if (cache->colorStyle() == Q3DTheme::ColorStyleObjectGradient) { - const QVector<QVector3D> indexed_vertices = dotObj->indexedvertices(); + const QList<QVector3D> indexed_vertices = dotObj->indexedvertices(); itemCount = createObjectGradientUVs(cache, buffered_uvs, indexed_vertices); } @@ -234,7 +234,7 @@ void ScatterObjectBufferHelper::updateUVs(ScatterSeriesRenderCache *cache) } uint ScatterObjectBufferHelper::createRangeGradientUVs(ScatterSeriesRenderCache *cache, - QVector<QVector2D> &buffered_uvs) + QList<QVector2D> &buffered_uvs) { ObjectHelper *dotObj = cache->object(); const int uvsCount = dotObj->indexedUVs().count(); @@ -276,8 +276,8 @@ uint ScatterObjectBufferHelper::createRangeGradientUVs(ScatterSeriesRenderCache } uint ScatterObjectBufferHelper::createObjectGradientUVs(ScatterSeriesRenderCache *cache, - QVector<QVector2D> &buffered_uvs, - const QVector<QVector3D> &indexed_vertices) + QList<QVector2D> &buffered_uvs, + const QList<QVector3D> &indexed_vertices) { ObjectHelper *dotObj = cache->object(); const int uvsCount = dotObj->indexedUVs().count(); @@ -316,7 +316,7 @@ void ScatterObjectBufferHelper::update(ScatterSeriesRenderCache *cache, qreal do return; // Index vertices - const QVector<QVector3D> indexed_vertices = dotObj->indexedvertices(); + const QList<QVector3D> indexed_vertices = dotObj->indexedvertices(); int verticeCount = indexed_vertices.count(); float itemSize = cache->itemSize() / itemScaler; @@ -331,12 +331,12 @@ void ScatterObjectBufferHelper::update(ScatterSeriesRenderCache *cache, qreal do } modelMatrix.scale(modelScaler); - QVector<QVector3D> scaled_vertices; + QList<QVector3D> scaled_vertices; scaled_vertices.resize(verticeCount); for (int i = 0; i < verticeCount; i++) scaled_vertices[i] = indexed_vertices[i] * modelMatrix; - QVector<QVector3D> buffered_vertices; + QList<QVector3D> buffered_vertices; buffered_vertices.resize(verticeCount * updateSize); int itemCount = 0; diff --git a/src/datavisualization/utils/scatterobjectbufferhelper_p.h b/src/datavisualization/utils/scatterobjectbufferhelper_p.h index 48b9ea99..fac5e922 100644 --- a/src/datavisualization/utils/scatterobjectbufferhelper_p.h +++ b/src/datavisualization/utils/scatterobjectbufferhelper_p.h @@ -58,11 +58,9 @@ public: void setScaleY(float scale) { m_scaleY = scale; } private: - uint createRangeGradientUVs(ScatterSeriesRenderCache *cache, - QVector<QVector2D> &buffered_uvs); - uint createObjectGradientUVs(ScatterSeriesRenderCache *cache, - QVector<QVector2D> &buffered_uvs, - const QVector<QVector3D> &indexed_vertices); + uint createRangeGradientUVs(ScatterSeriesRenderCache *cache, QList<QVector2D> &buffered_uvs); + uint createObjectGradientUVs(ScatterSeriesRenderCache *cache, QList<QVector2D> &buffered_uvs, + const QList<QVector3D> &indexed_vertices); float m_scaleY; }; diff --git a/src/datavisualization/utils/scatterpointbufferhelper.cpp b/src/datavisualization/utils/scatterpointbufferhelper.cpp index 860a2b88..d3621423 100644 --- a/src/datavisualization/utils/scatterpointbufferhelper.cpp +++ b/src/datavisualization/utils/scatterpointbufferhelper.cpp @@ -111,7 +111,7 @@ void ScatterPointBufferHelper::load(ScatterSeriesRenderCache *cache) } } - QVector<QVector2D> buffered_uvs; + QList<QVector2D> buffered_uvs; if (itemsVisible) m_indexCount = renderArraySize; @@ -169,7 +169,7 @@ void ScatterPointBufferHelper::updateUVs(ScatterSeriesRenderCache *cache) // It may be that the buffer hasn't yet been initialized, in case the entire series was // hidden items. No need to update in that case. if (m_indexCount > 0) { - QVector<QVector2D> buffered_uvs; + QList<QVector2D> buffered_uvs; createRangeGradientUVs(cache, buffered_uvs); if (buffered_uvs.size()) { @@ -196,7 +196,7 @@ void ScatterPointBufferHelper::updateUVs(ScatterSeriesRenderCache *cache) } void ScatterPointBufferHelper::createRangeGradientUVs(ScatterSeriesRenderCache *cache, - QVector<QVector2D> &buffered_uvs) + QList<QVector2D> &buffered_uvs) { const ScatterRenderItemArray &renderArray = cache->renderArray(); const bool updateAll = (cache->updateIndices().size() == 0); diff --git a/src/datavisualization/utils/scatterpointbufferhelper_p.h b/src/datavisualization/utils/scatterpointbufferhelper_p.h index 2b5ee4cc..d1e8f5b0 100644 --- a/src/datavisualization/utils/scatterpointbufferhelper_p.h +++ b/src/datavisualization/utils/scatterpointbufferhelper_p.h @@ -65,11 +65,10 @@ public: GLuint m_pointbuffer; private: - void createRangeGradientUVs(ScatterSeriesRenderCache *cache, - QVector<QVector2D> &buffered_uvs); + void createRangeGradientUVs(ScatterSeriesRenderCache *cache, QList<QVector2D> &buffered_uvs); private: - QVector<QVector3D> m_bufferedPoints; + QList<QVector3D> m_bufferedPoints; int m_oldRemoveIndex; float m_scaleY; }; diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index f9e4181e..96a75422 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -77,7 +77,7 @@ void SurfaceObject::setUpSmoothData(const QSurfaceDataArray &dataArray, const QR if (changeGeometry) m_vertices.resize(totalSize); - QVector<QVector2D> uvs; + QList<QVector2D> uvs; if (changeGeometry) uvs.resize(totalSize); int totalIndex = 0; @@ -315,7 +315,7 @@ void SurfaceObject::smoothUVs(const QSurfaceDataArray &dataArray, const bool zDescending = m_dataDimension.testFlag(SurfaceObject::ZDescending); const bool xDescending = m_dataDimension.testFlag(SurfaceObject::XDescending); - QVector<QVector2D> uvs; + QList<QVector2D> uvs; uvs.resize(m_rows * m_columns); int index = 0; for (int i = 0; i < m_rows; i++) { @@ -534,7 +534,7 @@ void SurfaceObject::setUpData(const QSurfaceDataArray &dataArray, const QRect &s if (changeGeometry) m_vertices.resize(totalSize); - QVector<QVector2D> uvs; + QList<QVector2D> uvs; if (changeGeometry) uvs.resize(totalSize); @@ -620,7 +620,7 @@ void SurfaceObject::coarseUVs(const QSurfaceDataArray &dataArray, const bool zDescending = m_dataDimension.testFlag(SurfaceObject::ZDescending); const bool xDescending = m_dataDimension.testFlag(SurfaceObject::XDescending); - QVector<QVector2D> uvs; + QList<QVector2D> uvs; uvs.resize(m_rows * m_columns * 2); int index = 0; int colLimit = m_columns - 1; @@ -802,12 +802,12 @@ void SurfaceObject::createCoarseGridlineIndices(int x, int y, int endX, int endY void SurfaceObject::uploadBuffers() { - QVector<QVector2D> uvs; // Empty dummy + QList<QVector2D> uvs; // Empty dummy createBuffers(m_vertices, uvs, m_normals, 0); } -void SurfaceObject::createBuffers(const QVector<QVector3D> &vertices, const QVector<QVector2D> &uvs, - const QVector<QVector3D> &normals, const GLint *indices) +void SurfaceObject::createBuffers(const QList<QVector3D> &vertices, const QList<QVector2D> &uvs, + const QList<QVector3D> &normals, const GLint *indices) { // Move to buffers glBindBuffer(GL_ARRAY_BUFFER, m_vertexbuffer); diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index 41b6ad5f..532f7692 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_p.h @@ -104,8 +104,8 @@ private: QVector3D createSmoothNormalBodyLineItem(int x, int y); QVector3D createSmoothNormalUpperLineItem(int x, int y); QVector3D normal(const QVector3D &a, const QVector3D &b, const QVector3D &c); - void createBuffers(const QVector<QVector3D> &vertices, const QVector<QVector2D> &uvs, - const QVector<QVector3D> &normals, const GLint *indices); + void createBuffers(const QList<QVector3D> &vertices, const QList<QVector2D> &uvs, + const QList<QVector3D> &normals, const GLint *indices); void checkDirections(const QSurfaceDataArray &array); inline void getNormalizedVertex(const QSurfaceDataItem &data, QVector3D &vertex, bool polar, bool flipXZ); @@ -116,8 +116,8 @@ private: int m_rows = 0; GLuint m_gridElementbuffer; GLuint m_gridIndexCount = 0; - QVector<QVector3D> m_vertices; - QVector<QVector3D> m_normals; + QList<QVector3D> m_vertices; + QList<QVector3D> m_normals; // Caches are not owned AxisRenderCache &m_axisCacheX; AxisRenderCache &m_axisCacheY; diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp index fb7b099a..b1371610 100644 --- a/src/datavisualization/utils/texturehelper.cpp +++ b/src/datavisualization/utils/texturehelper.cpp @@ -108,7 +108,7 @@ GLuint TextureHelper::create2DTexture(const QImage &image, bool useTrilinearFilt return textureId; } -GLuint TextureHelper::create3DTexture(const QVector<uchar> *data, int width, int height, int depth, +GLuint TextureHelper::create3DTexture(const QList<uchar> *data, int width, int height, int depth, QImage::Format dataFormat) { if (Utils::isOpenGLES() || !width || !height || !depth) diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h index 962e27e9..fac32a42 100644 --- a/src/datavisualization/utils/texturehelper_p.h +++ b/src/datavisualization/utils/texturehelper_p.h @@ -59,7 +59,7 @@ class TextureHelper : protected QOpenGLFunctions // Ownership of created texture is transferred to caller GLuint create2DTexture(const QImage &image, bool useTrilinearFiltering = false, bool convert = true, bool smoothScale = true, bool clampY = false); - GLuint create3DTexture(const QVector<uchar> *data, int width, int height, int depth, + GLuint create3DTexture(const QList<uchar> *data, int width, int height, int depth, QImage::Format dataFormat); GLuint createCubeMapTexture(const QImage &image, bool useTrilinearFiltering = false); // Returns selection texture and inserts generated framebuffers to framebuffer parameters diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index 36d93563..5b770366 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.cpp @@ -48,13 +48,10 @@ bool VertexIndexer::getSimilarVertexIndex_fast(const PackedVertex &packed, } } -void VertexIndexer::indexVBO(const QVector<QVector3D> &in_vertices, - const QVector<QVector2D> &in_uvs, - const QVector<QVector3D> &in_normals, - QVector<GLuint> &out_indices, - QVector<QVector3D> &out_vertices, - QVector<QVector2D> &out_uvs, - QVector<QVector3D> &out_normals) +void VertexIndexer::indexVBO(const QList<QVector3D> &in_vertices, const QList<QVector2D> &in_uvs, + const QList<QVector3D> &in_normals, QList<GLuint> &out_indices, + QList<QVector3D> &out_vertices, QList<QVector2D> &out_uvs, + QList<QVector3D> &out_normals) { unique_vertices = 0; QMap<PackedVertex, GLuint> VertexToOutIndex; diff --git a/src/datavisualization/utils/vertexindexer_p.h b/src/datavisualization/utils/vertexindexer_p.h index 030b781b..42a48465 100644 --- a/src/datavisualization/utils/vertexindexer_p.h +++ b/src/datavisualization/utils/vertexindexer_p.h @@ -42,7 +42,7 @@ #include "datavisualizationglobal_p.h" -#include <QtCore/QVector> +#include <QtCore/QList> #include <QtGui/QVector2D> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -59,13 +59,10 @@ public: } }; - static void indexVBO(const QVector<QVector3D> &in_vertices, - const QVector<QVector2D> &in_uvs, - const QVector<QVector3D> &in_normals, - QVector<GLuint> &out_indices, - QVector<QVector3D> &out_vertices, - QVector<QVector2D> &out_uvs, - QVector<QVector3D> &out_normals); + static void indexVBO(const QList<QVector3D> &in_vertices, const QList<QVector2D> &in_uvs, + const QList<QVector3D> &in_normals, QList<GLuint> &out_indices, + QList<QVector3D> &out_vertices, QList<QVector2D> &out_uvs, + QList<QVector3D> &out_normals); private: static bool getSimilarVertexIndex_fast(const PackedVertex &packed, diff --git a/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp b/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp index 23aa072c..982353ac 100644 --- a/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp +++ b/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp @@ -77,9 +77,9 @@ void tst_custom::construct() QVERIFY(custom); delete custom; - QVector<uchar> *tdata = new QVector<uchar>(1000); + QList<uchar> *tdata = new QList<uchar>(1000); - QVector<QRgb> table; + QList<QRgb> table; table << QRgb(0xff00ff) << QRgb(0x00ff00); custom = new QCustom3DVolume(QVector3D(1.0, 1.0, 1.0), QVector3D(1.0, 1.0, 1.0), diff --git a/tests/manual/galaxy/cumulativedistributor.h b/tests/manual/galaxy/cumulativedistributor.h index 59610953..56276e98 100644 --- a/tests/manual/galaxy/cumulativedistributor.h +++ b/tests/manual/galaxy/cumulativedistributor.h @@ -38,8 +38,8 @@ #define CUMULATIVEDISTRIBUTOR_H #include <QtCore/qglobal.h> +#include <QtCore/QList> #include <QtGui/QVector2D> -#include <QtCore/QVector> class CumulativeDistributor { @@ -69,13 +69,13 @@ private: qreal m_a; qreal m_RBulge; - QVector<qreal> m_vM1; - QVector<qreal> m_vY1; - QVector<qreal> m_vX1; + QList<qreal> m_vM1; + QList<qreal> m_vY1; + QList<qreal> m_vX1; - QVector<qreal> m_vM2; - QVector<qreal> m_vY2; - QVector<qreal> m_vX2; + QList<qreal> m_vM2; + QList<qreal> m_vY2; + QList<qreal> m_vX2; void buildCDF(int nSteps); diff --git a/tests/manual/qmlvolume/datasource.cpp b/tests/manual/qmlvolume/datasource.cpp index 6f3d8c15..a06ea6d9 100644 --- a/tests/manual/qmlvolume/datasource.cpp +++ b/tests/manual/qmlvolume/datasource.cpp @@ -57,7 +57,7 @@ void DataSource::fillVolume(QCustom3DVolume *volumeItem) float(textureSize) / 2.0f, float(textureSize) / 2.0f); - QVector<uchar> *textureData = new QVector<uchar>(textureSize * textureSize * textureSize / 2); + QList<uchar> *textureData = new QList<uchar>(textureSize * textureSize * textureSize / 2); for (int i = 0; i < textureSize; i++) { for (int j = 0; j < textureSize / 2; j++) { for (int k = 0; k < textureSize; k++) { @@ -82,7 +82,7 @@ void DataSource::fillVolume(QCustom3DVolume *volumeItem) volumeItem->setTextureFormat(QImage::Format_Indexed8); volumeItem->setTextureData(textureData); - QVector<QRgb> colorTable(256); + QList<QRgb> colorTable(256); for (int i = 1; i < 256; i++) { if (i < 15) diff --git a/tests/manual/volumetrictest/volumetrictest.cpp b/tests/manual/volumetrictest/volumetrictest.cpp index 6b2a57a8..a60c55bc 100644 --- a/tests/manual/volumetrictest/volumetrictest.cpp +++ b/tests/manual/volumetrictest/volumetrictest.cpp @@ -251,7 +251,7 @@ void VolumetricModifier::handleFpsChange() void VolumetricModifier::testSubtextureSetting() { // Setting the rendered Slice as subtexture should result in identical volume - QVector<uchar> dataBefore = *m_volumeItem->textureData(); + QList<uchar> dataBefore = *m_volumeItem->textureData(); dataBefore[0] = dataBefore.at(0); // Make sure we are detached checkRenderCase(1, Qt::XAxis, 56, dataBefore, m_volumeItem); @@ -355,7 +355,7 @@ void VolumetricModifier::testBoundsSetting() } void VolumetricModifier::checkRenderCase(int id, Qt::Axis axis, int index, - const QVector<uchar> &dataBefore, + const QList<uchar> &dataBefore, QCustom3DVolume *volumeItem) { QImage slice = volumeItem->renderSlice(axis, index); @@ -384,7 +384,7 @@ void VolumetricModifier::createVolume() << logo.sizeInBytes() << (logo.width() * logo.height()) << logo.bytesPerLine(); - QVector<QImage *> imageArray(imageCount); + QList<QImage *> imageArray(imageCount); for (int i = 0; i < imageCount; i++) { QImage *newImage = new QImage(logo); imageArray[i] = newImage; @@ -399,7 +399,7 @@ void VolumetricModifier::createVolume() m_sliceIndexY = m_volumeItem->textureWidth() / 2; m_sliceIndexZ = m_volumeItem->textureWidth() / 2; - QVector<QRgb> colorTable = m_volumeItem->colorTable(); + QList<QRgb> colorTable = m_volumeItem->colorTable(); // Hack some alpha to the picture for (int i = 0; i < colorTable.size(); i++) { @@ -540,7 +540,7 @@ void VolumetricModifier::createAnotherVolume() logo.save("d:/qt/goobar.png"); - QVector<QImage *> imageArray(imageCount); + QList<QImage *> imageArray(imageCount); for (int i = 0; i < imageCount; i++) { QImage *newImage = new QImage(logo); imageArray[i] = newImage; @@ -582,9 +582,9 @@ void VolumetricModifier::createYetAnotherVolume() // m_volumeItem->textureDepth()); m_volumeItem3->setTextureDimensions(200, 200, 200); - QVector<uchar> *tdata = new QVector<uchar>(m_volumeItem3->textureDataWidth() - * m_volumeItem3->textureHeight() - * m_volumeItem3->textureDepth()); + QList<uchar> *tdata = + new QList<uchar>(m_volumeItem3->textureDataWidth() * m_volumeItem3->textureHeight() + * m_volumeItem3->textureDepth()); tdata->fill(0); m_volumeItem3->setTextureData(tdata); @@ -592,7 +592,7 @@ void VolumetricModifier::createYetAnotherVolume() m_sliceIndexY = m_volumeItem3->textureWidth() / 2; m_sliceIndexZ = m_volumeItem3->textureWidth() / 2; - QVector<QRgb> colorTable = m_volumeItem->colorTable(); + QList<QRgb> colorTable = m_volumeItem->colorTable(); colorTable[0] = qRgba(0, 0, 0, 0); m_volumeItem3->setColorTable(colorTable); int redIndex = colorTable.size() - 3; diff --git a/tests/manual/volumetrictest/volumetrictest.h b/tests/manual/volumetrictest/volumetrictest.h index 2e4309a6..83e0d01a 100644 --- a/tests/manual/volumetrictest/volumetrictest.h +++ b/tests/manual/volumetrictest/volumetrictest.h @@ -67,7 +67,7 @@ private: void createVolume(); void createAnotherVolume(); void createYetAnotherVolume(); - void checkRenderCase(int id, Qt::Axis axis, int index, const QVector<uchar> &dataBefore, + void checkRenderCase(int id, Qt::Axis axis, int index, const QList<uchar> &dataBefore, QCustom3DVolume *volumeItem); QAbstract3DGraph *m_graph; |