Skip to content

Commit

Permalink
Merge pull request ome#157 from will-moore/units_unit_fix
Browse files Browse the repository at this point in the history 
units unit fix
  • Loading branch information
@joshmoore
joshmoore authored Mar 9, 2023
2 parents 6ef5739 + 40034d5 commit 5600401
Show file tree
Hide file tree
Showing 8 changed files with 116 additions and 116 deletions.
4 changes: 2 additions & 2 deletions 0.4/examples/multiscales_strict/multiscales_transformations.json
View file
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
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
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

0 comments on commit 5600401

Please sign in to comment.