summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/engine/drawer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Module renamedTomi Korpipää2013-09-101-347/+0
| | | | | | | Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* New 3D scene for lights and camera setup for input handlers.Keränen Pasi2013-09-101-3/+3
| | | | | Change-Id: Ib909bd818364c1646615df7c543d57b07b920a83 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Label width issue fixedTomi Korpipää2013-09-091-2/+8
| | | | | | | Task-number: QTRD-2248 Change-Id: I6b17ac4d6e6a647ea627bdd55bac9eae272554d4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed various issuesHeikkinen Miikka2013-09-051-0/+1
| | | | | | | | | +Valgrind reported memory leaks +Linux build warnings +Bartest ui layout more friendly for smaller screen Change-Id: I9773e374ccf8bd6be877cb9be599b50556f04d9d Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Make axes ownership more usefulMiikka Heikkinen2013-08-291-12/+14
| | | | | | | | | 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>
* Android and mingw compilation fixes Tomi Korpipää2013-08-211-2/+2
| | | | | | | Change-Id: If51261a4806bb27e8ed1715a7b3d0070aa30e2bb Change-Id: If51261a4806bb27e8ed1715a7b3d0070aa30e2bb Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Refactored enums zoom -> slice Tomi Korpipää2013-08-211-1/+1
| | | | | | Change-Id: I39a53326403b127746437233853bee032b551f8c Change-Id: I39a53326403b127746437233853bee032b551f8c Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Implement selection label formattingMiikka Heikkinen2013-08-211-3/+3
| | | | | Change-Id: Iae57b93be41ffeeb5ef8fc6ff625af22a7f2d21a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enums moved to a class to be usable from QML and C++Tomi Korpipää2013-08-141-5/+5
| | | | | | | Task-number: QTRD-2126 Change-Id: I280047cc7101292d17111babb7735c03436a40f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Copyright headers updated Tomi Korpipää2013-08-131-31/+8
| | | | | | | | Task-number: QTRD-2112 Change-Id: I0dad7933af2dcd0386b8243f71bbd949f92aab8c Change-Id: I0dad7933af2dcd0386b8243f71bbd949f92aab8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Replaced sins and cos's with q -versionsTomi Korpipää2013-08-121-9/+9
| | | | | | | + replaced qFabs with qAbs where applicable Change-Id: Icea0953a29ffb8f779479d4c26cd385c2535ce8d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DScatter: Axis label drawing addedTomi Korpipää2013-08-061-1/+7
| | | | | | | | Now draws x, y and z labels. Categoryaxes still used for testing, should be converted to valueaxes. Change-Id: I2c7bc5402315dec9e09eacd8b65fcdbbf536bc64 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fancy curve example and other stuff.Mika Salmela2013-07-221-2/+2
| | | | | Change-Id: Id090ed0bedb3bec96ab6ba64b9af8205c1998f12 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Finally first visible surface.Mika Salmela2013-07-151-1/+33
| | | | | Change-Id: Ib168cbb8cd636539aee62098b98e6e24a112dab6 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Refactor data itemMiikka Heikkinen2013-07-091-10/+9
| | | | | | | | | Data items do not need to know about rendering related stuff, so separated that to render items. Renderer will maintain array of render items equal to the sample space. Change-Id: I61c0db96f115b7c667e37ea92aa5ae6b8583c61a Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Miscellaneous fixesMiikka Heikkinen2013-07-051-0/+2
| | | | | | | | | | | | | | | | - 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>
* Data proxy implementation for bars.Miikka Heikkinen2013-07-041-18/+13
| | | | | | | | | | Old QDataSet can be used with custom QOldDataProxy. This will be removed entirely once we have a viable variant based proxy to use, as it provides no real additional value over just using default proxy directly. Change-Id: Iee492152eec5d33b7a488053447fae6027409d71 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Axis abstractionMiikka Heikkinen2013-06-251-4/+1
| | | | | | | | | | Axis related data is now stored in separate axis classes, but have not yet been exposed beyond QDataSet. Also contains unrelated gitignore change Change-Id: I130ee6557accfab672d5014f47bb74be08e6feef Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc fixes and some cleanupMiikka Heikkinen2013-06-241-1/+1
| | | | | | | | | - Now generates enum documentation (not all values documented, though) - Renamed the qdatavis3namespace.h as it was missing a 'd' - Fixes a couple of warnings about deprecated QString constructor Change-Id: Ib8698d8f6d9f5dd37682b71150dbc5731b6dedb4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* CameraHelper made non-static to support multiple concurrent 3D views.Keränen Pasi2013-06-191-2/+4
| | | | | Change-Id: I88ba9ff299b4469784459e0409dfe3c629119af3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Restoring the proper Scene Graph GL state when shadows are active.Keränen Pasi2013-06-191-10/+13
| | | | | Change-Id: I34a8df6022ff01b53f394858b08bf768282b2982 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QML2 shadows fixed again Tomi Korpipää2013-06-191-1/+7
| | | | | | | | | | 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>
* Include fix Tomi Korpipää2013-06-171-4/+4
| | | | | | | | | | | Module sources now include our own global headers from local dirs, not from installed dir. + Replaced radian conversions with a qmath function. Change-Id: Ie9f6d561c98022d3225a0dd4964f5118d00f9815 Change-Id: Ie9f6d561c98022d3225a0dd4964f5118d00f9815 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Renamed QTENTERPRISE_DATA.. -> QT_DATA.. Tomi Korpipää2013-06-131-2/+2
| | | | | | | | | Safer, in case enterprise is changed some time in the future. + changed 3 functions in to properties in q3dbars Change-Id: If6cc6bdc8beb4fa7b1e7482b1d5d6769b89925c1 Change-Id: If6cc6bdc8beb4fa7b1e7482b1d5d6769b89925c1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Documentation addedTomi Korpipää2013-06-121-2/+6
| | | | | | | 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-121-2/+6
| | | | | Change-Id: If983093d431b578db57ee0216f4d52c169978d36 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QTCOMMERCIAL -> QTENTERPRISETomi Korpipää2013-05-301-2/+2
| | | | | Change-Id: I2130b908e2fd4f019a33c61ed099f74f9d28d1f8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Some android related fixesHeikkinen Miikka2013-05-231-0/+11
| | | | | Change-Id: Id65b353260e8d044903ece306a43cd3d8b3ec6bb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added datavis3d back under srcHeikkinen Miikka2013-05-171-0/+300
| | | | | Change-Id: I209e8b3228b2ce0085c897db6fb2ea78e93afa67 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Directory structure reorganizedTomi Korpipää2013-05-081-300/+0
| | | | | | | | Unnecessary subdirectory levels deleted from examples and src Change-Id: I88892b4fc92784e706be2264eeb7d6208250a50f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added depth texture support to drawObject Tomi Korpipää2013-05-071-6/+13
| | | | | | Change-Id: I718d751bf623d5db526ae34ee6673e53c237f649 Change-Id: I718d751bf623d5db526ae34ee6673e53c237f649 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DMaps: Label updating after changes doneTomi Korpipää2013-05-031-2/+1
| | | | | Change-Id: I74b2408c3772e2983a921d7fab8ceab38d91e993 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Refactoring to get ready for a second vis typeTomi Korpipää2013-04-301-2/+139
| | | | | | | | Moved enums to global header. Moved drawLabel to Drawer. Change-Id: Ifb103467254b4288dee1ef6f7bb0c2aa23868dab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Separate selection label support added Tomi Korpipää2013-04-181-26/+7
| | | | | | | Change-Id: Icc880024a44f97da6de8d8b32183087931342126 Change-Id: Icc880024a44f97da6de8d8b32183087931342126 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added bar label drawing in zoom selection view Tomi Korpipää2013-04-171-7/+14
| | | | | | Change-Id: Iae58ef8395d7ad41df72e8698a2deca723e9b29c Change-Id: Iae58ef8395d7ad41df72e8698a2deca723e9b29c Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Object drawing and label generation moved to their own classTomi Korpipää2013-04-161-0/+169
Change-Id: I3721b201dd83b471cb6d55f0dd7def908c4ab0be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>