summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* API to query custom item selection Tomi Korpipää2014-05-1314-8/+163
| | | | | | | | | | 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-129-31/+436
| | | | | | 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-1216-69/+990
| | | | | | | 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-1223-215/+592
| | | | | | 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-0912-223/+685
| | | | | | | | 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-085-42/+142
| | | | | | | | | | 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-0826-70/+440
| | | | | | | 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-0210-34/+439
| | | | | | | | | | | | 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-029-39/+311
| | | | | | | | | | 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-3012-133/+494
| | | | | | | | | | 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-282-3/+1
| | | | | 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>
* Updated customitems example snapshot Tomi Korpipää2014-04-281-0/+0
| | | | | | Change-Id: Ifb7e33872cbe28529c79d7cd2fd0d7e586c3294d Change-Id: Ifb7e33872cbe28529c79d7cd2fd0d7e586c3294d 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>
* Updated customitems example meshes Tomi Korpipää2014-04-284-2125/+2601
| | | | | | Change-Id: If52735af2629cce80e88bdca04aecafd6768e08e Change-Id: If52735af2629cce80e88bdca04aecafd6768e08e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added blender files from customitems example Tomi Korpipää2014-04-282-0/+0
| | | | | | Change-Id: I698535a2ff768f8abd0fd75ee955b2fe099e275f Change-Id: I698535a2ff768f8abd0fd75ee955b2fe099e275f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Changed oil refinery mesh for customitemsTomi Korpipää2014-04-252-30958/+2124
| | | | | Change-Id: I5452a86e5a472476f981df8dd0f8985cfe69f100 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added customitems example snapshotTomi Korpipää2014-04-251-0/+0
| | | | | Change-Id: I9803c926feb6fe56be09dbeae074b148ea6b1fca 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-252-1/+17
| | | | | | 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-238-10/+6454
| | | | | | | Task-number: QTRD-3048 Change-Id: I90e6fbee38bae858c2e0910178684e28eacc6472 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Custom Item Example addedTomi Korpipää2014-04-2213-4/+33448
| | | | | | | | | | 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>
* Add custom item support, part 1Tomi Korpipää2014-04-1525-27/+634
| | | | | | | | | | | | | | 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>
* Added some tests for massive arraysMiikka Heikkinen2014-04-116-5/+336
| | | | | Change-Id: Iac99e4fddbbbcb9074051199815e0c58412582fa Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix compile error on ES2 buildsMiikka Heikkinen2014-04-112-2/+1
| | | | | | | Also fix one cosmetic issue. Change-Id: I80f04dc214b544755d2e4b462a3c30277582c390 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix crash when shadows are supported but flat is notMiikka Heikkinen2014-04-101-11/+18
| | | | | | | | Task-number: QTRD-3033 Change-Id: I07c9a9e8795f0e282e8cbd696a627bc2dc8776bc Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Optimize multiple series rendering.Miikka Heikkinen2014-04-1039-1210/+1619
| | | | | | | | | | | | | | 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-0416-48/+216
| | | | | | | Task-number: QTRD-2134 Change-Id: I181ee6c784b998886c2292b7548e16ce75d86458 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added snapshots to 2 examples Tomi Korpipää2014-04-032-0/+0
| | | | | | Change-Id: Iad72ba09bd419d2adf3d17636c298f7d54baff27 Change-Id: Iad72ba09bd419d2adf3d17636c298f7d54baff27 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Axis label dragging support, part 2Tomi Korpipää2014-04-0322-49/+723
| | | | | | | | | | | Task-number: QTRD-2367 + Added emitting selection signals + Added an example about creating an input handler for axis label dragging - Snapshot for example docs to be taken Change-Id: I641f4feb9e31c32023727b1c7c695324923accc4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Initialize m_axisCacheY translate properly in barsMiikka Heikkinen2014-04-031-0/+1
| | | | | | | | If uninitialized, translate never gets set in cases where background adjustment would be zero. Change-Id: I24472febcfc74615d7bfbb33c5c75c4fb5b24a11 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable querying selection label via APIMiikka Heikkinen2014-04-0330-247/+414
| | | | | | | | | | | | 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>
* Axis label dragging support, part 1Tomi Korpipää2014-04-016-181/+307
| | | | | | | | | | Task-number: QTRD-2367 + Added label selection support to surface & scatter + Added Y-label selection support to bars Change-Id: I3153f1e38019604be763492feba66c3af084de14 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Axis formatter customization exampleMiikka Heikkinen2014-04-0126-118/+828
| | | | | | | | | | | | | | | Also refactored the formatter api somewhat: - Removed virtual from allowNegatives and allowZero and added a setter function for those. This will make it cleaner if we need to add similar properties to the axis formatter in the future, as no new virtual methods can be added without breaking BC. - Changed the labelValues array to labelStrings list, as it makes more sense to directly format the strings in recalculate. Change-Id: I3ea005afa984bb756845ca356b999762e0807415 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Row/colun selection using axis labels, part 1Tomi Korpipää2014-03-3112-149/+187
| | | | | | | | | | | Task-number: QTRD-2981 + Bars done + Scatter done (= no label selection) - Surface to be done Change-Id: Icd352e40ad6d0ada76380f3dba742f280fd278b3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Improve axis formatter flexibilityMiikka Heikkinen2014-03-2811-133/+147
| | | | | | | | Number of grid lines and labels are no longer tied to segment count. Change-Id: I517ebc905f1f70e2e00ae86c05fd0e49e922845d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make axis labels more accurate by using qreals for label valuesMiikka Heikkinen2014-03-2610-72/+94
| | | | | | | | | Also refactor axis formatter sub grid array to be one dimensional. There is no need to know which segment each sub grid line belongs to. Change-Id: Ie9813088650fcc0ca844f3c358ea1abae9258367 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement QLogValue3DAxisFormatterMiikka Heikkinen2014-03-2616-88/+813
| | | | | | | | | Task-number: QTRD-2787 Change-Id: I6ecff5c3d2047a2c566051951bf237bf3e68ffab Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 18:07:27 +0000