From 15a088a1b4d63df74b547a9b7d5d4d1fb311ec29 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 27 Aug 2014 09:30:26 +0300 Subject: Fix build issue with Qt 5.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QImage is not a QObject, and therefore QImage::Format doesn't seem to be a supported type for a Q_PROPERTY, either. At least this was the case in Qt 5.2.1. In Qt 5.3.1 this worked. In any case, worked around the issue by removing textureFormat as a property. This shouldn't be an issue, since texture cannot meaningfully be manipulated from QML anyway. Also fixed some compile warnings. Change-Id: I257c1502d3340c49c24085fb8bf2e6176d875215 Reviewed-by: Tomi Korpipää --- src/datavisualization/utils/scatterpointbufferhelper_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/utils/scatterpointbufferhelper_p.h') diff --git a/src/datavisualization/utils/scatterpointbufferhelper_p.h b/src/datavisualization/utils/scatterpointbufferhelper_p.h index b3adcfa8..d09ce0f7 100644 --- a/src/datavisualization/utils/scatterpointbufferhelper_p.h +++ b/src/datavisualization/utils/scatterpointbufferhelper_p.h @@ -39,7 +39,7 @@ class ScatterPointBufferHelper : public AbstractObjectHelper { public: ScatterPointBufferHelper(); - ~ScatterPointBufferHelper(); + virtual ~ScatterPointBufferHelper(); GLuint pointBuf(); -- cgit v1.2.3 From 9a40207d83b66072fff4aaa03eca15b02f8a11c1 Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Thu, 28 Aug 2014 10:29:39 +0300 Subject: Range gradient for points on static optimization Change-Id: Ic44a6a28617f272540d146f02bf50b4bd84cd9c8 Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/scatterpointbufferhelper_p.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/datavisualization/utils/scatterpointbufferhelper_p.h') diff --git a/src/datavisualization/utils/scatterpointbufferhelper_p.h b/src/datavisualization/utils/scatterpointbufferhelper_p.h index d09ce0f7..3edc4c8f 100644 --- a/src/datavisualization/utils/scatterpointbufferhelper_p.h +++ b/src/datavisualization/utils/scatterpointbufferhelper_p.h @@ -46,14 +46,21 @@ public: void pushPoint(uint pointIndex); void popPoint(); void load(ScatterSeriesRenderCache *cache); + void setScaleY(float scale) { m_scaleY = scale; } + void updateUVs(ScatterSeriesRenderCache *cache); public: GLuint m_pointbuffer; +private: + void createRangeGradientUVs(ScatterSeriesRenderCache *cache, + QVector &buffered_uvs); + private: QVector m_bufferedPoints; uint m_oldRemoveIndex; bool m_oldRemove; + float m_scaleY; }; QT_END_NAMESPACE_DATAVISUALIZATION -- cgit v1.2.3 From df2571bdf0b15237a324471c63913989c80349d8 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 2 Oct 2014 16:19:33 +0300 Subject: Fix changing items in static optimization mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-3344 Change-Id: I8c1d2e2ae4afd6f9058c59adfc3d784b5f724358 Reviewed-by: Tomi Korpipää --- src/datavisualization/utils/scatterpointbufferhelper_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/utils/scatterpointbufferhelper_p.h') diff --git a/src/datavisualization/utils/scatterpointbufferhelper_p.h b/src/datavisualization/utils/scatterpointbufferhelper_p.h index 3edc4c8f..8b34542d 100644 --- a/src/datavisualization/utils/scatterpointbufferhelper_p.h +++ b/src/datavisualization/utils/scatterpointbufferhelper_p.h @@ -46,6 +46,7 @@ public: void pushPoint(uint pointIndex); void popPoint(); void load(ScatterSeriesRenderCache *cache); + void update(ScatterSeriesRenderCache *cache); void setScaleY(float scale) { m_scaleY = scale; } void updateUVs(ScatterSeriesRenderCache *cache); @@ -58,8 +59,7 @@ private: private: QVector m_bufferedPoints; - uint m_oldRemoveIndex; - bool m_oldRemove; + int m_oldRemoveIndex; float m_scaleY; }; -- cgit v1.2.3