Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion _version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.6.dev3'
__version__ = '0.6.dev4'
2 changes: 1 addition & 1 deletion examples/bf2raw/image.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"bioformats2raw.layout": 3
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/bf2raw/plate.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"bioformats2raw.layout": 3,
"plate": {
"columns": [
Expand Down
2 changes: 1 addition & 1 deletion examples/label_strict/colors_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"image-label": {
"colors": [
{
Expand Down
14 changes: 7 additions & 7 deletions examples/multiscales_strict/multiscales_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"multiscales": [
{
"name": "example",
Expand All @@ -28,8 +28,8 @@
// and the time unit (0.1 milliseconds), which is the same for each scale level
"type": "scale",
"scale": [0.1, 1.0, 0.5, 0.5, 0.5],
"input": "s0",
"output": "intrinsic"
"input": {"path": "s0"},
"output": {"name": "intrinsic"}
}
]
},
Expand All @@ -41,8 +41,8 @@
// and the time unit (0.1 milliseconds), which is the same for each scale level
"type": "scale",
"scale": [0.1, 1.0, 1.0, 1.0, 1.0],
"input": "s1",
"output": "intrinsic"
"input": {"path": "s1"},
"output": {"name": "intrinsic"}
}
]
},
Expand All @@ -54,8 +54,8 @@
// and the time unit (0.1 milliseconds), which is the same for each scale level
"type": "scale",
"scale": [0.1, 1.0, 2.0, 2.0, 2.0],
"input": "s2",
"output": "intrinsic"
"input": {"path": "s2"},
"output": {"name": "intrinsic"}
}
]
}
Expand Down
18 changes: 9 additions & 9 deletions examples/multiscales_strict/multiscales_example_relative.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"multiscales": [
{
"version": "0.6.dev3",
"version": "0.6.dev4",
"name": "example",
"coordinateSystems" : [
{
Expand Down Expand Up @@ -33,8 +33,8 @@
"coordinateTransformations": [{
"type": "scale",
"scale": [1, 1, 1, 1, 1],
"input": "s0",
"output": "intrinsic"
"input": {"path": "s0"},
"output": {"name": "intrinsic"}
}]
},
{
Expand All @@ -43,8 +43,8 @@
// the second scale level (downscaled by a factor of 2 relative to "s0" in zyx)
"type": "scale",
"scale": [1, 1, 2, 2, 2],
"input" : "s1",
"output" : "intrinsic"
"input" : {"path": "s1"},
"output" : {"name": "intrinsic"}
}]
},
{
Expand All @@ -53,8 +53,8 @@
// the third scale level (downscaled by a factor of 4 relative to "s0" in zyx)
"type": "scale",
"scale": [1, 1, 4, 4, 4],
"input" : "s2",
"output" : "intrinsic"
"input" : {"path": "s2"},
"output" : {"name": "intrinsic"}
}]
}
],
Expand All @@ -63,8 +63,8 @@
"name": "additional_translation",
"type": "translation",
"translation": [0, 0, 10, 20, 30],
"input": "intrinsic",
"output": "world"
"input": {"name": "intrinsic"},
"output": {"name": "world"}
}
]
}
Expand Down
10 changes: 5 additions & 5 deletions examples/multiscales_strict/multiscales_transformations.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"multiscales": [
{
"coordinateSystems": [
Expand Down Expand Up @@ -45,8 +45,8 @@
{
"scale": [1, 1],
"type": "scale",
"input": "s0",
"output": "intrinsic"
"input": {"path": "s0"},
"output": {"name": "intrinsic"}
}
]
}
Expand All @@ -55,8 +55,8 @@
{
"scale": [10, 10],
"type": "scale",
"input": "intrinsic",
"output": "physical"
"input": {"name": "intrinsic"},
"output": {"name": "physical"}
}
],
"name": "image_with_coordinateTransformations",
Expand Down
2 changes: 1 addition & 1 deletion examples/ome/series-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"series": ["0", "1"]
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/plate_strict/plate_2wells.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"plate": {
"acquisitions": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/plate_strict/plate_6wells.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"plate": {
"acquisitions": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/scene/scene_registration.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"scene": {
"coordinateTransformations": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/scene/scene_stitching.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"scene": {
"coordinateTransformations": [
{
Expand Down
87 changes: 0 additions & 87 deletions examples/subspace/subspaceMultidim.json

This file was deleted.

10 changes: 5 additions & 5 deletions examples/subspace/subspacePermute.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node_type": "group",
"attributes": {
"ome": {
"version": "0.6.dev3",
"version": "0.6.dev4",
"multiscales": [
{
"name": "multiscales",
Expand Down Expand Up @@ -47,8 +47,8 @@
"coordinateTransformations": [
{
"type": "scale",
"output": "array_coordinates",
"input": "array",
"output": {"name": "array_coordinates"},
"input": {"path": "array"},
"name": "default-scale",
"scale": [1, 1]
}
Expand All @@ -58,8 +58,8 @@
"coordinateTransformations": [
{
"type": "mapAxis",
"output": "physical",
"input": "array_coordinates",
"output": {"name": "physical"},
"input": {"name": "array_coordinates"},
"name": "transform-name",
"mapAxis": [1, 0]
}
Expand Down
4 changes: 2 additions & 2 deletions examples/transformations/affine2d2d.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
{
"type": "affine",
"affine": [[1, 2, 3], [4, 5, 6]],
"input": "ji",
"output": "yx"
"input": {"name": "ji"},
"output": {"name": "yx"}
}
]
}
4 changes: 2 additions & 2 deletions examples/transformations/affine2d2d_with_channel.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
[0, 1, 2, 3],
[0, 4, 5, 6]
],
"input": "cji",
"output": "cyx"
"input": {"name": "cji"},
"output": {"name": "cyx"}
}
]
}
4 changes: 2 additions & 2 deletions examples/transformations/affine2d3d.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
{
"type": "affine",
"affine": [[1, 0, 0], [2, 3, 4], [5, 6, 7]],
"input": "ij",
"output": "zyx"
"input": {"name": "ij"},
"output": {"name": "zyx"}
}
]
}
4 changes: 2 additions & 2 deletions examples/transformations/bijection.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"type" : "coordinates",
"path" : "inverse_coordinates"
},
"input": "src",
"output": "tgt"
"input": {"name": "src"},
"output": {"name": "tgt"}
}
]
}
8 changes: 4 additions & 4 deletions examples/transformations/bijection_verbose.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "bijection",
"forward": { "type" : "coordinates", "path" : "forward_coordinates", "input" : "src", "output" : "tgt" },
"inverse": { "type" : "coordinates", "path" : "inverse_coordinates", "input" : "tgt", "output" : "src" },
"input": "src",
"output": "tgt"
"forward": { "type" : "coordinates", "path" : "forward_coordinates", "input" : {"name": "src"}, "output" : {"name": "tgt"} },
"inverse": { "type" : "coordinates", "path" : "inverse_coordinates", "input" : {"name": "tgt"}, "output" : {"name": "src"} },
"input": {"name": "src"},
"output": {"name": "tgt"}
}
4 changes: 2 additions & 2 deletions examples/transformations/byDimension1.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"coordinateTransformations": [
{
"type": "byDimension",
"input": "in",
"output": "out",
"input": {"name": "in"},
"output": {"name": "out"},
"transformations": [
{
"transformation": {
Expand Down
4 changes: 2 additions & 2 deletions examples/transformations/byDimension2.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"coordinateTransformations": [
{
"type": "byDimension",
"input": "in",
"output": "out",
"input": {"name": "in"},
"output": {"name": "out"},
"transformations": [
{
"transformation": {
Expand Down
Loading
Loading