Commit Graph

84 Commits

Author SHA1 Message Date
Sakaria Pouke f10ab883a6 Add transparency support to surface graph
Relies on Order independent transparencyín qtquick3d
Accurate OIT relies on commit
cbc1cc8c9bef15690e31485ab76e5ffc47fc59dd

Fixes: QTBUG-129384
Fixes: QTBUG-128235
Change-Id: I6f46a7fd00bf4ec79c5a9944d38e715e3a88dde5
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-12-08 20:44:52 +02:00
Tomi Korpipaa a1beef074b Check for invalid values in barThickness
Pick-to: 6.8
Fixes: QTBUG-131735
Change-Id: Ia9dbe36d4334ff545cd847f16d11e6398c6c85e3
Reviewed-by: Niko Korkala <niko.korkala@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-12-02 08:57:54 +02:00
Tomi Korpipaa dfefb422ff Check for invalid aspect ratio values
At the same time, fix unqualified accesses in the touched
test files.

Pick-to: 6.8
Fixes: QTBUG-131730
Change-Id: Ib840c9f745751ee4738a62ca39df7d3d7b0699e4
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-11-29 09:53:29 +02:00
Kwanghyo Park 1504778e37 Add clipping camera target position in range
The document states the range of the camera target position
but it is not properly set

Pick-to: 6.8
Fixes: QTBUG-131524
Change-Id: I1ebaf34ab1de54689e7c9dee6def2290467412dd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-11-28 11:21:17 +02:00
Tomi Korpipaa feb9939c57 Add missing signal emissions
Also fix an incorrect function call in setWrapCameraXRotation.

Pick-to: 6.8
Fixes: QTBUG-129109
Change-Id: I5fbf1d75480fc429cd54345223d2e858c44faf6b
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-11-27 10:45:27 +02:00
Tomi Korpipaa 7527a0f442 Return the actual custom item list
Re-enable autotests as well.

Pick-to: 6.8
Fixes: QTBUG-131473
Change-Id: I37aeaff4e905507f8475f1ec2af51dc753489776
Reviewed-by: Niko Korkala <niko.korkala@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
2024-11-26 06:53:46 +02:00
Tomi Korpipaa 6ac03f52f9 Give a warning if a file is missing
setHeighMapFile and setMeshFile did not check whether
the filename given pointed to an existing file.

Pick-to: 6.8
Fixes: QTBUG-129824
Change-Id: I2326d839e27a612733b4edcda08c97c87bbd7ec4
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-11-20 08:15:19 +02:00
Sakaria Pouke 94d12f0a41 Make camera rotation limits public
QML only, public getters/setters already exist for widget

Fixes: QTBUG-121318
Change-Id: I391e57c6570a572ec40bb41ec6a9f959815389e2
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-11-11 13:51:21 +02:00
Sakaria Pouke ee5ede3108 Add spline rendering to scatter
Also adding manual and autotests

Fixes: QTBUG-125916
Fixes: QTBUG-124742
Change-Id: I152e1d3652c9c97cb3e714e0a80acdfc9e4f9482
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-11-11 13:51:21 +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
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
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
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
Sami Varanka 7569772b09 Rename labelAutoRotation to labelAutoAngle
Pick-to: 6.8
Task-number: QTBUG-125364
Change-Id: I74c9c556708616aba45beeb9d5d4a356bb391198
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-07-31 09:15:28 +03:00
Jere Tuliniemi 81c8f453c3 Change colors when platform color scheme changes
Add a connection to listen to platform color changes. This is done by
adding an internal color scheme enum that contains Automatic value
in addition to Unknown, Light and Dark. The user can opt in and out
of the automatic behavior by setting the color scheme with the new
enum.

Fixes: QTBUG-125782
Pick-to: 6.8
Change-Id: I21a82269d498b1fc17c675bcedae7fd71bc36e1c
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-07-26 09:02:54 +03:00
Sakaria Pouke 8584d8b639 Add value coloring for bars
Fixes: QTBUG-126354
Change-Id: I2c2171bbce79b046d5d163676dfc5f56e0631a3d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-07-22 14:44:29 +03:00
Dilek Akcay c86ee31bf3 Add an enum class for shading type in Surface3D
Task-number: QTBUG-126146
Pick-to: 6.8
Change-Id: Ide9bd731f348fb83cb10863efc4aa25484d9fac0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-07-15 15:46:48 +03:00
Sami Varanka 5e04ee41a8 Fix getter names in widgetitems
Pick-to: 6.8
Task-number: QTBUG-127033
Change-Id: I30718abbd7ad14bb9c68d5cea64a87e00e003f25
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-07-11 11:19:55 +03:00
Sami Varanka 6429384571 Fix property getter names in qml types
Pick-to: 6.8
Task-number: QTBUG-127036
Change-Id: I00d543a43278dc6bfde98fedea01d35cb3f8aedd
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-07-10 19:25:26 +03:00
Kwanghyo Park ad6a85867c Change the default theme to QtGreen
Fixes: QTBUG-125470
Pick-to: 6.8
Change-Id: I817419c25adb48805a5376f98419c5a0165ea9d5
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-07-08 14:20:04 +03:00
Alexandru Croitor 1d977ca6b2 CMake: Combine separate configure.cmake files into a single one
The previous configure.cmake files were evaluated during the build
to access feature values, but because they were not tied to any
specific module target, the feature values would not be recorded on
the exported targets, and then not available to any consumers of the
Graphs module (which is the case for standalone tests).

To tie the configure.cmake file to a module, it must reside in the
same directory where the qt_internal_add_module call is done.

Initially there were two separate configure.cmake files because there
were two separate module targets, but now that they are merged, the
files should also be merged.

This fixes exporting the features.

Amends 89f3697015
Amends d5313f8aa8

Pick-to: 6.7 6.8
Change-Id: I91214d0e7b339f04d157f6eb53879fc88d4424b2
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-06-28 13:05:47 +03:00
Dilek Akcay dfd54c826c Change QGraphs3D namespace name to QtGraphs3D
Task-number: QTBUG-125886
Pick-to: 6.8
Change-Id: Ifcde54306e518c352d9b354c9bfe92c52c0bb0e3
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-06-19 14:09:12 +00:00
Sami Varanka 3e570bf59d Use composition with QQuickWidget
Pick-to: 6.8
Task-number: QTBUG-125771
Change-Id: Id7e5a0b730f47d2a38916c52cd3ab0a0a453c0b8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2024-06-13 10:29:48 +02:00
Kwanghyo Park a2cdd8b77b Integrate redundant properties into grouped property
Therer is redandancy to the properties for lines.
So grouped them into grouped property.

Task-number: QTBUG-125378
Change-Id: I06e357375aed2dbb662f76669b3e0f8430a0e48d
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
2024-06-12 13:37:43 +03:00
Dilek Akcay d06d9d35fa Fix inconsistent property naming
Task-number: QTBUG-125386
Pick-to: 6.8
Change-Id: Ia749398697ef973a1b60cc52a52328869bedae6f
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
2024-06-12 08:08:41 +00:00
Sakaria Pouke 3cba601bf3 Add label margin support
Fixes: QTBUG-124739
Change-Id: Ia94c7b281bfae9e57d50eb7619f7b2c72f4b79eb
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
2024-06-12 08:27:24 +03:00
Dilek Akcay f51cb5027e Change 'enabled' properties to visible in 3D
Task-number: QTBUG-125377
Pick-to: 6.8
Change-Id: I342bb9e6a125867fb5e2bcc858d5254047a3ac23
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
2024-06-11 09:29:53 +00:00
Tomi Korpipaa d398d19da0 Add another env variable test to QNX test disabling
Change-Id: I84766d9c02c75314a56f478bce7866f56a44caf7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-05-31 12:04:54 +03:00
Dilek Akcay 0c2ca80e6a Change 'enabled' properties to visible in GraphsTheme
Task-number: QTBUG-125377
Change-Id: I3e7ad9ec44e58af221b94cbe46186b92c0ae5a63
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-05-31 10:22:00 +03:00
Tomi Korpipaa 883f7e46ae Disable a failing autotest for QNX
Change-Id: I788c46dc8ede9b0cdaf5dd1c97c3f5203545e3f8
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-05-31 09:20:55 +03:00
Dilek Akcay 98d5b4ebfd Change SelectionFlag enum to enum class
Task-number: QTBUG-125365
Change-Id: Id890ab19b0126f503824778c06a506dfb706c7b4
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-05-30 09:51:22 +00:00
Sami Varanka d4e5e224d1 Move widgets to another module
Fixes: QTBUG-125719
Change-Id: Ieeab2e64d0d2a3a8d3969df5384b7ddd0fd180b7
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-05-28 18:33:49 +03:00
Kaj Grönholm 92a5092bb3 API: Improve theme functionality
- Change gridMainWidth and gridSubWidth default values. Make them be
  pixel amounts and match with axisMainWidth and axisSubWidth.
- Document some default values.
- Reset customized properties when colorScheme is changed after
  component is ready.
- Change float to qreal in properties.
- Set axis colors to match with grid colors in colorScheme change.
- Fix updates and document properties in QGraphsView.

Task-number: QTBUG-125254
Change-Id: I8d56e8e8828bcbee99ea11acb3fd8cdb5afe69f1
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: <owais.akhtar@qt.io>
2024-05-23 20:58:25 +03:00
Sami Varanka aae5e99117 Move enums away from QAbstract3DGraph
Fixes: QTBUG-125409
Change-Id: Ide84873da6fe4f59399c8c5f25416db5ae547620
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2024-05-22 19:02:19 +03:00
Tomi Korpipaa fc95d79b59 Fix some autotest compilation warnings
Change-Id: I198ccd6774e07d229925bf00fcd94bb96921f2d4
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
2024-05-14 13:57:14 +03:00
Sakaria Pouke 9d540154d3 Add primary and secondary viewport support
Also deleted redundant scene3dprivate classes
Changed primarySubViewport to only affect the slicing viewport.

Fixes: QTBUG-122435
Change-Id: Ia53d63259c91cac4b9c69ce7cd2ad8b365fe2899
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-05-03 15:14:11 +03:00
Kaj Grönholm 27beaeaa8a Unify background colors theming
Unify naming and usage of background color properties in 2D & 3D.
- windowColor is renamed to backgroundColor. In 3D it will control the
  SceneEnvironment background color, not adjust window color anymore.
- backgroundColor is renamed to plotAreaBackgroundColor. In 3D it will
  control the plot area (grid) background color like it used to.
- Also have *Enabled properties for both. When backgroundEnabled is
  false, SceneEnvironment background is transparent.
- Remove plotAreaBackground property from 2D GraphsView as it comes
  from theme now.

Fixes: QTBUG-125050
Change-Id: Iaf824bacb224230fc501637887f61f11af860464
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-05-03 15:14:11 +03:00
Sakaria Pouke c021676343 Support offsetting title position
Fixes: QTBUG-110161
Change-Id: I5246656dcc93345f3bb5af875ed17de8a9e03d23
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-05-02 11:26:37 +03:00
Kwanghyo Park c8be94138e Introduce integrated theme for graphs
Task-number: QTBUG-123223
Task-number: QTBUG-123461
Task-number: QTBUG-124837
Task-number: QTBUG-124836
Change-Id: Iaa5ab35a0707fc63329b07f10a203fc63e033f0d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-04-30 08:15:46 +03:00
Sakaria Pouke dbbcc795a4 Add support for hiding axis labels
Fixes: QTBUG-116000
Change-Id: If27112985da142d1fc14f103ba6b0c2a88d9dfed
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-04-19 13:38:22 +03:00
Sakaria Pouke 9ae45bdbdb Add subgrid color support to shader grid
Also updated tst_qmltheme to allow for more property tests

Task-number: QTBUG-123460
Change-Id: I3da5df55a23de4725aba226181de4ac55f4e1734
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-04-17 13:40:15 +03:00
Sakaria Pouke 7ede1a9993 Add linewidth property to shader grid lines
Fixes: QTBUG-123586
Change-Id: I23457cdec64b9b5c8ff290e2d6082e93887cdd18
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2024-03-25 14:06:00 +02:00
Lucie Gérard cdbb572098 Correct license for build system files
According to QUIP-18 [1], all build system
files should be BSD-3-Clause

[1]: https://contribute.qt-project.org/quips/18

Pick-to: 6.7
Task-number: QTBUG-121787
Change-Id: Ie1b4144b758f37c4c95b23d24818f59373ef5464
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2024-03-15 14:38:24 +01:00
Sakaria Pouke e37f984995 Add queryGraphPosition support
Also added testing

Fixes: QTBUG-122943
Pick-to: 6.7
Change-Id: I7456dd23867bbb557f37c8c421920d2032d35eb0
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-03-14 10:34:01 +02:00
Sakaria Pouke 743553e0b8 Use Shader to render grid
Task-number: QTBUG-115735
Change-Id: Icf27ac1268683a25fa62b5a8e6db3a112f368426
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
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-03-14 10:34:01 +02:00
Tomi Korpipaa 04ddefbf4f Set resize mode in constructor
Doing this removes the need to add setting the resize mode
on application code.

Fixes: QTBUG-121998
Pick-to: 6.6 6.7
Change-Id: I6545913cc1e8ebf9713f0244a6892b7d5a019a49
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-02-12 07:05:22 +02:00
Dilek Akcay 5b590c0840 Remove data members from proxy in bars
Task-number: QTBUG-117226
Change-Id: Ib001a895e4fc090f7a16d2deb9c6ee4f4173c6f0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-02-01 15:51:40 +02:00
Dilek Akcay 085ea530d8 Remove data members from proxy in surface
Task-number: QTBUG-117226
Change-Id: I85290d5bd25c67f8702dbbfb16b507980aeec4ba
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-02-01 15:51:40 +02:00
Dilek Akcay 670e85a477 Remove data members from proxy in scatter
Task-number: QTBUG-117226
Change-Id: Iae059d420b04383fb039f90cf8ce28b0bd032a6c
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-01-29 12:18:52 +00:00
Tomi Korpipaa 26eead91b3 Fix tst_input compilation if bars3d feature is off
Fixes: QTBUG-121386
Change-Id: Ia3783b6cf55d53787ca9b30200948b4a0b89e665
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
2024-01-24 12:04:15 +02:00