summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Implement zooming to cursorMiikka Heikkinen2014-09-268-9/+47
| | | | | | | | | Zooming to cursor is now default operating mode of the default input handler. Task-number: QTRD-3263 Change-Id: I5699fc0ce7393059538972cd52f31f06d87e3d8d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Allow setting the floor level on bar graphs.Miikka Heikkinen2014-09-224-1/+19
| | | | | | Task-number: QTRD-3313 Change-Id: Ie0f8e36af8698081a6937c360043773da895b6e6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed custom item wrong side reflectionTomi Korpipää2014-09-177-30/+6424
| | | | | | | Task-number: QTRD-3311 Change-Id: Ia5aea90259c249a5ffd48e16fae4e2dc33902afd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement volume slice framesMiikka Heikkinen2014-09-121-1/+3
| | | | | Change-Id: I409f3c95892b26ca6097dd4509109fc9978b9900 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Limit volume to axis rangesMiikka Heikkinen2014-09-103-20/+86
| | | | | | | | | 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-083-13/+114
| | | | | | | | 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-035-8/+80
| | | | | Change-Id: Iafaac6bd2106253bec913d1d9ee8a3f40e339adf Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Make volume items draw after regular custom itemsMiikka Heikkinen2014-09-031-1/+12
| | | | | | | | | Since volume items typically contain transparencies, make them draw after regular custom items, which are less likely to be transparent. Change-Id: Id7c48b6c77d7ed8654b72923d7dccf4158c9c088 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QML support for volume itemsMiikka Heikkinen2014-09-038-1/+419
| | | | | Change-Id: I4061bfd4d288aabaea76847c9f692e71ecf5f94c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change volumetric example to show fictional terrainMiikka Heikkinen2014-09-031-3/+3
| | | | | | 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-021-0/+4
| | | | | | | | 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>
* Diffuse and specular color for static optimizationMika Salmela2014-08-273-1/+16
| | | | | Change-Id: I2c51ba06c6af9193a70f4a268dfd2fbd6c6910b3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Reflection API addedTomi Korpipää2014-08-264-3/+47
| | | | | | | Task-number: QTRD-3287 Change-Id: I6c06b8fe025e0f1f87be00be906cab0e1f18a19f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add alpha multiplier to QCustom3DVolume apiMiikka Heikkinen2014-08-251-1/+3
| | | | | | 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-253-4/+48
| | | | | Change-Id: Iea18967c3b525a8d4507a06e6541c85ed3abb470 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Tweak volume shaders.Miikka Heikkinen2014-08-225-47/+311
| | | | | | | Also fix custom object default texture. Change-Id: Iba9ff6afb807d9f7a4e1f58b0e5fb4bca4c9c431 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Implement volume rendering supportMiikka Heikkinen2014-08-187-1/+473
| | | | | | | | New subclass of QCustom3DItem, QCustom3DVolume is provided. The documentation for the example will be done in a separate commit. Change-Id: Idb3fdb0654c6bec7606ca012b75852a5a8412397 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable camera targeting.Miikka Heikkinen2014-08-0610-60/+242
| | | | | | | | | | | | | | | Also fix custom item positioning in absolute mode as it was completely broken in bars and z-coord was flipped in others. Clarified Q3DObject::position property usage, namely that it is reserved for internal use for now. Some refactoring also done. Task-number: QTRD-2567 Change-Id: I5da65b83a2f8ecf20f8fd054e59748278ef1a714 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Exposed default input handlers to QMLMiikka Heikkinen2014-07-043-30/+71
| | | | | | | | | | | Also added properties to control rotation, zoom, and selection individually. Also added missing documentation about surface texture. Task-number: QTRD-3202 Change-Id: I981edb7f336aea499440559f4a2098711200206d Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Texture to surfaceMika Salmela2014-07-045-13/+29
| | | | | | | | API for setting a texture to surface. Task-number: QTRD-3232 Change-Id: Icd9de61882b54b9c1fc84a742e49980926ca681d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix labels and grid lines changing size when aspect ratio is changedMiikka Heikkinen2014-07-021-4/+15
| | | | | | | | | | | 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 <mika.salmela@digia.com>
* Added horizontal aspect ratio property for abstract graphsMiikka Heikkinen2014-07-016-5/+39
| | | | | | | | Value 0.0 indicates automatic scaling (the default). Task-number: QTRD-3192 Change-Id: I5e4cc1b7a03c0ba811e2ed3916a440906429af57 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Adjust background margins based on angular labels and titleMiikka Heikkinen2014-06-301-1/+1
| | | | | | | | Also separated the vertical and horizontal background margins. Task-number: QTRD-3184 Change-Id: I988217d4df7749585dd85b5ea8f3f50254dca6ad Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Polar chart for scatterMiikka Heikkinen2014-06-263-3/+62
| | | | | | Task-number: QTRD-3184 Change-Id: Ie8e10050e58a3630eda87ec44fb342776d667ae6 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Polar graph support, phase oneMiikka Heikkinen2014-06-263-0/+13
| | | | | | | | | | - 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 <mika.salmela@digia.com>
* Add testing of renderToImage to scatter testMiikka Heikkinen2014-06-043-3/+35
| | | | | Change-Id: I03c3868ac7c98658fafa71c19409eb3afe851a10 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Misc fixes found during testingMiikka Heikkinen2014-06-042-5/+12
| | | | | | | | | - Memory leaks - Y-axis placement issues in scatter and surface Change-Id: I7ec6c9c3e53502445b52c049c973186a7c54c95f Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix surface shadows and other misc fixesMiikka Heikkinen2014-06-031-1/+3
| | | | | | | | | | | - Remove culling from surface shadows to make them look correct - Remove unnecessary metatype registration from qmloscilloscope - itemmodeltest multi-change fixed - Valgrind fixes Task-number: QTRD-3160 Change-Id: I2da8b3e024dae56c52afb6b915535f49c6c987fc Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix various issuesMiikka Heikkinen2014-06-021-8/+9
| | | | | Change-Id: I4a6d4775f3ca578370a9ce23491bddcb0f5486ec Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added CustomLabelItemTomi Korpipää2014-05-281-1/+10
| | | | | | Task-number: QTRD-3135 Change-Id: Ie13c7ab5cbfca2eef88ed4ca17eaf46f2aeb4788 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement binary search for determining surface sample spaceMiikka Heikkinen2014-05-283-0/+72
| | | | | | Task-number: QTRD-3066 Change-Id: I3a6d727c528e37e914aa1c3f08ee6d268a2c5230 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Optionally show axis titles on the graphMiikka Heikkinen2014-05-276-6/+102
| | | | | | Task-number: QTRD-2961 Change-Id: I6a344156bd29fa8fb1ede0546af4d0e67e5e2db4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added API for changing data aspect ratioTomi Korpipää2014-05-266-9/+47
| | | | | | Task-number: QTRD-3144 Change-Id: I9acd1be13083d7fbbed840882260a60f46c5f698 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Android and iOS config fix Tomi Korpipää2014-05-221-4/+0
| | | | | | | | + example tweak Change-Id: I408cd43a7af3efceccd42bd2439803e41c5272d6 Change-Id: I408cd43a7af3efceccd42bd2439803e41c5272d6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cache ObjectHelper instancesMiikka Heikkinen2014-05-221-0/+2
| | | | | | Task-number: QTRD-2792 Change-Id: I90d83bd9b73a0f337fd26f1b92000e72b3ec0607 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Do not draw custom items outside axis ranges Tomi Korpipää2014-05-201-1/+2
| | | | | | | | 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-1/+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-191-0/+1
| | | | | | Task-number: QTRD-3093 Change-Id: Ia24a1bc657af1bb1a528581e1f65fb50277e6874 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added visible flag and possibility to release ownership of custom itemTomi Korpipää2014-05-141-2/+10
| | | | | | 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-141-0/+4
| | | | | | Task-number: QTRD-3074 Change-Id: I2dc67f0c524bce87498129bbc462bd8f014b8d2c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multi-match behavior implementation for bar item model proxyMiikka Heikkinen2014-05-132-11/+42
| | | | | | 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-121-7/+10
| | | | | | 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-15/+422
| | | | | | | 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-121-17/+14
| | | | | | 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-093-97/+108
| | | | | | | | 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-083-6/+76
| | | | | | | | | | 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-089-2/+196
| | | | | | | Task-number: QTRD-2428 Change-Id: I51b3a1f8f974d5b72b36ee1188b7557539b9609b Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Optimize single item changes in bar/surface item models.Miikka Heikkinen2014-05-023-1/+306
| | | | | | | | | | | | 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-023-3/+220
| | | | | | | | | | 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-304-33/+259
| | | | | | | | | | 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>