summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2
Commit message (Collapse)AuthorAgeFilesLines
* Implement generic clearSelection() method for graphsMiikka Heikkinen2014-01-162-0/+7
| | | | | | | | | Also fixed scene sync related bug on selection. Task-number: QTRD-2606 Task-number: QTRD-2773 Change-Id: I057fd83ae5bf5ee94e413287fb2b3cefa455b156 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Better control of series ordering and 'primary' series for barsMiikka Heikkinen2014-01-152-0/+23
| | | | | | Task-number: QTRD-2578 Change-Id: Icbd945596334afb03d81f3b1d6a72399077455db Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-1520-64/+106
| | | | | | | | | - 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>
* Base color/gradient disconnection Tomi Korpipää2014-01-132-0/+19
| | | | | | | | Task-number: QTRD-2758 Change-Id: I3dabbef0d37ad6e8cb7835ef5ef54ba29e23b272 Change-Id: I3dabbef0d37ad6e8cb7835ef5ef54ba29e23b272 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Improve static build support.Miikka Heikkinen2014-01-134-3/+8
| | | | | | | Now qml plugin can also be built statically. Change-Id: Id37f565ab9e02529fafaffa024acd69560b3703a Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Make active axes properties in C++Miikka Heikkinen2014-01-098-36/+72
| | | | | | | | | | Also provide axis changed signals both C++ and QML. Some other minor fixes, too. Task-number: QTRD-2669 Change-Id: Ib797bffd6720382cf26359a9059e1809efdf58da Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Invalid point/selection as constant property in qmlMiikka Heikkinen2014-01-0912-14/+150
| | | | | | | | Also fixed 0,0 QPoint -> QPointF conversion issue for Q3DScene Task-number: QTRD-2688 Change-Id: I3778081bb6ef2b5dbfcaad7502a4e164286c2646 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Enable showing multiple graphs in QMLMiikka Heikkinen2014-01-082-17/+42
| | | | | | | | + other minor fixes Task-number: QTRD-2749 Change-Id: I654d41fd4124d6596f9df3ace7019706452d8bfa Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Rename axis classesMiikka Heikkinen2014-01-079-78/+78
| | | | | | | | | 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>
* Fix setting theme typeMiikka Heikkinen2014-01-072-3/+23
| | | | | | | | | | Now reset the theme properties immediately to new theme type, instead of waiting for the theme activation. Also make changing theme type later work consistently. Task-number: QTRD-2750 Change-Id: I970d69587623119df33ad2a825fbc12367804eae Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix theme ownershipMiikka Heikkinen2014-01-071-3/+3
| | | | | | | | | | | Theme ownership now uses similar model as axis and inputhandler ownership: Graph can own multiple themes, but only one is active at the time. Task-number: QTRD-2623 Change-Id: I7134384df6f8cc465cc28fbebb454b7d2e254f83 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixes update on move to retina display on Mac OS X and Qt 5.2Keränen Pasi2013-12-182-12/+10
| | | | | | | Task-id: QTRD-2565 Change-Id: I4c6fdf0b595f44bc83c1f7fa3540ee311a74e17e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix various issues for previous commitMiikka Heikkinen2013-12-171-4/+3
| | | | | Change-Id: I4a4c9e46df0517e563cfa1d6930e636fab213bfc Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Antialiasing and direct rendering with QML.Keränen Pasi2013-12-178-201/+94
| | | | | | | Task-id: QTRD-2565 Change-Id: I4099c869f157361ee6a900dfc1c29301b373ac30 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix qml crash when qml launched by external launcherMiikka Heikkinen2013-12-172-30/+35
| | | | | | | Task-number: QTRD-2658 Change-Id: Ibf7242f6004a3021fbe1da865545dacb461b8022 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Theme color update Tomi Korpipää2013-12-131-1/+1
| | | | | | | | + mingw warning fix Change-Id: I1dd89d27fccbdcde2b209a4e8f947f775066b531 Change-Id: I1dd89d27fccbdcde2b209a4e8f947f775066b531 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiseries support for theme colors and gradients, part 2Tomi Korpipää2013-12-115-61/+210
| | | | | | | Task-number: QTRD-2611 Change-Id: I280f3b7c22a212ed46813bd28c639d255107f9f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiseries support for theme colors and gradients, Part 1Tomi Korpipää2013-12-107-62/+234
| | | | | | | | | | 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>
* Move series specific visual elements to series, part 4Miikka Heikkinen2013-12-109-80/+322
| | | | | | | | | | | | 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>
* QML docs + enum movingTomi Korpipää2013-12-052-0/+8
| | | | | | | | Task-number: QTRD-2670 Task-number: QTRD-2505 Change-Id: I51a870f9a57b093e8216759a5577e161ff3afd60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Notifys added to propertiesTomi Korpipää2013-12-058-12/+52
| | | | | | | Task-number: QTRD-2671 Change-Id: If95696b01eab836c2b4d5c6a3c19d7da9b255ab3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Swap row and column axis orientations in bars aroundMiikka Heikkinen2013-12-041-4/+4
| | | | | | | Now axis orientations are a logical match for surface axes. Change-Id: Ib04436c5e83a59bf47f152b60b51b6e8559d681a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixes Mac linker issue.Keränen Pasi2013-12-041-0/+1
| | | | | | | Task-id: QTRD-2673 Change-Id: I2759e6e931f5ad9bf5bc9453fde06b1255ee91d1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixes to QML retina display issues.Keränen Pasi2013-12-0315-482/+132
| | | | | | | | Task-id: QTRD-2661 Change-Id: I05fa1d9c3d078a7ed552b2b225f0d9bb1c03a0aa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move series specific visual elements to series, part 2Miikka Heikkinen2013-12-032-37/+0
| | | | | | | | Surface series grid visibility and smoothness Task-number: QTRD-2557 Change-Id: I0beecb7785bf2fb489d0faba797a145151513a79 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QML gradient support for themeTomi Korpipää2013-12-037-6/+257
| | | | | | | Task-number: QTRD-2664 Change-Id: I66e5890ef284ad7a28f7034c3c3d4e6ce01b0c1d 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-294-138/+0
| | | | | | | | Meshes moved to series. Task-number: QTRD-2557 Change-Id: I80050e413faf3bc942eb5a5627a66747de5805d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Visual properties moved to themeTomi Korpipää2013-11-284-70/+2
| | | | | | | Task-number: QTRD-2632 Change-Id: I91eaa8fa26e232de24fe89ef0c8a2fc53f31fb8c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Integrated item model mappings to item model proxiesMiikka Heikkinen2013-11-272-11/+0
| | | | | | | | 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-252-6/+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>
* Fix documentation related to multiseries changes.Miikka Heikkinen2013-11-252-3/+0
| | | | | | | | Also fixed some other miscellaneous issues. Task-number: QTRD-2558 Change-Id: I2da3f7e64fbbbb287ddb7845cb0a15006dc4d6f5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Multi series selection part 3: surfaceMiikka Heikkinen2013-11-224-18/+26
| | | | | | | Task-number: QTRD-2556 Change-Id: I3a465c1bfff95f6c89d2f473f9e235c6079b8116 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* User-modifiable themes, part 1Tomi Korpipää2013-11-228-13/+14
| | | | | | | | | | | | 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-214-17/+6
| | | | | | | Task-number: QTRD-2556 Change-Id: I9ee193141dff6603b47db28b0ed0682db6f914c8 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Multi series selection part 1: barsMiikka Heikkinen2013-11-204-17/+21
| | | | | | | Task-number: QTRD-2556 Change-Id: I1f537f0b4c299028d4415f074d5eac6552bb3b9b Reviewed-by: Pasi Keränen <pasi.keranen@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>
* Basic multiseries supportMiikka Heikkinen2013-11-1510-79/+175
| | | | | | | | Task-number: QTRD-2548 Change-Id: Iba324c0e8be56f2b3f8f6c6a992883c134a51a9d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Gradient support part 2Miikka Heikkinen2013-11-084-6/+6
| | | | | | | | Scatter gradients. Task-number: QTRD-2200 Change-Id: Ia6ac271440d0d26b7cae9332ef2ba4e7bf1a11fe Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support Part 1Miikka Heikkinen2013-11-072-2/+2
| | | | | | | | | TODO: - Finish scatter - QML (maybe left until data set is sorted, though) Change-Id: I87a8117cb29f147080e0662c55b1098cb2e71689 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q_PROPERTY NOTIFY addition, part 2 Tomi Korpipää2013-11-055-15/+29
| | | | | | | | 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-056-31/+40
| | | | | | | | | 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-042-2/+19
| | | | | | | 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 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-013-3/+3
| | | | | Change-Id: Ic9c44d9af34d602a017ef274cc73fb6ad51f59d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QML selection API for scatter and surfaceMiikka Heikkinen2013-10-305-2/+38
| | | | | Change-Id: I8a6f28fff8833cb123340ee5a953d29cea40f502 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Selection overhaulMiikka Heikkinen2013-10-304-20/+15
| | | | | | | | | | | | | | | | 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>
* 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>
* Fix crashes and bugs when using surface with ES2Miikka Heikkinen2013-10-152-1/+7
| | | | | | | | +Fix compile warnings +Fix qmlsurface example Change-Id: I28bbf38e7aa51b1ec315374182a9daae8eded87c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>