summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/datavisualization/axis/qlogvalue3daxisformatter.cpp1
-rw-r--r--src/datavisualization/theme/q3dtheme.cpp4
-rw-r--r--tests/auto/qmltest/axis3d/tst_category.qml19
-rw-r--r--tests/auto/qmltest/axis3d/tst_logvalue.qml15
-rw-r--r--tests/auto/qmltest/axis3d/tst_value.qml24
-rw-r--r--tests/auto/qmltest/custom3d/tst_customvolume.qml19
-rw-r--r--tests/auto/qmltest/scatter3d/tst_scatterseries.qml14
-rw-r--r--tests/auto/qmltest/scene3d/tst_camera.qml16
-rw-r--r--tests/auto/qmltest/scene3d/tst_scene.qml13
-rw-r--r--tests/auto/qmltest/surface3d/tst_heightproxy.qml15
-rw-r--r--tests/auto/qmltest/theme3d/tst_theme.qml24
11 files changed, 162 insertions, 2 deletions
diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter.cpp b/src/datavisualization/axis/qlogvalue3daxisformatter.cpp
index 7367e7c5..85fd5c4f 100644
--- a/src/datavisualization/axis/qlogvalue3daxisformatter.cpp
+++ b/src/datavisualization/axis/qlogvalue3daxisformatter.cpp
@@ -42,6 +42,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
* \since QtDataVisualization 1.1
* \ingroup datavisualization_qml
* \instantiates QLogValue3DAxisFormatter
+ * \inherits ValueAxis3DFormatter
* \brief LogValueAxis3DFormatter implements logarithmic value axis formatter.
*
* This type provides formatting rules for a logarithmic ValueAxis3D.
diff --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp
index 70397e23..a1dfe8b3 100644
--- a/src/datavisualization/theme/q3dtheme.cpp
+++ b/src/datavisualization/theme/q3dtheme.cpp
@@ -323,7 +323,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
* \qmlproperty real Theme3D::lightStrength
*
- * Specular light strength for the whole graph. Value must be between 0.0 and 1.0.
+ * Specular light strength for the whole graph. Value must be between 0.0 and 10.0.
*/
/*!
@@ -335,7 +335,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
* \qmlproperty real Theme3D::highlightLightStrength
*
- * Specular light strength for highlighted objects. Value must be between 0.0 and 1.0.
+ * Specular light strength for highlighted objects. Value must be between 0.0 and 10.0.
*/
/*!
diff --git a/tests/auto/qmltest/axis3d/tst_category.qml b/tests/auto/qmltest/axis3d/tst_category.qml
index 7f0be845..318fa011 100644
--- a/tests/auto/qmltest/axis3d/tst_category.qml
+++ b/tests/auto/qmltest/axis3d/tst_category.qml
@@ -46,6 +46,10 @@ Item {
id: change
}
+ CategoryAxis3D {
+ id: invalid
+ }
+
TestCase {
name: "CategoryAxis3D Initial"
@@ -113,4 +117,19 @@ Item {
compare(change.titleVisible, true)
}
}
+
+ TestCase {
+ name: "CategoryAxis3D Invalid"
+
+ function test_invalid() {
+ invalid.labelAutoRotation = -10
+ compare(invalid.labelAutoRotation, 0.0)
+ invalid.labelAutoRotation = 100
+ compare(invalid.labelAutoRotation, 90.0)
+ invalid.max = -10
+ compare(invalid.min, 0)
+ invalid.min = 10
+ compare(invalid.max, 11)
+ }
+ }
}
diff --git a/tests/auto/qmltest/axis3d/tst_logvalue.qml b/tests/auto/qmltest/axis3d/tst_logvalue.qml
index fad93611..89228ad1 100644
--- a/tests/auto/qmltest/axis3d/tst_logvalue.qml
+++ b/tests/auto/qmltest/axis3d/tst_logvalue.qml
@@ -40,6 +40,10 @@ Item {
id: change
}
+ LogValueAxis3DFormatter {
+ id: invalid
+ }
+
TestCase {
name: "LogValueAxis3DFormatter Initial"
@@ -73,4 +77,15 @@ Item {
compare(change.showEdgeLabels, false)
}
}
+
+ TestCase {
+ name: "LogValueAxis3DFormatter Invalid"
+
+ function test_invalid() {
+ invalid.base = 1
+ compare(invalid.base, 10)
+ invalid.base = -1
+ compare(invalid.base, 10)
+ }
+ }
}
diff --git a/tests/auto/qmltest/axis3d/tst_value.qml b/tests/auto/qmltest/axis3d/tst_value.qml
index 6a8f7849..54189c8b 100644
--- a/tests/auto/qmltest/axis3d/tst_value.qml
+++ b/tests/auto/qmltest/axis3d/tst_value.qml
@@ -50,6 +50,10 @@ Item {
id: change
}
+ ValueAxis3D {
+ id: invalid
+ }
+
TestCase {
name: "ValueAxis3D Initial"
@@ -127,4 +131,24 @@ Item {
compare(change.titleVisible, true)
}
}
+
+ TestCase {
+ name: "ValueAxis3D Invalid"
+
+ function test_invalid() {
+ invalid.segmentCount = -1
+ compare(invalid.segmentCount, 1)
+ invalid.subSegmentCount = -1
+ compare(invalid.subSegmentCount, 1)
+
+ invalid.labelAutoRotation = -10
+ compare(invalid.labelAutoRotation, 0.0)
+ invalid.labelAutoRotation = 100
+ compare(invalid.labelAutoRotation, 90.0)
+ invalid.max = -10
+ compare(invalid.min, -11)
+ invalid.min = 10
+ compare(invalid.max, 11)
+ }
+ }
}
diff --git a/tests/auto/qmltest/custom3d/tst_customvolume.qml b/tests/auto/qmltest/custom3d/tst_customvolume.qml
index 89717d5d..08c15013 100644
--- a/tests/auto/qmltest/custom3d/tst_customvolume.qml
+++ b/tests/auto/qmltest/custom3d/tst_customvolume.qml
@@ -57,6 +57,10 @@ Item {
id: change
}
+ Custom3DVolume {
+ id: invalid
+ }
+
TestCase {
name: "Custom3DVolume Initial"
@@ -160,4 +164,19 @@ Item {
compare(change.visible, false)
}
}
+
+ TestCase {
+ name: "Custom3DVolume Invalid"
+
+ function test_invalid() {
+ invalid.alphaMultiplier = -1.0
+ compare(invalid.alphaMultiplier, 1.0)
+ invalid.sliceFrameGaps = Qt.vector3d(-0.1, -0.1, -0.1)
+ compare(invalid.sliceFrameGaps, Qt.vector3d(0.01, 0.01, 0.01))
+ invalid.sliceFrameThicknesses = Qt.vector3d(-0.1, -0.1, -0.1)
+ compare(invalid.sliceFrameThicknesses, Qt.vector3d(0.01, 0.01, 0.01))
+ invalid.sliceFrameWidths = Qt.vector3d(-0.1, -0.1, -0.1)
+ compare(invalid.sliceFrameWidths, Qt.vector3d(0.01, 0.01, 0.01))
+ }
+ }
}
diff --git a/tests/auto/qmltest/scatter3d/tst_scatterseries.qml b/tests/auto/qmltest/scatter3d/tst_scatterseries.qml
index e42443ad..4df58303 100644
--- a/tests/auto/qmltest/scatter3d/tst_scatterseries.qml
+++ b/tests/auto/qmltest/scatter3d/tst_scatterseries.qml
@@ -100,6 +100,10 @@ Item {
id: change
}
+ Scatter3DSeries {
+ id: invalid
+ }
+
TestCase {
name: "Scatter3DSeries Initial"
@@ -216,4 +220,14 @@ Item {
compare(change.baseGradient.stops[0].color, "#ffff00")
}
}
+ TestCase {
+ name: "Scatter3DSeries Invalid"
+
+ function test_invalid() {
+ invalid.itemSize = -1.0
+ compare(invalid.itemSize, 0.0)
+ invalid.itemSize = 1.1
+ compare(invalid.itemSize, 0.0)
+ }
+ }
}
diff --git a/tests/auto/qmltest/scene3d/tst_camera.qml b/tests/auto/qmltest/scene3d/tst_camera.qml
index c29de0c7..07adf633 100644
--- a/tests/auto/qmltest/scene3d/tst_camera.qml
+++ b/tests/auto/qmltest/scene3d/tst_camera.qml
@@ -45,6 +45,10 @@ Item {
id: change
}
+ Camera3D {
+ id: invalid
+ }
+
TestCase {
name: "Camera3D Initial"
@@ -114,6 +118,18 @@ Item {
compare(change.yRotation, 22.5)
compare(change.zoomLevel, 500.0)
}
+ }
+ TestCase {
+ name: "Camera3D Invalid"
+
+ function test_invalid() {
+ invalid.target = Qt.vector3d(-1.5, -1.5, -1.5)
+ compare(invalid.target, Qt.vector3d(-1.0, -1.0, -1.0))
+ invalid.target = Qt.vector3d(1.5, 1.5, 1.5)
+ compare(invalid.target, Qt.vector3d(1.0, 1.0, 1.0))
+ invalid.minZoomLevel = 0.1
+ compare(invalid.minZoomLevel, 1.0)
+ }
}
}
diff --git a/tests/auto/qmltest/scene3d/tst_scene.qml b/tests/auto/qmltest/scene3d/tst_scene.qml
index 8d497b5c..d53042ca 100644
--- a/tests/auto/qmltest/scene3d/tst_scene.qml
+++ b/tests/auto/qmltest/scene3d/tst_scene.qml
@@ -46,6 +46,10 @@ Item {
id: change
}
+ Bars3D {
+ id: invalid
+ }
+
TestCase {
name: "Scene3D Initial"
@@ -109,4 +113,13 @@ Item {
compare(change.scene.viewport, Qt.rect(0, 0, 100, 100))
}
}
+
+ TestCase {
+ name: "Scene3D Invalid"
+
+ function test_invalid() {
+ invalid.scene.primarySubViewport = Qt.rect(0, 0, -50, -50)
+ compare(invalid.scene.primarySubViewport, Qt.rect(0, 0, 0, 0))
+ }
+ }
}
diff --git a/tests/auto/qmltest/surface3d/tst_heightproxy.qml b/tests/auto/qmltest/surface3d/tst_heightproxy.qml
index dc6938f8..29772451 100644
--- a/tests/auto/qmltest/surface3d/tst_heightproxy.qml
+++ b/tests/auto/qmltest/surface3d/tst_heightproxy.qml
@@ -42,6 +42,10 @@ Item {
id: change
}
+ HeightMapSurfaceDataProxy {
+ id: invalid
+ }
+
TestCase {
name: "HeightMapSurfaceDataProxy Initial"
@@ -98,4 +102,15 @@ Item {
compare(change.rowCount, 24)
}
}
+
+ TestCase {
+ name: "HeightMapSurfaceDataProxy Invalid"
+
+ function test_invalid() {
+ invalid.maxXValue = -10
+ compare(invalid.minXValue, -11)
+ invalid.minZValue = 20
+ compare(invalid.maxZValue, 21)
+ }
+ }
}
diff --git a/tests/auto/qmltest/theme3d/tst_theme.qml b/tests/auto/qmltest/theme3d/tst_theme.qml
index 9c1a22f1..3e42b300 100644
--- a/tests/auto/qmltest/theme3d/tst_theme.qml
+++ b/tests/auto/qmltest/theme3d/tst_theme.qml
@@ -93,6 +93,10 @@ Item {
id: change
}
+ Theme3D {
+ id: invalid
+ }
+
TestCase {
name: "Theme3D Initial"
@@ -239,4 +243,24 @@ Item {
compare(change.baseGradients[0].stops[0].color, "#000000")
}
}
+
+
+ TestCase {
+ name: "Theme3D Invalid"
+
+ function test_invalid() {
+ invalid.ambientLightStrength = -1.0
+ compare(invalid.ambientLightStrength, 0.25)
+ invalid.ambientLightStrength = 1.1
+ compare(invalid.ambientLightStrength, 0.25)
+ invalid.highlightLightStrength = -1.0
+ compare(invalid.highlightLightStrength, 7.5)
+ invalid.highlightLightStrength = 10.1
+ compare(invalid.highlightLightStrength, 7.5)
+ invalid.lightStrength = -1.0
+ compare(invalid.lightStrength, 5.0)
+ invalid.lightStrength = 10.1
+ compare(invalid.lightStrength, 5.0)
+ }
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 01:40:00 +0000