summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/scatter3drenderer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix for static optimization crash on androidMika Salmela2014-06-061-1/+13
| | | | | | | Added checks if visible items really exists and if buffers are empty. Change-Id: Id29f87924e098c6f8b7b57bc74543ce37787995f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix missing axis titles with zero rotation and fixed titlesMiikka Heikkinen2014-06-061-7/+8
| | | | | Change-Id: I026578b224772fe9d96f6f7789e253d433690091 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change label polygon offset to follow draw orderMiikka Heikkinen2014-06-051-3/+6
| | | | | Change-Id: I6b0bbb458fe9eae9664cd50f9b20f672b08cf4b9 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Clean upTomi Korpipää2014-06-051-13/+23
| | | | | | Task-number: QTRD-3149 Change-Id: Ife8937e93b06b118b369ff909097a137106736cf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Scatter perf improvementMika Salmela2014-06-051-38/+230
| | | | | | | Task-number: QTRD-3148 Change-Id: I2c9efa84184819aaac123ee29685bc3a9e35bfe6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Misc fixes found during testingMiikka Heikkinen2014-06-041-0/+2
| | | | | | | | | - 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>
* Clean up renderersTomi Korpipää2014-06-031-21/+0
| | | | | | | Task-number: QTRD-3149 Change-Id: I71b9b7533ad3730d0d203c3d07e66d824b690fbb Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix various issuesMiikka Heikkinen2014-06-021-2/+5
| | | | | Change-Id: I4a6d4775f3ca578370a9ce23491bddcb0f5486ec Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix labels transparency within each axisMiikka Heikkinen2014-05-281-69/+88
| | | | | | Task-number: QTRD-3141 Change-Id: I8ca51b411e2d92e0c615c81d215d89575d614acd Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Optionally show axis titles on the graphMiikka Heikkinen2014-05-271-32/+28
| | | | | | 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-261-31/+36
| | | | | | Task-number: QTRD-3144 Change-Id: I9acd1be13083d7fbbed840882260a60f46c5f698 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Cache ObjectHelper instancesMiikka Heikkinen2014-05-221-15/+9
| | | | | | Task-number: QTRD-2792 Change-Id: I90d83bd9b73a0f337fd26f1b92000e72b3ec0607 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added support for custom items with absolute coordinatesTomi Korpipää2014-05-211-4/+15
| | | | | | Task-number: QTRD-3122 Change-Id: Iefd4c4adad45721ed3519bdcecbbfa1e97039f08 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix label alignmentsMiikka Heikkinen2014-05-191-4/+4
| | | | | | | | - 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>
* Optimize label rotations a bitMiikka Heikkinen2014-05-191-5/+10
| | | | | Change-Id: Ie6075aefa70228769d5a2717e9d96c23b9fee494 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement axis label autorotationMiikka Heikkinen2014-05-191-53/+177
| | | | | | Task-number: QTRD-2857 Change-Id: I158abb75272813cf7eb5d4b419e24325389d940e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added option to use orthographic projectionTomi Korpipää2014-05-141-1/+8
| | | | | | | Task-number: QTRD-3078 Change-Id: I07ebc2b7edd542cd28e405dfc80282f18b7a7314 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Use blending for custom items only when neededTomi Korpipää2014-05-141-4/+4
| | | | | | | Task-number: QTRD-3077 Change-Id: I2406a8fd133943379a5cb1c1c2961a419ef9315f Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* API to query custom item selection Tomi Korpipää2014-05-131-0/+4
| | | | | | | | | | 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-131-0/+4
| | | | | | Task-number: QTRD-3045 Change-Id: Ib5c8f29bcf0148ae604e27b2a81e6f72a2dbca2a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Scatter data changing optimization.Miikka Heikkinen2014-05-021-23/+44
| | | | | | | | | | 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-301-3/+3
| | | | | | | | | | 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>
* Fix texture cleanup.Miikka Heikkinen2014-04-281-8/+2
| | | | | | | | | 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>
* 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-241-5/+5
| | | | | | | | | | | 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>
* Add custom item support, part 2Tomi Korpipää2014-04-161-125/+16
| | | | | | | | | 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-151-0/+124
| | | | | | | | | | | | | | 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>
* Fix compile error on ES2 buildsMiikka Heikkinen2014-04-111-1/+0
| | | | | | | Also fix one cosmetic issue. Change-Id: I80f04dc214b544755d2e4b462a3c30277582c390 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Optimize multiple series rendering.Miikka Heikkinen2014-04-101-360/+373
| | | | | | | | | | | | | | 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>
* Axis label dragging support, part 2Tomi Korpipää2014-04-031-3/+5
| | | | | | | | | | | 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>
* Enable querying selection label via APIMiikka Heikkinen2014-04-031-33/+14
| | | | | | | | | | | | 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-011-84/+135
| | | | | | | | | | 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>
* Row/colun selection using axis labels, part 1Tomi Korpipää2014-03-311-26/+8
| | | | | | | | | | | 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-281-3/+3
| | | | | | | | 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-261-3/+3
| | | | | | | | | 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>
* 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>
* Added range gradient support for MeshPointsTomi Korpipää2014-03-251-0/+7
| | | | | | | Task-number: QTRD-2701 Change-Id: Id3f096099ef584a6feaaebcbecc084810ec27967 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Actually use axis formatter in renderer.Miikka Heikkinen2014-03-251-166/+108
| | | | | | | Task-number: QTRD-2787 Change-Id: I0ced8e506928df5fba2e8df94258b53457f4412e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Use GL_LINES for ES2 grid linesTomi Korpipää2014-03-241-18/+49
| | | | | | | | 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>
* Move selection labels to renderer from render itemsMiikka Heikkinen2014-02-241-3/+4
| | | | | | | | | | | | 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>
* Removed unnecessary overloaded function Tomi Korpipää2014-02-241-6/+0
| | | | | | Change-Id: I067d02c448fbff9b0e381760c247a1275a0f9b98 Change-Id: I067d02c448fbff9b0e381760c247a1275a0f9b98 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-181-5/+4
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Take qml_plugin.prf into useMiikka Heikkinen2014-02-131-0/+1
| | | | | | | Enables us to lose a bunch of hacks. Change-Id: Id7641012004428aa9782cfb5dbaf9fc9c4629706 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-101-7/+3
| | | | | | | | | 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>
* Change rotations to use angle and vector in APIsMiikka Heikkinen2014-02-061-1/+8
| | | | | | | | 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>
* Moved nonfunctional public methods to privateTomi Korpipää2014-01-301-4/+4
| | | | | | | Task-number: QTRD-2809 Change-Id: I009316652475d71d82a66ba23368b045f34c1f9a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix copyright yearMiikka Heikkinen2014-01-271-1/+1
| | | | | | | 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-271-12/+22
| | | | | | | Task-number: QTRD-2654 Change-Id: I864d33bc173b35b8680eddb402bdf1817ecb031f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed accessing series during render Tomi Korpipää2014-01-221-6/+2
| | | | | | | | Task-number: QTRD-2791 Change-Id: I85ada903072b31829fdd42510029373fcf791a35 Change-Id: I85ada903072b31829fdd42510029373fcf791a35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 19:06:44 +0000