summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2
Commit message (Collapse)AuthorAgeFilesLines
* QML them basecolor override by series bug fixedTomi Korpipää2014-04-251-1/+1
| | | | | | | | | | | Task-number: QTRD-3010 QML calls properties in "random" (or alphabetical) order, which in this case causes theme initialization to be called after series basecolor override, so setting a basecolor to a series to override theme did not work. Change-Id: I434f2a278bf2a70512a3d4d73c30d80319bd0e8e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fixed crash when setting invalid baseColors/Gradients to a Theme3D Tomi Korpipää2014-04-251-0/+8
| | | | | | | | Task-number: QTRD-3009 Change-Id: Icacc4e656dec286334d827c9282037b2bba78e43 Change-Id: Icacc4e656dec286334d827c9282037b2bba78e43 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Added QML support for custom itemsTomi Korpipää2014-04-232-7/+33
| | | | | | | Task-number: QTRD-3048 Change-Id: I90e6fbee38bae858c2e0910178684e28eacc6472 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Introduce fps measurement via propertiesMiikka Heikkinen2014-04-043-0/+30
| | | | | | | Task-number: QTRD-2134 Change-Id: I181ee6c784b998886c2292b7548e16ce75d86458 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable querying selection label via APIMiikka Heikkinen2014-04-031-0/+4
| | | | | | | | | | | | Also enable suppressing drawing the label on graph. Selection label formatting was consequently moved from renderers to series. Task-number: QTRD-2896 Change-Id: Ia6a1a40298d8db0f54349de3eb27fb0b683dd302 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Axis formatter customization exampleMiikka Heikkinen2014-04-012-1/+15
| | | | | | | | | | | | | | | Also refactored the formatter api somewhat: - Removed virtual from allowNegatives and allowZero and added a setter function for those. This will make it cleaner if we need to add similar properties to the axis formatter in the future, as no new virtual methods can be added without breaking BC. - Changed the labelValues array to labelStrings list, as it makes more sense to directly format the strings in recalculate. Change-Id: I3ea005afa984bb756845ca356b999762e0807415 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix iOS empty graph problemTomi Korpipää2014-03-191-0/+10
| | | | | | | Task-number: QTRD-2956 Change-Id: I5ec52d70ca4d2e77d219af5b9909967123df6357 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>
* SelectionMode as combination of checkboxesTomi Korpipää2014-03-132-40/+292
| | | | | Change-Id: I30f697ae3f94258717f01b34813dc7fd66c2485c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* barThickness tweak Tomi Korpipää2014-03-061-4/+4
| | | | | | Change-Id: I7180b0348ee2e006f3e9727f8686cf7628e6df48 Change-Id: I7180b0348ee2e006f3e9727f8686cf7628e6df48 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Adding support for barThickness and barSpacing again.Thomas Hartmann2014-03-061-0/+40
| | | | | | | | | The barSpacing property barSpacing is rounded to integers, but this is fixed by: https://codereview.qt-project.org/#change,79968 Change-Id: I39844ccfa90c4aa344c05bc87d6039fcf3836cb0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixing the enum scopes for the comboboxes.Thomas Hartmann2014-03-063-0/+9
| | | | | | | | Warning: This does require Qt Creator 5.1, but I think Qt Creator 5.1 should be a requirement. Change-Id: I2783d28618bfdf468cb1ab8ee9d2268894364fa7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Changing float to doubleThomas Hartmann2014-03-051-33/+33
| | | | | | | | | | | | QmlDesigner has a problem handling "float". This will be fixed, but as a workaround we just change float to double. The code model does not differentiate between float and double. Change-Id: If5802efdb501c24194cd758e0a10612c2c5e630b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Adding plugins.qmltypesThomas Hartmann2014-03-052-0/+1390
| | | | | | | | This file is required for the Qt Creator code model. Change-Id: Ie0480751841aae59c2df7ae9b0470d5e068257e1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Actual icons for designer Tomi Korpipää2014-03-056-0/+0
| | | | | | Change-Id: I5ab858067d3fc921b9574d1d0dd1ca4987e6e251 Change-Id: I5ab858067d3fc921b9574d1d0dd1ca4987e6e251 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make sure we don't draw empty graphs in designerMiikka Heikkinen2014-03-052-3/+5
| | | | | Change-Id: I90dac0c7c884326875dd4b58d71075fd316e47b8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Default graphs for qmldesignerMiikka Heikkinen2014-03-045-7/+122
| | | | | | | +Some doc changes Change-Id: Id815f178e3321c6033f6782d75a99b54c656ca7a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Specifics typo bug fix Tomi Korpipää2014-03-043-6/+6
| | | | | | Change-Id: I19c1bec9a7c562d3bcd510ba7faa20a0773eb6a5 Change-Id: I19c1bec9a7c562d3bcd510ba7faa20a0773eb6a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added default size to designer components Tomi Korpipää2014-03-041-0/+9
| | | | | | Change-Id: I5aa7f75aafd3437c1f5389b3ffbbb47cdde02d8e Change-Id: I5aa7f75aafd3437c1f5389b3ffbbb47cdde02d8e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed designer properties that do not work yet Tomi Korpipää2014-03-041-40/+0
| | | | | | | | Made a jira task to put them back once the issue has been fixed Change-Id: I4fbd40a739b7cf811d20f511ec0d870a676c0b7c Change-Id: I4fbd40a739b7cf811d20f511ec0d870a676c0b7c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Enable querying shadow support from graphsMiikka Heikkinen2014-03-032-0/+9
| | | | | | | Also some example tweaking. Change-Id: If69e9d3617afc37b88fed4fd0e02ae19f0af7f78 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Round viewport to nearest integerMika Salmela2014-03-031-4/+5
| | | | | | | | Task-number: QTRD-2905 Change-Id: I4a922544c72fede663379e19c49f31de77c6a767 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove the invalid renderer deletion from context switch.Miikka Heikkinen2014-03-031-17/+4
| | | | | | | | Multiwindow case is still broken, though. Added note to code about it. Change-Id: Iec381d362469a8b2cf998c52f807b5c855526b22 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Mac shared context bug fixTomi Korpipää2014-02-281-8/+8
| | | | | Change-Id: I3c3865eca8c2aadbb1de871e477f29495244b5a4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Mac compilation fixTomi Korpipää2014-02-283-6/+8
| | | | | Change-Id: I9203e511d9d50af4d7bb2127af790df4c74fa9b2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Introduce state storing for mac and android.Miikka Heikkinen2014-02-287-22/+1021
| | | | | | | | | | | | 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>
* Fix some copyrightsMiikka Heikkinen2014-02-263-18/+12
| | | | | Change-Id: I97e4bd37243ae94ce4537ee849fd11ee59a570bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Make graphs look nice in QML designerMiikka Heikkinen2014-02-261-1/+4
| | | | | | | | "Qml2Puppet" is the application name that runs the graph in QML designer, so we default to no item content in that case. Change-Id: Iee96dfd1398951239eb57104d976e27f3863733d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Context sharing disabled for mac only Tomi Korpipää2014-02-261-3/+3
| | | | | | Change-Id: I291cb7b7fe8fa08f769a941e1e9328f2af33e263 Change-Id: I291cb7b7fe8fa08f769a941e1e9328f2af33e263 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Don't copy qmldir in android or iosMiikka Heikkinen2014-02-261-6/+7
| | | | | Change-Id: Ia2d05ad2a19bd37681facc17fc98ee14993ea639 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Android build fix Tomi Korpipää2014-02-261-1/+2
| | | | | | | | Task-number: QTRD-2903 Change-Id: I58a58a3c636331dc754183ceddb3d3ea49dfc2ed Change-Id: I58a58a3c636331dc754183ceddb3d3ea49dfc2ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix Valgrind found issuesMiikka Heikkinen2014-02-251-0/+1
| | | | | Change-Id: Iccacab527abf745e7ccd1e562ff9ea5dea4c8005 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Specifics.qml bug fix Tomi Korpipää2014-02-253-6/+6
| | | | | | | | Task-number: QTRD-2851 Change-Id: I723a9332c1816936d3538d1719adfefd4ecd880b Change-Id: I723a9332c1816936d3538d1719adfefd4ecd880b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Specifics.qml update Tomi Korpipää2014-02-253-12/+54
| | | | | | | | Task-number: QTRD-2851 Change-Id: I8f8c547855dd530bacc40efeedcb0e10bddf6f17 Change-Id: I8f8c547855dd530bacc40efeedcb0e10bddf6f17 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Improve antialiasing & msaaSamples handling in qmlMiikka Heikkinen2014-02-242-37/+40
| | | | | | | + Make sure we don't crash if old window gets destroyed Change-Id: I037e0bb29284aad1dd37da6fcb6a0839bac962e0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed retina problems with FBO renderingTomi Korpipää2014-02-212-3/+4
| | | | | | | Task-number: QTRD-2890 Change-Id: I9cd5de30dd58b78adc0e065742ed689f16b630f1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Mac fixes for QMLTomi Korpipää2014-02-212-3/+13
| | | | | Change-Id: I9598b83985aee3bbdf006f317bcc00ba95027569 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix initializing to direct rendering modeMiikka Heikkinen2014-02-201-8/+9
| | | | | Change-Id: Ic52429ba55035c03de065a94196f4ed4219367ef Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Call update after changing the contents flagMiikka Heikkinen2014-02-201-2/+4
| | | | | Change-Id: Ic26d5396753c8300323d9022a56c19f44a09ab99 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix case in header ifndef in declarativerendernode_p.hMiikka Heikkinen2014-02-201-2/+2
| | | | | Change-Id: I2f48946d340e35797b05d6a44addb244f788522f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* MSAA support added to QMLTomi Korpipää2014-02-204-94/+269
| | | | | Change-Id: I64258705e4423b2762aeff28c3eafd6bdf5d34e9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Do not create FBO in indirect rendering case if size is invalidMiikka Heikkinen2014-02-191-0/+3
| | | | | Change-Id: Idd12e984d82411a17f60641bfc4ba49a38ea05d0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix indirect rendering issue with boot2qt launcherMiikka Heikkinen2014-02-191-3/+7
| | | | | | | Also fix the RenderDirectToBackground_NoClear mode. Change-Id: Ib3b05a4f576767c82c785bf3b33c671368b407a7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Minor changes to abstractdeclarative Tomi Korpipää2014-02-191-4/+4
| | | | | | Change-Id: I8d724e052db765649539234c4b1e5b28e3237916 Change-Id: I8d724e052db765649539234c4b1e5b28e3237916 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix scene coordinates in qml indirect renderingMiikka Heikkinen2014-02-193-20/+30
| | | | | | | | | | | +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-184-19/+47
| | | | | | | | 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-1812-30/+15
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* First step towards FXAA based antialiasing.Pasi Keranen2014-02-175-33/+258
| | | | | | Change-Id: I40e767373156cf3e7f89c05767846a4949df319c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Designer plugin update Tomi Korpipää2014-02-133-8/+46
| | | | | | | | Task-number: QTRD-2851 Change-Id: Ic5bc5d9f45e15b11ef99b933869223d7b9e10a90 Change-Id: Ic5bc5d9f45e15b11ef99b933869223d7b9e10a90 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Designer plugin draft addedTomi Korpipää2014-02-1312-0/+334
| | | | | | | Task-number: QTRD-2851 Change-Id: I63384fa510a60aa08837426444ff725593744598 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>