summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/scatter3drenderer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Reintroduced namespace macros Tomi Korpipää2014-01-161-7/+2
| | | | | | | | Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Docs updated after namespace macro removalTomi Korpipää2014-01-161-0/+5
| | | | | | | | - some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-151-22/+22
| | | | | | | | | - docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add series name propertyMiikka Heikkinen2014-01-141-2/+5
| | | | | | | | | | | +Don't call updateScene for every render cycle +Fixed item label update when format or name changes +Misc cosmetic fixes Task-number: QTRD-2736 Task-number: QTRD-2571 Change-Id: I43aa6b8e3202b09529b17a22bb24d05fcb545609 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Direction for scatter itemsMika Salmela2014-01-131-2/+10
| | | | | | | Task-number: QTRD-2654 Change-Id: Ib21e6d75fa43de45387ad6225973aa8a11ffc0c9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Cache scatter series item sizeMiikka Heikkinen2014-01-101-4/+6
| | | | | | | Task-number: QTRD-2689 Change-Id: I8cd73a74f1ede49ce35c742712fbf3a5357f152e Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Enable showing multiple graphs in QMLMiikka Heikkinen2014-01-081-0/+9
| | | | | | | | + other minor fixes Task-number: QTRD-2749 Change-Id: I654d41fd4124d6596f9df3ace7019706452d8bfa Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Rename axis classesMiikka Heikkinen2014-01-071-1/+1
| | | | | | | | | Moved the '3D' in axis class names so that the classes would be in line with other '3D' classes. Task-number: QTRD-2674 Change-Id: Ie4f8a10babe3bf1b0b30b366863f55ed02ec66ba Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Check context before attempting to release opengl resourcesMiikka Heikkinen2013-12-201-5/+7
| | | | | | | | | | In case of QMl ApplicationWindow using applications, openGL context seems to be 0 when the renderer gets destroyed at application shutdown. Work around this by checking for context validity on destructors before attempting to free openGL resources. Change-Id: I5ba5209740f8f4467f4ba2cc8dd195171bcd13c8 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* fix rendering issuesMiikka Heikkinen2013-12-171-5/+0
| | | | | Change-Id: I5dee557f2f4857f586412d604040ffbeda0e78a1 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Antialiasing and direct rendering with QML.Keränen Pasi2013-12-171-33/+20
| | | | | | | Task-id: QTRD-2565 Change-Id: I4099c869f157361ee6a900dfc1c29301b373ac30 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move series specific visual elements to series, part 4Miikka Heikkinen2013-12-101-62/+89
| | | | | | | | | | | | Colors to series - Multiselection labels in bar slices still buggy - Selection in bars doesn't work correctly if not all series have items in that grid Task-number: QTRD-2557 Change-Id: Icd38428e5337a26b8410476104bb1f1f784cdc7f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* ES2 compilation fix Tomi Korpipää2013-12-051-0/+4
| | | | | | Change-Id: I325739b199fad7dc5ea7fb45f87ea776dd14a7f4 Change-Id: I325739b199fad7dc5ea7fb45f87ea776dd14a7f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Item size per series for scatterTomi Korpipää2013-12-041-81/+130
| | | | | | | Task-number: QTRD-2568 Change-Id: Ic137185304a5cc5ad16699cbb127035db86196cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed crash on selection with no visible seriesTomi Korpipää2013-12-031-1/+1
| | | | | | | Task-number: QTRD-2667 Change-Id: I460ba87b4bcb639328439f6e1b698ca1323c0968 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixes retina issues with C++ widget graphs.Keränen Pasi2013-12-021-6/+6
| | | | | | | | Task-id: QTRD-2660 Change-Id: Icd36c082f45077a1ebb3372838f43a50fd277076 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Theme documentedTomi Korpipää2013-12-021-6/+6
| | | | | | | Task-number: QTRD-2633 Change-Id: Ib274ec236f50145df8fd4c2d83f62d4a9154687a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move series specific visual elements to series, part 1Miikka Heikkinen2013-11-291-70/+88
| | | | | | | | Meshes moved to series. Task-number: QTRD-2557 Change-Id: I80050e413faf3bc942eb5a5627a66747de5805d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Theme syncTomi Korpipää2013-11-281-10/+2
| | | | | | | Task-number: QTRD-2538 Change-Id: I12dfb562dc59ae1df3b5127f0f675a3796ba3f00 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Change qreals to floatsMiikka Heikkinen2013-11-251-7/+6
| | | | | | | | | + Fix default axes to sensible + Fix some rounding errors in surface creation Task-number: QTRD-2622 Change-Id: I44450efc1e77ac8d8dbefc75814345949b8fb1f1 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* User-modifiable themes, part 1Tomi Korpipää2013-11-221-11/+11
| | | | | | | | | | | | Task-number: QTRD-2120 + old functionality remade - new functionality to be added + fixed a compilation error in qbarseries for mingw Change-Id: I710c97b5d4023861be8e8cc5cc61c05bb4644964 Signed-off-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multi series selection part 2: scatterMiikka Heikkinen2013-11-211-15/+51
| | | | | | | Task-number: QTRD-2556 Change-Id: I9ee193141dff6603b47db28b0ed0682db6f914c8 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Multi series selection part 1: barsMiikka Heikkinen2013-11-201-21/+16
| | | | | | | Task-number: QTRD-2556 Change-Id: I1f537f0b4c299028d4415f074d5eac6552bb3b9b Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Changes scene to be proxy for input position and selection communication.Keränen Pasi2013-11-151-17/+2
| | | | | Change-Id: I83729508c8a0281569be5f43791d44d36d800ca2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Basic multiseries supportMiikka Heikkinen2013-11-151-16/+12
| | | | | | | | Task-number: QTRD-2548 Change-Id: Iba324c0e8be56f2b3f8f6c6a992883c134a51a9d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Removed unused and duplicate shaders Tomi Korpipää2013-11-131-3/+3
| | | | | | | | | - texture.frag, texture.vert and texture_ES2.frag are used in Q3DMaps if it is reintroduced some day Change-Id: I80e838ce2471ecef45d7662c59d8fbc74bf72769 Change-Id: I80e838ce2471ecef45d7662c59d8fbc74bf72769 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiple set support for scatterTomi Korpipää2013-11-121-157/+199
| | | | | | | | | Task-number: QTRD-2550 - not finished, as QTRD-2548 is not completed Change-Id: I2af9cc134ab7a7359fff311da31a0209ca791c90 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Shadow support for surfaceMika Salmela2013-11-081-3/+3
| | | | | | | Task-number: QTRD-2266 Change-Id: I99fd7a6eda570df3d114ab10a1b07c22736cc86c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support part 2Miikka Heikkinen2013-11-081-14/+30
| | | | | | | | Scatter gradients. Task-number: QTRD-2200 Change-Id: Ia6ac271440d0d26b7cae9332ef2ba4e7bf1a11fe Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* ES2 support for scatter pointsTomi Korpipää2013-11-061-11/+41
| | | | | | | Task-number: QTRD-2539 Change-Id: I2465322d9a4341ce4c345756fe085a4c5ad2be5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added GL_POINTS for scatter Tomi Korpipää2013-11-061-74/+130
| | | | | | | | Task-number: QTRD-2535 Change-Id: Icf2d4ab1d8a46ea38864d2b587411ed05c58de38 Change-Id: Icf2d4ab1d8a46ea38864d2b587411ed05c58de38 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* ES2 shadow message Tomi Korpipää2013-11-051-2/+0
| | | | | | | | Task-number: QTRD-2536 Change-Id: I82f763547a632ceada070d9440785b218b3a0011 Change-Id: I82f763547a632ceada070d9440785b218b3a0011 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Support for non-zero centered data in scatter Tomi Korpipää2013-11-011-20/+22
| | | | | | | | Task-number: QTRD-2311 Change-Id: I12a60b2d10dd6706d5303cdf127a54f05a819780 Change-Id: I12a60b2d10dd6706d5303cdf127a54f05a819780 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Cleaning controller callbacks from renderers, part 2Miikka Heikkinen2013-10-311-38/+2
| | | | | | | | | Removed m_controller from renderers so it won't accidentally be used again. Replaced the remaining callbacks with queued signals. Task-number: QTRD-2216 Change-Id: Ib10bc661bcdc3d810baa8b2513f5e6dd67f7207e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cleaning controller callbacks from renderers, part 1Miikka Heikkinen2013-10-311-13/+14
| | | | | | | | Input state and position via synchronization Task-number: QTRD-2216 Change-Id: If53530aa9f65a8668fb628ba86d367149a62e64f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Support for non-zero centered data in barsTomi Korpipää2013-10-301-2/+2
| | | | | | | Task-number: QTRD-2198 Change-Id: Ief48895d93ac9a8ab70743f3da0fdaf7ccd6ea27 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection overhaulMiikka Heikkinen2013-10-301-27/+37
| | | | | | | | | | | | | | | | Selection modes are now proper flags, so you can easily mix and match item, row, and column modes as you wish. Slice flag means automatic slicing control - if user wishes to control slicing himself, he should not set this mode flag. Clicking an item on graph now emits clicked signal from renderer to controller on all graphs instead of setting the selected item. Controller will set the selected item based on this information. Task-number: QTRD-2366 Task-number: QTRD-2491 Change-Id: I6251c42e22ea676613fbd36685e33574e6eb9a1a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Grid line bars replaced by flatsTomi Korpipää2013-10-291-27/+59
| | | | | | | | | Task-number: QTRD-2509 + polygon offset added to labels Change-Id: I9d56a2001943d2d817f32c503790c07c241297b5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix scatter item label positioningMiikka Heikkinen2013-10-281-1/+1
| | | | | Change-Id: I4403b9b585ebac9dc2a4446211967e9f59626e75 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix a couple of build warningsMiikka Heikkinen2013-10-251-3/+1
| | | | | Change-Id: I1962ee8fcf0c074f1152929294de7928c73d4f62 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Slice view lighting fixed Tomi Korpipää2013-10-221-42/+14
| | | | | | | | | | Task-number: QTRD-2490 + grid line lighting fixed Change-Id: Ieed6b3ab52baca958b84a814093ccd1e6fa8ba71 Change-Id: Ieed6b3ab52baca958b84a814093ccd1e6fa8ba71 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed buffer creation failure issueTomi Korpipää2013-10-221-1/+9
| | | | | | | Task-number: QTRD-2316 Change-Id: Ic1b206687c6d5f591259d11874cddd3f6f4c51b2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed obsolete additions (zComp -related) Tomi Korpipää2013-10-221-2/+1
| | | | | | Change-Id: If4cb4f89bdfd9dc357f8fc2d8cc1ad95e446c483 Change-Id: If4cb4f89bdfd9dc357f8fc2d8cc1ad95e446c483 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Minor optimizations and cleanup to bars and scatter renderingMiikka Heikkinen2013-10-221-268/+210
| | | | | Change-Id: I4fc5b83bfb41ff9bcd54438710b68c8132334cd3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix grid line shadowing Tomi Korpipää2013-10-211-2/+6
| | | | | | Change-Id: I25870a86853508737b54116405c98ddf7e41e6b7 Change-Id: I25870a86853508737b54116405c98ddf7e41e6b7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Background lighting fix Tomi Korpipää2013-10-211-1/+1
| | | | | | | | Task-number: QTRD-2482 Change-Id: Ifb7bf95a7ff1da7adea3a40ce54855d915a803a2 Change-Id: Ifb7bf95a7ff1da7adea3a40ce54855d915a803a2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed zComp Tomi Korpipää2013-10-211-30/+27
| | | | | | | | Task-number: QTRD-2488 Change-Id: I7d7b067a1d82a44aa349f553f0aff7c173969ea9 Change-Id: I7d7b067a1d82a44aa349f553f0aff7c173969ea9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Minor optimization for scatter Tomi Korpipää2013-10-151-3/+5
| | | | | | | | + fix for barstest and scattertest Change-Id: I9c04aeb847162cacc9ceeb788b8626b81c75f7fa Change-Id: I9c04aeb847162cacc9ceeb788b8626b81c75f7fa Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added Camera QML API and ExampleKeränen Pasi2013-10-081-1/+3
| | | | | Change-Id: Ibc790ac6c720b6d22d68f662ff2f50e74a9abaae Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactored MeshStyle and InputState Tomi Korpipää2013-10-021-1/+1
| | | | | | | | Task-number: QTRD-2362 Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9 Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>