Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unit -> units #168

Closed
wants to merge 11 commits into from
Closed

unit -> units #168

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d7a616a
unit -> units
d-v-b Mar 1, 2023
1e6b48e
Fix 'units' -> 'unit' in 0.4 and latest schemas, examples and test files
will-moore Nov 2, 2022
5a26ac8
change unit to units in schema
d-v-b Mar 10, 2023
38f2d80
change unit to units in examples
d-v-b Mar 10, 2023
4f5049e
Fix `<img/>` element for newer bikeshed versions
joshmoore Mar 14, 2023
1a74291
Fix `<img/>` element for newer bikeshed versions
joshmoore Mar 14, 2023
859a5c8
clarify relationship between units and old unit key
d-v-b Mar 17, 2023
9a10f41
Merge branch 'main' into units
d-v-b Mar 17, 2023
815d9a4
style
d-v-b Mar 18, 2023
5a59d3f
add units to schema
d-v-b Mar 21, 2023
e3bba84
style tweaks
d-v-b Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 0.4/examples/multiscales_strict/multiscales_transformations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down
2 changes: 1 addition & 1 deletion 0.4/schemas/image.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"type": "string",
"enum": ["space"]
},
"units": {
"unit": {
"type": "string"
}
}
Expand Down
92 changes: 46 additions & 46 deletions 0.4/tests/image_suite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,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"
}
],
"datasets": [
Expand Down Expand Up @@ -60,12 +60,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -115,12 +115,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
]
}
Expand All @@ -138,12 +138,12 @@
{
"name": "y",
"type": "space",
"units": "micron"
"unit": "micron"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -204,12 +204,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
]
}
Expand All @@ -231,12 +231,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -270,12 +270,12 @@
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -344,12 +344,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -382,12 +382,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -476,12 +476,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -530,11 +530,11 @@
"axes": [
{
"type": "space",
"units": "micron"
"unit": "micron"
},
{
"type": "space",
"units": "micron"
"unit": "micron"
}
],
"datasets": [
Expand Down Expand Up @@ -567,7 +567,7 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -641,12 +641,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -679,12 +679,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -725,12 +725,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand All @@ -754,12 +754,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [],
Expand All @@ -779,12 +779,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"version": "0.4"
Expand Down Expand Up @@ -829,12 +829,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -867,12 +867,12 @@
{
"name": "y",
"type": "invalid",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -905,12 +905,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -1032,12 +1032,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down Expand Up @@ -1087,12 +1087,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand All @@ -1117,12 +1117,12 @@
{
"name": "y",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
},
{
"name": "x",
"type": "space",
"units": "micrometer"
"unit": "micrometer"
}
],
"datasets": [
Expand Down
Loading