summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r--src/datavisualization/engine/abstract3dcontroller_p.h2
-rw-r--r--src/datavisualization/engine/abstract3drenderer.cpp14
-rw-r--r--src/datavisualization/engine/abstract3drenderer_p.h2
-rw-r--r--src/datavisualization/engine/axisrendercache.cpp2
-rw-r--r--src/datavisualization/engine/axisrendercache_p.h4
-rw-r--r--src/datavisualization/engine/bars3dcontroller_p.h4
-rw-r--r--src/datavisualization/engine/bars3drenderer.cpp10
-rw-r--r--src/datavisualization/engine/bars3drenderer_p.h4
-rw-r--r--src/datavisualization/engine/barseriesrendercache_p.h4
-rw-r--r--src/datavisualization/engine/q3dcamera.cpp2
-rw-r--r--src/datavisualization/engine/scatter3dcontroller_p.h4
-rw-r--r--src/datavisualization/engine/scatter3drenderer.cpp4
-rw-r--r--src/datavisualization/engine/scatter3drenderer_p.h2
-rw-r--r--src/datavisualization/engine/scatterseriesrendercache_p.h8
-rw-r--r--src/datavisualization/engine/surface3dcontroller_p.h6
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp8
-rw-r--r--src/datavisualization/engine/surface3drenderer_p.h6
17 files changed, 43 insertions, 43 deletions
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 10:14:17 +0000