Commit Graph

34 Commits

Author SHA1 Message Date
Sami Varanka 7156846862 Fix widgetgallery surfacegraph crash
When selecting a point on the surface graph
and then changing to slice selection,
the slice view is not created. Then selecting
a slice point tries to update the slice view
which is not created. The solution: when updating
the slice view, create slice view if it's not
created already

Pick-to: 6.6
Fixes: QTBUG-116398
Change-Id: I63f0937f52450a72ed66828e056582c89c90e49a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-08-24 09:47:59 +03:00
Sakaria Pouke 6e5da867bd Update heightmap ranges inside shaders
Also removed obselete surfaceTexturedMaterial and corresponding shader

Pick-to: 6.6
Fixes: QTBUG-111059
Change-Id: Ib1f5535bcdde14bce78f9bca087612bb23bef35c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-08-23 12:28:05 +03:00
Tomi Korpipaa ba8ada9fb9 Patch through lightStrength to surface shader
Replace the hardcoded spcularity value with one from
the theme's lightStrength

Pick-to: 6.6
Task-number: QTBUG-113272
Change-Id: I7a132290a0692cf7e6af11066735869baea2a020
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
2023-08-22 08:09:22 +03:00
Kwanghyo Park 6458e2129c Item format follows the setting
Pick-to: 6.6
Fixes: QTBUG-116140
Change-Id: I5c3238564cbd9e7b334739857eb40967e22649d7
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-08-21 13:21:14 +03:00
Sakaria Pouke 697a1d029f Unify surface color styles into one shader
Pick-to: 6.6
Task-number: QTBUG-116084
Change-Id: I9fc7b9d492b278c8a376e4c6fe3530bc41532c27
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-08-17 15:22:57 +03:00
Kwanghyo Park b395b1ea72 Fix slice view size
Pick-to: 6.6
Fixes: QTBUG-114120
Change-Id: I5536c3466d9ae4639397b5690bcc70153d281635
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-08-15 15:29:58 +03:00
Kwanghyo Park 57ec7eca7e Fix toggling texture update
Pick-to: 6.6
Fixes: QTBUG-116005
Change-Id: I4dfc9031fdcb490814ddcbf9eb2b2952c94fdc91
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-08-15 13:40:28 +03:00
Kwanghyo Park c2d156e84a Fix axis range change crash on surface
Pick-to: 6.6
Fixes: QTBUG-115694
Change-Id: I496678181a4c68e5f639bdaed307911f64f16df7
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2023-08-15 10:32:07 +03:00
Kwanghyo Park dd94017da5 Update title labels for surface
Title labels for surface graph are now updated

Pick-to: 6.6
Fixes: QTBUG-115683
Change-Id: Ife8d59c40498c9b475bfd7583c943d510882fc3a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
2023-08-14 16:27:36 +03:00
Kwanghyo Park ee50f409d1 Update textured material when update graph
If the graph using textured material updated, keep the
texture

Pick-to: 6.6
Fixes: QTBUG-115684
Change-Id: Ibc258c3d1648b06dbf5acc6750c5c5d4c650c341
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2023-08-14 11:01:11 +03:00
Sakaria Pouke cf06174f70 Fix surfacegraph crash while picking and downsampling
This fix also reorganizes some code so that the updateModel function is called
before UpdateSelectedPoint.

Fixes: QTBUG-115940
Pick-to: 6.6
Change-Id: Ie7611936691c28bcb5257e2fac7e175c796a96f4
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
2023-08-09 14:55:52 +03:00
Kwanghyo Park 13ea2acec7 Use vertex shader for surface graph
To enhance the update performance, surface graph starts
using vertex shader

Pick-to: 6.6
Task-number: QTBUG-108129
Change-Id: I0002c7babe27bf11292404315b692fad56949c91
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-08-04 12:56:39 +03:00
Kwanghyo Park 49240fd366 Slice graph follows the multi selection mode
Slice graph also follows the multi selection flag

Pick-to: 6.6
Fixes: QTBUG-112441
Change-Id: Icb29741285571caa499eacaf4ea69c9a1489e419
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2023-08-03 09:15:09 +03:00
Sakaria Pouke 6f4ee383e8 Fix crash on surfacegraph data resolution resize
Pick-to: 6.6
Fixes: QTBUG-114867
Change-Id: I20cbf8320b8919464aee18a8cadeff84eef8fcf5
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-07-31 12:47:03 +03:00
Kwanghyo Park 64576de853 Fix the issue when changing visibility of series
When series visibility is changed, the graphs was
not shown.
This commit fixed it

Fixes: QTBUG-114129
Pick-to: 6.6
Change-Id: Ic4e5a37b6ed47b3761ec33f1ad279e103d18eadf
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-07-31 12:47:03 +03:00
Kwanghyo Park 0aae6a1045 Support axis range changes
When axis range changes, the grid and labels also follows

Pick-to: 6.6
Fixes: QTBUG-112393
Change-Id: I7a237f11bb0ec9545394bf252444c9b0d216539d
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
2023-07-31 10:51:20 +03:00
Kwanghyo Park 3a5daa0891 Prevent label being occluded by graphs
The label goes behind graphs when the selected position
is behind the graph.

Fixes: QTBUG-113525
Pick-to: 6.6
Change-Id: Id34c283725d20b6907249ead7cd4397b9fdb0328
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2023-06-16 09:42:55 +03:00
Kwanghyo Park aee99eabc7 Add support for object gradient for surface
Object gradient support for surface enabled

Task-number: QTBUG-112325
Pick-to: 6.6
Change-Id: I7b9276398e523a5f2fc38ee4d75219af758e351d
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-06-05 11:32:56 +03:00
Tomi Korpipaa e4ca8e4a77 Add plumbing for input handling
Fixes: QTBUG-99829
Change-Id: Ieaf63f6ec275b6d72757134c8c0405adfc1bac50
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-05-24 15:00:32 +03:00
Kwanghyo Park 176d42ab30 Add texture API support
Add support when the file is set as a source of a texture

Task-number: QTBUG-99842
Change-Id: I57264501aabd4d2cf294d94f1cd4f51440b94e52
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-05-24 11:38:47 +03:00
Kwanghyo Park d9663649c1 Add polar axes support
Polar coordinates support is added

Task-number: QTBUG-99820
Change-Id: I5c594ef114da35be0153e2a3e2ed58aed5915bb4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2023-05-22 10:15:59 +03:00
Tomi Korpipaa d640d3c3e0 Add support for doing picking on touch
Task-number: QTBUG-99829
Change-Id: I2d5e205888d7e4141b4fa0f0fdd061b8bb54e66d
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-05-17 14:23:16 +03:00
Kwanghyo Park b375ce4f00 Fix slice graph update issues
When the data is updated, the slice graph is not shown
properly and does not show correct graph.

Fixes: QTBUG-113540
Change-Id: Ie709c8c1d9e89b9761fe4898abb0085f55e4ebea
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-05-12 10:30:03 +03:00
Kwanghyo Park 923aa8eb17 Enhance rendering performance
Enhance the rendering performance by reducing
rendering calculation

Task-number: QTBUG-108129
Change-Id: I99f554104e7dcc53e16538cca0f72f5b385e5557
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2023-05-02 09:10:20 +03:00
Kwanghyo Park da2a48f1ad Handle multi series selection with different size
There could be cases that the graphs have different
size of series but selected.

Task-number: QTBUG-112729
Change-Id: Ib6c017fd27d82f4e5ab24d56ef54ce541a90f4dd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-04-18 13:50:03 +03:00
Kwanghyo Park afdfc96860 Fix crash issue when changing series
When changing the data of series, the slice view
handling is updated to fix crash

Task-number: QTBUG-112242
Change-Id: I49578d8fbc19d326928138e3ea6abc9e7f85ff24
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-04-12 14:31:40 +03:00
Tomi Korpipaa e0c699fb01 Fix Surface3D memory leaks
Task-number: QTBUG-110692
Change-Id: I4214f6d4b8911dc4bef4daa45c043d6aa9848b10
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-04-11 11:25:08 +03:00
Kwanghyo Park e9e4d1e093 Fix picking issues when graph grid is on
When graph grid is on, picking other than graph still gets picked
It is due to picking of Line primitive geometry is not the same as
picking Triangles primitive.
Make the surface graph still there but not visible to be picked on
an exact point

Task-number: QTBUG-112442
Change-Id: Ibcce25041ededc64e5f0dbe048843aec71f2e485
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-03-31 12:54:12 +03:00
Kwanghyo Park 06b64491dc Fix surface disappearing issue
The surface graph disappears in a certain sequence.
Clean up the logic to handle mouse pressed to avoid such issue

Task-number: QTBUG-112279
Change-Id: I07bf7772e473179785be047043227a6e7a399d4e
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-03-31 09:01:23 +03:00
Kwanghyo Park b80c6fe91c Apply aspectRatio calculation for scale
AspecRatio and horizontalAspectRatio is used to calculate
scale

Task-number: QTBUG-112359
Change-Id: I5fb1316c2955e11d44df53c833ab07f36dcd7cf4
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-03-29 07:01:00 +03:00
Tomi Korpipaa 3e970657bd Initial support for range gradient for bars and surface
Support range gradient with custom material

Task-number: QTBUG-112285
Change-Id: I681fcdaba67a82f54c9807e5a040bce740be0343
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-03-28 08:19:05 +03:00
Kwanghyo Park 8312f0ebbd Add orthographic camera support
Add support for orthographic camera on main graph view

Task-number: QTBUG-112144
Change-Id: I80a3a9f9d3be2b7e7c627a51e2d7db9da39fa96e
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-03-24 09:54:42 +02:00
Kwanghyo Park af4ed8f338 Fix slice view on qmlsurfacegallery example
The slice view is created when there is a first interaction
requires slice view so that the slice view can retrieve the
size of the main view.

Task-number: QTBUG-111672
Change-Id: I2ad83ca023deaf70990fed2080599da0bf12e5a6
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-03-21 15:33:18 +02:00
Jukka Jokiniva 8d18b56183 Initial commit 2023-03-02 15:45:23 +02:00