diff --git a/e2e_tests/.env.sample b/e2e_tests/.env.sample index 17361097b..434f5fb0f 100644 --- a/e2e_tests/.env.sample +++ b/e2e_tests/.env.sample @@ -1,3 +1,4 @@ # Because this is intended to be run in a CI environment, this will normally be unnecessary. E2E_ENVIRONMENT= E2E_API_KEY= +E2E_TEAM_SLUG= diff --git a/e2e_tests/data/convert/nifti-legacy-scaling/from/2044737.fat.nii.json b/e2e_tests/data/convert/nifti-legacy-scaling/from/2044737.fat.nii.json index 9d7b56f10..f96c9fcee 100644 --- a/e2e_tests/data/convert/nifti-legacy-scaling/from/2044737.fat.nii.json +++ b/e2e_tests/data/convert/nifti-legacy-scaling/from/2044737.fat.nii.json @@ -5,17 +5,17 @@ "name": "2044737.fat.nii.gz", "path": "/", "source_info": { - "item_id": "0193542b-7af8-f2cc-1a15-25b9fc8c52c8", - "team": { - "name": "John staging", - "slug": "john-staging" - }, + "item_id": "0193ac69-454f-9764-7f19-3210e1ac309c", "dataset": { - "name": "DAR-4960", - "slug": "dar-4960", - "dataset_management_url": "https://staging.v7labs.com/datasets/511591/dataset-management" + "name": "MED_2D_VIEWER_ON", + "slug": "med_2d_viewer_on", + "dataset_management_url": "https://darwin.v7labs.com/datasets/1354683/dataset-management" + }, + "team": { + "name": "V7 John", + "slug": "v7-john" }, - "workview_url": "https://staging.v7labs.com/workview?dataset=511591&item=0193542b-7af8-f2cc-1a15-25b9fc8c52c8" + "workview_url": "https://darwin.v7labs.com/workview?dataset=1354683&item=0193ac69-454f-9764-7f19-3210e1ac309c" }, "slots": [ { @@ -24,32 +24,32 @@ "width": 224, "height": 174, "fps": null, - "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/thumbnail", + "thumbnail_url": "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/thumbnail", "source_files": [ { "file_name": "2044737.fat.nii.gz", - "url": "https://staging.v7labs.com/api/v2/teams/john-staging/uploads/edc51515-6655-4971-abdc-624ef2170924" + "url": "https://darwin.v7labs.com/api/v2/teams/v7-john/uploads/4e098703-28ac-4843-aaab-06138562fc6a" } ], "frame_count": 17, "frame_urls": [ - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/0", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/1", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/2", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/3", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/4", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/5", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/6", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/7", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/8", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/9", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/10", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/11", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/12", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/13", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/14", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/15", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/16" + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/0", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/1", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/2", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/3", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/4", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/5", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/6", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/7", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/8", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/9", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/10", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/11", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/12", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/13", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/14", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/15", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/16" ], "metadata": { "handler": "MONAI", @@ -59,7 +59,7 @@ 174, 17 ], - "SeriesInstanceUID": "1.2.826.0.1.3680043.8.498.14688033293578606435326463042448076904", + "SeriesInstanceUID": "1.2.826.0.1.3680043.8.498.10750507634885783767501509168547060521", "affine": "[[-2.232142925262451, 0.0, 0.0, 250.0], [0.0, -2.232142925262451, 0.0, 194.1964316368103], [0.0, 0.0, -3.0, 27.0], [0.0, 0.0, 0.0, 1.0]]", "colorspace": "RG16", "original_affine": [ @@ -96,334 +96,217 @@ "annotations": [ { "frames": { - "8": { + "1": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": true, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 - }, - { - "x": 178.8974, - "y": 226.8708 - }, - { - "x": 193.6933, - "y": 203.0329 - } - ] - ] - } - }, - "9": { - "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 148.4836, - "y": 193.9909 + "x": 170.1923, + "y": 154.7734 }, { - "x": 137.7976, - "y": 210.8418 + "x": 154.8077, + "y": 178.8118 }, { - "x": 178.8974, - "y": 226.8708 - }, - { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "10": { + "2": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 + "x": 170.1923, + "y": 154.7734 }, { - "x": 178.8974, - "y": 226.8708 + "x": 154.8077, + "y": 178.8118 }, { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "11": { + "3": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 + "x": 170.1923, + "y": 154.7734 }, { - "x": 178.8974, - "y": 226.8708 + "x": 154.8077, + "y": 178.8118 }, { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "12": { + "4": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 + "x": 170.1923, + "y": 154.7734 }, { - "x": 178.8974, - "y": 226.8708 + "x": 154.8077, + "y": 178.8118 }, { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "13": { + "5": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 + "x": 170.1923, + "y": 154.7734 }, { - "x": 137.7976, - "y": 210.8418 + "x": 154.8077, + "y": 178.8118 }, { - "x": 178.8974, - "y": 226.8708 - }, - { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "14": { + "6": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 + "x": 170.1923, + "y": 154.7734 }, { - "x": 178.8974, - "y": 226.8708 + "x": 154.8077, + "y": 178.8118 }, { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "15": { + "7": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 + "x": 170.1923, + "y": 154.7734 }, { - "x": 178.8974, - "y": 226.8708 + "x": 154.8077, + "y": 178.8118 }, { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "16": { - "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 - }, - "keyframe": true, - "polygon": { - "paths": [ - [ - { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 - }, - { - "x": 178.8974, - "y": 226.8708 - }, - { - "x": 193.6933, - "y": 203.0329 - } - ] - ] - } - } - }, - "global_sub_types": {}, - "id": "a88eccc0-70e5-4e8f-8550-85c8ac70b583", - "interpolate_algorithm": "linear-1.1", - "interpolated": true, - "name": "poly1", - "properties": [], - "ranges": [ - [ - 8, - 17 - ] - ], - "slot_names": [ - "0" - ] - }, - { - "frames": { "8": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, - "keyframe": true, + "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -431,34 +314,26 @@ }, "9": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -466,34 +341,26 @@ }, "10": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -501,34 +368,26 @@ }, "11": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -536,34 +395,26 @@ }, "12": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -571,34 +422,26 @@ }, "13": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -606,34 +449,26 @@ }, "14": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -641,34 +476,26 @@ }, "15": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -676,34 +503,26 @@ }, "16": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": true, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -711,14 +530,14 @@ } }, "global_sub_types": {}, - "id": "c5148bb4-fba4-4522-8aaf-a5662c10db9d", + "id": "5e17e4d2-f4b3-4602-a288-a2e81e9d66cc", "interpolate_algorithm": "linear-1.1", "interpolated": true, - "name": "poly1", + "name": "Reference_sBAT", "properties": [], "ranges": [ [ - 8, + 1, 17 ] ], @@ -728,366 +547,40 @@ }, { "frames": { - "8": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, + "1": { "keyframe": true, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } - }, - "9": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } + "mask": {} }, - "10": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } + "2": { + "keyframe": true, + "mask": {} }, - "11": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } + "3": { + "keyframe": true, + "mask": {} }, - "12": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } + "4": { + "keyframe": true, + "mask": {} }, - "13": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } + "5": { + "keyframe": true, + "mask": {} }, - "14": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } - }, - "15": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } - }, - "16": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": true, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } - } - }, - "global_sub_types": {}, - "id": "f6b00d67-2052-43f1-93b6-a6c5c66fb884", - "interpolate_algorithm": "linear-1.1", - "interpolated": true, - "name": "poly1", - "properties": [], - "ranges": [ - [ - 8, - 17 - ] - ], - "slot_names": [ - "0" - ] - }, - { - "frames": { - "8": { - "keyframe": true, - "mask": {} - }, - "9": { - "keyframe": true, - "mask": {} - }, - "10": { - "keyframe": true, - "mask": {} - }, - "11": { + "6": { "keyframe": true, "mask": {} } }, - "id": "6e1b243d-b70c-4d0a-9e7f-5ed9ce36559c", + "id": "bfc7284c-7aae-47fa-bd50-16c74e4d8168", "interpolate_algorithm": "linear-1.1", - "name": "mask1", + "name": "test_mask_basic", "only_keyframes": true, "properties": [], "ranges": [ [ - 8, - 12 + 1, + 7 ] ], "slot_names": [ @@ -1096,406 +589,218 @@ }, { "frames": { - "8": { + "1": { "keyframe": true, "raster_layer": { "dense_rle": [ 0, - 17366, - 1, - 4, - 0, - 218, + 21208, 1, - 8, - 0, - 215, - 1, - 9, + 6, 0, - 215, + 216, 1, 10, 0, 213, 1, - 11, - 0, - 212, - 1, - 12, - 0, - 212, - 1, 12, 0, 211, 1, - 12, - 0, - 212, - 1, - 12, - 0, - 212, - 1, - 12, - 0, - 211, - 1, - 12, - 0, - 212, - 1, - 12, - 0, - 212, - 1, - 11, - 0, - 213, - 1, - 11, - 0, - 213, - 1, - 10, - 0, - 215, - 1, - 9, - 0, - 215, - 1, - 8, + 14, 0, - 218, + 210, 1, - 4, + 14, 0, - 2404, + 209, 1, - 7, + 16, 0, - 215, + 208, 1, - 11, + 16, 0, - 212, + 208, 1, - 13, + 16, 0, - 211, + 208, 1, - 13, + 16, 0, - 210, + 208, 1, - 15, + 16, 0, 207, 1, 17, 0, - 206, - 1, - 18, - 0, - 206, - 1, - 18, - 0, - 205, - 1, - 19, - 0, - 204, - 1, - 19, - 0, - 120, - 1, - 6, - 0, - 79, - 1, - 19, - 0, - 118, - 1, - 10, - 0, - 77, - 1, - 18, - 0, - 119, + 207, 1, - 10, + 17, 0, - 77, + 207, 1, - 18, + 17, 0, - 118, + 207, 1, - 12, + 17, 0, - 76, + 208, 1, 16, 0, - 120, + 208, 1, - 12, + 16, 0, - 76, + 208, 1, - 15, + 16, 0, - 121, + 208, 1, - 12, + 16, 0, - 76, + 209, 1, - 15, + 14, 0, - 121, + 210, 1, - 12, + 14, 0, - 77, + 211, 1, 12, 0, - 124, - 1, - 10, - 0, - 78, - 1, - 11, - 0, - 125, + 213, 1, 10, 0, - 80, - 1, - 7, - 0, - 129, + 216, 1, 6, 0, - 11230 + 12834 ], "mask_annotation_ids_mapping": { - "6e1b243d-b70c-4d0a-9e7f-5ed9ce36559c": 1 + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 }, "total_pixels": 38976 } }, - "9": { + "2": { "keyframe": true, "raster_layer": { "dense_rle": [ 0, - 18701, + 20312, 1, - 5, - 0, - 217, - 1, - 9, + 7, 0, - 214, + 215, 1, - 12, + 11, 0, 212, 1, - 12, - 0, - 211, - 1, - 14, - 0, - 210, - 1, - 14, - 0, - 210, - 1, - 14, + 13, 0, 210, 1, - 14, - 0, - 211, - 1, - 12, - 0, - 212, - 1, - 12, - 0, - 214, - 1, - 8, - 0, - 3510, - 1, - 6, - 0, - 216, - 1, - 11, - 0, - 212, - 1, 15, 0, 209, 1, - 17, - 0, - 206, - 1, - 18, - 0, - 206, - 1, - 20, - 0, - 204, - 1, - 20, - 0, - 204, - 1, - 21, + 15, 0, - 124, + 208, 1, - 6, + 17, 0, - 73, + 207, 1, - 21, + 17, 0, - 122, + 207, 1, - 10, + 17, 0, - 70, + 207, 1, - 22, + 17, 0, - 122, + 207, 1, - 10, + 17, 0, - 70, + 207, 1, - 22, + 17, 0, - 121, + 207, 1, - 12, + 17, 0, - 69, + 208, 1, - 22, + 16, 0, - 121, + 208, 1, - 12, + 16, 0, - 68, + 208, 1, - 23, + 16, 0, - 121, + 208, 1, - 12, + 16, 0, - 68, + 208, 1, - 22, + 16, 0, - 122, + 209, 1, - 12, + 14, 0, - 68, + 210, 1, - 22, + 14, 0, - 122, + 211, 1, 12, 0, - 68, - 1, - 21, - 0, - 123, - 1, - 11, - 0, - 70, - 1, - 20, - 0, - 124, - 1, - 10, - 0, - 70, - 1, - 18, - 0, - 127, - 1, - 8, - 0, - 72, - 1, - 13, - 0, - 131, - 1, - 8, - 0, - 73, + 213, 1, 10, 0, - 135, - 1, - 4, - 0, - 78, + 216, 1, - 5, + 6, 0, - 10033 + 13953 ], "mask_annotation_ids_mapping": { - "6e1b243d-b70c-4d0a-9e7f-5ed9ce36559c": 1 + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 }, "total_pixels": 38976 } }, - "10": { + "3": { "keyframe": true, "raster_layer": { "dense_rle": [ 0, - 19374, + 20759, 1, 6, 0, @@ -1503,421 +808,451 @@ 1, 10, 0, - 214, + 212, + 1, + 13, + 0, + 209, + 1, + 16, + 0, + 207, + 1, + 17, + 0, + 206, + 1, + 19, + 0, + 205, + 1, + 19, + 0, + 204, 1, - 10, + 20, 0, - 213, + 204, 1, - 12, + 20, 0, - 212, + 204, 1, - 12, + 20, 0, - 212, + 204, 1, - 12, + 20, 0, - 212, + 204, 1, - 12, + 20, 0, - 213, + 204, 1, - 10, + 20, 0, - 214, + 204, 1, - 10, + 20, 0, - 216, + 204, 1, - 6, + 19, 0, - 3741, + 205, 1, - 5, + 19, 0, - 217, + 206, 1, - 9, + 18, 0, - 213, + 207, 1, - 11, + 17, 0, - 213, + 207, 1, - 12, + 17, 0, - 211, + 208, 1, - 13, + 15, 0, - 114, + 209, 1, - 4, + 15, 0, - 93, + 210, 1, 13, 0, - 112, + 212, 1, - 8, + 11, 0, - 91, + 215, 1, - 14, + 7, + 0, + 13060 + ], + "mask_annotation_ids_mapping": { + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 + }, + "total_pixels": 38976 + } + }, + "4": { + "keyframe": true, + "raster_layer": { + "dense_rle": [ 0, - 111, + 20979, 1, - 8, + 7, 0, - 91, + 215, 1, - 14, + 11, 0, - 110, + 212, 1, - 10, + 13, 0, - 90, + 210, 1, 15, 0, - 108, + 209, 1, - 11, + 16, 0, - 90, + 207, 1, - 15, + 18, 0, - 107, + 206, 1, - 14, + 19, 0, - 89, + 205, 1, - 15, + 20, 0, - 104, + 204, 1, - 16, + 21, 0, - 89, + 203, 1, - 15, + 21, 0, - 103, + 203, 1, - 18, + 22, 0, - 89, + 203, 1, - 14, + 21, 0, - 102, + 203, 1, - 19, + 22, 0, - 90, + 203, 1, - 13, + 21, 0, - 101, + 204, 1, - 20, + 21, 0, - 91, + 202, 1, - 11, + 22, 0, - 102, + 202, 1, - 20, + 22, 0, - 93, + 203, 1, - 9, + 21, 0, - 101, + 203, 1, - 20, + 21, 0, - 97, + 203, 1, - 4, + 21, 0, - 103, + 204, 1, 20, 0, 204, 1, - 19, + 20, 0, 205, 1, - 19, - 0, - 206, - 1, - 17, + 18, 0, 207, 1, - 15, + 17, 0, - 210, + 209, 1, - 12, + 14, 0, - 214, + 212, 1, - 9, + 11, 0, - 218, + 215, 1, - 4, + 7, 0, - 8565 + 12159 ], "mask_annotation_ids_mapping": { - "6e1b243d-b70c-4d0a-9e7f-5ed9ce36559c": 1 + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 }, "total_pixels": 38976 } }, - "11": { + "5": { "keyframe": true, "raster_layer": { "dense_rle": [ 0, - 18703, + 21427, 1, 4, 0, - 218, + 4, 1, - 8, + 6, 0, - 216, + 207, 1, - 8, + 19, 0, - 215, + 203, 1, - 10, + 22, 0, - 214, + 201, 1, - 10, + 24, 0, - 214, + 199, 1, - 10, + 25, 0, - 214, + 199, 1, - 10, + 26, 0, - 215, + 197, 1, - 8, + 27, 0, - 216, + 197, 1, - 8, + 27, 0, - 218, + 197, 1, - 4, + 27, 0, - 4775, + 197, 1, - 4, + 27, 0, - 218, + 197, 1, - 8, + 27, 0, - 216, + 197, 1, - 8, + 27, 0, - 215, + 197, 1, - 10, + 27, 0, - 214, + 197, 1, - 10, + 27, 0, - 214, + 198, 1, - 10, + 26, 0, - 214, + 198, 1, - 10, + 26, 0, - 214, + 199, 1, - 10, + 24, 0, - 214, + 201, 1, - 10, + 23, 0, - 214, + 202, 1, - 10, + 21, 0, - 214, + 203, 1, - 10, + 21, 0, - 214, + 204, 1, - 11, + 20, 0, - 115, + 205, 1, - 4, + 18, 0, - 94, + 207, 1, - 11, + 17, 0, - 113, + 208, 1, - 8, + 15, 0, - 92, + 210, 1, - 11, + 13, 0, - 113, + 213, 1, - 8, + 9, 0, - 93, - 1, - 10, + 11937 + ], + "mask_annotation_ids_mapping": { + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 + }, + "total_pixels": 38976 + } + }, + "6": { + "keyframe": true, + "raster_layer": { + "dense_rle": [ 0, - 112, + 21660, 1, - 10, + 2, 0, - 92, + 219, 1, 10, 0, - 112, + 212, 1, - 10, + 14, 0, - 92, + 209, 1, - 10, + 16, 0, - 112, + 207, 1, - 10, + 18, 0, - 92, + 205, 1, - 10, + 19, 0, - 112, + 204, 1, - 10, + 21, 0, - 57, + 202, 1, - 4, + 22, 0, - 32, + 202, 1, - 8, + 22, 0, - 114, + 201, 1, - 8, + 23, 0, - 56, + 201, 1, - 8, + 23, 0, - 30, + 201, 1, - 8, + 23, 0, - 114, + 200, 1, - 8, + 24, 0, - 56, + 200, 1, - 10, + 24, 0, - 30, + 201, 1, - 4, + 23, 0, - 118, + 201, 1, - 4, + 22, 0, - 57, + 202, 1, - 12, + 22, 0, - 212, + 202, 1, - 12, + 21, 0, - 212, + 204, 1, - 13, + 19, 0, - 211, + 205, 1, - 13, + 18, 0, - 212, + 207, 1, - 12, + 16, 0, - 212, + 209, 1, - 12, + 13, 0, 213, 1, - 10, - 0, - 216, - 1, 8, 0, - 218, - 1, - 4, - 0, - 7012 + 12386 ], "mask_annotation_ids_mapping": { - "6e1b243d-b70c-4d0a-9e7f-5ed9ce36559c": 1 + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 }, "total_pixels": 38976 } } }, - "id": "13a9ac66-1bbf-42ac-9215-95fb83c6670d", + "id": "6fd53171-fea3-4b2d-94c5-a61129ea8297", "name": "__raster_layer__", "only_keyframes": true, "properties": [], diff --git a/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_Reference_sBAT.nii.gz b/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_Reference_sBAT.nii.gz new file mode 100644 index 000000000..028727491 Binary files /dev/null and b/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_Reference_sBAT.nii.gz differ diff --git a/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_poly1.nii.gz b/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_poly1.nii.gz deleted file mode 100644 index fb49c53ff..000000000 Binary files a/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_poly1.nii.gz and /dev/null differ diff --git a/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_mask1_m.nii.gz b/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_test_mask_basic_m.nii.gz similarity index 66% rename from e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_mask1_m.nii.gz rename to e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_test_mask_basic_m.nii.gz index 23c875322..e73badf53 100644 Binary files a/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_mask1_m.nii.gz and b/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_test_mask_basic_m.nii.gz differ