Row/column replace tests were disable in surface tst_proxy.qml.
The tests also used incorrect regex patterns.
Pick-to: 6.8
Task-number: QTBUG-132351
Change-Id: I1dbeb338c192c5c93d289e50c156b7bc3529b5cd
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Niko Korkala <niko.korkala@qt.io>
(cherry picked from commit 9592479c0b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Bars3D and Scatter3D didn't hide the item label according to series'
itemLabelVisible. This was also in the Surface3D but it was fixed
already. However, the fix was not complete since it did not work if the
selection was active.
Fixes: QTBUG-141370
Pick-to: 6.8
Change-Id: I65acfc33e0d41cd4322efe521b7d7ba509ca159a
Reviewed-by: Niko Korkala <niko.korkala@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 8d8f2ffc91)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
When the modelhandler resolves the model, it always resizes scalearray.
This patch adds a check whether the itemmodel has scale roleindex. If
the model has no scale, it skips the resizing of scalearray.
Fixes: QTBUG-141186
Change-Id: I2718987f15c751cd187f1a398a92e10c71c9fbc6
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
(cherry picked from commit 77ac8a5a9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Textured surfaces ignored alpha channel in the images used as
textures. Added a check which forces transparency if the textureFile
source or texture property has other than 1.0 in alpha.
Pick-to: 6.8
Fixes: QTBUG-140660
Change-Id: Ibe95b4a4fb6b674b615d15c1b7e37e2cd6edee77
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit d890ea35d3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
selectionQuery is essentially a legacy way to do picking
while graphPositionQuery returns a picked position of the graph.
Task-number: QTBUG-138828
Pick-to: 6.8
Change-Id: Ieb90086e0416558bb31633a2b28db37443dd6362
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 47dc05aac6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Adding the same axis to multiple graphs is not supported. It will result
to crash since graphsview destructor tries to set axis' associated graph
to nullptr.
Fixes: QTBUG-138822
Pick-to: 6.9 6.8
Change-Id: If306e415f87f2366ae0d82f6fd5c9a9a5e356f85
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Alexei Cazacov <alexei.cazacov@qt.io>
(cherry picked from commit 818613a0ee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
In fact, don't return the QImage at all. It's an asynchronous function,
and the rendering will take an unknown time to complete. Callers must
connect to the sliceImageChanged() anyway to get the result, so just
let them do that, instead of clumsily polling with a timer.
Update the documentation and manual tests as much as possible for
now. There are baseline tests, but no auto-tests, so hard to say if this
still works correctly. It's likely that this needs a bit more work as a
follow up, but at least we don't release any dangerous API.
Change-Id: I19d616c76746a826c4a46ed1df0aab4dc988556c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 5a97dd4180)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
QtQuick3D was listed as a required module in dependencies. However,
you should be able to build QtGraphs without 3D features. In that case,
it is not necessary to have Quick3D. Therefore, the Quick3D required
field should be false in the dependencies. In addition, the baseline
tests must be turned off if 3D features are unavailable, as they link
to Quick3D.
Pick-to: 6.9 6.8
Change-Id: I6c45fde93d75d54b4adf89471441d989452b0245
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 6300f5af2f)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Removes logic that caused setPieSize() and setHoleSize() to implicitly
modify each other. The setters now only affect their own respective
properties.
Pick-to: 6.9 6.8
Fixes: QTBUG-134003
Change-Id: I2d7b3e36d692248cd2de19dc6daa9d09a61c8158
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
(cherry picked from commit e2def3779a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Switching to mask mode does not seem to visually change
the labels much if at all, and it fixes the problem with approximate
OIT.
Fixes: QTBUG-138827
Change-Id: Ia222cf6c5ec6a8e764d06217b1593abe27e166e3
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 330273682e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Do not introduce new APIs with QSharedPointer
Rationale: QSharedPointer's implementation is poor and requires
twice the number of atomic operations on copy than std::shared_ptr.
We want to remove the class in Qt 7.
Solution: Instead of returning shared pointer to a QQuickItemGrabResult
that is received from the QQuick3DViewport, extract the image from
the grab result and return a pointer to that instead.
Task-number: QTBUG-137478
Change-Id: I54cc9aece72cf8cf5ec4abaddc1da189d0c31b2b
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
(cherry picked from commit 544bc177fd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: this change improves the clarity and semantics
of the enum by renaming SliceType to SliceCaptureType.
Enum values were also renamed to explicitly indicate the type of
slice being captured to an image.
Task-number: QTBUG-137478
Change-Id: I1c21180f064d26189ba4121e412f103017c00fd6
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit ff599b3b56)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Update angleSpanVisibleLimitChanged and
angleSpanVisibleModeChanged signals to include their
respective new values as parameters.
Maintain consistency with the rest of Qt.
Task-number: QTBUG-137478
Change-Id: I384ee60f933e0da15ca22cfc01eec693588dc183
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit c0f6e03ede)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: the drawOrder property has been renamed to
zValue for consistency within the Qt Graphics API.
Task-number: QTBUG-137478
Change-Id: I8b82a998ca2d5165169d3184c493708b3214f24a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 9a2b68a825)
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Based on API review: Rename the VisibleMode enum to LabelVisibility
to specifically state that it controls label visibility in pie series.
Task-number: QTBUG-137478
Change-Id: If7834e180a3be90c8a5f69807ac9763b7e4ac853
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 8a24be6330)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Renamed the textElide property to textElideMode
to improve clarity and align with Qt naming conventions.
Task-number: QTBUG-137478
Change-Id: I5261055f686dd8b96576809ca266599a5c258fee
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
(cherry picked from commit 49468e7019)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Removed the constructor overload that
accepted a scaleRole parameter in QItemModelScatterDataProxy.
Task-number: QTBUG-137478
Change-Id: Iae85f6321e53189f68da5b15d586c9b52fadfd25
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 74ef58cc32)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
qmatrix4x4.h will lose its qquaternion.h include, so include
qquaternion.h explicitly in all files that mention 'QQuaternion',
unless, for a foo.cpp, the own foo.h has already included it.
Also add forward declarations, where needed.
Amends the start of this module's history.
Pick-to: 6.9 6.8
Change-Id: I605bf742be5bb92a676704f12d738d241bd9b0da
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 6a44c5fe57)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Renamed the getDataPointCoordinates method to
dataPointCoordinatesAt to align with Qt naming conventions and improve API clarity.
Task-number: QTBUG-137478
Change-Id: If9edbba24fdefde1beed168992cb3cbf076375bb
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
(cherry picked from commit 8f22dc0959)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
asan build kept failing on qmltest tst_bars.qml. Fixing this required
to move nullptr check in QQuickGraphsItem::addCustomItemto the top of
the function, and changing the tst_bars.qml to not use dynamic
creation of qmlobjects.
Change-Id: I4649bf2f8178555ad69c6581a85654a58ce58d1f
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit bf73e296a1)
This is the result of running util/normalize on the code base. The
following manual edits were needed:
(none)
Pick-to: 6.9 6.8
Change-Id: I26d9ba6799dec9fba0220d718679353231a7c8c7
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 4c03576ce1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Also update ItemModelScatterDataProxy and ScatterItemModelHandler.
Added manual test for vector fields.
Fixes: QTBUG-134242
Task-number: QTBUG-134558
Change-Id: Ie4f128419ea176d1b8e0f8e874f447ce7fb35b39
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Feature allows developers to turn on categorized logging in graphs 3D which will log various different things
qt.graphs3d.general, general purpose logs
qt.graphs3d.series, series addition/removal
qt.graphs3d.properties, property changes
qt.graphs3d.events, sliceview enter/exit, zoom/rotate values
qt.graphs3d.inputEvents, pick results
qt.graphs3d.axis.general, axis general purpose
qt.graphs3d.axis.properties, axis properties
qt.graphs3d.critical, critical
Task-number: QTBUG-128886
Change-Id: I714ff59af47f9ec583eae57e89fd0ae417d900df
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Adds drawOrder property to each series so that the user can change
the order in which the series list is drawn.
Task-number: QTBUG-124929
Change-Id: If50aa81268dce11a09687013afe9ab0e5a4749c8
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
CustomScatter in tst_qmlbarscatter was still trying to use QQmlComponent *pointMarker property even though it has been renamed to pointDelegate
Pick-to: 6.8 6.9
Fixes: QTBUG-136950
Change-Id: Ic2d9d3b01d71e415f789e85253928471b2f5e0b3
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Change EveryOther mode to Odd and Even modes.
Task-number: QTBUG-135929
Change-Id: I5bada3eeaf014251af4164c66656fac4af360860
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Add properties for controlling the visibility of slice labels
in slices that fall under a size limit set by the user.
Fixes: QTBUG-135929
Change-Id: I0d88b08bcf66b60f1be01156f1ae723b04507e12
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
For too long, developers were bound by an unyielding rule:
Every graph item that dared to venture beyond the plot area was
mercilessly clipped, with no means to defy this constraint.
But now, everything changes.
With the arrival of this patch, a new power emerges — a property named
clipPlotArea. This simple yet formidable addition grants developers the
ong-sought ability to choose:
Should the outliers be silenced... or set free?
The control is finally in your hands.
Task-number: QTBUG-135887
Change-Id: Id1d4b5b3fa4405b23bfe606ef83d2712dcd15d27
Reviewed-by: Alexei Cazacov <alexei.cazacov@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Axis labels on 2D graphs now support horizontal text elide.
Task-number: QTBUG-120502
Task-number: QTBUG-135930
Change-Id: Id89e59bfb9791e8512124432f0d6235880c6b2fe
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Alexei Cazacov <alexei.cazacov@qt.io>
Also remove a warning in a manual test
Pick-to: 6.8 6.9
Change-Id: I498792834e86843b7245a27b37f7e2594d2f9ef9
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Remove the ASM language where no assembler files are used.
Pick-to: 6.8 6.9
Change-Id: I461058a754991599d566cb9e63b43510b505f794
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Each series can now have their own axisX and axisY that the
AxisRenderer now renders as separate axis lines and tickers.
Task-number: QTBUG-132333
Change-Id: I2e529de167171bf81a2fb952876717f99ac75d4a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
User cannot just click the screen and get the correct position on the
graph's coordinates. That require's calculating plot area position from
the mousearea click position. This patch adds method to lineseries
for calculating the graph coordinates from plot area click.
Task-number: QTBUG-134499
Change-Id: Id020d040f87c5c8cfe6661aee941b1dd783f0e49
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Creates Surface3DNode, Bars3DNode and Scatter3DNode QML elements.
The node classes create a graph, reparent the graphs rootNode to itself
and forward the parameters.
Task-number: QTBUG-134041
Change-Id: I7e53ff96e59bb42febeaf5c0c084646b50785d19
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
As in other baseline test implementations, exit with a fatal
message when the reference file cannot be opened.
Pick-to: 6.9
Change-Id: I112f3ed3bfa57af17eab91357dd0056e7b5c5585
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
The scene grabber uses QUnifiedTimer from the private QtCore API.
Pick-to: 6.9
Change-Id: I6dd4354b3acaa6e35be239b6aefb86b481b2492d
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Slice view creation of given index of row or column
The requested slice view is rendered outisde of window and grabbed to
QQuickGrabbedResult.
QML side provides to save it to a specified path.
grabsliceview manual test for feature test
Task-number: QTBUG-105607
Change-Id: Ia8019f99134abbb328a027b656ba85552ffcaf92
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
If a type is not exposed to qml, having revision macro in the type's
signals causes problems in subtypes that are exposed to qml.
This patch exposes qabstractseries as an anonymous type.
In addition fix missing " problems in qmltestbed.
Amends 28df8f7f37
Change-Id: I21573713d5096df961fabd4ee9c1e8d8932c49bb
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Sami Varanka
Tomi Korpipaa
Sakaria Pouke
Volker Hilsheimer
Alexey Edelev
Kwanghyo Park
Jere Tuliniemi
Marc Mutz
Niko Korkala
Joerg Bornemann