summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2/abstractdeclarative_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Reduce the scope of the preprocessor branches with the help of a unionJake Petroules2017-08-091-12/+6
| | | | | | | Change-Id: I195589565920e795cdae99f837b51917b3831228 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix build for -no-feature-wheeleventStephan Binner2017-04-241-0/+2
| | | | | Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add mutex guards for AbstractDeclarative::updateWindowParametersMika Salmela2017-01-121-0/+3
| | | | | | | | | | | Adds a mutex to guard that pointer to controller is not deleted while doing updateWindowParameters. The render thread doesn't have control to the node mutex, so that won't apply since it may be deleted while requesting a mutex. Change-Id: I8897954415c1bd7ab61ef99b420c9ac2aaa89411 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Copyright file update to GPLMiikka Heikkinen2016-01-121-9/+17
| | | | | Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Fix issues with COIN buildsMiikka Heikkinen2015-10-221-2/+5
| | | | | | | | | | | | -Fix miscellaneous compile errors -Move manual tests to manual folder and enable export of autotests -Added widgets requirement -Fixed autotests -Fixed renderer and controller synchronization in QML case -Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL Change-Id: If6619733725d079e339bef16262e5ea1450ab20f 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>
* Fix building against 5.6Miikka Heikkinen2015-06-171-2/+2
| | | | | | | | Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS macros instead of 'signals' and 'slots' in headers. Change-Id: I4140b1fff4386d74bb371176919234366965e887 Reviewed-by: Mika Salmela <mika.salmela@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>
* Fix WinRT issues.Miikka Heikkinen2014-11-191-1/+1
| | | | | | | | | | Primary fix is to not use shared context in qml with WinRT, as that causes black screen. Also removed widget apps from build in WinRT. Change-Id: Id65ce90dbeb80442194ab838952e8cadc91135a6 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 context cleanupMiikka Heikkinen2014-10-131-0/+1
| | | | | | | | | | Context was not getting properly cleaned up in cases where render thread stopped before the cleanup took place. Now we ensure that required cleanup is done before context thread terminates. Change-Id: I1489914dafec928eebb69bac737f6f858ff49432 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make background margin configurableMiikka Heikkinen2014-09-301-0/+5
| | | | | | | | | | | Added margin as abstract graph property. If the margin is narrow, the positions of theedge labels of the axes are adjusted to avoid overlap with edge labels on other axes. Task-number: QTRD-3204 Change-Id: I7fa5a04c8f2091519d99689ef2f6cbcf799fb15e Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement zooming to cursorMiikka Heikkinen2014-09-261-0/+4
| | | | | | | | | 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>
* Added possibility to change graph's localeMiikka Heikkinen2014-09-191-0/+5
| | | | | | | | | | Locale affects how axis labels are formatted. Default locale is still the "C". Task-number: QTRD-3229 Change-Id: I6126ce676906f4bbc91ae0abd18775bc1d564118 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Reflection API addedTomi Korpipää2014-08-261-0/+10
| | | | | | | Task-number: QTRD-3287 Change-Id: I6c06b8fe025e0f1f87be00be906cab0e1f18a19f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added horizontal aspect ratio property for abstract graphsMiikka Heikkinen2014-07-011-0/+5
| | | | | | | | Value 0.0 indicates automatic scaling (the default). Task-number: QTRD-3192 Change-Id: I5e4cc1b7a03c0ba811e2ed3916a440906429af57 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add radialLabelOffset property for graphsMiikka Heikkinen2014-06-261-0/+5
| | | | | | | | | This property indicates where radial labels of the polar chart are drawn Task-number: QTRD-3184 Change-Id: I1500e67da5e578b90d679876130c2d56c1d08039 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Polar graph support, phase oneMiikka Heikkinen2014-06-261-0/+5
| | | | | | | | | | - Polar property for toggling the polar mode - Example added. Example docs will be added in another patch once all of the functionality the example needs has been implemented. - Only surface graph supports polar so far. Scatter to be added later. Change-Id: I54d36f764ac1771ac88f73a5f3a2142f2309f6e8 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix selectedElement qmldesigner crashMiikka Heikkinen2014-06-101-4/+6
| | | | | | | Also fix some minor inconsistencies in the API. Change-Id: Ia31321a1f70d132173a909fef68fd3b59e06e080 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Scatter perf improvementMika Salmela2014-06-051-0/+13
| | | | | | | Task-number: QTRD-3148 Change-Id: I2c9efa84184819aaac123ee29685bc3a9e35bfe6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clean up declarative Tomi Korpipää2014-06-031-3/+0
| | | | | | | Task-number: QTRD-3149 Change-Id: Icaa8aba25a5041268709f625c3d1b0be91fab069 Change-Id: Icaa8aba25a5041268709f625c3d1b0be91fab069 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added API for changing data aspect ratioTomi Korpipää2014-05-261-0/+5
| | | | | | Task-number: QTRD-3144 Change-Id: I9acd1be13083d7fbbed840882260a60f46c5f698 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix misc minor issuesMiikka Heikkinen2014-05-221-1/+1
| | | | | | | | | | - Rename bars background mesh more logically - Reorder ElementAxis enums logically - Change the sun in rotations example to a custom item Task-number: QTRD-3132 Change-Id: I00dacb68ebce222edc1a732cf7d14f1660934b36 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added enablers for axis dragging to QMLTomi Korpipää2014-05-211-1/+14
| | | | | | | | | Task-number: QTRD-3003 Will add an example in a separate commit Change-Id: I7fa9eb1b504d188c77b66ef8d4b2ee44416667e2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added visible flag and possibility to release ownership of custom itemTomi Korpipää2014-05-141-0/+1
| | | | | | Task-number: QTRD-3080 Change-Id: I198930c48fe9bce6a158406aff5fbf31272b9afe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added option to use orthographic projectionTomi Korpipää2014-05-141-0/+5
| | | | | | | Task-number: QTRD-3078 Change-Id: I07ebc2b7edd542cd28e405dfc80282f18b7a7314 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* API to query custom item selection Tomi Korpipää2014-05-131-0/+4
| | | | | | | | | | Task-number: QTRD-3046 + Added missing elementSelected signal to QML Change-Id: I5e79d8e910d2730e3d2ae5550ce576f01aac0b18 Change-Id: I5e79d8e910d2730e3d2ae5550ce576f01aac0b18 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added API for querying label selectionTomi Korpipää2014-05-131-0/+3
| | | | | | Task-number: QTRD-3045 Change-Id: Ib5c8f29bcf0148ae604e27b2a81e6f72a2dbca2a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* CustomDataItem made into a public classTomi Korpipää2014-05-121-6/+11
| | | | | | Task-number: QTRD-3055 Change-Id: I1e449df7c1bcb48fc639dbae579e2e1499c9ef2b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add missing Q_REVISION macros to signals.Miikka Heikkinen2014-05-021-2/+2
| | | | | | | | Qt codes seem to always add Q_REVISION() macro to revisioned properties notify signals, so I assume it is necessary. Change-Id: I08f5f6d4034527020ed37b2a78267874f103d5a0 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Add revision macros to new invokablesMiikka Heikkinen2014-04-291-5/+7
| | | | | Change-Id: I8c0834a6cb282e8a05d487fe62369ad5b1281c9d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added QML support for custom itemsTomi Korpipää2014-04-231-1/+7
| | | | | | | Task-number: QTRD-3048 Change-Id: I90e6fbee38bae858c2e0910178684e28eacc6472 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Introduce fps measurement via propertiesMiikka Heikkinen2014-04-041-0/+8
| | | | | | | Task-number: QTRD-2134 Change-Id: I181ee6c784b998886c2292b7548e16ce75d86458 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add proper scoping to signals with enum parametersMiikka Heikkinen2014-03-171-3/+3
| | | | | | | | | According to customer feedback, the lack of proper scoping makes it impossible to use the traditional style SIGNAL() macro when making connections. Change-Id: I3fbead5400bbd8b5fad62e4facecc6610c36c9a6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make sure we don't draw empty graphs in designerMiikka Heikkinen2014-03-051-0/+1
| | | | | Change-Id: I90dac0c7c884326875dd4b58d71075fd316e47b8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable querying shadow support from graphsMiikka Heikkinen2014-03-031-0/+4
| | | | | | | Also some example tweaking. Change-Id: If69e9d3617afc37b88fed4fd0e02ae19f0af7f78 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Mac shared context bug fixTomi Korpipää2014-02-281-8/+8
| | | | | Change-Id: I3c3865eca8c2aadbb1de871e477f29495244b5a4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Introduce state storing for mac and android.Miikka Heikkinen2014-02-281-3/+18
| | | | | | | | | | | | At least some mac and android environments do not handle shared contexts properly, leading to slowdowns and/or artifacts. Disable context sharing on mac and android, and instead store and restore relevant opengl state. Also improve renderer and context cleanup Change-Id: I8fa596b95f6ff20d53c950a34b5c28513acbc18f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Improve antialiasing & msaaSamples handling in qmlMiikka Heikkinen2014-02-241-0/+2
| | | | | | | + Make sure we don't crash if old window gets destroyed Change-Id: I037e0bb29284aad1dd37da6fcb6a0839bac962e0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* MSAA support added to QMLTomi Korpipää2014-02-201-1/+13
| | | | | Change-Id: I64258705e4423b2762aeff28c3eafd6bdf5d34e9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix scene coordinates in qml indirect renderingMiikka Heikkinen2014-02-191-3/+3
| | | | | | | | | | | +Rename enums +Remove unnecessary update loop +Fudge qmlmultigraphs example data so that shadows are not borked in bar graph +Remove unnecessary border from around buttons in qmlmultigraphs Change-Id: I6c24f33912d29b7954c82f17becd342aea66b0e1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Crash fixTomi Korpipää2014-02-181-1/+0
| | | | | | | | Also fixes messing up the quick controls when switching between rendering modes. Change-Id: I8c383ee948b0ba363d09a93b35f14028702296d3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-181-5/+4
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* First step towards FXAA based antialiasing.Pasi Keranen2014-02-171-6/+18
| | | | | | Change-Id: I40e767373156cf3e7f89c05767846a4949df319c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Abstractdeclarative crash vulnerability fix Tomi Korpipää2014-02-041-2/+1
| | | | | | Change-Id: I28a455daa156c93807e12335bafa0d06c09e56c7 Change-Id: I28a455daa156c93807e12335bafa0d06c09e56c7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed boot2qt window clearing bugTomi Korpipää2014-02-041-1/+4
| | | | | | | Task-number: QTRD-2843 Change-Id: I4dd344cea667ad5c178bf24cf3cf6aad60e6396d 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>
* Reintroduced namespace macros, part 2Tomi Korpipää2014-01-171-2/+2
| | | | | | | | Added changes lost in merge Task-number: QTRD-2594 Change-Id: Ib68b5d9294ad65f69443c475ba771dcfd09926bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement generic clearSelection() method for graphsMiikka Heikkinen2014-01-161-0/+2
| | | | | | | | | 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>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-151-10/+40
| | | | | | | | | - 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>