Commit Graph

1108 Commits

Author SHA1 Message Date
Tomi Korpipaa 1728887e0a React to userDefinedMesh and mesh change in Surface3D
Pick-to: 6.8.1 6.8
Fixes: QTBUG-130010
Fixes: QTBUG-130011
Fixes: QTBUG-130870
Change-Id: I3516b1af5a1af65ad0060c775143e73af8732167
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-11-11 13:20:24 +02:00
Thiago Macieira ffa6c6018d Use the correct macro to create an exported Q_NAMESPACE
Pick-to: 6.8
Change-Id: I564281ca685a168501ecfffdd3e631f1c0ad7579
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-11-10 13:15:59 -08:00
Sakaria Pouke 3199d40a3d Check for existing labels in baritemmodelhandler
Also add setting column and row labels in tst_qmltheme.

Fixes: QTBUG-130722
Pick-to: 6.8
Change-Id: I09cc382957cb3d9ccca0b72ae3723978157726ac
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
2024-11-08 09:23:03 +02:00
Qt Submodule Update Bot a56b3ca05c Update dependencies on 'dev' in qt/qtgraphs
Change-Id: I742b9edbd182b735ce600c2f0a5dc988a7ef79dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-11-07 06:41:06 +00:00
Qt Submodule Update Bot 938820f7db Update dependencies on 'dev' in qt/qtgraphs
Change-Id: I082764f7ed2151e3764289ae7ba7eabb0926996e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-11-06 13:49:03 +00:00
Tomi Korpipaa f2c98b5444 Fix selection item label visibility
Pick-to: 6.8
Fixes: QTBUG-130013
Change-Id: I978d65bccaa4c87af40f17b099b1706177c3afee
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
2024-11-05 10:56:23 +02:00
Sakaria Pouke 028dbbb4d1 Add label relative sizing
Adds two extra controls for axis; label size and adjust label size.
Label size is a blanket size scaler for the axis level.
Adjust label size is a boolean that controls whether label size
is adjusted with the amount of labels on that axis

Task-number: QTBUG-129371
Change-Id: I83babf13e394fabb2cb1e05aa7f7df8f51bed0b6
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-11-04 14:52:24 +03:00
Qt Submodule Update Bot 6aeb16984e Update dependencies on 'dev' in qt/qtgraphs
Change-Id: Idf756159f815dcfeac7518d967cc06680bb4d911
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-11-01 22:12:31 +00:00
Qt Submodule Update Bot 0aeb08fa36 Update dependencies on 'dev' in qt/qtgraphs
Change-Id: Ib13aee6514f9cf85b58f796592f6364fd4480605
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-10-30 22:19:43 +00:00
Kaj Grönholm 48e0c363d4 Support theme gridVisible
Don't show any grid lines when theme gridVisible is set to false.

Task-number: QTBUG-130655
Pick-to: 6.8
Change-Id: Ibbc86c190f88b100f81a177382b286d884d81f06
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-10-29 15:58:04 +02:00
Kaj Grönholm 28b42fcdd6 Update GraphsView documentation
Update the GraphsTheme changes and axis locations.

Task-number: QTBUG-130649
Pick-to: 6.8
Change-Id: I35c4abcc68b5fd17866f06059d1eff356601c6fd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
2024-10-29 15:58:04 +02:00
Tomi Korpipaa 50dc60e8e4 Fix incorrect scaling of custom items
We incorrectly assumed meshes to be scaled to 1 by default, when they in
reality are scaled to 2 (-1...1). Because of this we need to multiply
the default scale by 2.

This should not be picked to Qt 6.8, as it changes the way custom
items are scaled by default.

Fixes: QTBUG-126611
Change-Id: I1468123ff1ed886d3210f269d4d7c76f81d11ca7
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-10-29 13:54:41 +02:00
Jere Tuliniemi f08c8cf64d Fix crash when clicking a PointRenderer graph
Pick-to: 6.8
Fixes: QTBUG-130507
Change-Id: Id3ab07d84d0e612f3ad8902b93fb9319ec52b3bd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-10-29 10:16:28 +03:00
Lucie Gérard f31d9f92ec Add REUSE.toml files and missing licenses
REUSE.toml files are read by reuse to complement or override the
copyright and licensing information found in file.

The use of REUSE.toml files was introduced in REUSE version 3.1.0a1.
This reuse version is compatible with reuse specification
version 3.2 [1].
With this commit's files,
* The SPDX document generated by reuse spdx conforms to SPDX 2.3,
* The reuse lint command reports that the Qt project is reuse compliant.

[1]: https://reuse.software/spec-3.2/

Task-number: QTBUG-124453
Task-number: QTBUG-125211
Pick-to: 6.8
Change-Id: Idd8d8f389ff3603d9202145bde5647c3aa903f72
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-10-28 11:28:51 +02:00
Tomi Korpipaa 09cddcd99b Fix userDefinedMesh docs
Pick-to: 6.8
Change-Id: I549e38023dd6ae8a2282d6b057d0d362aab0eff6
Reviewed-by: Alexei Cazacov <alexei.cazacov@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-10-28 08:57:15 +02:00
Jere Tuliniemi 6c643a7d41 Optimize AreaRenderer
Use QPainterPath method from PointRenderer to improve AreaRenderer
performance. Also fixes bugged lower spline behavior.

Pick-to: 6.8
Task-number: QTBUG-129768
Change-Id: I738abeecd620ed4897e2f77301bc9e47dc0d39e8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Owais Akhtar <owais.akhtar@qt.io>
2024-10-24 09:03:28 +03:00
Tomi Korpipaa 54e9e7af27 Replace wavefront OBJ files with meshes in tests
Pick-to: 6.8
Change-Id: I0533d7a420f7ab2b176f8124afc8c03960cfd66f
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Niko Korkala <niko.korkala@qt.io>
2024-10-24 07:44:26 +03:00
Qt Submodule Update Bot 97e96b86ea Update dependencies on 'dev' in qt/qtgraphs
Change-Id: Iaea8d51b501aa721d3d4cc8d7a1883061f2fd416
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-10-23 08:35:57 +00:00
Kaj Grönholm ec123721f3 Remove API docs of non-existing append method
This "append(string label, VariantList values)" variant has API docs for
both Qt Charts and Qt Graphs, but neither of them really implement it.

Task-number: QTBUG-130306
Pick-to: 6.8
Change-Id: I676a98c2c3e7df12fd8f10a2bd85680d5330ad4f
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-10-21 14:34:46 +03:00
Niko Korkala 206904596b Change swap to use QExplicitlySharedDataPointers swap instead of std::swap
Add tests for QGraphsLine

Fixes: QTBUG-129497
Pick-to: 6.8
Change-Id: I02b8249235739210b48bdc784af1db80075a642a
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-10-17 07:53:21 +03:00
Tomi Korpipaa 8a13776f9c Fix B2Qt build of cockpit example
Pick-to: 6.8
Fixes: QTBUG-129352
Change-Id: I3a821ec5c707c1533079dbf3c25ee13d0beb62ec
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
2024-10-15 11:11:43 +03:00
Niko Korkala 7de0bcbc10 Add missing Q_INVOKABLES and signalspys to 3d qml tests
Task-number: QTBUG-124504
Pick-to: 6.8
Change-Id: Iaa88b451dc9a81ae49b7dee6fa61d139c69a5234
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Owais Akhtar <owais.akhtar@qt.io>
2024-10-11 09:19:54 +03:00
Jere Tuliniemi 509bacbd09 Add a benchmark app as a manual test for 2D
This app allows for benchmarking and producing graphs based on
the results without much manual work. Can be built to run with both
Graphs and Charts.

Task-number: QTBUG-127963
Change-Id: I29b1af325c604630b43345e6b9dbf5cf7313afc5
Reviewed-by: Owais Akhtar <owais.akhtar@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-10-10 11:31:36 +03:00
Niko Korkala 33c8eb221f Fix DateTimeAxis double signaling
Add signalspys to DateTimeAxis cpp test

Fixes: QTBUG-129381
Pick-to: 6.8
Change-Id: I6178fc3f7c5c0b8e752908bb2f372db6ecc09df7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Owais Akhtar <owais.akhtar@qt.io>
2024-10-08 09:12:08 +03:00
Niko Korkala 24a531d8af Add signalspys and missing invokables to 2dqml auto tests
Task-number: QTBUG-124504
Change-Id: I7306503c1e4ec4b64aebd10e5d8181c4a17df9a1
Reviewed-by: Owais Akhtar <owais.akhtar@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-10-07 14:45:11 +03:00
Niko Korkala f75dd68e23 Fix horizontal/vertical button from testbed/barModelMapping and remove button from testbed/qmlUsageSeries
Task-number: QTBUG-128898
Pick-to: 6.8
Change-Id: Icfe02eb44b2c0d7870c45901029ca834a830d53b
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-10-04 10:21:42 +03:00
Niko Korkala 3eb85fa68e Add axis segment sliders to scatter and bargraph manual tests
Task-number: QTBUG-112646
Change-Id: I2ae3aaf3e659dfa5fe0d24329c8f6daa99b039d4
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-10-04 08:55:12 +03:00
Kai Köhne ef7a5e40ad Move Cockpit example to 'Data Visualization' category
Right now, it shows up in Qt Creator only under 'Other'.

Pick-to: 6.8
Change-Id: Ic594d854dfcc5c93bfbff61cceb4c4fcda86c805
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-10-02 09:10:30 +02:00
Kaj Grönholm ddab1d76dc Add series index dynamic properties for custom delegates
Support for series index in BarSeries (barIndex) and XYSeries
(pointIndex). These will allow new customization possibilities.

Task-number: QTBUG-129382
Change-Id: I4b332efda9c630bcb0394ffa49e999a3aca4fbf1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
2024-09-30 08:20:25 +03:00
Qt Submodule Update Bot f5f3d9b16b Update dependencies on 'dev' in qt/qtgraphs
Change-Id: I38c1eb08a0d09ddbc288b139d96b758d3fbdaaeb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-27 09:09:57 +00:00
Owais Akhtar 43c22c32cc Fix crashes with animations and allow for removal
This should fix the known crashes with animations, i.e when calling remove,
having single animation type, or the wrong order.
Remove animation for splines doesnt look that great yet. I tried different lerps
and Catmull-Rom but they all have a similar effect, so this can still be improved later.

Fixes: QTBUG-129025
Fixes: QTBUG-129357
Change-Id: If2606e167f064b158dcb8f4e1ef1ca4bae25f7a8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-26 15:08:20 +03:00
Tomi Korpipaa 178f1b5b30 Query maximum texture size from QRhi
The preset default of 8192 was too large for some
targets. Use QRhi to find out the actual maximum
texture size, or fall back to 4096 in case unsuccessful.

Pick-to: 6.8
Fixes: QTBUG-112198
Task-number: QTBUG-129054
Change-Id: Id95f902a377567e047d5cf73fafb399be1a7f86c
Reviewed-by: Niko Korkala <niko.korkala@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-09-26 13:46:56 +03:00
Jere Tuliniemi 98ebeff4c7 Connect pointsReplaced to update
When all points were replaced, the view wasn't updated due to this
missing connection.

Pick-to: 6.8
Fixes: QTBUG-129336
Change-Id: Ib7ae8bf28bf09ded5f9dbbccb230c29ce97103c4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-26 09:17:47 +03:00
Niko Korkala 2db50a6538 Add signalSpys to 3d autotests
Task-number: QTBUG-124504
Pick-to: 6.8
Change-Id: I2f6c85ced82e889221bcee82e4b7193b997e04aa
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-25 10:31:32 +03:00
Qt Submodule Update Bot 68e1abe9ed Update dependencies on 'dev' in qt/qtgraphs
Change-Id: I5e0a8e2c71618cb20ca25c5c073630a8714e9079
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-25 06:00:59 +00:00
Alexei Cazacov 292b786bd2 Docs: Format the Qt Graphs Configuration Options article
Change-Id: Ic119fcbd111d22041b396550c457939b56ac9586
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-25 08:54:34 +03:00
Jere Tuliniemi 81a6271e44 Change count from invokable to property
Count was mistakenly implemented as an invokable function making
it unusable in QML for binding purposes.

Fixes: QTBUG-129272
Pick-to: 6.8 6.8.0
Change-Id: I9b985d69bebbac33972f42ef2177483e2b0f2b42
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-24 12:49:25 +03:00
Tomi Korpipaa 3ca12e8d45 Add docs for 2D feature configuration
Fixes: QTBUG-129101
Change-Id: Ic105d446a6ff4de3830fd13f57b3ecb8b371c23d
Reviewed-by: Alexei Cazacov <alexei.cazacov@qt.io>
Reviewed-by: Owais Akhtar <owais.akhtar@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-24 08:59:16 +03:00
Qt Submodule Update Bot eb491879bc Update dependencies on 'dev' in qt/qtgraphs
Change-Id: Icac2e6708c51ad4276469729d531acdb72f5120d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-23 20:34:40 +00:00
Tomi Korpipaa c12733352f Fix autotest crash
Fixes: QTBUG-129138
Change-Id: I3bf60a4e742b9f2960eff4cc2ed42a51b7eab739
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-09-23 12:22:16 +03:00
Ulf Hermann 560b56f80f tests: Avoid warning about QTP0001
Pick-to: 6.8
Change-Id: Ia67d7a0e6ccfbbaf72065b43ea28d1f09bf2721f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2024-09-23 10:42:46 +02:00
Sami Varanka d68f1f2466 Remove unused mouseMoveEvent from QQuickGraphsItem
Removed mouseMoveEvent handler implementation from QQuickGraphsItem.
QGraphsInputHandler emits mouseMove in hoverMoveEvent handler. For this
to work, QGraphsInputHandler needs to accept hoverEvents.

Pick-to: 6.8
Change-Id: I9ceb19f2637dc7da61ea08809a7ee8cd9182e9f5
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-23 11:41:36 +03:00
Sami Varanka f5007eaa99 Don't expose seriesGradients to qml
In qml baseGradients should be used.

Pick-to: 6.8 6.8.0
Task-number: QTBUG-129137
Change-Id: I54e5aaeac026d19eb186d4d26a7c4d53c4567070
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-23 09:18:30 +03:00
Owais Akhtar 6167ef3398 Add bound checks to QXYseries
Some invokeables dont have bound checks

Fixes: QTBUG-129162
Pick-to: 6.8
Change-Id: Ie08914b25d6d3674c1ea3bd60124264e48185415
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-09-23 09:18:30 +03:00
Tomi Korpipaa 8b7dc3fa99 Use Fusion style in equation example
Pick-to: 6.8.0 6.8
Fixes: QTBUG-126433
Change-Id: I542df59095c79daef09ba288116942dab4ade895
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-23 08:23:59 +03:00
Qt Submodule Update Bot b007bceb5e Update dependencies on 'dev' in qt/qtgraphs
Change-Id: I92906826bf019f06d650500fb5c11d611b28182e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-20 19:28:30 +00:00
Tomi Korpipaa b0255c4d66 Add feature support for 2D graphs
Fixes: QTBUG-121037
Change-Id: I9090a3dfc051c0e8aadd5c00a0cc086763c32269
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-09-20 12:29:49 +03:00
Owais Akhtar 69e1b24764 Add documentation for animation types
Documentation for graph animation classes are missing.

Pick-to: 6.8.0 6.8
Task-number: QTBUG-128538
Change-Id: Ib38f57dde2c8a36797388e56b9e3914f131d12bb
Reviewed-by: Alexei Cazacov <alexei.cazacov@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-18 10:22:08 +03:00
Niko Korkala c0ad2d77a3 Fix new barsets connection issue and double signaling
This aims to fix issue with new barsets not creating connection with handleSet
slots when replace function is used. Also fixes issue of double signal sent
when setvisibility function is used.

Fixes: QTBUG-128661
Fixes: QTBUG-128863
Pick-to: 6.8
Change-Id: I432349a70032bf4b373142e063a38c46b35688db
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-09-17 11:51:48 +03:00
Niko Korkala ecc46041bf Add signalspys to cpp2d auto tests
Task-number: QTBUG-124504
Pick-to: 6.8
Change-Id: I4dbd0cefac4a2212c87e1180d0bc8325e1ebf105
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-09-17 09:32:59 +03:00