summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine
Commit message (Collapse)AuthorAgeFilesLines
* Introduce state storing for mac and android.Miikka Heikkinen2014-02-283-2/+12
| | | | | | | | | | | | At least some mac and android environments do not handle shared contexts properly, leading to slowdowns and/or artifacts. Disable context sharing on mac and android, and instead store and restore relevant opengl state. Also improve renderer and context cleanup Change-Id: I8fa596b95f6ff20d53c950a34b5c28513acbc18f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc fixes Tomi Korpipää2014-02-271-2/+2
| | | | | | | | | | | - QAbstract3DAxis - QAbstract3dSeries - QAbstract3DGraph - QAbstract3DInputHandler Change-Id: Ida248755523fb3de7d2f9dfda274429200525737 Change-Id: Ida248755523fb3de7d2f9dfda274429200525737 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc fixes Tomi Korpipää2014-02-271-1/+1
| | | | | | | | | - Q3DObject - Q3DTheme Change-Id: I9d5717beece4426b9611b6b81a4dcf388373de2b Change-Id: I9d5717beece4426b9611b6b81a4dcf388373de2b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DCamera doc and API updateTomi Korpipää2014-02-273-11/+11
| | | | | Change-Id: Id33645c7f921ad7289c2e368a656ee1c7b2d69ea Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix some copyrightsMiikka Heikkinen2014-02-261-0/+2
| | | | | Change-Id: I97e4bd37243ae94ce4537ee849fd11ee59a570bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix Valgrind found issuesMiikka Heikkinen2014-02-255-23/+33
| | | | | Change-Id: Iccacab527abf745e7ccd1e562ff9ea5dea4c8005 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move selection labels to renderer from render itemsMiikka Heikkinen2014-02-247-61/+92
| | | | | | | | | | | | 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>
* Set objects dirty on Y axis range changeMika Salmela2014-02-242-1/+15
| | | | | | | Task-number: QTRD-2889 Change-Id: Iac92a50b6454d8e83ece984a13a0bcfa1f908d9f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Don't do unnecessary polygon fill enablingsMiikka Heikkinen2014-02-241-6/+4
| | | | | Change-Id: I7111837454e901dc44a7aaf094f1762dcf14455c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed unnecessary overloaded function Tomi Korpipää2014-02-242-10/+0
| | | | | | Change-Id: I067d02c448fbff9b0e381760c247a1275a0f9b98 Change-Id: I067d02c448fbff9b0e381760c247a1275a0f9b98 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix the variable naming in findMatchingRowMiikka Heikkinen2014-02-242-6/+6
| | | | | | | Y -> Z Change-Id: I793b956212ba51c523f965c5f99db250d0cac1cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiseries support for selection pointerMika Salmela2014-02-214-54/+146
| | | | | | | Task-number: QTRD-2515 Change-Id: Id3611533c4dd333b68b96669c7230707506b68ab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Misc fixesMiikka Heikkinen2014-02-211-3/+5
| | | | | | | | | + Rectangle used as main item in qml examples to make ui consistent + Surface autoaxis adjustment fixes for multiseries case + Qmlsurface example UI tweaks Change-Id: Ie75b0efc08f9a56ca709f079b28865e34caa8641 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed surface shadow wrong direction bug Tomi Korpipää2014-02-211-9/+1
| | | | | | | | Task-number: QTRD-2887 Change-Id: I37938a86fe4b414cd969fda819d096dc885fa48f Change-Id: I37938a86fe4b414cd969fda819d096dc885fa48f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Scaling and offset support for multiseriesMika Salmela2014-02-204-92/+222
| | | | | | | | Task-number: QTRD-2868 Change-Id: I47cb0c6e26e2445ca39426e6a52963b80ebb3816 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-1832-751/+67
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Surface remaining shadow problem fixed Tomi Korpipää2014-02-171-2/+4
| | | | | | | | Task-number: QTRD-2871 Change-Id: Iaabd77f48fcb02b4f439a91fec4fbc5721b13295 Change-Id: Iaabd77f48fcb02b4f439a91fec4fbc5721b13295 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection works on wireframe-only mode Tomi Korpipää2014-02-171-2/+2
| | | | | | | | Task-number: QTRD-2875 Change-Id: Iabce6db6a121fcfe6c8669b91c994df01d411d35 Change-Id: Iabce6db6a121fcfe6c8669b91c994df01d411d35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Draw surface grid in slice when wireframe only Tomi Korpipää2014-02-171-24/+26
| | | | | | | | Task-number: QTRD-2876 Change-Id: Iaa09592250e7e827ef194abc27cee86596ca5d8d Change-Id: Iaa09592250e7e827ef194abc27cee86596ca5d8d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Series visibility affects slice Tomi Korpipää2014-02-171-1/+2
| | | | | | | | Task-number: QTRD-2873 Change-Id: If03f492cec9d3c39387554b0a191df09efa6ee06 Change-Id: If03f492cec9d3c39387554b0a191df09efa6ee06 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Take qml_plugin.prf into useMiikka Heikkinen2014-02-133-0/+6
| | | | | | | Enables us to lose a bunch of hacks. Change-Id: Id7641012004428aa9782cfb5dbaf9fc9c4629706 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove mentions about only supporting single surfaceMiikka Heikkinen2014-02-111-8/+2
| | | | | Change-Id: I3daec1f80eb0c984c1ecc6e3defe81c795dd0077 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Multiseries support for surface sliceMika Salmela2014-02-112-48/+62
| | | | | | | Task-number: QTRD-2867 Change-Id: I705e3b743ab9d561d93039a60288d71627db8661 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed sampleSpace validity checkMika Salmela2014-02-111-1/+1
| | | | | | | | Task-number: QTRD-2863 Change-Id: Ia809f01772289aa2cc3e34cb055c334fb1647e4d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>
* Multiseries support for surfaceMika Salmela2014-02-104-118/+109
| | | | | | | | | Multiseries support for item and row changes. Task-number: QTRD-2767 Change-Id: I5702989e7f59913481a2ca888e402effa22a4221 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Mostly revert the rotations refactorMiikka Heikkinen2014-02-104-17/+7
| | | | | | | | | 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>
* Added selectedSeries propertyTomi Korpipää2014-02-1013-2/+78
| | | | | | | Task-number: QTRD-2806 Change-Id: Icd895915f39e475fe9f2a006bebd956615474202 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Check for surface object createdMika Salmela2014-02-071-10/+12
| | | | | | | Task-number: QTRD-2864 Change-Id: Ibbb4186cdf064debc25bc7b255da1abbc658077a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added axis labels to surface slice Tomi Korpipää2014-02-071-9/+35
| | | | | | | | Task-number: QTRD-2854 Change-Id: Icf6e57a39b1d7044b522daadedbe0df5aa73e15c Change-Id: Icf6e57a39b1d7044b522daadedbe0df5aa73e15c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Surface shadow problem fixed Tomi Korpipää2014-02-072-17/+36
| | | | | | | | | Task-number: QTRD-2815 Task-number: QTRD-2637 Change-Id: I8c17a09976826683358084392e190a7333f63357 Change-Id: I8c17a09976826683358084392e190a7333f63357 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Change rotations to use angle and vector in APIsMiikka Heikkinen2014-02-063-10/+13
| | | | | | | | 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>
* Multiseries support for surfaceMika Salmela2014-02-0611-373/+628
| | | | | | | Task-number: QTRD-2767 Change-Id: Ifa7ca07f2afdb27974ad20819f0a4646293764b0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix slice update for bars, too.Miikka Heikkinen2014-02-053-14/+18
| | | | | | | Also revert the incorrect change to surface slice update. Change-Id: If08d5848e5b216f4f6b82e39727eeb7facd463ca Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add qmloscilloscope exampleMiikka Heikkinen2014-02-053-18/+20
| | | | | | | | | | +Fix itemAt() in surface proxy +Add itemAt(QPoint) in bar and surface proxies +Misc fixes to other examples Task-number: QTRD-2816 Change-Id: I5e06cfce98f74719a20885e3ca5a1e6fefb23a9c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Moved nonfunctional public methods to privateTomi Korpipää2014-01-3011-384/+267
| | | | | | | Task-number: QTRD-2809 Change-Id: I009316652475d71d82a66ba23368b045f34c1f9a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Surface slice view scaling fix Tomi Korpipää2014-01-292-4/+8
| | | | | | | | Task-number: QTRD-2799 Change-Id: I43650b9b1fb87a112db5e0a233c96c32346def70 Change-Id: I43650b9b1fb87a112db5e0a233c96c32346def70 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Valground betaMiikka Heikkinen2014-01-272-0/+2
| | | | | Change-Id: I05867a256caea389fb1d2c19bccbf244732343a2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* iOS: Fixed crashesTomi Korpipää2014-01-271-0/+2
| | | | | | | | Added registering ShadowQuality metatype for C++ and QML Task-number: QTRD-2802 Change-Id: I794071dfe65bbae6f668306e78c6d1cd68684751 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix copyright yearMiikka Heikkinen2014-01-2750-50/+50
| | | | | | | Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add missing consts to public apisMiikka Heikkinen2014-01-276-20/+20
| | | | | | | Task-number: QTRD-2807 Change-Id: I74a6735ab37a8b3d97548adba99ca79ce2c7975c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added series rotation and bar item rotation supportMiikka Heikkinen2014-01-279-39/+120
| | | | | | | Task-number: QTRD-2654 Change-Id: I864d33bc173b35b8680eddb402bdf1817ecb031f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multiseries bars uniform scaling support addedTomi Korpipää2014-01-246-17/+90
| | | | | | | Task-number: QTRD-2805 Change-Id: I7172662b2bed0a222ceb7560718450bcabd2879d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move qmlmultigraphs to examplesMiikka Heikkinen2014-01-231-14/+6
| | | | | | | | | | +Fix Q3DScene::isPointInPrimarySubView +Fix Q3DScene::isPointInSecondarySubView +Remove some unnecessary imports from examples Task-number: QTRD-2800 Change-Id: I5a9bc737c5ee92edbb514e76054adbb54076aef8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add example for showing graph legendMiikka Heikkinen2014-01-231-1/+4
| | | | | | | | +Fix default theme Task-number: QTRD-2653 Change-Id: Iccf4161cd19a9dfe6226189568efeb4565ba53ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Slice view positioning in qml fixed Tomi Korpipää2014-01-231-1/+2
| | | | | | | | Task-number: QTRD-2798 Change-Id: I287802424493435eaa54a14cace651b66a0f1a86 Change-Id: I287802424493435eaa54a14cace651b66a0f1a86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>
* Made jira tasks of TODOs, part 2 Tomi Korpipää2014-01-2232-161/+116
| | | | | | | | | + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made jira tasks of TODOs, part 1Tomi Korpipää2014-01-228-63/+1
| | | | | | | | - commented-out code will be removed (and made tasks of, if necessary) in part 2 Task-number: QTRD-2398 Change-Id: Ib94a4a873ecd25f4040c74c42902e204f3f41943 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* InputState enum moved to private Tomi Korpipää2014-01-221-6/+7
| | | | | | | | Task-number: QTRD-2784 Change-Id: Ibda5445cc9872e2a5bf234914f11d4c380447cf4 Change-Id: Ibda5445cc9872e2a5bf234914f11d4c380447cf4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>