summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/surface3drenderer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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-32/+32
| | | | | | | | | - 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>
* Slice view fixes Tomi Korpipää2014-01-151-2/+2
| | | | | | | | | | | | + zero moves, grid doesn't + y-axis label moved closer to grid + label alignment changes Task-number: QTRD-2769 Task-number: QTRD-2738 Change-Id: Ie4d5a4c47472f1e61e02447847157c8ad8195c07 Change-Id: Ie4d5a4c47472f1e61e02447847157c8ad8195c07 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add series name propertyMiikka Heikkinen2014-01-141-3/+9
| | | | | | | | | | | +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>
* Fix highlight color in slice modeMiikka Heikkinen2014-01-131-17/+17
| | | | | | | Also fixes the wandering selection ball when resizing surface graph. Change-Id: Iacb29809ee9b240839956142f9f5ba78d0294620 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Enable showing multiple graphs in QMLMiikka Heikkinen2014-01-081-0/+5
| | | | | | | | + other minor fixes Task-number: QTRD-2749 Change-Id: I654d41fd4124d6596f9df3ace7019706452d8bfa Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Check context before attempting to release opengl resourcesMiikka Heikkinen2013-12-201-9/+10
| | | | | | | | | | 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>
* IFDEFs for fillDepthTextureMika Salmela2013-12-191-1/+4
| | | | | | | Task-number: QTRD-2742 Change-Id: Iab7787196bfd56ee57f5ed6604bb6dd04e5be4f9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clear the depth texture when surface not visibleMika Salmela2013-12-191-10/+13
| | | | | | | | Also grid and surface visibility should not affect on updates. Task-number: QTRD-2742 Change-Id: I9605897599d571b1ee39dab7f6c93d5c80110f0c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixes QML surface selections.Keränen Pasi2013-12-181-0/+11
| | | | | | | Task-id: QTRD-2565 Change-Id: I7864e2e71b1d7b7cfab8ad4d9a3e9376d832c0d6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* fix rendering issuesMiikka Heikkinen2013-12-171-3/+0
| | | | | Change-Id: I5dee557f2f4857f586412d604040ffbeda0e78a1 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Antialiasing and direct rendering with QML.Keränen Pasi2013-12-171-67/+28
| | | | | | | Task-id: QTRD-2565 Change-Id: I4099c869f157361ee6a900dfc1c29301b373ac30 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix more valgrind issuesMiikka Heikkinen2013-12-131-3/+6
| | | | | | | | + some misc fixes Change-Id: I728da6779bea026d0554d8aae5c00254c3c27694 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Control for surface visibility featuresMika Salmela2013-12-131-7/+11
| | | | | | | | Task-number: QTRD-2628 Change-Id: Ic03e2a71231665c478a918044ebd3e5b2d22b445 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiseries support for theme colors and gradients, Part 1Tomi Korpipää2013-12-101-1/+1
| | | | | | | | | | Task-number: QTRD-2611 - declarative support for color list missing - declarative connections and fixes for count etc. Change-Id: I0ac007dcd7acb011d1a4461a56066ee41c364a75 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix mingw build and bar selection issues.Miikka Heikkinen2013-12-101-1/+1
| | | | | Change-Id: I0484c8f512299b58109efe68b82480399f66b402 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move series specific visual elements to series, part 4Miikka Heikkinen2013-12-101-53/+44
| | | | | | | | | | | | 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>
* Better proxy API for surfaceMika Salmela2013-12-031-19/+59
| | | | | | | Part 2, item change. More is on the way. Change-Id: Ic41f3a90b5a47502b741391ace990117ef2eaf80 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move series specific visual elements to series, part 3Miikka Heikkinen2013-12-031-0/+2
| | | | | | | | Surface pointer to use series mesh Task-number: QTRD-2557 Change-Id: Ibf6c1d91c8bce22b4f9c71b0fbf4d62ad8cc09da Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move series specific visual elements to series, part 2Miikka Heikkinen2013-12-031-13/+28
| | | | | | | | Surface series grid visibility and smoothness Task-number: QTRD-2557 Change-Id: I0beecb7785bf2fb489d0faba797a145151513a79 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed crash on selection with no visible seriesTomi Korpipää2013-12-031-1/+2
| | | | | | | 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-2/+11
| | | | | | | | Task-id: QTRD-2660 Change-Id: Icd36c082f45077a1ebb3372838f43a50fd277076 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move series specific visual elements to series, part 1Miikka Heikkinen2013-11-291-6/+0
| | | | | | | | 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-3/+3
| | | | | | | Task-number: QTRD-2538 Change-Id: I12dfb562dc59ae1df3b5127f0f675a3796ba3f00 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Visual properties moved to themeTomi Korpipää2013-11-281-7/+4
| | | | | | | Task-number: QTRD-2632 Change-Id: I91eaa8fa26e232de24fe89ef0c8a2fc53f31fb8c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Better proxy API for surfaceMika Salmela2013-11-271-0/+42
| | | | | | | Part 1, row change. More is on the way. Change-Id: I4e152a5160275f2d629e7793d4d40b85082a2fc2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Change qreals to floatsMiikka Heikkinen2013-11-251-27/+16
| | | | | | | | | + 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>
* Multi series selection part 3: surfaceMiikka Heikkinen2013-11-221-8/+12
| | | | | | | Task-number: QTRD-2556 Change-Id: I3a465c1bfff95f6c89d2f473f9e235c6079b8116 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* User-modifiable themes, part 1Tomi Korpipää2013-11-221-18/+17
| | | | | | | | | | | | 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 1: barsMiikka Heikkinen2013-11-201-6/+5
| | | | | | | Task-number: QTRD-2556 Change-Id: I1f537f0b4c299028d4415f074d5eac6552bb3b9b Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Initialization for depth textureMika Salmela2013-11-181-1/+2
| | | | | | | | Precaution for using depth texture before nothing has been drawn. Task-number: QTRD-2570 Change-Id: I47ece387542acbd1ffed8d650a70ecc471efb30e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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-18/+25
| | | | | | | | Task-number: QTRD-2548 Change-Id: Iba324c0e8be56f2b3f8f6c6a992883c134a51a9d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Slice render out-of-sync fixed Tomi Korpipää2013-11-131-9/+3
| | | | | | | | Task-number: QTRD-2555 Change-Id: I443f990a16a3d662332ac4021d3c22cb428875f1 Change-Id: I443f990a16a3d662332ac4021d3c22cb428875f1 Reviewed-by: Pasi Keränen <pasi.keranen@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>
* Default ES2 vertex shader into useMika Salmela2013-11-131-1/+1
| | | | | | | Task-number: QTRD-2551 Change-Id: I64b32fa0da64c0c0dbe4542ce90214e8a1ebb9d2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Shadow support for surfaceMika Salmela2013-11-081-37/+59
| | | | | | | Task-number: QTRD-2266 Change-Id: I99fd7a6eda570df3d114ab10a1b07c22736cc86c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support part 2Miikka Heikkinen2013-11-081-4/+1
| | | | | | | | Scatter gradients. Task-number: QTRD-2200 Change-Id: Ia6ac271440d0d26b7cae9332ef2ba4e7bf1a11fe Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support Part 1Miikka Heikkinen2013-11-071-8/+5
| | | | | | | | | TODO: - Finish scatter - QML (maybe left until data set is sorted, though) Change-Id: I87a8117cb29f147080e0662c55b1098cb2e71689 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clear surface data array after array reset Tomi Korpipää2013-11-071-0/+5
| | | | | | | | Task-number: QTRD-2542 Change-Id: I5983b217ae15f17d75ac09fe3492e6d56b8e8152 Change-Id: I5983b217ae15f17d75ac09fe3492e6d56b8e8152 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add configurable main and slice view ordering.Keränen Pasi2013-11-051-6/+9
| | | | | Change-Id: I9f5d7399d60971c782fa8ac6fc39a05fa3bbcaa8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Surface toggling API implementedTomi Korpipää2013-11-041-57/+68
| | | | | | | Task-number: QTRD-2337 Change-Id: I59695a042c864faed90839c4e566fcece5cb94f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Remove unnecessary render cycle for slicing mode.Miikka Heikkinen2013-11-041-7/+0
| | | | | Change-Id: I685352180bd7c17783c1f8a131b2d1877106622c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cleaning controller callbacks from renderers, part 2Miikka Heikkinen2013-10-311-42/+4
| | | | | | | | | 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-14/+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-91/+100
| | | | | | | | | | | | | | | | 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-25/+53
| | | | | | | | | Task-number: QTRD-2509 + polygon offset added to labels Change-Id: I9d56a2001943d2d817f32c503790c07c241297b5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Tech preview RC fixes Tomi Korpipää2013-10-251-0/+2
| | | | | | Change-Id: I5a47053c8708b9a9c37b845bc55166f02fc99de3 Change-Id: I5a47053c8708b9a9c37b845bc55166f02fc99de3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc: language review datavisualizationNico Vertriest2013-10-251-1/+1
| | | | | | | Task-number: QTBUG-33360 Change-Id: I67eaab3914effa2a7a5be1b72c6d2c59cb2402f6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>