summaryrefslogtreecommitdiffstats
path: root/examples/qmlbarchart
Commit message (Collapse)AuthorAgeFilesLines
* QML examples cleaned upTomi Korpipää2013-09-024-95/+154
| | | | | | | Moved data and axes into separate qml files. Change-Id: I2aaf828d7e7cba3bdc1d03379ccdf0b55c3e9922 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactor item model mapping and proxiesMiikka Heikkinen2013-09-021-1/+5
| | | | | | | | | | | | | | | | - Introduced new handler for item models. Instance of this is owned by item model proxies. - Introduced abstract mapping class to enable moving a lot of duplicate code to the new handler. - Changed ownership handling of mapping objects to be in line with proxies and axes, though there is no default mapping at this time. Need to reconsider the default case more. - Made item model const so it is clear that we do not own it. The documentation is not yet up to date. Change-Id: Ie961da29340743fdaa9293d7d4ace9577def9102 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QMLBarchart example improved a bitTomi Korpipää2013-08-304-59/+92
| | | | | | | + works on Android now Change-Id: If5cd81548c40ddd6d57fcd1709d9e7c9d88539fc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Android qml crash fix, part 2 Tomi Korpipää2013-08-291-8/+0
| | | | | | | | | | Task-number: QTRD-2136 Scatter works, bars still crashes. Change-Id: I69a7d2a8e873bfed55f3c29ee36be288ea949f96 Change-Id: I69a7d2a8e873bfed55f3c29ee36be288ea949f96 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Android QML crash fix Tomi Korpipää2013-08-291-10/+0
| | | | | | | | | | Task-number: QTRD-2136 Fixes first crash right after deployment. Another one remains.. Change-Id: I1753bf20066f2f15b123aaaaf2cc880c6a713536 Change-Id: I1753bf20066f2f15b123aaaaf2cc880c6a713536 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make axes ownership more usefulMiikka Heikkinen2013-08-291-9/+17
| | | | | | | | | Chart can now own multiple axes while showing only one. Default axes are no longer modifiable by users. Task-number: QTRD-2212 Change-Id: I028f0d7539dbbf6e3474680290c7ec6bba5a4223 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Selection improvements for bars:Miikka Heikkinen2013-08-221-0/+7
| | | | | | | | - Signal to notify of selection change - Setting selection via API Change-Id: I87c71005d76b15dd259f745392ff7b5112d146b5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement selection label formattingMiikka Heikkinen2013-08-211-0/+4
| | | | | Change-Id: Iae57b93be41ffeeb5ef8fc6ff625af22a7f2d21a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc update; q3dbars, q3dwindowTomi Korpipää2013-08-191-1/+1
| | | | | | | + api updates Change-Id: I8da49e3cb45025eaa5713ae563bf8475f15cc298 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement value axis label formatting.Miikka Heikkinen2013-08-161-1/+1
| | | | | Change-Id: Ie657df264549e4277d3bd1eaf2ca48436c153717 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Support for setting axes in QML.Miikka Heikkinen2013-08-151-46/+63
| | | | | Change-Id: I9dccd7066d286a8a028450997a5ae34d44310ca1 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* QML: Invokables to propertiesTomi Korpipää2013-08-141-2/+4
| | | | | | | Task-number: QTRD-2188 Change-Id: Id0edd2c1fb98621c0b3bf590ff1f0b7239fd7225 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactoring function and enum namesTomi Korpipää2013-08-131-1/+1
| | | | | | | + moved an enum to a correct place Change-Id: Iea133f70ccf87e812cb87b61c16fb16be76b2da3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Copyright header update to docs Tomi Korpipää2013-08-131-18/+9
| | | | | | Change-Id: I2a75460393447e990b553b52da92f99bd9f25dc1 Change-Id: I2a75460393447e990b553b52da92f99bd9f25dc1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Copyright headers updated Tomi Korpipää2013-08-132-8/+4
| | | | | | | | Task-number: QTRD-2112 Change-Id: I0dad7933af2dcd0386b8243f71bbd949f92aab8c Change-Id: I0dad7933af2dcd0386b8243f71bbd949f92aab8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Changed "tick" to "segment"Miikka Heikkinen2013-08-091-1/+1
| | | | | | | | | Talking about tick count was misleading, since we are counting the segments between ticks instead of ticks themselves. Changed the term accordingly to reduce confusion. Change-Id: Ic044b179a950083ba9116173a424b865ebb5785a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Introduce item model based proxyMiikka Heikkinen2013-07-121-84/+110
| | | | | | | QML bars changed to utilize this and example updated Change-Id: Ied22a137c1bc320e7dd98759c16087c2d8d80fb4 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Miscellaneous fixesMiikka Heikkinen2013-07-051-1/+1
| | | | | | | | | | | | | | | | - Widget example now uses default QBarDataProxy directly - Axes store labels in QStringLists instead of vectors - Axes LabelItems as QList<LabelItem *> instead of QVector<LabelItem> This allows better control of when label items are constructed and destructed -> easier to keep track of textures. - Removed label setting from QAbstractDataItem api, it should be replaced with label format setter if we want individual items to have custom labels. - Added functionality to QBarDataItem - Misc bug fixes Change-Id: I01b3a5f3fc4acb8c1a826f19fa2762864430a088 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* QML files added to resources Tomi Korpipää2013-06-283-2/+9
| | | | | | | | | - Added qml files to resource file - Load qml file from resource Change-Id: Idda60aaba32fffca2db1ad6f577fb49eb1224f34 Change-Id: Idda60aaba32fffca2db1ad6f577fb49eb1224f34 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Android QML build fix Tomi Korpipää2013-06-271-0/+4
| | | | | | | | Task-number: QTRD-2135 Change-Id: I190349ec36dd049fc5d078371b66be068da42ab0 Change-Id: I190349ec36dd049fc5d078371b66be068da42ab0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Crash fix to QML bars exit Tomi Korpipää2013-06-241-12/+13
| | | | | | | | | | Still possible to get crashing if datasets, rows and items are created in reverse order. Needs to be documented. Change-Id: Ia35b54eb9652ba031da35dd37f9ef9cae9aca04d Change-Id: Ia35b54eb9652ba031da35dd37f9ef9cae9aca04d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* CameraHelper made non-static to support multiple concurrent 3D views.Keränen Pasi2013-06-191-9/+9
| | | | | Change-Id: I88ba9ff299b4469784459e0409dfe3c629119af3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QML2 shadows fixed again Tomi Korpipää2013-06-191-6/+27
| | | | | | | | | | Hack solution, may cause trouble later on. Should try to find a better way to fix this. Change-Id: I440252419a451fd26932c6d851f95259a5c60e24 Change-Id: I440252419a451fd26932c6d851f95259a5c60e24 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Texture flipping implemented in code Tomi Korpipää2013-06-181-13/+0
| | | | | | | Change-Id: I8ac2568b08d00a4fc14ce62bd0530ce3e01022ca Change-Id: I8ac2568b08d00a4fc14ce62bd0530ce3e01022ca Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Convert mouse position from QML to Qt coordinatesTomi Korpipää2013-06-181-8/+18
| | | | | | | | | QML has (0, 0) at bottom left, Qt at top left. For rotating to work correctly on both, we need to convert QML mouse coordinates before passing them to renderer. Change-Id: Ic85fbaec2f75c0432f81dfb48070f7ab598c8e00 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Implemented passing of mouse events from QtQuick.Keränen Pasi2013-06-181-76/+95
| | | | | Change-Id: I5174c9deb43604924f8a63e217b851897ac2dcd6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Passing QML ListModel to C++ QAbstractItemModel works partially Tomi Korpipää2013-06-171-11/+15
| | | | | | | | | Setting ListModel to setData works. Adding custom type (DataItem) to ListElement does not work. Change-Id: I98f333367a37cc28fe9443e83f3b5d7647233ab6 Change-Id: I98f333367a37cc28fe9443e83f3b5d7647233ab6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed QML properties not updated and handling of depth FBO.Keränen Pasi2013-06-171-1/+7
| | | | | Change-Id: Iba414954342a74bc3e3efd7436811cca6c422649 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Rendering code placeholder added for 3D Bars.Keränen Pasi2013-06-141-1/+1
| | | | | Change-Id: I23d815dace8298d034c339c90e7bc0a0a4375d77 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Renamed property correctly Tomi Korpipää2013-06-141-60/+53
| | | | | | Change-Id: I22e924a4f4028f116a00297158b36c0f08a44e96 Change-Id: I22e924a4f4028f116a00297158b36c0f08a44e96 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed invokables from C++ apiTomi Korpipää2013-06-131-1/+1
| | | | | | | | | Added missing properties to declarativebars. Renamed boolean properties to conform with naming conventions. Change-Id: Ide93c2a456713e1e77ba0a01ccdc110d00377e83 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Documentation addedTomi Korpipää2013-06-121-0/+38
| | | | | | | Draft. Still a lot missing. Change-Id: I7b3ebc15bf4bf6dbcf5aa014acac1d500ead8448 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Refactoring commong 3d bars functionality to separate class, added QML classes.Keränen Pasi2013-06-122-62/+74
| | | | | Change-Id: If983093d431b578db57ee0216f4d52c169978d36 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QML2 Texture flipped correctly Tomi Korpipää2013-06-071-2/+15
| | | | | | Change-Id: I0a4ea4e8bf383a1c4ff40371d2ec0a407194ef44 Change-Id: I0a4ea4e8bf383a1c4ff40371d2ec0a407194ef44 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QML2 Q3DBars hardcoded h4x0r version implemented Tomi Korpipää2013-06-062-38/+41
| | | | | | | | You can enable QML2 version of engine by uncommenting Change-Id: Ia12fcf9d503d648cc9792a4932e5f8b3488a743c Change-Id: Ia12fcf9d503d648cc9792a4932e5f8b3488a743c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added a DeclarativeBars classTomi Korpipää2013-06-051-45/+63
| | | | | | | DeclarativeBars provides a wrapper for qml properties of Q3DBars. Change-Id: Ia39fb3284fae47ec2116a2d02bea607491687bea Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Mac / linux fixes + other tweaksTomi Korpipää2013-06-041-7/+10
| | | | | Change-Id: I8b1457b86b0f881cfd374cf9e9ed3c803e7d04d2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Qml: Changed some invokables to properties Tomi Korpipää2013-05-311-3/+41
| | | | | | Change-Id: If5fd4b4b738c5c5f84b90e50cbf6f7548f58dcac Change-Id: If5fd4b4b738c5c5f84b90e50cbf6f7548f58dcac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Qml2 example added, no real functionality yetTomi Korpipää2013-05-318-0/+409
Also reorganized examples a bit; moved duplicate configs to examples.pri. Change-Id: If518447ffa45e2b800fb3da9e6a7425d86209d35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>