From bc4f395193b63ed671d4e4bdc0d7477c58abada8 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Fri, 8 Dec 2023 12:05:58 -0500 Subject: [PATCH] "units" -> "unit" --- .../multiscales_transformations.json | 8 +- latest/schemas/axes.schema | 4 +- latest/tests/image_suite.json | 92 +++++++++---------- latest/tests/strict_image_suite.json | 32 +++---- 4 files changed, 68 insertions(+), 68 deletions(-) diff --git a/latest/examples/multiscales_strict/multiscales_transformations.json b/latest/examples/multiscales_strict/multiscales_transformations.json index 8dc6ca25..192cae17 100644 --- a/latest/examples/multiscales_strict/multiscales_transformations.json +++ b/latest/examples/multiscales_strict/multiscales_transformations.json @@ -5,15 +5,15 @@ { "name": "multiscales_transformations", "axes": [ - { "name": "y", "type": "space", "units": "micrometer" }, - { "name": "x", "type": "space", "units": "micrometer" } + { "name": "y", "type": "space", "unit": "micrometer" }, + { "name": "x", "type": "space", "unit": "micrometer" } ] }, { "name": "multiscales_transformations_intermediate", "axes": [ - { "name": "y", "type": "space", "units": "micrometer" }, - { "name": "x", "type": "space", "units": "micrometer" } + { "name": "y", "type": "space", "unit": "micrometer" }, + { "name": "x", "type": "space", "unit": "micrometer" } ] } ], diff --git a/latest/schemas/axes.schema b/latest/schemas/axes.schema index 00b87369..56b447f2 100644 --- a/latest/schemas/axes.schema +++ b/latest/schemas/axes.schema @@ -49,9 +49,9 @@ "type": "boolean", "description": "Whether the dimension is discrete" }, - "units": { + "unit": { "type": "string", - "description": "Units for the axis" + "description": "Unit for the axis" } }, "required": [ diff --git a/latest/tests/image_suite.json b/latest/tests/image_suite.json index b446abc9..e017dac0 100644 --- a/latest/tests/image_suite.json +++ b/latest/tests/image_suite.json @@ -34,17 +34,17 @@ { "name": "t", "type": "time", - "units": "micrometer" + "unit": "micrometer" }, { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -88,12 +88,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -134,12 +134,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -179,12 +179,12 @@ { "name": "y", "type": "space", - "units": "micron" + "unit": "micron" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -237,12 +237,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -287,12 +287,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -332,12 +332,12 @@ { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -420,12 +420,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -465,12 +465,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -573,12 +573,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -634,11 +634,11 @@ "axes": [ { "type": "space", - "units": "micron" + "unit": "micron" }, { "type": "space", - "units": "micron" + "unit": "micron" } ] } @@ -678,7 +678,7 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -766,12 +766,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -821,12 +821,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -855,12 +855,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -885,12 +885,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -914,12 +914,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -987,12 +987,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -1032,12 +1032,12 @@ { "name": "y", "type": "invalid", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -1089,12 +1089,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -1230,12 +1230,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -1282,12 +1282,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -1326,12 +1326,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } diff --git a/latest/tests/strict_image_suite.json b/latest/tests/strict_image_suite.json index f41be352..d55069fb 100644 --- a/latest/tests/strict_image_suite.json +++ b/latest/tests/strict_image_suite.json @@ -260,12 +260,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -310,12 +310,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -371,12 +371,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -399,12 +399,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -438,12 +438,12 @@ { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -474,17 +474,17 @@ { "name": "z", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] } @@ -561,17 +561,17 @@ { "name": "z", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "y", "type": "space", - "units": "micrometer" + "unit": "micrometer" }, { "name": "x", "type": "space", - "units": "micrometer" + "unit": "micrometer" } ] }