summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Doc fix Tomi Korpipää2014-03-251-2/+1
| | | | | | Change-Id: I5cf4507bb9e4feefbc9a3de377a17b270604191d Change-Id: I5cf4507bb9e4feefbc9a3de377a17b270604191d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q3DScene emitneedrenders fixed Tomi Korpipää2014-03-252-1/+1
| | | | | | | | Task-number: QTRD-2410 Change-Id: I68f2de1db5a66a877cfc12c9b097035ed1eb3f0f Change-Id: I68f2de1db5a66a877cfc12c9b097035ed1eb3f0f Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Point style gradient bug fix Tomi Korpipää2014-03-251-1/+2
| | | | | | | | - Selection highlighting fixed Change-Id: Ieba8af12d8947f27b199d61591a77d295dbc9c48 Change-Id: Ieba8af12d8947f27b199d61591a77d295dbc9c48 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Qt5.3.0 MinGW compilation fix Tomi Korpipää2014-03-251-0/+1
| | | | | | Change-Id: I3c9cc0698c22c242126e8b4d1881e8fdf2d50168 Change-Id: I3c9cc0698c22c242126e8b4d1881e8fdf2d50168 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added range gradient support for MeshPointsTomi Korpipää2014-03-258-4/+25
| | | | | | | Task-number: QTRD-2701 Change-Id: Id3f096099ef584a6feaaebcbecc084810ec27967 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Actually use axis formatter in renderer.Miikka Heikkinen2014-03-2531-861/+786
| | | | | | | Task-number: QTRD-2787 Change-Id: I0ced8e506928df5fba2e8df94258b53457f4412e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Introduce value axis formatterMiikka Heikkinen2014-03-2421-69/+882
| | | | | | | | | | | | | Currently only used for label formatting. Also some other preparatory changes for logaxis. Task-number: QTRD-2787 Note: Not to be merged until 1.0 is released Change-Id: I2d7ab70b9c51677d0edd5b0226fb779c9e346286 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* User-defined mesh glimmer fix Tomi Korpipää2014-03-241-0/+4
| | | | | | | | Task-number: QTRD-2648 Change-Id: Ibde745807609dab069d93e7cc9b4d4d547fff6f1 Change-Id: Ibde745807609dab069d93e7cc9b4d4d547fff6f1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Use GL_LINES for ES2 grid linesTomi Korpipää2014-03-249-70/+215
| | | | | | | | Task-number: QTRD-2527 Change-Id: I08b9c740f6dfaf8107601cfc1e7e53db13bf8268 Note: Not to be merged until 1.0 is released Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Support for rendering to image Tomi Korpipää2014-03-247-3/+80
| | | | | | | | | | Task-number: QTRD-2869 Change-Id: I5182c182f15893e70129a95c3cfdd590ed4f0853 Note: Not to be merged until v1.0 is out Change-Id: I5182c182f15893e70129a95c3cfdd590ed4f0853 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added info about binary package to docsTomi Korpipää2014-03-212-3/+36
| | | | | Change-Id: I49235bcfcd41976e272d5cbcf3f9bc3f9794138c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix iOS empty graph problemTomi Korpipää2014-03-191-0/+10
| | | | | | | Task-number: QTRD-2956 Change-Id: I5ec52d70ca4d2e77d219af5b9909967123df6357 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed bars slice label problem with grid offKorpipää Tomi2014-03-181-5/+4
| | | | | | | Task-number: QTRD-2950 Change-Id: Icab3ed5279c671b57921f93c9ffef7efff2da204 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix surface slice problem on MacMika Salmela2014-03-172-1/+24
| | | | | | | Separate shader for slice surfaces. Change-Id: I29f89dc718a4a5dde8d78e1f602283889087bf23 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add proper scoping to signals with enum parametersMiikka Heikkinen2014-03-177-11/+11
| | | | | | | | | 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>
* Remove pregenerated docs mention from READMEMiikka Heikkinen2014-03-141-3/+5
| | | | | Change-Id: I96c7983ac3a0099e9b8d3dd94cbf3cf39ab80c49 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Selection label skewing fixed Tomi Korpipää2014-03-141-7/+7
| | | | | | Change-Id: I13b06175a1be0eb92acd7c1aac2ea860e02d6fac Change-Id: I13b06175a1be0eb92acd7c1aac2ea860e02d6fac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Qt5.3.0 fix for qmlmultigraph example and testTomi Korpipää2014-03-144-8/+8
| | | | | Change-Id: Ib93917992c9cd8e744d4f8156271614893f8679e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* SelectionMode as combination of checkboxesTomi Korpipää2014-03-132-40/+292
| | | | | Change-Id: I30f697ae3f94258717f01b34813dc7fd66c2485c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 18:37:05 +0000