summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/q3dscene.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Add \brief commands to property docs (Q3dScene)Leena Miettinen2017-02-271-63/+83
| | | | | | Change-Id: I1124ecce8a81256916e4936dc952ea619082a272 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fixed inability to set subviewportsTomi Korpipää2016-11-141-49/+112
| | | | | | Change-Id: I7966292cca04fe990a2fa6a5b4233bf89e77c553 Task-number: QTRD-1807 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Copyright file update to GPLMiikka Heikkinen2016-01-121-9/+17
| | | | | Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Update license headersMiikka Heikkinen2015-10-201-11/+14
| | | | | Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
* Copyright header changesMika Salmela2015-04-141-3/+3
| | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Change copyright headers.Miikka Heikkinen2014-11-071-7/+7
| | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix screen position based queries in threaded rendering environmentMiikka Heikkinen2014-10-091-0/+5
| | | | | | | | | | | | | | | | QtQuick's threaded renderer doesn't seem to always pair up sync and render (or more accurately, beforeSynchronizing and node's preprocess calls). Sometimes sync comes without a followup render, or there are two syncs in a row, even though the sync is using direct connection. Both of these cases broke the old logic for handling position based queries. Changed the logic to actually ensure we have resolved the query before emitting the relevant signal. Task-number: QTRD-3358 Change-Id: Ica6c8c311f53a06311c21532aaabc18c28556655 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed ordering of subviewsTomi Korpipää2014-10-021-13/+27
| | | | | | Task-number: QTRD-2790 Change-Id: I8ac6ce89920a9c988c7a059e1b02c980a0264200 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement zooming to cursorMiikka Heikkinen2014-09-261-2/+60
| | | | | | | | | Zooming to cursor is now default operating mode of the default input handler. Task-number: QTRD-3263 Change-Id: I5699fc0ce7393059538972cd52f31f06d87e3d8d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix to slice crash bug fixTomi Korpipää2014-09-161-5/+6
| | | | | | | Task-number: QTRD-3301 Change-Id: Ia0ae6d5e3ac9aabc9af9199df27bbbe7f7908d60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Invalid slice usage crash fixedTomi Korpipää2014-09-161-2/+7
| | | | | | | | Task-number: QTRD-3301 Change-Id: I0e39348a2e9392b4c1f0bd7ef26c5613272460e2 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Enable camera targeting.Miikka Heikkinen2014-08-061-0/+6
| | | | | | | | | | | | | | | Also fix custom item positioning in absolute mode as it was completely broken in bars and z-coord was flipped in others. Clarified Q3DObject::position property usage, namely that it is reserved for internal use for now. Some refactoring also done. Task-number: QTRD-2567 Change-Id: I5da65b83a2f8ecf20f8fd054e59748278ef1a714 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Minor doc fix to sceneMiikka Heikkinen2014-06-051-2/+6
| | | | | Change-Id: Ibff77f2aea13c7627bf612ae75358025231198c8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc \since changes Tomi Korpipää2014-06-051-1/+1
| | | | | | | | | | Task-number: QTRD-3150 All \since -tags changed to use the same format. Change-Id: I858afd61002cef7ecb3cf56deda0dabc431c4fd5 Change-Id: I858afd61002cef7ecb3cf56deda0dabc431c4fd5 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Clean up the rest of engine Tomi Korpipää2014-06-031-5/+0
| | | | | | | Task-number: QTRD-3149 Change-Id: Id1c9f72480c63878cc9fa9a71cb3b1b057a79454 Change-Id: Id1c9f72480c63878cc9fa9a71cb3b1b057a79454 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DScene emitneedrenders fixed Tomi Korpipää2014-03-251-0/+1
| | | | | | | | Task-number: QTRD-2410 Change-Id: I68f2de1db5a66a877cfc12c9b097035ed1eb3f0f Change-Id: I68f2de1db5a66a877cfc12c9b097035ed1eb3f0f Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Support for rendering to image Tomi Korpipää2014-03-241-1/+0
| | | | | | | | | | Task-number: QTRD-2869 Change-Id: I5182c182f15893e70129a95c3cfdd590ed4f0853 Note: Not to be merged until v1.0 is out Change-Id: I5182c182f15893e70129a95c3cfdd590ed4f0853 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-181-2/+2
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Moved nonfunctional public methods to privateTomi Korpipää2014-01-301-17/+17
| | | | | | | Task-number: QTRD-2809 Change-Id: I009316652475d71d82a66ba23368b045f34c1f9a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix copyright yearMiikka Heikkinen2014-01-271-1/+1
| | | | | | | Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move qmlmultigraphs to examplesMiikka Heikkinen2014-01-231-14/+6
| | | | | | | | | | +Fix Q3DScene::isPointInPrimarySubView +Fix Q3DScene::isPointInSecondarySubView +Remove some unnecessary imports from examples Task-number: QTRD-2800 Change-Id: I5a9bc737c5ee92edbb514e76054adbb54076aef8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Slice view positioning in qml fixed Tomi Korpipää2014-01-231-1/+2
| | | | | | | | Task-number: QTRD-2798 Change-Id: I287802424493435eaa54a14cace651b66a0f1a86 Change-Id: I287802424493435eaa54a14cace651b66a0f1a86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made jira tasks of TODOs, part 2 Tomi Korpipää2014-01-221-7/+17
| | | | | | | | | + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made jira tasks of TODOs, part 1Tomi Korpipää2014-01-221-2/+0
| | | | | | | | - commented-out code will be removed (and made tasks of, if necessary) in part 2 Task-number: QTRD-2398 Change-Id: Ib94a4a873ecd25f4040c74c42902e204f3f41943 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Reintroduced namespace macros Tomi Korpipää2014-01-161-9/+5
| | | | | | | | Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Docs updated after namespace macro removalTomi Korpipää2014-01-161-2/+11
| | | | | | | | - some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-151-2/+2
| | | | | | | | | - 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>
* Add series name propertyMiikka Heikkinen2014-01-141-3/+24
| | | | | | | | | | | +Don't call updateScene for every render cycle +Fixed item label update when format or name changes +Misc cosmetic fixes Task-number: QTRD-2736 Task-number: QTRD-2571 Change-Id: I43aa6b8e3202b09529b17a22bb24d05fcb545609 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Invalid point/selection as constant property in qmlMiikka Heikkinen2014-01-091-3/+9
| | | | | | | | 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>
* Fix various issues for previous commitMiikka Heikkinen2013-12-171-164/+139
| | | | | Change-Id: I4a4c9e46df0517e563cfa1d6930e636fab213bfc Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Antialiasing and direct rendering with QML.Keränen Pasi2013-12-171-21/+140
| | | | | | | Task-id: QTRD-2565 Change-Id: I4099c869f157361ee6a900dfc1c29301b373ac30 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* QML docs + enum movingTomi Korpipää2013-12-051-12/+102
| | | | | | | | Task-number: QTRD-2670 Task-number: QTRD-2505 Change-Id: I51a870f9a57b093e8216759a5577e161ff3afd60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Miscellaneous api cleanupMiikka Heikkinen2013-12-031-15/+10
| | | | | | | Task-number: QTRD-2665 Change-Id: I3ed82721603e1b72b4b1543f197d1eabb8743bb7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change qreals to floatsMiikka Heikkinen2013-11-251-3/+3
| | | | | | | | | + 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-251-6/+9
| | | | | | | | Also fixed some other miscellaneous issues. Task-number: QTRD-2558 Change-Id: I2da3f7e64fbbbb287ddb7845cb0a15006dc4d6f5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* InputHandler QML test code and fixes to rendering trigger.Keränen Pasi2013-11-191-0/+4
| | | | | | Task-number: QTRD-2562 Change-Id: Iadb6ba61adc296bc18f255a4c7c2727f09dc9904 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Changes scene to be proxy for input position and selection communication.Keränen Pasi2013-11-151-2/+35
| | | | | Change-Id: I83729508c8a0281569be5f43791d44d36d800ca2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add configurable main and slice view ordering.Keränen Pasi2013-11-051-0/+26
| | | | | Change-Id: I9f5d7399d60971c782fa8ac6fc39a05fa3bbcaa8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Misc documentation fixesMiikka Heikkinen2013-10-161-1/+1
| | | | | Change-Id: Ifd7a7ceae128c6d63692459c4502a83971468a46 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix surface slice clearing when axis range changesMiikka Heikkinen2013-10-111-0/+1
| | | | | | | Now close slice view in these cases Change-Id: I4561f63a8d82e9168699662ba716fb14a0d5a634 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Doc fix Tomi Korpipää2013-10-101-0/+5
| | | | | | | | Documented signal in scene Change-Id: Ibe56d0fb9a5fe22a826d7661216ec1a4bf75f017 Change-Id: Ibe56d0fb9a5fe22a826d7661216ec1a4bf75f017 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixing the camera preset change not re-rendering bug.Keränen Pasi2013-10-091-0/+21
| | | | | | | Change-Id: Ie993f08b8e24910c1a956936a4c4bfa63b99c87f Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added Camera QML API and ExampleKeränen Pasi2013-10-081-22/+13
| | | | | Change-Id: Ibc790ac6c720b6d22d68f662ff2f50e74a9abaae Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added device pixel ratio change detection to widgetsKeränen Pasi2013-09-231-0/+24
| | | | | Change-Id: I7c0677c5e6b862589150d1be8a5c5a8a0e5b4445 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixes to setting of active camera and light in the scene.Keränen Pasi2013-09-191-2/+6
| | | | | Change-Id: Ibe70e175ded6e853b4f37db13160d5f99fad6c98 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Qdoc documentation for new scene and input classes.Keränen Pasi2013-09-191-74/+150
| | | | | | Change-Id: I5d9680fcf2e49655c1b9bcdf961bbda02bf31968 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix Q3DScene cachingMiikka Heikkinen2013-09-121-48/+101
| | | | | | | | Task-number: QTRD-2258 Change-Id: Ifce23dca40566e75398e00975e8b2159b325739e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* QBarDataProxy now has list of row and column labelsMiikka Heikkinen2013-09-111-0/+1
| | | | | | | | | | Category axes use those labels if no explicit labels are set to them. + Other misc fixes Task-number: QTRD-2252 Change-Id: Idc15e0cc1cdeb08195b2e2baeead9cfef2533e04 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Module renamedTomi Korpipää2013-09-101-0/+199
Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>