summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data
Commit message (Collapse)AuthorAgeFilesLines
* Replace Q_NULLPTR with nullptrKevin Funk2017-09-2615-45/+45
| | | | | Change-Id: Idc9a7a0ebcc986c8def79ac56f7defceea1e4432 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Use qRadiansToDegrees() and qDegreesToRadians() more widelyEdward Welbourne2017-06-141-1/+1
| | | | | | | | | These document what the arithmetic is actually doing; and save us an ad-hoc use of an approximate value for pi while we're about it. Task-number: QTBUG-58083 Change-Id: I82c5502af724b33ec598c5a9da76537f93a95eac Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit custom item, label, and volume docs for grammar and stylev5.9.0-beta3v5.9.0-beta2Leena Miettinen2017-04-073-114/+145
| | | | | Change-Id: I2b5a546c5035cbf304db57d3e18c998421969392 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit data item docs for grammar and styleLeena Miettinen2017-04-073-44/+47
| | | | | Change-Id: Ic93eb2648bdff84e88acdf7941ddd85cc6d874ca Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit data proxy documentation for grammar and styleLeena Miettinen2017-04-074-195/+249
| | | | | Change-Id: Ibf26f40e53e8dab3cea717c6ca55e2568cb747e1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit the series docs for grammar and stylev5.9.0-beta1Leena Miettinen2017-03-274-115/+133
| | | | | Change-Id: I9b03e4e3cf600fa68a4d7f0372b0fba676affb65 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc commands (QItemModelBarDataProxy)Leena Miettinen2017-03-021-38/+64
| | | | | | | | | - Use \list command for lists - Add \brief commands for property docs - Replace \returns with "returns" Change-Id: I7930a9dd9ce87c61e8381a5e2c4f42c7bf0ae75a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix some references in ItemModelProxy type docsLeena Miettinen2017-03-021-4/+4
| | | | | Change-Id: Ia32c27f8d05ee8fb87ce4ed9f4bee2d99e0e61de Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return commands (QSurfaceDataProxy)Leena Miettinen2017-02-271-10/+10
| | | | | Change-Id: I3a44f525b75a7f89d3aaaaf38342ec5e1de66bae Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (QScatter3DSeries)Leena Miettinen2017-02-271-17/+33
| | | | | Change-Id: I7d3e77746ba81f76ec22c7a4b8779df56e680f78 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return QDoc commands (QSurface3dSeries)Leena Miettinen2017-02-271-36/+61
| | | | | | Change-Id: I95eeefc57ccefe8548c76f40157148c0a5cb8196 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Add \brief commands for property docs (QItemModelScatterDataProxy)Leena Miettinen2017-02-271-39/+63
| | | | | Change-Id: I014470926e16e1b5f0b00f263e321302bbfa6652 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc commands (QScatterDataProxy)Leena Miettinen2017-02-271-11/+10
| | | | | | | | - Add \brief commands for property docs - Replace \returns with "Returns". Change-Id: I49b67c8a86135666e43c89f787a0821b48b5587a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc commands (QItemModelSurfaceDataProxy)Leena Miettinen2017-02-231-113/+171
| | | | | | | | | | - Add \brief commands for property docs. - Replace \return with "Returns". - Use the \c command to format "true". - Edit the text where necessary. Change-Id: I9ab1f5ed2c242118990d08da8114012899d88289 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Add \brief commands for property docs (QHeightMapSurfaceDataProxy)Leena Miettinen2017-02-231-10/+33
| | | | | | | | | Separate setter function docs to from property docs, to be able to describe the arguments for the setter functions. Change-Id: I60bd1a31cd1424260070c231af48c9603916d132 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Fix QDoc commands (QCustom3dVolume)Leena Miettinen2017-02-201-32/+67
| | | | | | | | | | | - Add \brief commands to property docs - Fix \note commands (the colon after the command results in a double colon) - Remove \a commands from property docs - Replace the \return command with "returns" Change-Id: I0dd555a350999d588fff904d5a46c6d57e8f6199 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (QCustom3dLabel)Leena Miettinen2017-02-201-14/+28
| | | | | Change-Id: Iafc407d288ef26d94b33ea07e36f34da5a9f38a0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (QCustom3dItem)Leena Miettinen2017-02-201-27/+47
| | | | | Change-Id: I37f31a95e35722a78040055d045206082aaf457c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (QBar3DSeries)Leena Miettinen2017-02-171-17/+36
| | | | | | | Separate documentation for setSelectedBar() from the property docs. Change-Id: Iaf9e6b2cfeccd47cb5b3fee2fa8cd8baa43b8fcd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (QBarDataProxy)Leena Miettinen2017-02-171-9/+14
| | | | | Change-Id: Ia3e4811e76f63913d84d86d9e0d41f5976b3c4ad Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief command for property docs (QAbstractDataProxy)Leena Miettinen2017-02-171-1/+1
| | | | | Change-Id: Ie23fb3c9cd5a1e2197fda2231cf6b5dab9e3f64c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (QAbstract3dSeries)Leena Miettinen2017-02-171-72/+71
| | | | | | | Remove \a commands from property docs. Change-Id: I50b7cdbe144d157580c9e647a44708e93ab81784 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fixed incorrect value axis autoAdjustRange behavior5.8Tomi Korpipää2017-01-041-3/+3
| | | | | | Change-Id: I8c52745f18a710add9e257a4fe587833f711a2f2 Task-number: QTBUG-57599 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Handle data proxy change on the controllerMika Salmela2016-11-293-0/+6
| | | | | | | | Adds a connection to controllers to react dataProxyChange signal. Task-number: QTBUG-57291 Change-Id: Ia9ad6880418ec861381e1a5363ce38f8d0bda2e8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Ensure that the formatter is respected for zero and negative valuesTomi Korpipää2016-11-144-17/+82
| | | | | | | | This also ensures that INF and NaN numbers are also handled correctly Task-number: QTBUG-57075 Change-Id: I8db693cb28303bc13f936c818147fe31b7ee1199 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0815-76/+76
|\ | | | | | | | | | | | | Conflicts: src/datavisualization/utils/qutils.h Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
| * Add explicit and make public headers compile with ↵Marc Mutz2016-03-0315-76/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Copyright file update to GPLMiikka Heikkinen2016-01-1272-648/+1224
|/ | | | | Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Update license headersMiikka Heikkinen2015-10-2072-792/+1008
| | | | | Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
* Fix compile warnings about shadowMiikka Heikkinen2015-09-146-13/+13
| | | | | | | | Renamed some function parameters so that they do not trigger shadow warnings. Change-Id: Iea6561d26d3f77d075fc7f30b047bfa4d34cb2e7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Fix building against 5.6Miikka Heikkinen2015-06-1719-20/+20
| | | | | | | | Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS macros instead of 'signals' and 'slots' in headers. Change-Id: I4140b1fff4386d74bb371176919234366965e887 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Copyright header changesMika Salmela2015-04-1472-216/+216
| | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Change copyright headers.Miikka Heikkinen2014-11-0772-504/+504
| | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix another crash at app shutdown.Miikka Heikkinen2014-10-301-3/+2
| | | | | | | Context doesn't exist on all envs at shutdown. Change-Id: I6c0398203f0ab3ceaa38f64936cdf375c43e9f55 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix crash on application shutdown.Miikka Heikkinen2014-10-301-1/+1
| | | | | | | | Label items should not try to delete their textures at destructor if they are already deleted. Change-Id: I8131301bec47a0a2617b4a923d7cce430d35e18b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Support for dynamic opengl builds.Miikka Heikkinen2014-10-291-3/+3
| | | | | | Task-number: QTRD-3392 Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added C++ autotests for seriesTomi Korpipää2014-10-211-0/+3
| | | | | | | | | Also fixed a bug found in testing, and added tests for optional constructors for already tested classes. Task-number: QTRD-3368 Change-Id: I2214f28e2c5069ecab422fc6817acb2f0c0b192b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Document the issue with large surfaces and static scatters.Miikka Heikkinen2014-10-201-0/+4
| | | | | | | | | | 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ää <tomi.korpipaa@digia.com>
* Test for QML proxiesTomi Korpipää2014-10-161-8/+8
| | | | | | | | Also added missing default values to some docs. Task-number: QTRD-3368 Change-Id: I98940a80d6edfe60801c6b2606307b3ec3ab8c39 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Added tests for QML custom items Tomi Korpipää2014-10-152-0/+2
| | | | | | | | | | Also added skeleton for remaining QML tests and some inheritance updates to documentation. Task-number: QTRD-3368 Change-Id: I28cb52c4738953b7f281ce91a3764f849643d35a Change-Id: I28cb52c4738953b7f281ce91a3764f849643d35a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Added possibility to change graph's localeMiikka Heikkinen2014-09-191-8/+13
| | | | | | | | | | Locale affects how axis labels are formatted. Default locale is still the "C". Task-number: QTRD-3229 Change-Id: I6126ce676906f4bbc91ae0abd18775bc1d564118 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement volume slice framesMiikka Heikkinen2014-09-127-61/+405
| | | | | Change-Id: I409f3c95892b26ca6097dd4509109fc9978b9900 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Limit volume to axis rangesMiikka Heikkinen2014-09-103-8/+54
| | | | | | | | | 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 <mika.salmela@digia.com>
* Add possibility to scale custom items according to data rangesMiikka Heikkinen2014-09-086-16/+101
| | | | | | | | Proper behavior of volume objects that are shown only partially will be added in a separate patch later. Change-Id: I1fcd98faa6c4a7d09e3fef1645ed9816ff54654f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Allow setting volume subtexture along any axisMiikka Heikkinen2014-09-032-31/+103
| | | | | Change-Id: Iafaac6bd2106253bec913d1d9ee8a3f40e339adf Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Change volumetric example to show fictional terrainMiikka Heikkinen2014-09-031-1/+1
| | | | | | Change-Id: I7cb3c59acef5364ff964da3e756d2db387b53308 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add option to use low definition volume shader.Miikka Heikkinen2014-09-025-4/+70
| | | | | | | | Low definition volume shader samples the texture at even intervals, so it will sometimes skip texels, causing flickering. Change-Id: Iee6cb0e8893498b89ce1a40f34701a53d100283e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix build issue with Qt 5.2.1Miikka Heikkinen2014-08-272-18/+33
| | | | | | | | | | | | | | 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ää <tomi.korpipaa@digia.com>
* Add alpha multiplier to QCustom3DVolume apiMiikka Heikkinen2014-08-255-75/+216
| | | | | | Change-Id: I856c4166513f6d6f7b73fd52bc46d52ab1b8fdff Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Implement API function for rendering volume slice to an image.Miikka Heikkinen2014-08-252-3/+82
| | | | | Change-Id: Iea18967c3b525a8d4507a06e6541c85ed3abb470 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 11:52:27 +0000