Skip to content

Commit

Permalink
Merge pull request #297 from RADAR-base/release-0.7.7
Browse files Browse the repository at this point in the history
Release 0.7.7
  • Loading branch information
mpgxvii authored Feb 2, 2022
2 parents 9850c30 + b385940 commit 3356c20
Show file tree
Hide file tree
Showing 9 changed files with 200 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"namespace": "org.radarcns.connector.upload.altoida",
"name": "AltoidaARTestQuestionnaire",
"type": "record",
"doc": "Schema of Altoida AR Test questionnaire data.",
"fields": [
{ "name": "time", "type": "double", "doc": "Timestamp in UTC (s) when the assessment is started by the subject." },
{ "name": "timeReceived", "type": "double", "doc": "Timestamp in unix time received from Altoida API."},
{ "name": "firstObjectPlaced", "type": "string", "doc": "First object placed. Name of the object: star, heart or teddy." },
{ "name": "firstObjectPlacedCorrect", "type": "string", "doc": "First object placed correct answer. Name of the object: star, heart or teddy." },
{ "name": "firstObjectSearched", "type": "string", "doc": "First object searched. Name of the object: star, heart or teddy." },
{ "name": "firstObjectSearchedCorrect", "type": "string", "doc": "First object searched correct answer. Name of the object: star, heart or teddy." }
]
}

18 changes: 18 additions & 0 deletions commons/connector/upload/altoida/altoida_assessment_event.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"namespace": "org.radarcns.connector.upload.altoida",
"type": "record",
"name": "AltoidaAssessmentEvent",
"doc": "Altoida assessmment event.",
"fields": [
{ "name": "time", "type": "double", "doc": "Timestamp in UTC (s) when the event occurred." },
{ "name": "assessmentName", "type": ["null", "string"], "doc": "Assessment name.", "default": null },
{ "name": "assessmentTimestamp", "type": "double", "doc": "Timestamp in UTC (s) when the assessment is started." },
{ "name": "eventType", "type": ["null", "string"], "doc": "Event type.", "default": null },
{ "name": "objectName", "type": ["null", "string"], "doc": "Object name related to the event.", "default": null },
{ "name": "location", "type": ["null", {
"name": "LocationValue",
"type": "enum",
"doc": "Location values provided by Altoida.",
"symbols": ["TOP", "LEFT", "RIGHT", "BOTTOM", "TOPLEFT", "TOPRIGHT", "BOTTOMLEFT", "BOTTOMRIGHT", "UNKNOWN"]}], "doc": "Tapping location.", "default": null}
]
}
14 changes: 14 additions & 0 deletions commons/connector/upload/altoida/altoida_assessments_summary.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"namespace": "org.radarcns.connector.upload.altoida",
"name": "AltoidaAssessmentsSummary",
"type": "record",
"doc": "Summary timestamps of a completed Altoida assessment.",
"fields": [
{ "name": "timeReceived", "type": "double", "doc": "Timestamp in unix time received from Altoida API."},
{ "name": "assessmentName", "type": ["null", "string"], "doc": "Assessment name.", "default": null },
{ "name": "startTime", "type": "double", "doc": "Timestamp in UTC (s) when the assessment is started." },
{ "name": "endTime", "type": "double", "doc": "Timestamp in UTC (s) when the assessment is finished." },
{ "name": "metadata", "type": ["null", "string"], "doc": "Assessment metadata, if provided.", "default": null }
]
}

4 changes: 3 additions & 1 deletion commons/connector/upload/altoida/altoida_domain_result.avsc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
{"name": "visualPerception", "type": "float", "doc": "Percentage value of visual perception."},
{"name": "planning", "type": "float", "doc": "Percentage value of planning."},
{"name": "prospectiveMemory", "type": "float", "doc": "Percentage value of prospective memory."},
{"name": "spatialMemory", "type": "float", "doc": "Percentage value of spatial memory."}
{"name": "spatialMemory", "type": "float", "doc": "Percentage value of spatial memory."},
{"name": "eyeMovement", "type": ["null", "float"], "doc": "Percentage value of eye movement.", "default": null},
{"name": "speech", "type": ["null", "float"], "doc": "Percentage value of speech.", "default": null}
]
}
12 changes: 12 additions & 0 deletions commons/connector/upload/altoida/altoida_motor_bubble.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"namespace": "org.radarcns.connector.upload.altoida",
"type": "record",
"name": "AltoidaMotorBubble",
"doc": "Data from Altoida motor bubble test.",
"fields": [
{"name": "time", "type": "double", "doc": "Timestamp in unix time acquired locally from the device."},
{"name": "timeReceived", "type": "double", "doc": "Timestamp in unix time received from Altoida API."},
{"name": "x", "type": "double", "doc": "Distance from the center of the screen in (cm)s on x-axis."},
{"name": "y", "type": "double", "doc": "Distance from the center of the screen in (cm)s on y-axis."}
]
}
22 changes: 22 additions & 0 deletions commons/connector/upload/altoida/altoida_test_screen_element.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"namespace": "org.radarcns.connector.upload.altoida",
"name": "AltoidaTestScreenElement",
"type": "record",
"doc": "Schema for the Altoida test screen element.",
"fields": [
{ "name": "time", "type": "double", "doc": "Timestamp in UTC (s) when the assessment is started by the subject." },
{ "name": "assessmentName", "type": "string", "doc": "Assessment name." },
{ "name": "id", "type": ["null", "int"], "doc": "Circle id.", "default": null },
{ "name": "name", "type": ["null", "string"], "doc": "Element name.", "default": null },
{ "name": "width", "type": ["null", "double"], "doc": "Element width in cm.", "default": null},
{ "name": "height", "type": ["null", "double"], "doc": "Element height in cm.", "default": null },
{ "name": "radius", "type": ["null", "double"], "doc": "Circle radius.", "default": null },
{ "name": "xCenterOffset", "type": ["null", "double"], "doc": "Circle location x center offset in cm.", "default": null },
{ "name": "yCenterOffset", "type": ["null", "double"], "doc": "Circle location y center offset in cm.", "default": null },
{ "name": "colorAlpha", "type": ["null", "float"], "doc": "Circle alpha value in RGBA color space.", "default": null },
{ "name": "colorRed", "type": ["null", "float"], "doc": "Circle red value in RGBA color space.", "default": null },
{ "name": "colorGreen", "type": ["null", "float"], "doc": "Circle green value in RGBA color space.", "default": null },
{ "name": "colorBlue", "type": ["null", "float"], "doc": "Circle blue value in RGBA color space.", "default": null }
]
}

114 changes: 114 additions & 0 deletions commons/connector/upload/altoida/altoida_xml_metadata.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
{
"namespace": "org.radarcns.connector.upload.altoida",
"type": "record",
"name": "AltoidaXmlMetadata",
"doc": "Data that contains Altoida test metadata which includes information on the session, subject, and device.",
"fields": [
{
"name": "time",
"type": "double",
"doc": "Timestamp in unix time acquired locally from the device."
},
{
"name": "timeReceived",
"type": "double",
"doc": "Timestamp in unix time received from Altoida API."
},
{
"name": "age",
"type": ["null", "int"],
"doc": "Age of the participant in years.",
"default": null
},
{
"name": "yearsOfEducation",
"type": ["null", "int"],
"doc": "Years of education in years.",
"default": null
},
{
"name": "gender",
"type": {
"name": "GenderType",
"type": "enum",
"doc": "Gender types provided by Altoida.",
"symbols": ["MALE", "FEMALE", "OTHER", "UNKNOWN"]
},
"doc": "Gender of the participant.",
"default": "UNKNOWN"
},
{
"name": "dominantHand",
"type": {
"name": "DominantHandType",
"type": "enum",
"doc": "Gender types provided by Altoida.",
"symbols": ["LEFT", "RIGHT", "OTHER", "UNKNOWN"]
},
"doc": "Dominant hand of the participant.",
"default": "UNKNOWN"
},
{
"name": "applicationVersion",
"type": "string",
"doc": "Version number."
},
{
"name": "deviceType",
"type": {
"name": "DeviceType",
"type": "enum",
"doc": "Device types provided by Altoida.",
"symbols": ["PHONE", "TABLET", "OTHER", "UNKNOWN"]
},
"doc": "Device type used by the participant.",
"default": "UNKNOWN"
},
{
"name": "deviceDescription",
"type": "string",
"doc": "Device description such as model, etc."
},
{
"name": "osType",
"type": {
"name": "OSType",
"type": "enum",
"doc": "OS types provided by Altoida.",
"symbols": ["IOS", "ANDROID", "OTHER", "UNKNOWN"]
},
"doc": "OS type of the device used by the participant.",
"default": "UNKNOWN"
},
{
"name": "osVersion",
"type": "string",
"doc": "Device OS version."
},
{
"name": "displayPpi",
"type": "double",
"doc": "Device display PPI."
},
{
"name": "displayWidthPixels",
"type": "double",
"doc": "Device display width pixels."
},
{
"name": "displayHeightPixels",
"type": "double",
"doc": "Device display height pixels."
},
{
"name": "displayWidthCm",
"type": "double",
"doc": "Device display width centimeters."
},
{
"name": "displayHeightCm",
"type": "double",
"doc": "Device display height centimeters."
}
]
}
2 changes: 1 addition & 1 deletion java-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
}

allprojects {
version = '0.7.6'
version = '0.7.7'
group = 'org.radarbase'
}

Expand Down
2 changes: 1 addition & 1 deletion java-sdk/radar-catalog-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
implementation project(':radar-schemas-core')
implementation group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: argparseVersion

def log4j2Version = "2.17.0"
def log4j2Version = "2.17.1"
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:$log4j2Version")
runtimeOnly("org.apache.logging.log4j:log4j-api:$log4j2Version")
runtimeOnly("org.apache.logging.log4j:log4j-jul:$log4j2Version")
Expand Down

0 comments on commit 3356c20

Please sign in to comment.