summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix misc minor issuesMiikka Heikkinen2014-05-226-6/+6
| | | | | | | | | | - Rename bars background mesh more logically - Reorder ElementAxis enums logically - Change the sun in rotations example to a custom item Task-number: QTRD-3132 Change-Id: I00dacb68ebce222edc1a732cf7d14f1660934b36 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Update custom item translation when axes change, if needed Tomi Korpipää2014-05-222-0/+17
| | | | | | | Task-number: QTRD-3129 Change-Id: If7e28778ca7fd628159d37ee74ae2afb8d941e53 Change-Id: If7e28778ca7fd628159d37ee74ae2afb8d941e53 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Cache ObjectHelper instancesMiikka Heikkinen2014-05-2215-96/+146
| | | | | | Task-number: QTRD-2792 Change-Id: I90d83bd9b73a0f337fd26f1b92000e72b3ec0607 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added enablers for axis dragging to QMLTomi Korpipää2014-05-218-37/+102
| | | | | | | | | Task-number: QTRD-3003 Will add an example in a separate commit Change-Id: I7fa9eb1b504d188c77b66ef8d4b2ee44416667e2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added support for custom items with absolute coordinatesTomi Korpipää2014-05-2112-37/+140
| | | | | | 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-203-6/+15
| | | | | | | | 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>
* Surface slice grid line fix Tomi Korpipää2014-05-201-2/+2
| | | | | | | Task-number: QTRD-3115 Change-Id: I0be10ebb9c2a9472da63e258723bdd305e0102cf Change-Id: I0be10ebb9c2a9472da63e258723bdd305e0102cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix label alignmentsMiikka Heikkinen2014-05-194-38/+28
| | | | | | | | - Left and right were logically swapped - Horizontal axis labels on slice views were incorrectly aligned Change-Id: I8c13acaeec02961464ee63f8b489e353dcb379e6 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>
* Optimize label rotations a bitMiikka Heikkinen2014-05-197-37/+65
| | | | | Change-Id: Ie6075aefa70228769d5a2717e9d96c23b9fee494 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added property for disabling shadows on custom itemsTomi Korpipää2014-05-197-15/+82
| | | | | | Task-number: QTRD-3093 Change-Id: Ia24a1bc657af1bb1a528581e1f65fb50277e6874 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement axis label autorotationMiikka Heikkinen2014-05-1914-185/+659
| | | | | | Task-number: QTRD-2857 Change-Id: I158abb75272813cf7eb5d4b419e24325389d940e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Optimized custom item addition/removalTomi Korpipää2014-05-196-28/+55
| | | | | | Task-number: QTRD-3056 Change-Id: I653d8aeec797b76c19d9b542391b79e9370e7501 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Dirty bits to custom item Tomi Korpipää2014-05-168-11/+126
| | | | | | | Task-number: QTRD-3082 Change-Id: I1503b067edcc677904ca16c1501109187809f98b Change-Id: I1503b067edcc677904ca16c1501109187809f98b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* GLStateStore ES2 fix Tomi Korpipää2014-05-152-3/+13
| | | | | | Change-Id: I96e92601be00fc7dc1deef179b2ac825d6478283 Change-Id: I96e92601be00fc7dc1deef179b2ac825d6478283 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Added visible flag and possibility to release ownership of custom itemTomi Korpipää2014-05-1413-3/+75
| | | | | | Task-number: QTRD-3080 Change-Id: I198930c48fe9bce6a158406aff5fbf31272b9afe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added option to use orthographic projectionTomi Korpipää2014-05-1414-21/+148
| | | | | | | Task-number: QTRD-3078 Change-Id: I07ebc2b7edd542cd28e405dfc80282f18b7a7314 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multi-match behavior implementation for surface item model proxyMiikka Heikkinen2014-05-1414-13/+122
| | | | | | 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-146-19/+33
| | | | | | | 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>
* Some changes to querying series selection Tomi Korpipää2014-05-135-8/+10
| | | | | | | Task-number: QTRD-3047 Change-Id: I95a3e4d5b4a19f1bca7e92bf1e55918a2f0eb3a0 Change-Id: I95a3e4d5b4a19f1bca7e92bf1e55918a2f0eb3a0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* API to query custom item selection Tomi Korpipää2014-05-1311-4/+116
| | | | | | | | | | Task-number: QTRD-3046 + Added missing elementSelected signal to QML Change-Id: I5e79d8e910d2730e3d2ae5550ce576f01aac0b18 Change-Id: I5e79d8e910d2730e3d2ae5550ce576f01aac0b18 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added API for querying label selectionTomi Korpipää2014-05-1311-7/+121
| | | | | | Task-number: QTRD-3045 Change-Id: Ib5c8f29bcf0148ae604e27b2a81e6f72a2dbca2a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Enable mapping single role to multiple properties for scatterMiikka Heikkinen2014-05-128-24/+426
| | | | | | 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-128-54/+568
| | | | | | | Task-number: QTRD-3074 Change-Id: If40de067526b6f24b3e55bf64ed804a79d473e5f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Added docs for ThemeColorTomi Korpipää2014-05-122-2/+35
| | | | | | Task-number: QTRD-3081 Change-Id: Ic96e284685ee4641c3fa039a5e95680b58d3b46b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* CustomDataItem made into a public classTomi Korpipää2014-05-1220-180/+547
| | | | | | 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-096-24/+433
| | | | | | | | Surface and scatter to follow in separate task Task-number: QTRD-3074 Change-Id: I790078446cd1b805a83da2e3760eaf27c586aaab Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove invalid comment from common.priMiikka Heikkinen2014-05-081-3/+0
| | | | | Change-Id: Ieaca061c62b06376dc0e1a2dd072521407cffbc3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Allow surface rows and cols be in ascending or descending XZ orderMiikka Heikkinen2014-05-082-36/+66
| | | | | | | | | | 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>
* Value axis reversing supportMiikka Heikkinen2014-05-0814-68/+231
| | | | | | | Task-number: QTRD-2428 Change-Id: I51b3a1f8f974d5b72b36ee1188b7557539b9609b Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix some simple memory leaksSimon Hausmann2014-05-052-16/+15
| | | | | | | Make sure all GLint arrays get deleted and also with delete []. Change-Id: I5ec46eed85f78aee87696986b96ef02f201a9be3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add missing Q_REVISION macros to signals.Miikka Heikkinen2014-05-023-5/+5
| | | | | | | | 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-027-33/+133
| | | | | | | | | | | | 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>
* Scatter data changing optimization.Miikka Heikkinen2014-05-026-36/+91
| | | | | | | | | | No longer reset the entire render item array if single item changes, significantly speeding up this operation. Task-number: QTRD-2190 Change-Id: Ia3de833b761dc6f24acff581ad79668f51c3e9c5 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Bar data item and row changing optimizationsMiikka Heikkinen2014-04-308-100/+235
| | | | | | | | | | No longer reset the entire render item array if single item or row changes, significantly speeding up these operations. Task-number: QTRD-2190 Change-Id: I44b8abd384003e252e4bfc34af5d73ac1dee34bf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add revision macros to new invokablesMiikka Heikkinen2014-04-291-5/+7
| | | | | Change-Id: I8c0834a6cb282e8a05d487fe62369ad5b1281c9d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Android GLSL linker fix Tomi Korpipää2014-04-296-8/+12
| | | | | | | | Task-number: QTRD-3059 Change-Id: Ie5b82c6418cb87f7d9c04fcca287f5924d8616a5 Change-Id: Ie5b82c6418cb87f7d9c04fcca287f5924d8616a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Misc cleanupMiikka Heikkinen2014-04-281-2/+0
| | | | | Change-Id: I126edfa39dcfe4fe71e89527b5ae05b7d773c61e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Only disable theme forcing during initial loading of graph.Miikka Heikkinen2014-04-281-1/+1
| | | | | | | Task-number: QTRD-3010 Change-Id: If07c11052e11373ea80de47276dd9e8b291dc2fd Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix texture cleanup.Miikka Heikkinen2014-04-287-44/+18
| | | | | | | | | 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>
* QML them basecolor override by series bug fixedTomi Korpipää2014-04-253-4/+5
| | | | | | | | | | | Task-number: QTRD-3010 QML calls properties in "random" (or alphabetical) order, which in this case causes theme initialization to be called after series basecolor override, so setting a basecolor to a series to override theme did not work. Change-Id: I434f2a278bf2a70512a3d4d73c30d80319bd0e8e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added explanation / example of axis label selectionTomi Korpipää2014-04-251-1/+2
| | | | | | Task-number: QTRD-2982 Change-Id: Ia164c2462d6e43ddf79e3e13f356435018c383a9 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Fixed crash on exit Tomi Korpipää2014-04-251-1/+2
| | | | | | | | Task-number: QTRD-3052 Change-Id: I05b09df72534e5eae803d58e330b2a8045f47038 Change-Id: I05b09df72534e5eae803d58e330b2a8045f47038 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Fixed crash when setting invalid baseColors/Gradients to a Theme3D Tomi Korpipää2014-04-251-0/+8
| | | | | | | | Task-number: QTRD-3009 Change-Id: Icacc4e656dec286334d827c9282037b2bba78e43 Change-Id: Icacc4e656dec286334d827c9282037b2bba78e43 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Scatter label selection fixed Tomi Korpipää2014-04-251-4/+4
| | | | | | | | Task-number: QTRD-3053 Change-Id: Ia0f1a9061d29b799bc60d8c965de4c012fa852b1 Change-Id: Ia0f1a9061d29b799bc60d8c965de4c012fa852b1 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Color problem fixed Tomi Korpipää2014-04-2423-80/+88
| | | | | | | | | | | Task-number: QTRD-3001 Changed all colors to QVector4Ds to avoid mixups with vec4 and vec3 colors in shaders. Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added QML support for custom itemsTomi Korpipää2014-04-234-9/+75
| | | | | | | Task-number: QTRD-3048 Change-Id: I90e6fbee38bae858c2e0910178684e28eacc6472 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Custom Item Example addedTomi Korpipää2014-04-221-3/+4
| | | | | | | | | | Task-number: QTRD-3043 + surface selection bug fix - snapshot to be added Change-Id: I17276e39c304cbf1a58eaa2334eff2268656dbf4 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add custom item support, part 2Tomi Korpipää2014-04-1616-213/+296
| | | | | | | | | Task-number: QTRD-2866 + Added custom item rendering Change-Id: If24400fed7c0467d8ebbd554d6e4df3ec5a205f3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 08:04:37 +0000