summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Multi series selection part 2: scatterMiikka Heikkinen2013-11-2120-135/+218
| | | | | | | Task-number: QTRD-2556 Change-Id: I9ee193141dff6603b47db28b0ed0682db6f914c8 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Multi series selection part 1: barsMiikka Heikkinen2013-11-2032-210/+411
| | | | | | | Task-number: QTRD-2556 Change-Id: I1f537f0b4c299028d4415f074d5eac6552bb3b9b Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* InputHandler QML test code and fixes to rendering trigger.Keränen Pasi2013-11-192-12/+4
| | | | | | Task-number: QTRD-2562 Change-Id: Iadb6ba61adc296bc18f255a4c7c2727f09dc9904 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Initialization for depth textureMika Salmela2013-11-183-2/+21
| | | | | | | | 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>
* Enable giving series and proxies as child items in QMLMiikka Heikkinen2013-11-158-6/+196
| | | | | | | | Task-number: QTRD-2359 Change-Id: I37558b169bb60ee90993c1a8703da0c6745a9db0 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Changes scene to be proxy for input position and selection communication.Keränen Pasi2013-11-1515-99/+88
| | | | | Change-Id: I83729508c8a0281569be5f43791d44d36d800ca2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Basic multiseries supportMiikka Heikkinen2013-11-1562-800/+2186
| | | | | | | | 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-132-19/+7
| | | | | | | | Task-number: QTRD-2555 Change-Id: I443f990a16a3d662332ac4021d3c22cb428875f1 Change-Id: I443f990a16a3d662332ac4021d3c22cb428875f1 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Default theme fixed Tomi Korpipää2013-11-132-2/+4
| | | | | | | | Task-number: QTRD-2559 Change-Id: Iadfdef6f06fef4fd9180b0864f6b1b745605363f Change-Id: Iadfdef6f06fef4fd9180b0864f6b1b745605363f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed unused and duplicate shaders Tomi Korpipää2013-11-1316-191/+14
| | | | | | | | | - 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>
* Removed rounding additions for surface shadersMika Salmela2013-11-125-5/+5
| | | | | Change-Id: I430aca3c3ff6cb1ce4ee7eb8eab1a31c57d1e890 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multiple set support for scatterTomi Korpipää2013-11-123-161/+206
| | | | | | | | | Task-number: QTRD-2550 - not finished, as QTRD-2548 is not completed Change-Id: I2af9cc134ab7a7359fff311da31a0209ca791c90 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiple set support for bars, part 1Tomi Korpipää2013-11-112-290/+368
| | | | | | | | | | Task-number: QTRD-2549 - no support for slicing into one series - no support for selecting one bar from a set Change-Id: I546e23e758194fd8ec4447cb57f051d86d058851 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Adds methods to widget components for setting custom input handlers.Keränen Pasi2013-11-082-0/+52
| | | | | | Change-Id: I9939c99164b7cf8a524a435899e2f78df36c1fc7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Updated dot meshTomi Korpipää2013-11-082-46/+44
| | | | | | | Task-number: QTRD-2544 Change-Id: I49167654a0f4e3aca482b9175d7e882317a9edaf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Shadow support for surfaceMika Salmela2013-11-0813-53/+240
| | | | | | | Task-number: QTRD-2266 Change-Id: I99fd7a6eda570df3d114ab10a1b07c22736cc86c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Grid lines for bars slice Tomi Korpipää2013-11-082-31/+162
| | | | | | | | | Task-number: QTRD-2537 Change-Id: I1bb2aeee0116cfb894e62f1326c6107c4f54629a Change-Id: I1bb2aeee0116cfb894e62f1326c6107c4f54629a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support part 2Miikka Heikkinen2013-11-0820-109/+83
| | | | | | | | Scatter gradients. Task-number: QTRD-2200 Change-Id: Ia6ac271440d0d26b7cae9332ef2ba4e7bf1a11fe Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support Part 1Miikka Heikkinen2013-11-0725-152/+832
| | | | | | | | | 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>
* ES2 support for scatter pointsTomi Korpipää2013-11-065-11/+58
| | | | | | | Task-number: QTRD-2539 Change-Id: I2465322d9a4341ce4c345756fe085a4c5ad2be5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added GL_POINTS for scatter Tomi Korpipää2013-11-0611-102/+187
| | | | | | | | 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-054-6/+17
| | | | | | | | Task-number: QTRD-2536 Change-Id: I82f763547a632ceada070d9440785b218b3a0011 Change-Id: I82f763547a632ceada070d9440785b218b3a0011 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add configurable main and slice view ordering.Keränen Pasi2013-11-055-12/+52
| | | | | Change-Id: I9f5d7399d60971c782fa8ac6fc39a05fa3bbcaa8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q_PROPERTY NOTIFY addition, part 2 Tomi Korpipää2013-11-0513-69/+197
| | | | | | | | Task-number: QTRD-2534 Change-Id: I243f1457aef986d54cb27a5a24b411b2291d8c0d Change-Id: I243f1457aef986d54cb27a5a24b411b2291d8c0d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q_PROPERTY NOTIFY addition, part 1Tomi Korpipää2013-11-0511-62/+100
| | | | | | | | | Task-number: QTRD-2534 + Abstract3DController and AbstractDeclarative notifiers done Change-Id: I405b06388c4e9c9226ebbb051452ecf4f6b637c9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Surface toggling API implementedTomi Korpipää2013-11-049-59/+137
| | | | | | | Task-number: QTRD-2337 Change-Id: I59695a042c864faed90839c4e566fcece5cb94f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Mac related Qt 5.2 compilation fixesMika Salmela2013-11-041-2/+3
| | | | | Change-Id: I729607979d7ad3da5270391255664dc9c1462e69 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix build instructionsMiikka Heikkinen2013-11-041-6/+11
| | | | | Change-Id: I246b2f413494e8abd0b1c26d424592ac86047592 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove unnecessary render cycle for slicing mode.Miikka Heikkinen2013-11-042-14/+0
| | | | | Change-Id: I685352180bd7c17783c1f8a131b2d1877106622c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed minimal qml functionality Tomi Korpipää2013-11-011-2/+4
| | | | | | | | Task-number: QTRD-2529 Change-Id: I84d9a86ce128b4c02324abf0458d68a19deda9ce Change-Id: I84d9a86ce128b4c02324abf0458d68a19deda9ce Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Support for non-zero centered data in scatter Tomi Korpipää2013-11-015-45/+79
| | | | | | | | Task-number: QTRD-2311 Change-Id: I12a60b2d10dd6706d5303cdf127a54f05a819780 Change-Id: I12a60b2d10dd6706d5303cdf127a54f05a819780 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix qml plugin install on non-unix platformsMiikka Heikkinen2013-11-011-6/+5
| | | | | Change-Id: If9a9b95b3d4e759d18673fee7ff48967234cd2c4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove com.digia. from QML importMiikka Heikkinen2013-11-0124-45/+45
| | | | | Change-Id: Ic9c44d9af34d602a017ef274cc73fb6ad51f59d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* MinGW compilation error fix Tomi Korpipää2013-11-011-2/+2
| | | | | | Change-Id: I7a966ca8eaed9c7be7333aed57e548aa4ff8d8f7 Change-Id: I7a966ca8eaed9c7be7333aed57e548aa4ff8d8f7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Shadows fixed for barsTomi Korpipää2013-10-312-44/+39
| | | | | | | Task-number: QTRD-2524 Change-Id: I8d016a471a18e7f1465be19fdd029d55fb525c07 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Cleaning controller callbacks from renderers, part 2Miikka Heikkinen2013-10-3114-134/+78
| | | | | | | | | 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>
* Support for off-zero bar value rangesTomi Korpipää2013-10-312-19/+66
| | | | | | | Task-number: QTRD-2520 Change-Id: Id648ff3a8ff6c742c06b8f4b03482c4173ed2ffa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Cleaning controller callbacks from renderers, part 1Miikka Heikkinen2013-10-3111-62/+101
| | | | | | | | 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-3012-152/+120
| | | | | | | Task-number: QTRD-2198 Change-Id: Ief48895d93ac9a8ab70743f3da0fdaf7ccd6ea27 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* QML selection API for scatter and surfaceMiikka Heikkinen2013-10-307-2/+53
| | | | | Change-Id: I8a6f28fff8833cb123340ee5a953d29cea40f502 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Selection overhaulMiikka Heikkinen2013-10-3032-485/+661
| | | | | | | | | | | | | | | | 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-294-108/+191
| | | | | | | | | 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>
* Tech preview RC fixes Tomi Korpipää2013-10-252-3/+18
| | | | | | Change-Id: I5a47053c8708b9a9c37b845bc55166f02fc99de3 Change-Id: I5a47053c8708b9a9c37b845bc55166f02fc99de3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix whitespace issue in getting started docMiikka Heikkinen2013-10-251-1/+1
| | | | | Change-Id: Icb9b704a1c2ae37cc6091b91dc690eba84f5ac5a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix a couple of build warningsMiikka Heikkinen2013-10-251-3/+1
| | | | | Change-Id: I1962ee8fcf0c074f1152929294de7928c73d4f62 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Minor Getting started fixMiikka Heikkinen2013-10-251-3/+3
| | | | | Change-Id: I59114e036689921f0c20df61b73f60a65982fd6c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc: language review datavisualizationNico Vertriest2013-10-2522-86/+86
| | | | | | | Task-number: QTBUG-33360 Change-Id: I67eaab3914effa2a7a5be1b72c6d2c59cb2402f6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>