Merge pull request #71 from DIAGNijmegen/1628_multiple_polygon_image

Add the schemas for multi polygon mask answers
DIAGNijmegen · Feb 2, 2021 · d5360da · d5360da
2 parents 3226bcf + 15c6cca
commit d5360da
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 2 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -2,6 +2,11 @@
 History
 =======
 
+0.3.3 (2021-02-02)
+------------------
+
+* Adds support for multiple polygon image answers
+
 0.3.2 (2021-02-01)
 ------------------
 

diff --git a/gcapi/__version__.py b/gcapi/__version__.py
@@ -1,3 +1,3 @@
-VERSION = (0, 3, 2)
+VERSION = (0, 3, 3)
 
 __version__ = ".".join(map(str, VERSION))
diff --git a/gcapi/schemas/answer.json b/gcapi/schemas/answer.json
@@ -256,6 +256,13 @@
             },
             "required": ["type", "version", "polygons"]
         },
+        "MPIM": {
+            "type": "object",
+            "properties": {
+                "upload_session_pk": {"type": "string", "format": "uuid"}
+            },
+            "required": ["upload_session_pk"]
+        },
         "CHOI": {"type": "number"},
         "MCHO": {"type": "array", "items": {"type": "number"}},
         "valid-answers": {
@@ -273,6 +280,7 @@
                 {"$ref": "#/definitions/POLY"},
                 {"$ref": "#/definitions/PIMG"},
                 {"$ref": "#/definitions/MPOL"},
+                {"$ref": "#/definitions/MPIM"},
                 {"$ref": "#/definitions/CHOI"},
                 {"$ref": "#/definitions/MCHO"}
             ]

diff --git a/gcapi/schemas/post-answer.json b/gcapi/schemas/post-answer.json
@@ -245,6 +245,13 @@
             },
             "required": ["type", "version", "polygons"]
         },
+        "MPIM": {
+            "type": "object",
+            "properties": {
+                "upload_session_pk": {"type": "string", "format": "uuid"}
+            },
+            "required": ["upload_session_pk"]
+        },
         "CHOI": {"type": "number"},
         "MCHO": {"type": "array", "items": {"type": "number"}},
         "valid-answers": {
@@ -262,6 +269,7 @@
                 {"$ref": "#/definitions/POLY"},
                 {"$ref": "#/definitions/PIMG"},
                 {"$ref": "#/definitions/MPOL"},
+                {"$ref": "#/definitions/MPIM"},
                 {"$ref": "#/definitions/CHOI"},
                 {"$ref": "#/definitions/MCHO"}
             ]

diff --git a/gcapi/schemas/reader-study.json b/gcapi/schemas/reader-study.json
@@ -74,7 +74,8 @@
                                 "Multiple points",
                                 "Polygon",
                                 "Polygon (saved as mask)",
-                                "Multiple polygons"
+                                "Multiple polygons",
+                                "Multiple polygons (saved as mask)"
                             ]
                         },
                         "image_port" : {