summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Rename axes to avoid conflicts with ChartsMiikka Heikkinen2013-09-0442-445/+452
| | | | | | | | + Some doc fixes. Task-number: QTRD-2214 Change-Id: Idecec749a76ef6a5d84857d1396f25be3ef017ca Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Unintentional QML label transparency fixed Tomi Korpipää2013-09-041-0/+1
| | | | | | | | Task-number: QTRD-2235 Change-Id: I23522db43570c6dc5c571f3ad0c8c7f5be7dd5be Change-Id: I23522db43570c6dc5c571f3ad0c8c7f5be7dd5be Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Made audiolevels example show something sensibleMiikka Heikkinen2013-09-041-0/+1
| | | | | | | | + Fixed zoom level setting via API Task-number: QTRD-2244 Change-Id: Iab8d877361c480ba4010a79e93af8a0121239b5d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Themes updated Tomi Korpipää2013-09-041-28/+38
| | | | | | Change-Id: Ic29777f5c45503caac9d03f226fd66e912534a6c Change-Id: Ic29777f5c45503caac9d03f226fd66e912534a6c Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fixed issues from Improve examples task Tomi Korpipää2013-09-041-2/+4
| | | | | | | | | | | | Task-number: QTRD-2239 + qmlscatter example improved + qmlbarchart button text changed + tweaked a theme Change-Id: I3a49c0183a63bcb7b5fcd8b9dac2e8ed55aa649e Change-Id: I3a49c0183a63bcb7b5fcd8b9dac2e8ed55aa649e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Removed the unused renderer pointer from render itemsMiikka Heikkinen2013-09-046-23/+2
| | | | | Change-Id: I16bad8a75050dac2563b347ab42dd1a6dd324cae Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove mapsMiikka Heikkinen2013-09-0436-4584/+4
| | | | | Change-Id: I4414919764f5c33242847d9ac873ae03845a00b4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed issues from Improve examples task Tomi Korpipää2013-09-044-6/+10
| | | | | | | | | | | Task-number: QTRD-2239 + white bars fixed + shaders improved; non-shadow is quite similar to shadow now Change-Id: I868b6ab9fb65151f47638ec366af4f11938e7a22 Change-Id: I868b6ab9fb65151f47638ec366af4f11938e7a22 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Only render the scene when something changes.Miikka Heikkinen2013-09-0315-71/+114
| | | | | | | | This seems to improve frame rate, too. Task-number: QTRD-2179 Change-Id: Icb3ddc5ba651ce0982068bcf7ab09c67be183717 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed issues from Improve examples taskTomi Korpipää2013-09-033-7/+12
| | | | | | | | | | | Task-number: QTRD-2239 + Barchart example improved + Themes tweaked + Background lighting tweaked Change-Id: I8b3018c2b9f1e864374fd72ce45eb30d31935b9c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Improve qmlbarchart exampleMiikka Heikkinen2013-09-036-11/+32
| | | | | | | | | + Fix building of surface example + Some warnings fixed Task-number: QTRD-2239 Change-Id: If957d86fdd3499f8f81e283b06c79e547b6ba09c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added labels to grid linesMika Salmela2013-09-032-36/+201
| | | | | Change-Id: Iba1a4f67a3565cc6ed5136e160ee338bda83bb52 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed issues from Improve examples taskTomi Korpipää2013-09-032-2/+2
| | | | | | | | | | | | Task-number: QTRD-2239 + Moved extra-full examples to tests + Removed extra functionality from widget and scatterchart examples + Changed bars default to bevelbar + Changed default label style to nobackground Change-Id: Idffba7a44d5b54dbaf36d7cdbfe616b78e0d4073 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Improve data mapping documentation.Miikka Heikkinen2013-09-039-51/+139
| | | | | | Task-number: QTRD-2133 Change-Id: I8f25fc7a3d15712060a1d100ec4d9895cc4b6637 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed general issues from Improve examples task Tomi Korpipää2013-09-023-16/+42
| | | | | | | | | | | Task-number: QTRD-2239 + single-color bars + margins for labels Change-Id: Ib3c47bdcca1f34455359e36bdcf596b013678def Change-Id: Ib3c47bdcca1f34455359e36bdcf596b013678def Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Removed margins from bars floor Tomi Korpipää2013-09-021-12/+12
| | | | | | | | Task-number: QTRD-2239 Change-Id: I298d72af3223ee589eac24518d973df88721f33d Change-Id: I298d72af3223ee589eac24518d973df88721f33d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Option for softer shadows addedTomi Korpipää2013-09-0210-32/+107
| | | | | | | + fixed a shadow shader bug that caused a little bit of shadowing always Change-Id: Ia39ff5d92d2aca32e4f6c5a3bd6d68213564254a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactor item model mapping and proxiesMiikka Heikkinen2013-09-0234-663/+1045
| | | | | | | | | | | | | | | | - Introduced new handler for item models. Instance of this is owned by item model proxies. - Introduced abstract mapping class to enable moving a lot of duplicate code to the new handler. - Changed ownership handling of mapping objects to be in line with proxies and axes, though there is no default mapping at this time. Need to reconsider the default case more. - Made item model const so it is clear that we do not own it. The documentation is not yet up to date. Change-Id: Ie961da29340743fdaa9293d7d4ace9577def9102 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Pinch-zoom and double-click selection fixed on AndroidTomi Korpipää2013-09-026-6/+57
| | | | | | | | | | Task-number: QTRD-2237 Press-and-hold selection doesn't work. This can be handled as an optional selection mode after input api task is done. Change-Id: Ic34b93fbf8114270ee18e1ecf06850abf83af1c0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* QMLScatter example improved a bit Tomi Korpipää2013-08-301-1/+1
| | | | | | Change-Id: Iac8e6b0edce20d2ef0cd89999c59a485a6f3862a Change-Id: Iac8e6b0edce20d2ef0cd89999c59a485a6f3862a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Rename "3d" -> "3D" in class names.Miikka Heikkinen2013-08-3027-219/+217
| | | | | Change-Id: I9e861c28f828b3ee5b821e187396fb31c05844cb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Improved the ownership handling of data proxies and axes.Miikka Heikkinen2013-08-3016-124/+325
| | | | | | | Task-number: QTRD-2212 Change-Id: Ie55e5c2765e28f1b31915f12eb952dbb5260047f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix crash when resetting axesMiikka Heikkinen2013-08-291-4/+12
| | | | | | | | Selection label generation didn't account for case where category axes are empty. Change-Id: I3c41f14764f810b52c20c5fc8adce5f9d8dea4d5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make axes ownership more usefulMiikka Heikkinen2013-08-2926-141/+497
| | | | | | | | | Chart can now own multiple axes while showing only one. Default axes are no longer modifiable by users. Task-number: QTRD-2212 Change-Id: I028f0d7539dbbf6e3474680290c7ec6bba5a4223 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* OpenGL ES2 compilation fix Tomi Korpipää2013-08-281-0/+2
| | | | | | Change-Id: Id27e5ab58c3b4e0042e4dea2841480971665bb7a Change-Id: Id27e5ab58c3b4e0042e4dea2841480971665bb7a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Compilation fixTomi Korpipää2013-08-281-0/+1
| | | | | | | Fixes plugin build issue with linux using multithreaded compiling Change-Id: I52a6effe0a36dea35bd63b8a93593e65958bd3cf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added vertical grid lines to scatterTomi Korpipää2013-08-271-48/+145
| | | | | | | Task-number: QTRD-2210 Change-Id: I1bb0046a06533de7d3b5d7e055d6ac1201c57830 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix rendering artifacts when changing data window sizeMiikka Heikkinen2013-08-272-0/+2
| | | | | Change-Id: I6bc76feca9b4400477cb9de94e46bd6d46e9dabc Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Limit scatter dot drawing to axis ranges Tomi Korpipää2013-08-271-5/+13
| | | | | | | | Task-number: QTRD-2184 Change-Id: Id8a35cadce54b8eef05d22a9d842b62ad0178055 Change-Id: Id8a35cadce54b8eef05d22a9d842b62ad0178055 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Auto-adjusting shadow quality fixed Tomi Korpipää2013-08-272-2/+6
| | | | | | | | Task-number: QTRD-2223 Change-Id: I73350177f3f664ac32f40d6b46deaea21f417497 Change-Id: I73350177f3f664ac32f40d6b46deaea21f417497 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Parents addedTomi Korpipää2013-08-2720-151/+84
| | | | | | | Task-number: QTRD-2211 Change-Id: I2ae7cef9feed852b90aa15ddf2d27dd7e2b7ff10 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add selection signaling for scatterMiikka Heikkinen2013-08-2716-125/+216
| | | | | | | | | | | + Fix crashes associated with selection + Optimized selection color handling Task-number: QTRD-2132 Task-number: QTRD-2208 Change-Id: Ie38c6779591fb0467cffb052edf7609f6677278a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Public slot and const ref changesTomi Korpipää2013-08-2612-54/+44
| | | | | | | Task-number: QTRD-2211 Change-Id: I86a253d54810544d5b87d4bcc8de079b1607c452 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed setfontsize Tomi Korpipää2013-08-2616-131/+0
| | | | | | | | Task-number: QTRD-2211 Change-Id: I33b363749ccfbd4d4e9ce3faa909eeaf46acb33a Change-Id: I33b363749ccfbd4d4e9ce3faa909eeaf46acb33a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed setwindowtitle and made parameters const ref Tomi Korpipää2013-08-2618-81/+33
| | | | | | | | Task-number: QTRD-2211 Change-Id: Ib4087b40bb8d0e72d9fc4fe0c97acce4996b7fbd Change-Id: Ib4087b40bb8d0e72d9fc4fe0c97acce4996b7fbd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* AbstractRenderer into use and grid linesMika Salmela2013-08-267-271/+451
| | | | | | | | | Modified renderer to use AbstractRenderer and copied grid lines mostly from scatter. Feel free to fix bugs. See you in a week. Change-Id: I54c79b134be4ed5d7814c395a008a42003037307 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Renderer cleanup Tomi Korpipää2013-08-265-73/+9
| | | | | | Change-Id: I4d318749830c2d14b998c00510794b71beb9627f Change-Id: I4d318749830c2d14b998c00510794b71beb9627f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Shadow shader compatibility fix Tomi Korpipää2013-08-263-48/+48
| | | | | | Change-Id: I52aeac571776ce4289696853e08063bd527414e3 Change-Id: I52aeac571776ce4289696853e08063bd527414e3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc update: model data proxies + indexTomi Korpipää2013-08-267-13/+112
| | | | | | | Task-number: QTRD-2133 Change-Id: Idf21d66e4c5ed078664a5e734cf4288e0bda4a79 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Docs update: model mappingsTomi Korpipää2013-08-238-61/+210
| | | | | | | Task-number: QTRD-2133 Change-Id: I557bcf5829d1869bd500513ddf7bf5edd1a1d457 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* First implementation of new input handling. Not integrated yet.Keränen Pasi2013-08-2313-0/+655
| | | | | Change-Id: I8be494bf072926f4bd9db32572678bf7a4ea674a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Selection improvements for bars:Miikka Heikkinen2013-08-2211-72/+177
| | | | | | | | - Signal to notify of selection change - Setting selection via API Change-Id: I87c71005d76b15dd259f745392ff7b5112d146b5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Linux compilation fix Tomi Korpipää2013-08-221-1/+1
| | | | | | Change-Id: Ie08206f1e9d51cd2b151a24820f1b3c88a2c5582 Change-Id: Ie08206f1e9d51cd2b151a24820f1b3c88a2c5582 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Shadows after slice resize fix Tomi Korpipää2013-08-221-0/+4
| | | | | | | | Task-number: QTRD-2217 Change-Id: If59cc1718a46ba9878d70c74da9c7921cdf5e568 Change-Id: If59cc1718a46ba9878d70c74da9c7921cdf5e568 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection failure fix Tomi Korpipää2013-08-221-0/+4
| | | | | | | | | Task-number: QTRD-2146 Change-Id: Iaafc0708b3f108e84f865421988362a425713ad3 Change-Id: Iaafc0708b3f108e84f865421988362a425713ad3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fixed label drawing order issue Tomi Korpipää2013-08-223-206/+181
| | | | | | | | Task-number: QTRD-2209 Change-Id: Ibc093e31300dcbe622b3dbcbd46f2b0e00c68a3a Change-Id: Ibc093e31300dcbe622b3dbcbd46f2b0e00c68a3a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Flipped scatter z-axis drawing Tomi Korpipää2013-08-221-6/+4
| | | | | | | | Task-number: QTRD-2204 Change-Id: I5e3e805ef05e4219e3b66a37cf2c3a98273f4be5 Change-Id: I5e3e805ef05e4219e3b66a37cf2c3a98273f4be5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Tweaked slice view lighting Tomi Korpipää2013-08-221-11/+5
| | | | | | Change-Id: Iaa774c97ed01d34cc3255f42737db7c5c605ab3e Change-Id: Iaa774c97ed01d34cc3255f42737db7c5c605ab3e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Android fix Tomi Korpipää2013-08-211-1/+1
| | | | | | Change-Id: I762df3b5daf6f664f49a1f36a29c94d0ea6bd808 Change-Id: I762df3b5daf6f664f49a1f36a29c94d0ea6bd808 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Android and mingw compilation fixes Tomi Korpipää2013-08-218-62/+123
| | | | | | | Change-Id: If51261a4806bb27e8ed1715a7b3d0070aa30e2bb Change-Id: If51261a4806bb27e8ed1715a7b3d0070aa30e2bb Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>