summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Move series specific visual elements to series, part 2Miikka Heikkinen2013-12-0315-212/+235
| | | | | | | | 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-033-3/+4
| | | | | | | Task-number: QTRD-2667 Change-Id: I460ba87b4bcb639328439f6e1b698ca1323c0968 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* QML gradient support for themeTomi Korpipää2013-12-038-7/+258
| | | | | | | Task-number: QTRD-2664 Change-Id: I66e5890ef284ad7a28f7034c3c3d4e6ce01b0c1d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixes retina issues with C++ widget graphs.Keränen Pasi2013-12-029-72/+67
| | | | | | | | 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-0223-267/+798
| | | | | | | Task-number: QTRD-2633 Change-Id: Ib274ec236f50145df8fd4c2d83f62d4a9154687a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix some QML warnings and errorsMiikka Heikkinen2013-11-291-1/+2
| | | | | | | | - Added NOTIFY to scene property to remove the warning in QML - Correct use of mesh in qmldynamicdata test Change-Id: If9a8c32ab9c873153379192859c5ce89e9a15d99 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move series specific visual elements to series, part 1Miikka Heikkinen2013-11-2942-591/+508
| | | | | | | | Meshes moved to series. Task-number: QTRD-2557 Change-Id: I80050e413faf3bc942eb5a5627a66747de5805d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Theme syncTomi Korpipää2013-11-2815-223/+212
| | | | | | | Task-number: QTRD-2538 Change-Id: I12dfb562dc59ae1df3b5127f0f675a3796ba3f00 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Visual properties moved to themeTomi Korpipää2013-11-2829-506/+330
| | | | | | | Task-number: QTRD-2632 Change-Id: I91eaa8fa26e232de24fe89ef0c8a2fc53f31fb8c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Better proxy API for surfaceMika Salmela2013-11-2711-72/+442
| | | | | | | Part 1, row change. More is on the way. Change-Id: I4e152a5160275f2d629e7793d4d40b85082a2fc2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Integrated item model mappings to item model proxiesMiikka Heikkinen2013-11-2734-1978/+1088
| | | | | | | | Separate mapping object was redundant. Task-number: QTRD-2564 Change-Id: I6b1a23ba52dbb184f46df0fdd64184eeb145c0c3 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Change qreals to floatsMiikka Heikkinen2013-11-2552-362/+368
| | | | | | | | | + 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>
* Fix documentation related to multiseries changes.Miikka Heikkinen2013-11-2529-179/+184
| | | | | | | | Also fixed some other miscellaneous issues. Task-number: QTRD-2558 Change-Id: I2da3f7e64fbbbb287ddb7845cb0a15006dc4d6f5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Example of customising input from QML .Keränen Pasi2013-11-252-0/+6
| | | | | | | | | Example documentation will be done in separate task. Task: QTRD-2562 Change-Id: Ifa63019ba1192ac605b87ba1202a9ef7a530ce7c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Theme dirty bits implemented Tomi Korpipää2013-11-225-148/+330
| | | | | | | | Task-number: QTRD-2625 Change-Id: Ifea7f85a142bb4ef085da61668d1c8038a285c16 Change-Id: Ifea7f85a142bb4ef085da61668d1c8038a285c16 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multi series selection part 3: surfaceMiikka Heikkinen2013-11-2217-106/+170
| | | | | | | Task-number: QTRD-2556 Change-Id: I3a465c1bfff95f6c89d2f473f9e235c6079b8116 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradients and colors defined for all built-in themes Tomi Korpipää2013-11-222-22/+134
| | | | | | | | Task-number: QTRD-2608 Change-Id: Ib6c3b4ec697efc238db9776b3f71c11a0d099c57 Change-Id: Ib6c3b4ec697efc238db9776b3f71c11a0d099c57 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* User-modifiable themes, part 1Tomi Korpipää2013-11-2241-435/+1323
| | | | | | | | | | | | 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-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>