Merge branch 'master' into postman-api-schema

Author: gregblt

package.json

@@ -12,7 +12,7 @@
     "workflow"
   ],
   "description": "Set of JSON schemas for the SPINE Virtual Laboratory",
-  "version": "3.2.0-dev.2",
+  "version": "3.2.0",
   "dependencies": {
     "ajv": "^6.12.2"
   },

schemas/core.schema.json

@@ -42,7 +42,7 @@
       "$id" : "#spineTypeInOut",
       "description": "SPINE Type",
       "type": "string",
-      "enum": ["String","Number","imageFileInOut","imageEntityInOut",
+      "enum": ["String","Number","Boolean","imageFileInOut","imageEntityInOut",
         "auxiliaryImageFile","lookUpTable","lookUpTableDescription","roiInOut","annotationInOut",
         "roiWithAnnotationsInOut","annotationTableDefinitionInputOutput", "annotationFormDefinitionInputOutput",
         "annotationTableDataInOut", "annotationFormDataInOut","polyRoiInOut"]
@@ -123,6 +123,23 @@
       ]
     },
 
+    "Boolean": {
+      "$id": "#Boolean",
+      "description": "Schema defining Boolean as input or output",
+      "allOf":[
+        {"$ref": "#/definitions/inputOutput_spine"},
+        {
+          "properties": {
+            "type":{
+              "type": "boolean",
+              "enum": ["Boolean"]
+            }
+          },
+          "required": ["type"]
+        }
+      ]
+    },
+
     "imageFileInOut_Type": {
       "$id" : "#imageFileInOut_Type",
       "description": "SPINE Image Type for imageFile",
@@ -541,6 +558,7 @@
         {"$ref": "#/definitions/roiWithAnnotationsInOut"},
         {"$ref": "#/definitions/String"},
         {"$ref": "#/definitions/Number"},
+        {"$ref": "#/definitions/Boolean"},
         {"$ref": "#/definitions/imageFileInOut"},
         {"$ref": "#/definitions/lookupTableInOut"},
         {"$ref": "#/definitions/lookUpTableDescriptionInOut"},

schemas/tool.schema.json

@@ -41,7 +41,7 @@
       "$id": "#layoutViewersType",
       "description": "Type of viewers layout.",
       "type": "string",
-      "enum": ["SINGLE","1M1R_IN_ROW","SINGLE_WITH_WIDGET_PANEL", "1M4R", "1M2R", "1M2R_WIDGETS","1M1R_ARROWS", "ROW"]
+      "enum": ["SINGLE","1M1R_IN_ROW","SINGLE_WITH_WIDGET_PANEL", "1M4R", "1M2R", "1M2R_WIDGETS","1M1R_ARROWS", "ROW","VERTICAL_FORM", "SIX_PACK","3_BY_3","3_BY_6", "2_BY_2"]
     },
 
     "possibleValueInAnnotationTable": {
@@ -802,4 +802,4 @@
   "oneOf": [
     {"$ref": "#toolBasicProperties"}
   ]
-}
+}