summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/engine/scatter3drenderer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* New 3D scene for lights and camera setup for input handlers.Keränen Pasi2013-09-101-44/+55
| | | | | Change-Id: Ib909bd818364c1646615df7c543d57b07b920a83 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Scatter data outside area -issue fixTomi Korpipää2013-09-091-8/+7
| | | | | | | | | Task-number: QTRD-2251 + Fixed z-axis grid line and label drawing bug Change-Id: I027701264c946e3c284c5a46985f5e98d6154aa6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixing more Valgrind found problemsHeikkinen Miikka2013-09-051-19/+2
| | | | | Change-Id: I11023faee65f7a660d63986bd2f7211fcd90964a Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fixed grid line shader issue Tomi Korpipää2013-09-041-60/+61
| | | | | | | | Task-number: QTRD-2246 Change-Id: I0f0e051f2fad1a266b708a32041932484151f41e Change-Id: I0f0e051f2fad1a266b708a32041932484151f41e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Rename axes to avoid conflicts with ChartsMiikka Heikkinen2013-09-041-1/+1
| | | | | | | | + Some doc fixes. Task-number: QTRD-2214 Change-Id: Idecec749a76ef6a5d84857d1396f25be3ef017ca Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed the unused renderer pointer from render itemsMiikka Heikkinen2013-09-041-4/+0
| | | | | Change-Id: I16bad8a75050dac2563b347ab42dd1a6dd324cae Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove mapsMiikka Heikkinen2013-09-041-42/+0
| | | | | Change-Id: I4414919764f5c33242847d9ac873ae03845a00b4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed issues from Improve examples taskTomi Korpipää2013-09-031-1/+1
| | | | | | | | | | | Task-number: QTRD-2239 + Barchart example improved + Themes tweaked + Background lighting tweaked Change-Id: I8b3018c2b9f1e864374fd72ce45eb30d31935b9c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed general issues from Improve examples task Tomi Korpipää2013-09-021-6/+17
| | | | | | | | | | | Task-number: QTRD-2239 + single-color bars + margins for labels Change-Id: Ib3c47bdcca1f34455359e36bdcf596b013678def Change-Id: Ib3c47bdcca1f34455359e36bdcf596b013678def Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Option for softer shadows addedTomi Korpipää2013-09-021-5/+36
| | | | | | | + fixed a shadow shader bug that caused a little bit of shadowing always Change-Id: Ia39ff5d92d2aca32e4f6c5a3bd6d68213564254a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Make axes ownership more usefulMiikka Heikkinen2013-08-291-3/+12
| | | | | | | | | 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>
* 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>
* 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-271-1/+3
| | | | | | | | Task-number: QTRD-2223 Change-Id: I73350177f3f664ac32f40d6b46deaea21f417497 Change-Id: I73350177f3f664ac32f40d6b46deaea21f417497 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add selection signaling for scatterMiikka Heikkinen2013-08-271-95/+60
| | | | | | | | | | | + 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>
* Renderer cleanup Tomi Korpipää2013-08-261-22/+0
| | | | | | Change-Id: I4d318749830c2d14b998c00510794b71beb9627f Change-Id: I4d318749830c2d14b998c00510794b71beb9627f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed label drawing order issue Tomi Korpipää2013-08-221-123/+110
| | | | | | | | 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>
* 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-211-2/+2
| | | | | | | Change-Id: If51261a4806bb27e8ed1715a7b3d0070aa30e2bb Change-Id: If51261a4806bb27e8ed1715a7b3d0070aa30e2bb Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Implement selection label formattingMiikka Heikkinen2013-08-211-19/+36
| | | | | Change-Id: Iae57b93be41ffeeb5ef8fc6ff625af22a7f2d21a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc update: q3dscatterTomi Korpipää2013-08-201-1/+1
| | | | | | | + QSizeF initialization fixes (float -> qreal) Change-Id: I050889a2919a3576214e2960a7141833e5482c82 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DScatter bug fix Tomi Korpipää2013-08-201-6/+0
| | | | | | | | Zero -valued (y = 0.0) items were not drawn. Change-Id: I0605638ef89ff179ae4626d043c2c8865400352f Change-Id: I0605638ef89ff179ae4626d043c2c8865400352f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cleanup of renderer base and subclasses.Keränen Pasi2013-08-191-51/+4
| | | | | Change-Id: Ibf9080fadc5a4bf2f1c58a9a67ca8fb43a459055 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cleaning up renderer baseclass-subclass division.Keränen Pasi2013-08-161-10/+2
| | | | | Change-Id: Ib66c766d53e3577e12fdb7de73818645e22cee30 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed duplicate codeTomi Korpipää2013-08-161-34/+4
| | | | | | | | + fixed a couple of signal connections Change-Id: I5da54e32472e67b8f40092d0a18b952490e0e62b Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fixed zoomlevel cachingMiikka Heikkinen2013-08-161-7/+0
| | | | | | Change-Id: I0bd73c65559ccdde00ef6e5a99b2ecad8cfd0f98 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* High aspect-ratio shadows fix Tomi Korpipää2013-08-151-6/+8
| | | | | | | | | Task-number: QTRD-2178 Change-Id: I463d177e82d0da1bdd2a803a1f597b3e650e084c Change-Id: I463d177e82d0da1bdd2a803a1f597b3e650e084c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Moved functions from specific controllers to abstract controllerTomi Korpipää2013-08-151-21/+6
| | | | | | Change-Id: Ib610d313d0708d8bb894e99004ace1530a83d1f7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Rearchitecting to ensure we transfer the data model to renderer in correct ↵Keränen Pasi2013-08-151-69/+31
| | | | | | | | step in declarative components. Change-Id: I7d7e646c5e0aed13199e011d5f5f898c21c28095 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Enums moved to a class to be usable from QML and C++Tomi Korpipää2013-08-141-26/+26
| | | | | | | Task-number: QTRD-2126 Change-Id: I280047cc7101292d17111babb7735c03436a40f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add missing methods to scatter proxy apiMiikka Heikkinen2013-08-141-2/+0
| | | | | | | + remove data mutex Change-Id: Ie0f150d3ecb51076a998c2bdc2ba6fec46941793 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Refactoring function and enum namesTomi Korpipää2013-08-131-5/+5
| | | | | | | + moved an enum to a correct place Change-Id: Iea133f70ccf87e812cb87b61c16fb16be76b2da3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Copyright headers updated Tomi Korpipää2013-08-131-31/+8
| | | | | | | | Task-number: QTRD-2112 Change-Id: I0dad7933af2dcd0386b8243f71bbd949f92aab8c Change-Id: I0dad7933af2dcd0386b8243f71bbd949f92aab8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DScatter: Implemented viewing scatter chart from below Tomi Korpipää2013-08-121-10/+57
| | | | | | | | Task-number: QTRD-2180 Change-Id: I89facfb8f3afca17a63a3b69e1613c37a86e484c Change-Id: I89facfb8f3afca17a63a3b69e1613c37a86e484c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DScatter: Fixed uniform scaling Tomi Korpipää2013-08-121-35/+50
| | | | | | Change-Id: Ia40762da7b4b1ffcc048c697df3b0bb962ae14fe Change-Id: Ia40762da7b4b1ffcc048c697df3b0bb962ae14fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DScatter: Axes taken into use for lines and labelsTomi Korpipää2013-08-091-375/+384
| | | | | | | -uniform scaling still needs labeling fix Change-Id: I29c89a260124f6abaceee6d8b5b1938ef1fa19c0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Changed "tick" to "segment"Miikka Heikkinen2013-08-091-21/+21
| | | | | | | | | Talking about tick count was misleading, since we are counting the segments between ticks instead of ticks themselves. Changed the term accordingly to reduce confusion. Change-Id: Ic044b179a950083ba9116173a424b865ebb5785a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Value axis labels support for barchartMiikka Heikkinen2013-08-091-1/+1
| | | | | | | | + Subtick support for value axes + misc fixes Change-Id: I409670312ec0dede1a1faa33c30c5b6bc7c7ee29 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q3DScatter: Autoscaling finished Tomi Korpipää2013-08-081-14/+91
| | | | | | | | | | | | + dot size is scaled based on item count + autoscaling works on scenes where x and z are different sizes + added an option to force uniform x and z scaling (using a compile-time flag for now) + changed default dot mesh to sphere Change-Id: Iadfef69489856d7f2c76678eade8896cc916e94e Change-Id: Iadfef69489856d7f2c76678eade8896cc916e94e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Q3DScatter: Refactoring Tomi Korpipää2013-08-081-40/+16
| | | | | | | | Removed obsolete functions and renamed others. Change-Id: Ic3ed31cd2ffa7d7a2319fdb141e49a0baf7c3c8c Change-Id: Ic3ed31cd2ffa7d7a2319fdb141e49a0baf7c3c8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* DeclarativeScatter example added Tomi Korpipää2013-08-081-58/+63
| | | | | | | | + fixed auto-scaling Change-Id: I420dd8ecb0ad11c5a9c7d8317ff4c13878b5bc59 Change-Id: I420dd8ecb0ad11c5a9c7d8317ff4c13878b5bc59 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* DeclarativeScatter: First draftTomi Korpipää2013-08-071-0/+2
| | | | | Change-Id: Icf3273f0266b3183fb5fc29858bba9f1c85ae251 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix for shadow angling bug Tomi Korpipää2013-08-071-9/+16
| | | | | | | | | | | Task-number: QTRD-2130 + added an option to use orthographic shadows, but using them would require shader changes and some more tweaking Change-Id: Ibf54f43daebbf136422284528588e5a6eecc4538 Change-Id: Ibf54f43daebbf136422284528588e5a6eecc4538 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix handleResize to use abstract versionMiikka Heikkinen2013-08-071-16/+1
| | | | | Change-Id: Icddcc987804db3344c153a9104a1351ed31e52f0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement axis caching to renderer.Miikka Heikkinen2013-08-071-166/+36
| | | | | | | | Axis properties are passed via signals from controller to renderer. Change-Id: Iaa0e47c4ea4dc0b586480f260b42958af95c028d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q3DScatter: Removed obsolete variables Tomi Korpipää2013-08-061-86/+79
| | | | | | | | +renamed bar... -> dot... Change-Id: I4eee95047e90502fecaff5c197fdb6eaa926d7d9 Change-Id: I4eee95047e90502fecaff5c197fdb6eaa926d7d9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DScatter: Axis label drawing addedTomi Korpipää2013-08-061-68/+118
| | | | | | | | Now draws x, y and z labels. Categoryaxes still used for testing, should be converted to valueaxes. Change-Id: I2c7bc5402315dec9e09eacd8b65fcdbbf536bc64 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q3DScatter: scatterposition to QVector3DTomi Korpipää2013-08-051-89/+65
| | | | | | | | | | | + removed obsolete inheritances + removed obsolete functions and signals + fixed selection label drawing - axis label drawing still disabled (works, but not correctly) - QML still unimplemented Change-Id: I5dc2e1e898c384543259e31daf8ce4c6c3cb6ccc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DScatter: Scene drawing works Tomi Korpipää2013-08-051-106/+176
| | | | | | | | | | + added an example utilizing sctter chart - labels still disabled and untested - QML still missing Change-Id: I98b3d6701ca6c73305ba3984f60923939e7988e6 Change-Id: I98b3d6701ca6c73305ba3984f60923939e7988e6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 02:36:55 +0000