From 210d75a7b1467dc1aa9c377affe04e0edc421cde Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Fri, 20 Mar 2020 09:07:36 +0100 Subject: [PATCH] Change default XYParameter precision to 2, add unit test for XYParameter --- orx-parameters/src/main/kotlin/Annotations.kt | 4 +--- orx-parameters/src/test/kotlin/TestAnnotations.kt | 10 ++++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/orx-parameters/src/main/kotlin/Annotations.kt b/orx-parameters/src/main/kotlin/Annotations.kt index b20cc680..00b8d94c 100644 --- a/orx-parameters/src/main/kotlin/Annotations.kt +++ b/orx-parameters/src/main/kotlin/Annotations.kt @@ -85,14 +85,12 @@ annotation class XYParameter( val maxX: Double = 1.0, val minY: Double = -1.0, val maxY: Double = 1.0, - val precision: Int = 1, + val precision: Int = 2, val showVector: Boolean = false, val invertY: Boolean = true, val order: Int = Integer.MAX_VALUE ) - - /** * ActionParameter annotation for functions without arguments * @property label a short description of the parameter diff --git a/orx-parameters/src/test/kotlin/TestAnnotations.kt b/orx-parameters/src/test/kotlin/TestAnnotations.kt index c3e1986f..21f7bd67 100644 --- a/orx-parameters/src/test/kotlin/TestAnnotations.kt +++ b/orx-parameters/src/test/kotlin/TestAnnotations.kt @@ -1,9 +1,9 @@ import org.amshove.kluent.* import org.openrndr.color.ColorRGBa import org.openrndr.extra.parameters.* +import org.openrndr.math.Vector2 import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe -import java.lang.IllegalArgumentException val a = object { @DoubleParameter("a double scalar", 0.0, 1.0, order = 0) @@ -26,13 +26,15 @@ val a = object { @ColorParameter("a color parameter", order = 5) var c = ColorRGBa.WHITE + @XYParameter("an XY parameter", order = 6) + var xy = Vector2.ZERO } object TestAnnotations : Spek({ describe("an annotated object") { it("has listable parameters") { val list = a.listParameters() - list.size `should be equal to` 6 + list.size `should be equal to` 7 list[0].property?.name `should be equal to` "d" list[0].parameterType `should be equal to` ParameterType.Double @@ -79,6 +81,10 @@ object TestAnnotations : Spek({ list[5].parameterType `should be equal to` ParameterType.Color list[5].property?.name `should be equal to` "c" list[5].label `should be equal to` "a color parameter" + + list[6].parameterType `should be equal to` ParameterType.XY + list[6].property?.name `should be equal to` "xy" + list[6].label `should be equal to` "an XY parameter" } } })