summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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-3024-192/+405
| | | | | | | Task-number: QTRD-2212 Change-Id: Ie55e5c2765e28f1b31915f12eb952dbb5260047f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix crash when resetting axesMiikka Heikkinen2013-08-294-4/+34
| | | | | | | | Selection label generation didn't account for case where category axes are empty. Change-Id: I3c41f14764f810b52c20c5fc8adce5f9d8dea4d5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Android qml crash fix, part 2 Tomi Korpipää2013-08-292-9/+3
| | | | | | | | | | Task-number: QTRD-2136 Scatter works, bars still crashes. Change-Id: I69a7d2a8e873bfed55f3c29ee36be288ea949f96 Change-Id: I69a7d2a8e873bfed55f3c29ee36be288ea949f96 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Android QML crash fix Tomi Korpipää2013-08-292-20/+0
| | | | | | | | | | Task-number: QTRD-2136 Fixes first crash right after deployment. Another one remains.. Change-Id: I1753bf20066f2f15b123aaaaf2cc880c6a713536 Change-Id: I1753bf20066f2f15b123aaaaf2cc880c6a713536 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make axes ownership more usefulMiikka Heikkinen2013-08-2935-234/+672
| | | | | | | | | 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-272-6/+14
| | | | | | | | 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-2719-132/+253
| | | | | | | | | | | + 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-2620-139/+17
| | | | | | | | 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-2620-83/+35
| | | | | | | | 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-268-272/+460
| | | | | | | | | 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-2215-95/+240
| | | | | | | | - 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>
* Refactored enums zoom -> slice Tomi Korpipää2013-08-216-18/+18
| | | | | | Change-Id: I39a53326403b127746437233853bee032b551f8c Change-Id: I39a53326403b127746437233853bee032b551f8c Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Doc update: global enumsTomi Korpipää2013-08-212-49/+37
| | | | | | | Task-number: QTRD-2133 Change-Id: Ifb109ddd5f865f3b0f58aeffb1e5abf10b2890d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement selection label formattingMiikka Heikkinen2013-08-2137-187/+335
| | | | | Change-Id: Iae57b93be41ffeeb5ef8fc6ff625af22a7f2d21a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc update: axesTomi Korpipää2013-08-213-0/+166
| | | | | | | Task-number: QTRD-2133 Change-Id: I767eb13ea491a440046165babc617737cf941afa Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc warning fixes Tomi Korpipää2013-08-204-4/+4
| | | | | | Change-Id: I2059a46052db755f4e0fe118512413d81e662ee2 Change-Id: I2059a46052db755f4e0fe118512413d81e662ee2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc update: data items and proxiesTomi Korpipää2013-08-2011-55/+426
| | | | | | | Task-number: QTRD-2133 Change-Id: Ifdc53d6f0f9c30ee68a9dc622d1fe98600a9e881 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc update: q3dscatterTomi Korpipää2013-08-2014-104/+136
| | | | | | | + QSizeF initialization fixes (float -> qreal) Change-Id: I050889a2919a3576214e2960a7141833e5482c82 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DScatter bug fix Tomi Korpipää2013-08-202-7/+1
| | | | | | | | Zero -valued (y = 0.0) items were not drawn. Change-Id: I0605638ef89ff179ae4626d043c2c8865400352f Change-Id: I0605638ef89ff179ae4626d043c2c8865400352f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Shader incompatibility fix Tomi Korpipää2013-08-203-48/+48
| | | | | | Change-Id: I493a5df016c6729a99bbe93c54b1790771405655 Change-Id: I493a5df016c6729a99bbe93c54b1790771405655 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc update; q3dbars, q3dwindowTomi Korpipää2013-08-1919-224/+178
| | | | | | | + api updates Change-Id: I8da49e3cb45025eaa5713ae563bf8475f15cc298 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Small renderer and controller cleanups.Keränen Pasi2013-08-193-29/+14
| | | | | Change-Id: Idf6a39feb1cc19e6d4e36db57ce3c5bef00a904e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cleanup of renderer base and subclasses.Keränen Pasi2013-08-196-139/+98
| | | | | Change-Id: Ibf9080fadc5a4bf2f1c58a9a67ca8fb43a459055 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Column origin changed; bottom right -> bottom left Tomi Korpipää2013-08-191-20/+18
| | | | | | | | Task-number: QTRD-2189 Change-Id: I8e52a82f3155a7f99e6407e0d82af9e2b4da69f6 Change-Id: I8e52a82f3155a7f99e6407e0d82af9e2b4da69f6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Changed default shadows to medium Tomi Korpipää2013-08-193-3/+3
| | | | | | | | + improved the look of slice view Change-Id: I666a21b0bb47cdb0312ce4397c8c12989e221f17 Change-Id: I666a21b0bb47cdb0312ce4397c8c12989e221f17 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Shows the selected data point with red ball and value labelMika Salmela2013-08-167-11/+422
| | | | | Change-Id: Ide47626eec98f603b4a50aaea84e35e14d54d1f9 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Cleaning up renderer baseclass-subclass division.Keränen Pasi2013-08-166-25/+37
| | | | | Change-Id: Ib66c766d53e3577e12fdb7de73818645e22cee30 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement value axis label formatting.Miikka Heikkinen2013-08-1612-89/+152
| | | | | Change-Id: Ie657df264549e4277d3bd1eaf2ca48436c153717 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix renderer initializationMiikka Heikkinen2013-08-162-0/+2
| | | | | | Task-number: QTRD-2195 Change-Id: Ifeda8025c5ae7be7f0c3dd28a026776bf4999650 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>