From ec195a34594dea6145af5e8f2fedc2f9401d0f14 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 19 Jun 2014 09:54:03 +0300 Subject: Polar graph support, phase one - Polar property for toggling the polar mode - Example added. Example docs will be added in another patch once all of the functionality the example needs has been implemented. - Only surface graph supports polar so far. Scatter to be added later. Change-Id: I54d36f764ac1771ac88f73a5f3a2142f2309f6e8 Reviewed-by: Mika Salmela --- .../src/qtdatavisualization-qml-abstractdeclarative.qdoc | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index 2cc3eece..5afbc8c7 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -152,6 +152,19 @@ * Add a list of \l{Custom3DItem}s to the graph. Graph takes ownership of the added items. */ +/*! + * \qmlproperty bool AbstractGraph3D::polar + * \since QtDataVisualization 1.2 + * + * If \c {true}, the horizontal axes are changed into polar axes. The X axis becomes the + * angular axis and the Z axis becomes the radial axis. + * Polar mode is not available for bar graphs. + * + * Defaults to \c{false}. + * + * \sa orthoProjection, AbstractAxis3D::gridOffset, radialLabelOffset + */ + /*! * \qmlmethod void AbstractGraph3D::clearSelection() * Clears selection from all attached series. -- cgit v1.2.3 From 36417dd3660f75c34328c3420bdd512436da86ff Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 25 Jun 2014 13:00:55 +0300 Subject: Add flipHorizontalGrid property for surface This property allows drawind the horizontal grid and axis labels on top of the graph rather than on the bottom. This is useful when surface graph is used for 2D spectrograms in orthographic mode, as otherwise the grid is covered by the surface itself. Particularly relevant for polar plots of the same. Task-number: QTRD-3184 Change-Id: I9dbcdbfc754e13af52d2cf31a1d9991ef4b241f7 Reviewed-by: Mika Salmela --- .../doc/src/qtdatavisualization-qml-surface3d.qdoc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc index 23a9a004..4c25cc0a 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc @@ -85,6 +85,16 @@ * To set the series, either use the addSeries() function or define them as children of the graph. */ +/*! + * \qmlproperty bool Surface3D::flipHorizontalGrid + * + * If \c{false}, the horizontal axis grid and labels are drawn on the horizontal background + * of the graph. + * If \c{true}, the horizontal axis grid and labels are drawn on the opposite side of the graph + * from the horizontal background. + * Defaults to \c{false}. + */ + /*! * \qmlmethod void Surface3D::addSeries(Surface3DSeries series) * Adds the \a series to the graph. -- cgit v1.2.3 From ffba0218893cd25b08718d4d6fd0c40c95aecf47 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 25 Jun 2014 14:45:01 +0300 Subject: Add radialLabelOffset property for graphs This property indicates where radial labels of the polar chart are drawn Task-number: QTRD-3184 Change-Id: I1500e67da5e578b90d679876130c2d56c1d08039 Reviewed-by: Mika Salmela --- .../src/qtdatavisualization-qml-abstractdeclarative.qdoc | 15 ++++++++++++++- .../doc/src/qtdatavisualization-qml-surface3d.qdoc | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index 5afbc8c7..cae9a406 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -162,7 +162,20 @@ * * Defaults to \c{false}. * - * \sa orthoProjection, AbstractAxis3D::gridOffset, radialLabelOffset + * \sa orthoProjection, radialLabelOffset + */ + +/*! + * \qmlproperty real AbstractGraph3D::radialLabelOffset + * \since QtDataVisualization 1.2 + * + * This property specifies the normalized horizontal offset for the axis labels of the radial + * polar axis. The value 0.0 indicates the labels should be drawn next to the 0-angle angular + * axis grid line. The value 1.0 indicates the labels are drawn on their normal place at the edge + * of the graph background. + * This property is ignored if polar property value is \c{false}. Defaults to 1.0. + * + * \sa polar */ /*! diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc index 4c25cc0a..4188e2b1 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc @@ -87,6 +87,7 @@ /*! * \qmlproperty bool Surface3D::flipHorizontalGrid + * \since QtDataVisualization 1.2 * * If \c{false}, the horizontal axis grid and labels are drawn on the horizontal background * of the graph. -- cgit v1.2.3 From a1293a58e0909d56e34654549ba719bacfdda1bb Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 30 Jun 2014 10:33:33 +0300 Subject: Added horizontal aspect ratio property for abstract graphs Value 0.0 indicates automatic scaling (the default). Task-number: QTRD-3192 Change-Id: I5e4cc1b7a03c0ba811e2ed3916a440906429af57 Reviewed-by: Mika Salmela --- ...qtdatavisualization-qml-abstractdeclarative.qdoc | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index cae9a406..c83beb74 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -315,10 +315,27 @@ * \qmlproperty real AbstractGraph3D::aspectRatio * \since QtDataVisualization 1.1 * - * Aspect ratio of the graph data. This is the ratio of data scaling between horizontal and - * vertical axes. Defaults to \c{2.0}. + * The aspect ratio is the ratio of the graph scaling between the longest axis on the horizontal + * plane and the Y-axis. Defaults to \c{2.0}. * * \note Has no effect on Bars3D. + * + * \sa horizontalAspectRatio + */ + +/*! + * \qmlproperty real AbstractGraph3D::horizontalAspectRatio + * \since QtDataVisualization 1.2 + * + * The horizontal aspect ratio is the ratio of the graph scaling between the X and Z axes. + * Value of 0.0 indicates automatic scaling according to axis ranges. + * Defaults to \c{0.0}. + * + * \note Has no effect on Bars3D, which handles scaling on the horizontal plane via + * \l{Bars3D::barThickness}{barThickness} and \l{Bars3D::barSpacing}{barSpacing} properties. + * Polar graphs also ignore this property. + * + * \sa aspectRatio, polar, Bars3D::barThickness, Bars3D::barSpacing */ /*! -- cgit v1.2.3 From 4e9ed2481a1960a2fc4a31ecd14d1904b76cad2e Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 1 Jul 2014 15:47:07 +0300 Subject: Fix labels and grid lines changing size when aspect ratio is changed Since shaders needed fixing anyway for surface because of this, also implements the support for object gradients for surface, which was missing. Task-number: QTRD-2666 Task-number: QTRD-3211 Change-Id: I0c5da7fdfef308a96ec0bae4750fd22035da4e82 Reviewed-by: Mika Salmela --- src/datavisualization/doc/src/qtdatavisualization.qdoc | 1 - 1 file changed, 1 deletion(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index af419814..3726e735 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -330,7 +330,6 @@ \li Surfaces with non-straight rows and columns do not always render properly. \li Q3DLight class (and Light3D QML item) are currently not usable for anything. \li Changing any of Q3DScene properties affecting subviewports currently has no effect. - \li The color style Q3DTheme::ColorStyleObjectGradient doesn't work for surface graphs. \li Widget based examples layout incorrectly in iOS. \li Reparenting a graph to an item in another QQuickWindow is not supported. \li There is a low-impact binary break between 1.0 and 1.1. The break is due to a QML type -- cgit v1.2.3 From 1753a58f78dc328405e0aa77252a9e59b356e5af Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 2 Jul 2014 09:56:07 +0300 Subject: Add qmlspectrogram example documentation Change-Id: I5a325fa17215c486184cdce0bc26cce8d9c755da Reviewed-by: Mika Salmela --- src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc index 4188e2b1..2e343d38 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc @@ -89,6 +89,11 @@ * \qmlproperty bool Surface3D::flipHorizontalGrid * \since QtDataVisualization 1.2 * + * In some use cases the horizontal axis grid is mostly covered by the surface, so it can be more + * useful to display the horizontal axis grid on top of the graph rather than on the bottom. + * A typical use case for this is showing 2D spectrograms using orthoGraphic projection with + * a top-down viewpoint. + * * If \c{false}, the horizontal axis grid and labels are drawn on the horizontal background * of the graph. * If \c{true}, the horizontal axis grid and labels are drawn on the opposite side of the graph -- cgit v1.2.3 From d5ccfe2c0aa2ab1d14619e41561b5a6603296c8d Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 4 Jul 2014 15:08:22 +0300 Subject: Added mention of WinRT only supporting Quick2 api Change-Id: Ia92494674bfc618d9368075dabe6ea0490e6c3d1 Reviewed-by: Mika Salmela --- src/datavisualization/doc/src/qtdatavisualization.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index 3726e735..a4718887 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -323,8 +323,8 @@ \title Qt Data Visualization Known Issues \list - \li Android doesn't support both widgets and OpenGL simultaneously, so only - the Qt Quick 2 API is usable in practice in Android. + \li Some platforms like Android and WinRT cannot handle multiple native windows properly, + so only the Qt Quick 2 graphs are available in practice for those platforms. \li Shadows are not supported with OpenGL ES2 (including Angle builds in Windows). \li Anti-aliasing doesn't work with OpenGL ES2 (including Angle builds in Windows). \li Surfaces with non-straight rows and columns do not always render properly. -- cgit v1.2.3 From fcac33d0ee25115808ca43810cf6a3438e2da227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 26 Aug 2014 11:26:06 +0300 Subject: Reflection API added Task-number: QTRD-3287 Change-Id: I6c06b8fe025e0f1f87be00be906cab0e1f18a19f Reviewed-by: Miikka Heikkinen --- ...tdatavisualization-qml-abstractdeclarative.qdoc | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index c83beb74..dfa65877 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -340,7 +340,7 @@ /*! * \qmlproperty AbstractGraph3D.OptimizationHints AbstractGraph3D::optimizationHints - * \since Qt Data Visualization 1.1 + * \since QtDataVisualization 1.1 * * Defines if the rendering optimization is default or static. Default mode provides the full feature set at * reasonable performance. Static is a beta level feature and currently supports only a subset of the @@ -351,3 +351,26 @@ * with massive data sets is not advisable. * Defaults to \c{OptimizationDefault} */ + +/*! + * \qmlproperty bool AbstractGraph3D::reflection + * \since QtDataVisualization 1.2 + * + * Sets floor reflections on or off. Defaults to \c{false}. + * + * \note Affects only Bars3D. + * + * \sa reflectivity + */ + +/*! + * \qmlproperty real AbstractGraph3D::reflectivity + * \since QtDataVisualization 1.2 + * + * Adjusts floor reflectivity, larger number being more reflective. Valid range is \c{[0...1]}. + * Defaults to \c{0.5}. + * + * \note Affects only Bars3D. + * + * \sa reflection + */ -- 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 --- .../doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index dfa65877..5dc7b35c 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -343,13 +343,10 @@ * \since QtDataVisualization 1.1 * * Defines if the rendering optimization is default or static. Default mode provides the full feature set at - * reasonable performance. Static is a beta level feature and currently supports only a subset of the - * features on the Scatter graph. Missing features are object gradient for mesh objects, both gradients - * for points, and diffuse and specular color on rotations. At this point static is intended just for - * introducing a new feature. It optimizes graph rendering and is ideal for large non-changing data - * sets. It is slower with dynamic data changes and item rotations. Selection is not optimized, so using it - * with massive data sets is not advisable. - * Defaults to \c{OptimizationDefault} + * reasonable performance. Static optimizes graph rendering and is ideal for large non-changing data sets. + * It is slower with dynamic data changes and item rotations. Selection is not optimized, so using it with + * massive data sets is not advisable. Static works only on the Scatter graph. + * Defaults to \c{OptimizationDefault}. */ /*! -- cgit v1.2.3 From ddb9be979d93b7e17f1067dc6056de54d9828b29 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 9 Sep 2014 11:30:15 +0300 Subject: Limit volume to axis ranges The volume object that would go partially outside axis ranges is scale and repositioned so that it only renders the portion that is inside the axis ranges. Change-Id: I792494e437998ba6276f58fab645767276c1476d Reviewed-by: Mika Salmela --- src/datavisualization/doc/src/qtdatavisualization.qdoc | 1 + 1 file changed, 1 insertion(+) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index a4718887..d3fb4856 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -327,6 +327,7 @@ so only the Qt Quick 2 graphs are available in practice for those platforms. \li Shadows are not supported with OpenGL ES2 (including Angle builds in Windows). \li Anti-aliasing doesn't work with OpenGL ES2 (including Angle builds in Windows). + \li QCustom3DVolume items are not supported with OpenGL ES2 (including Angle builds in Windows). \li Surfaces with non-straight rows and columns do not always render properly. \li Q3DLight class (and Light3D QML item) are currently not usable for anything. \li Changing any of Q3DScene properties affecting subviewports currently has no effect. -- cgit v1.2.3 From 3e795fd544331f4f38bcc667410f9c931f82bdf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 17 Sep 2014 11:25:06 +0300 Subject: Fixed custom item wrong side reflection Task-number: QTRD-3311 Change-Id: Ia5aea90259c249a5ffd48e16fae4e2dc33902afd Reviewed-by: Miikka Heikkinen --- .../doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index 5dc7b35c..b1d74dd6 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -357,6 +357,10 @@ * * \note Affects only Bars3D. * + * \note In Bars3D graphs holding both positive and negative values, reflections are not supported + * for custom items that intersect the floor plane. In that case, reflections should be turned off + * to avoid incorrect rendering. + * * \sa reflectivity */ -- cgit v1.2.3 From 98e0c04fe78da9735c2943524bd36648b2654f98 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 18 Sep 2014 13:49:23 +0300 Subject: Added possibility to change graph's locale MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Locale affects how axis labels are formatted. Default locale is still the "C". Task-number: QTRD-3229 Change-Id: I6126ce676906f4bbc91ae0abd18775bc1d564118 Reviewed-by: Mika Salmela Reviewed-by: Tomi Korpipää --- .../doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index b1d74dd6..5f06d404 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -375,3 +375,13 @@ * * \sa reflection */ + +/*! + * \qmlproperty locale AbstractGraph3D::locale + * \since QtDataVisualization 1.2 + * + * Sets the locale used for formatting various numeric labels. + * Defaults to \c{"C"} locale. + * + * \sa ValueAxis3D::labelFormat + */ -- cgit v1.2.3 From 36bc54f5720bddb9899e64d665117ac1e1b5bc94 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 19 Sep 2014 13:32:31 +0300 Subject: Allow setting the floor level on bar graphs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-3313 Change-Id: Ie0f8e36af8698081a6937c360043773da895b6e6 Reviewed-by: Tomi Korpipää --- src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc index 6ee51742..0348652a 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc @@ -114,6 +114,14 @@ * Defaults to the first added series or zero if no series are added to the graph. */ +/*! + * \qmlproperty real Bars3D::floorLevel + * + * The desired floor level for the bar graph in Y-axis data coordinates. + * The actual floor level cannot go below Y-axis minimum or above Y-axis maximum. + * Defaults to zero. + */ + /*! * \qmlmethod void Bars3D::addSeries(Bar3DSeries series) * Adds the \a series to the graph. A graph can contain multiple series, but only one set of axes, -- cgit v1.2.3 From 0ab45b018fa98e9ef6cffd70178f208eb4f16550 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 25 Sep 2014 15:04:44 +0300 Subject: Implement zooming to cursor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Zooming to cursor is now default operating mode of the default input handler. Task-number: QTRD-3263 Change-Id: I5699fc0ce7393059538972cd52f31f06d87e3d8d Reviewed-by: Tomi Korpipää --- ...tdatavisualization-qml-abstractdeclarative.qdoc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index 5f06d404..3dc5beea 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -385,3 +385,25 @@ * * \sa ValueAxis3D::labelFormat */ + +/*! + * \qmlproperty vector3d AbstractGraph3D::queriedGraphPosition + * \since QtDataVisualization 1.2 + * + * This read-only property contains the latest graph position values along each axis queried using + * Scene3D::graphPositionQuery. The values are normalized to range \c{[-1, 1]}. + * If the queried position was outside the graph bounds, the values + * will not reflect the real position, but will instead be some undefined position outside + * the range \c{[-1, 1]}. The value will be undefined before any queries are made. + * + * There isn't a single correct 3D coordinate to match to each specific screen position, so to be + * consistent, the queries are always done against the inner sides of an invisible box surrounding + * the graph. + * + * \note Bar graphs only allow querying graph position at the graph floor level, + * so the Y-value is always zero for bar graphs and the valid queries can be only made at + * screen positions that contain the floor of the graph. + * + * \sa Scene3D::graphPositionQuery + */ + -- cgit v1.2.3 From 6821c16e36a7454627ac9a18cd1d8b0f0bd9246f Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 29 Sep 2014 15:14:25 +0300 Subject: Make background margin configurable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added margin as abstract graph property. If the margin is narrow, the positions of theedge labels of the axes are adjusted to avoid overlap with edge labels on other axes. Task-number: QTRD-3204 Change-Id: I7fa5a04c8f2091519d99689ef2f6cbcf799fb15e Reviewed-by: Mika Salmela Reviewed-by: Tomi Korpipää --- .../qtdatavisualization-qml-abstractdeclarative.qdoc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index 3dc5beea..b26f0818 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -407,3 +407,22 @@ * \sa Scene3D::graphPositionQuery */ +/*! + * \qmlproperty real AbstractGraph3D::margin + * \since QtDataVisualization 1.2 + * + * This property contains the absolute value used for graph margin. The graph margin is the space + * left between the edge of the plottable graph area and the edge of the graph background. + * If the margin value is negative, the margins are determined automatically and can vary according + * to size of the items in the series and the type of the graph. + * The value is interpreted as a fraction of Y-axis range, provided the graph aspect ratios have + * not beed changed from the defaults. + * Defaults to \c{-1.0}. + * + * \note Having smaller than the automatically determined margin on scatter graph can cause + * the scatter items at the edges of the graph to overlap with the graph background. + * + * \note On scatter and surface graphs, if the margin is comparatively small to the axis label + * size, the positions of the edge labels of the axes are adjusted to avoid overlap with + * the edge labels of the neighboring axes. + */ -- cgit v1.2.3 From e42580773cb4124ff02669b8a87ff550057d3793 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 6 Oct 2014 11:10:14 +0300 Subject: Fix mac -> OS X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If0409af049a55dae152139fdb55a2eb58e5fbb51 Reviewed-by: Tomi Korpipää --- src/datavisualization/doc/src/qtdatavisualization.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index d3fb4856..ad53ded3 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -98,7 +98,7 @@ \row \li Windows (MSVC) \li nmake \row - \li OSX \li make + \li OS X \li make \endtable The above generates the default makefiles for your configuration, which is typically @@ -127,7 +127,7 @@ make release \endcode - For both builds (Windows/Mac only): + For both builds (Windows/OS X only): \code qmake CONFIG+="debug_and_release build_all" make -- cgit v1.2.3 From 961600f6549756754ae155ef9cf63bb990e00f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 14 Oct 2014 07:32:49 +0300 Subject: Bars3D, Surface3D and Scatter3D tests Task-number: QTRD-3368 + Removed erroneous property from docs Change-Id: I675e16b58e7b190b2b33d29029654039a60b5bfc Change-Id: I675e16b58e7b190b2b33d29029654039a60b5bfc Reviewed-by: Miikka Heikkinen --- src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc index 2e343d38..2b83b807 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc @@ -72,11 +72,6 @@ * \c SelectionMultiSeries flag set, this property holds the series which owns the selected point. */ -/*! - \qmlproperty ColorGradient Surface3D::gradient - The current surface gradient. Setting this property replaces the previous gradient. - */ - /*! * \qmlproperty list Surface3D::seriesList * \default -- cgit v1.2.3 From ad6b0a468fac879b217209eb91b68e6bc143d6c4 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 20 Oct 2014 10:18:48 +0300 Subject: Document the issue with large surfaces and static scatters. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OpenGL ES2 and/or 32bit environments can have relatively low maximum supported vertex counts per draw call, so large surfaces and static scatters may not get rendered. Task-number: QTRD-3364 Change-Id: I7fd024b0428548ac7e2ca043a06d01d2442dd226 Reviewed-by: Tomi Korpipää --- .../qtdatavisualization-qml-abstractdeclarative.qdoc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index b26f0818..b5a678e5 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -342,11 +342,20 @@ * \qmlproperty AbstractGraph3D.OptimizationHints AbstractGraph3D::optimizationHints * \since QtDataVisualization 1.1 * - * Defines if the rendering optimization is default or static. Default mode provides the full feature set at - * reasonable performance. Static optimizes graph rendering and is ideal for large non-changing data sets. - * It is slower with dynamic data changes and item rotations. Selection is not optimized, so using it with - * massive data sets is not advisable. Static works only on the Scatter graph. + * Defines if the rendering optimization is default or static. Default mode provides the full + * feature set at reasonable performance. Static mode optimizes graph rendering and is ideal for + * large non-changing data sets. It is slower with dynamic data changes and item rotations. + * Selection is not optimized, so using it with massive data sets is not advisable. + * Static works only on the Scatter graph. * Defaults to \c{OptimizationDefault}. + * + * \note On some environments, large graphs using static optimization may not render, because + * all of the items are rendered using a single draw call, and different graphics drivers have + * different maximum vertice counts per call that they support. + * This is mostly an issue on 32bit and/or OpenGL ES2 platforms. + * To work around this issue, choose an item mesh with low vertex count or use the point mesh. + * + * \sa Abstract3DSeries::mesh */ /*! -- cgit v1.2.3 From 9418882d1eb31c06f8e65e8bd6b6f0e9409d8553 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 23 Oct 2014 14:45:59 +0300 Subject: Release housekeeping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Changed the version number to 1.2 where relevant. - Regenerated plugins.qmltypes - Updated known issues Change-Id: I5f737a970d0ac7fc14dbd2d30a8684ecced45ac0 Reviewed-by: Tomi Korpipää --- src/datavisualization/doc/src/qtdatavisualization.qdoc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index ad53ded3..b07074b1 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -37,7 +37,7 @@ */ /*! - \qmlmodule QtDataVisualization 1.1 + \qmlmodule QtDataVisualization 1.2 \title Qt Data Visualization QML Types \ingroup qmlmodules @@ -327,16 +327,17 @@ so only the Qt Quick 2 graphs are available in practice for those platforms. \li Shadows are not supported with OpenGL ES2 (including Angle builds in Windows). \li Anti-aliasing doesn't work with OpenGL ES2 (including Angle builds in Windows). - \li QCustom3DVolume items are not supported with OpenGL ES2 (including Angle builds in Windows). + \li QCustom3DVolume items are not supported with OpenGL ES2 (including Angle builds in + Windows). \li Surfaces with non-straight rows and columns do not always render properly. \li Q3DLight class (and Light3D QML item) are currently not usable for anything. - \li Changing any of Q3DScene properties affecting subviewports currently has no effect. + \li Changing most of Q3DScene properties affecting subviewports currently has no effect. \li Widget based examples layout incorrectly in iOS. \li Reparenting a graph to an item in another QQuickWindow is not supported. - \li There is a low-impact binary break between 1.0 and 1.1. The break is due to a QML type - registration conflict with QAbstractItemModel between QtDataVisualization and - QtCommercial.Charts. Introducing the binary break makes it possible to use both - Charts and Data Visualization in the same QML application. + \li Android builds of QML applications importing QtDataVisualization also require + "QT += datavisualization" in the pro file. This is because Qt Data Visualization + QML plugin has a dependency to Qt Data Visualization C++ library, which Qt Creator + doesn't automatically add to the deployment package. \endlist */ -- cgit v1.2.3