summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data
Commit message (Collapse)AuthorAgeFilesLines
* Added support for custom items with absolute coordinatesTomi Korpipää2014-05-214-6/+66
| | | | | | Task-number: QTRD-3122 Change-Id: Iefd4c4adad45721ed3519bdcecbbfa1e97039f08 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Do not draw custom items outside axis ranges Tomi Korpipää2014-05-202-5/+5
| | | | | | | | Task-number: QTRD-3057 Change-Id: Icb8904fa0a1c009985ac21ee6fa51eefda81d9cc Change-Id: Icb8904fa0a1c009985ac21ee6fa51eefda81d9cc Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* texture filename & test bug fix Tomi Korpipää2014-05-191-0/+1
| | | | | | Change-Id: I40a5084de0cf59cee6373d3fcba4bdb9c39a4139 Change-Id: I40a5084de0cf59cee6373d3fcba4bdb9c39a4139 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added property for disabling shadows on custom itemsTomi Korpipää2014-05-194-14/+67
| | | | | | Task-number: QTRD-3093 Change-Id: Ia24a1bc657af1bb1a528581e1f65fb50277e6874 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Optimized custom item addition/removalTomi Korpipää2014-05-193-7/+24
| | | | | | Task-number: QTRD-3056 Change-Id: I653d8aeec797b76c19d9b542391b79e9370e7501 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Dirty bits to custom item Tomi Korpipää2014-05-164-10/+56
| | | | | | | Task-number: QTRD-3082 Change-Id: I1503b067edcc677904ca16c1501109187809f98b Change-Id: I1503b067edcc677904ca16c1501109187809f98b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added visible flag and possibility to release ownership of custom itemTomi Korpipää2014-05-145-3/+35
| | | | | | Task-number: QTRD-3080 Change-Id: I198930c48fe9bce6a158406aff5fbf31272b9afe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multi-match behavior implementation for surface item model proxyMiikka Heikkinen2014-05-149-8/+116
| | | | | | Task-number: QTRD-3074 Change-Id: I2dc67f0c524bce87498129bbc462bd8f014b8d2c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Use blending for custom items only when neededTomi Korpipää2014-05-142-2/+6
| | | | | | | Task-number: QTRD-3077 Change-Id: I2406a8fd133943379a5cb1c1c2961a419ef9315f Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multi-match behavior implementation for bar item model proxyMiikka Heikkinen2014-05-134-8/+117
| | | | | | Task-number: QTRD-3074 Change-Id: I8e34d2546198a743e0132f0ce201dd38daf7ce7a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable mapping single role to multiple properties for scatterMiikka Heikkinen2014-05-127-24/+425
| | | | | | Task-number: QTRD-3074 Change-Id: I7b1d338d28000eee7563a11a6069453f3e349c16 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable mapping single role to multiple properties for surfaceMiikka Heikkinen2014-05-127-54/+567
| | | | | | | Task-number: QTRD-3074 Change-Id: If40de067526b6f24b3e55bf64ed804a79d473e5f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* CustomDataItem made into a public classTomi Korpipää2014-05-125-70/+379
| | | | | | Task-number: QTRD-3055 Change-Id: I1e449df7c1bcb48fc639dbae579e2e1499c9ef2b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable mapping single role to multiple properties for barsMiikka Heikkinen2014-05-095-24/+432
| | | | | | | | Surface and scatter to follow in separate task Task-number: QTRD-3074 Change-Id: I790078446cd1b805a83da2e3760eaf27c586aaab Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Allow surface rows and cols be in ascending or descending XZ orderMiikka Heikkinen2014-05-081-10/+11
| | | | | | | | | | This allows adding rows that have smaller Z-value than the previously added row instead of being forced to insert rows into the beginning of the data array in these cases. Task-number: QTRD-2428 Change-Id: I4dc6c5a48a55ca494a2372f917aa7447f61f336e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add missing Q_REVISION macros to signals.Miikka Heikkinen2014-05-021-2/+2
| | | | | | | | Qt codes seem to always add Q_REVISION() macro to revisioned properties notify signals, so I assume it is necessary. Change-Id: I08f5f6d4034527020ed37b2a78267874f103d5a0 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Optimize single item changes in bar/surface item models.Miikka Heikkinen2014-05-025-29/+118
| | | | | | | | | | | | We are only able to optimize this in cases where rows and columns of the model are directly mapped to rows and columns of the data proxy. In other cases we do not know if the new values of the changed data item in the model actually specify the same row/column in our data proxy as the previous values. Task-number: QTRD-2190 Change-Id: Ie014469ac894474900e5cfd6d91fd1a60353b1f7 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Fix texture cleanup.Miikka Heikkinen2014-04-281-4/+3
| | | | | | | | | Make deleteTexture also zero the pointer and do the check if deletion is needed, as those are required anyway on the caller side in most cases. Change-Id: Ia12102c97a647127230db2518c32f81322ce6743 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add custom item support, part 2Tomi Korpipää2014-04-161-4/+5
| | | | | | | | | Task-number: QTRD-2866 + Added custom item rendering Change-Id: If24400fed7c0467d8ebbd554d6e4df3ec5a205f3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add custom item support, part 1Tomi Korpipää2014-04-155-2/+230
| | | | | | | | | | | | | | Task-number: QTRD-2866 + Added API for adding and removing custom items + Added custom data and custom render items + Added shaders for textured objects + Added custom item rendering draft to scatter + Fixed some shaders - to be continued in part 2 Change-Id: I9735fd02fc9e86ae486cca4c06f6d7f2a4b0b7da Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Optimize multiple series rendering.Miikka Heikkinen2014-04-104-13/+6
| | | | | | | | | | | | | | Cache all series instead of just the visible ones on all graphs instead of just surface. Changes to one series now trigger data update to only the affected series, which should significantly improve performance in these cases. Task-number: QTRD-2600 Task-number: QTRD-2957 Change-Id: I6db7c689108fce8d25aace6682a193936d6f0eaf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Introduce fps measurement via propertiesMiikka Heikkinen2014-04-041-0/+4
| | | | | | | Task-number: QTRD-2134 Change-Id: I181ee6c784b998886c2292b7548e16ce75d86458 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable querying selection label via APIMiikka Heikkinen2014-04-039-12/+259
| | | | | | | | | | | | Also enable suppressing drawing the label on graph. Selection label formatting was consequently moved from renderers to series. Task-number: QTRD-2896 Change-Id: Ia6a1a40298d8db0f54349de3eb27fb0b683dd302 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added range gradient support for MeshPointsTomi Korpipää2014-03-251-1/+2
| | | | | | | Task-number: QTRD-2701 Change-Id: Id3f096099ef584a6feaaebcbecc084810ec27967 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add proper scoping to signals with enum parametersMiikka Heikkinen2014-03-171-1/+1
| | | | | | | | | According to customer feedback, the lack of proper scoping makes it impossible to use the traditional style SIGNAL() macro when making connections. Change-Id: I3fbead5400bbd8b5fad62e4facecc6610c36c9a6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Property type fixesMika Salmela2014-03-072-7/+7
| | | | | | Change-Id: I43d9a3b27cf76a8d9b80b102705ab25c7bb7636c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* ItemModelBarDataProxy property type fixesMika Salmela2014-03-061-6/+6
| | | | | Change-Id: I0f4f62bdb89067ac142164afb66dbfc481e72bc2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Readability improvementMika Salmela2014-03-061-2/+2
| | | | | Change-Id: I77f2b488b44eb1d985bdb6985b979f46bba04085 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove obsolete property documentationMika Salmela2014-03-051-6/+0
| | | | | Change-Id: Ice8ea6f8ce26cdd77d52c71d9e6b14c91e52c57c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Default graphs for qmldesignerMiikka Heikkinen2014-03-041-3/+9
| | | | | | | +Some doc changes Change-Id: Id815f178e3321c6033f6782d75a99b54c656ca7a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Disallow clearing all draw flagsTomi Korpipää2014-03-031-4/+16
| | | | | | | Task-number: QTRD-2907 Change-Id: I89a45971bf67c533ecfe477cd685812c46574dd8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc fixes: Tomi Korpipää2014-02-276-23/+26
| | | | | | | | | | | | | - QValue3DAxis - QItemModelScatterDataProxy - QItemModelSurfaceDataProxy - QScatterDataProxy - QSurface3DSeries - QSurfaceDataProxy Change-Id: If94fef980c96d4e34a5034ba93f3ac676d479f05 Change-Id: If94fef980c96d4e34a5034ba93f3ac676d479f05 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc fixes: Tomi Korpipää2014-02-273-22/+25
| | | | | | | | | | | - QCategory3DAxis - QBarDataProxy - QHeightMapSurfaceDataProxy - QItemModelBarDataProxy Change-Id: I021af6e0b52a6cc0b8068784406c3422e45640e1 Change-Id: I021af6e0b52a6cc0b8068784406c3422e45640e1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc fixes Tomi Korpipää2014-02-271-21/+21
| | | | | | | | | | | - QAbstract3DAxis - QAbstract3dSeries - QAbstract3DGraph - QAbstract3DInputHandler Change-Id: Ida248755523fb3de7d2f9dfda274429200525737 Change-Id: Ida248755523fb3de7d2f9dfda274429200525737 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move selection labels to renderer from render itemsMiikka Heikkinen2014-02-245-61/+56
| | | | | | | | | | | | Creating a new label on demand is fast enough, so we don't need to store old labels. Storing labels unnecessarily leads to unchecked use of graphics memory. Optimized bar slices a bit by having separate class of render items for slice items. Change-Id: I5afdecfb3949393341b6c3eaefbc667c65da32e3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-1831-95/+106
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add rotations exampleMiikka Heikkinen2014-02-111-1/+1
| | | | | | | | | +Fix scatter rangegradient Task-number: QTRD-2801 Change-Id: I1515b0a500cd995471b3de1e0b5356099bc19ede Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Mostly revert the rotations refactorMiikka Heikkinen2014-02-1013-205/+189
| | | | | | | | | Quaternions are actually easier to use in most use cases. Added some convenience functionality for QML to enable using axis/angle combinations, too. Change-Id: I61c76e0967b4808aa9adaf43dfe6f4596c9ce353 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc fix + snapshot for qmloscilloscope Tomi Korpipää2014-02-071-0/+3
| | | | | | | | Task-number: QTRD-2635 Change-Id: If51da3c39130c3d7abf54e5f59b172dc15ba9d2f Change-Id: If51da3c39130c3d7abf54e5f59b172dc15ba9d2f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change rotations to use angle and vector in APIsMiikka Heikkinen2014-02-0619-162/+221
| | | | | | | | Quaternions are pain in the behind to use, especially in QML, so change them to angle + vector combinations. Change-Id: I25eb5ea92deaf3a079e2e193cce2e8de89f3c3c4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multiseries support for surfaceMika Salmela2014-02-061-0/+1
| | | | | | | Task-number: QTRD-2767 Change-Id: Ifa7ca07f2afdb27974ad20819f0a4646293764b0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix slice update for bars, too.Miikka Heikkinen2014-02-051-1/+1
| | | | | | | Also revert the incorrect change to surface slice update. Change-Id: If08d5848e5b216f4f6b82e39727eeb7facd463ca Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add qmloscilloscope exampleMiikka Heikkinen2014-02-055-11/+37
| | | | | | | | | | +Fix itemAt() in surface proxy +Add itemAt(QPoint) in bar and surface proxies +Misc fixes to other examples Task-number: QTRD-2816 Change-Id: I5e06cfce98f74719a20885e3ca5a1e6fefb23a9c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix surface mappingMiikka Heikkinen2014-01-316-56/+229
| | | | | | | Task-number: QTRD-2528 Change-Id: I2e677519b08d1a634d5024ecc85d82b74f8587ad Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Rotation support for item modelsMiikka Heikkinen2014-01-2912-3/+251
| | | | | | | Task-number: QTRD-2654 Change-Id: Ie919c3032731724f750fc0ccb237379454009585 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Valground betaMiikka Heikkinen2014-01-271-1/+1
| | | | | Change-Id: I05867a256caea389fb1d2c19bccbf244732343a2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix copyright yearMiikka Heikkinen2014-01-2761-61/+61
| | | | | | | Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added series rotation and bar item rotation supportMiikka Heikkinen2014-01-279-8/+101
| | | | | | | Task-number: QTRD-2654 Change-Id: I864d33bc173b35b8680eddb402bdf1817ecb031f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Made jira tasks of TODOs, part 2 Tomi Korpipää2014-01-2215-22/+24
| | | | | | | | | + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made jira tasks of TODOs, part 1Tomi Korpipää2014-01-227-17/+0
| | | | | | | | - commented-out code will be removed (and made tasks of, if necessary) in part 2 Task-number: QTRD-2398 Change-Id: Ib94a4a873ecd25f4040c74c42902e204f3f41943 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>