Reimplement new JSON settings into experiment

JFrit · JFrit · commit 49970cef2662 · 2021-04-27T16:47:52.000-04:00
Additionally, add check for the PupilLabs eye tracker before displaying
the appropriate button.
diff --git a/Assets/Scripts/HideIfNotPupil.cs b/Assets/Scripts/HideIfNotPupil.cs
@@ -0,0 +1,19 @@
+﻿using System;
+using ScriptableObjects;
+using UnityEngine;
+using UXF;
+
+public class HideIfNotPupil : MonoBehaviour
+{
+    [SerializeField] private SessionSettings settings;
+    
+    public void OnEnable()
+    {
+        var sessionSettingsDict = Session.instance.settings.GetDict("SessionSettings");
+        var tracker = (string) sessionSettingsDict["EyeTracker"];
+        if(char.ToLower(tracker[0]) != 'p')
+        {
+            gameObject.SetActive(false);
+        }
+    }
+}
diff --git a/Assets/Scripts/HideIfNotPupil.cs.meta b/Assets/Scripts/HideIfNotPupil.cs.meta
diff --git a/Assets/Scripts/ScriptableObjects/SessionSettings.cs b/Assets/Scripts/ScriptableObjects/SessionSettings.cs
@@ -94,7 +94,7 @@ public void LoadFromUxfJson()
             var sessionSettingsDict = Session.instance.settings.GetDict("SessionSettings");
             
             sessionType = ParseSessionType((string) Session.instance.participantDetails["SessionType"]);
-            cueType = ParseCueType((string) Session.instance.participantDetails["CueType"]);
+            cueType = ParseCueType((string) sessionSettingsDict["AttentionCueType"]);
             feedbackType = ParseFeedbackType((string) Session.instance.participantDetails["FeedbackType"]);
             numTrials = Convert.ToInt32(sessionSettingsDict["NumTrials"]);
             fixationTime = Convert.ToSingle(sessionSettingsDict["FixationTimeSeconds"]);
@@ -139,8 +139,8 @@ public void LoadFromUxfJson()
             angleErrorTolerance = Convert.ToSingle(sessionSettingsDict["AngleErrorToleranceDegrees"]);
             positionErrorTolerance = Convert.ToSingle(sessionSettingsDict["PositionErrorToleranceDegrees"]);
             
-            positionStaircaseEnabled = Convert.ToBoolean(Session.instance.participantDetails["LocationalStaircaseEnabled"]);
-            directionStaircaseEnabled = Convert.ToBoolean(Session.instance.participantDetails["DirectionalStaircaseEnabled"]);
+            positionStaircaseEnabled = Convert.ToBoolean(sessionSettingsDict["EnableLocationalStaircase"]);
+            directionStaircaseEnabled = Convert.ToBoolean(sessionSettingsDict["EnableDirectionalStaircase"]);
             
             fixationErrorTolerance = Convert.ToSingle(sessionSettingsDict["FixationErrorToleranceRadiusDegrees"]);
             buddyDotsEnabled = Convert.ToBoolean(sessionSettingsDict["EnableBuddyDots"]);
@@ -188,13 +188,13 @@ private static SessionType ParseSessionType(string sessionTypeString)
         
         private static CueType ParseCueType(string cueTypeString)
         {
-            switch (cueTypeString)
+            switch (char.ToLower(cueTypeString[0]))
             {
-                case "Neutral":
+                case 'n':
                     return CueType.Neutral;
-                case "Feature-based":
+                case 'f':
                     return CueType.FeatureBased;
-                case "Stimulus-based":
+                case 's':
                     return CueType.StimulusBased;
                 default:
                     return CueType.Neutral;
@@ -203,11 +203,11 @@ private static CueType ParseCueType(string cueTypeString)
         
         private static FeedbackType ParseFeedbackType(string feedbackTypeString)
         {
-            switch (feedbackTypeString)
+            switch (char.ToLower(feedbackTypeString[0]))
             {
-                case "Directional":
+                case 'd':
                     return FeedbackType.Directional;
-                case "Locational":
+                case 'l':
                     return FeedbackType.Locational;
                 default:
                     return FeedbackType.Directional;
diff --git a/Assets/Scripts/SelectEyeTracker.cs b/Assets/Scripts/SelectEyeTracker.cs
@@ -47,19 +47,20 @@ public void Start()
 
     public void SelectFromUxf()
     {
-        var tracker = (string) Session.instance.participantDetails["Eyetracker"];
-        switch (tracker)
+        var sessionSettingsDict = Session.instance.settings.GetDict("SessionSettings");
+        var tracker = (string) sessionSettingsDict["EyeTracker"];
+        switch (char.ToLower(tracker[0]))
         {
-            case "Dummy":
+            case 'd':
                 ChosenTracker = _dummyEyeTracker;
                 selection = ETrackerSelection.Dummy;
                 break;
-            case "Pupil Labs":
+            case 'p':
                 pupilEyeTracker.SetActive(true);
                 ChosenTracker = pupilEyeTracker.GetComponent<IEyeTracker>();
                 selection = ETrackerSelection.PupilLabs;
                 break;
-            case "VIVE Pro Eye":
+            case 'v':
                 viveProEye.SetActive(true);
                 ChosenTracker = viveProEye.GetComponent<IEyeTracker>();
                 selection = ETrackerSelection.ViveProEye;
diff --git a/Assets/Scripts/SessionManager.cs b/Assets/Scripts/SessionManager.cs
@@ -96,6 +96,7 @@ public void StartFirstTrial(InputAction.CallbackContext context)
         {
             Session.instance.BeginNextTrial();
             _sessionStarted = false;
+            confirmInputAction.onStateDown -= StartFirstTrial;
         }
     }
 
@@ -160,7 +161,7 @@ public void CalibratePupilLabs()
         else
         {
             infoText.text =
-                "PupilLabs tracker disconnected!\n If the tracker was selected in UXF, ensure Pupil Capture is running and try again.";
+                "PupilLabs tracker disconnected!\n If the tracker was selected in the JSON settings, ensure Pupil Capture is running and try again.";
             infoText.color = Color.red;
         }
     }
diff --git a/Assets/Scripts/Trial Manager/TrialManager.cs b/Assets/Scripts/Trial Manager/TrialManager.cs
@@ -89,6 +89,7 @@ public void OnEnable()
             _innerStimulusManager = innerStimulus.GetComponent<DotManager>();
             _partition = new AperturePartition(sessionSettings, _outerStimulusSettings, _innerStimulusSettings);
             StaircaseManager = new StaircaseManager(sessionSettings);
+            SetEnforcedHeadTransform();
 
             confirmInputAction[inputSource].onStateUp += GetUserSelection;
         }
diff --git a/Assets/StreamingAssets/TEMPLATE.json b/Assets/StreamingAssets/TEMPLATE.json
@@ -61,8 +61,8 @@
 		
 		"FailOnTimeout": true,
 		
-		"EyeTracker": "PupilLabs",
-		"AttentionCueType": "Stimulus-based",
+		"EyeTracker": "Dummy",
+		"AttentionCueType": "Feature-based",
 		
 		"EnableDirectionalStaircase": true,
 		"EnableLocationalStaircase": true

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ public void StartFirstTrial(InputAction.CallbackContext context)`
`96`	`96`	`{`
`97`	`97`	`Session.instance.BeginNextTrial();`
`98`	`98`	`_sessionStarted = false;`
	`99`	`+ confirmInputAction.onStateDown -= StartFirstTrial;`
`99`	`100`	`}`
`100`	`101`	`}`
`101`	`102`
`@@ -160,7 +161,7 @@ public void CalibratePupilLabs()`
`160`	`161`	`else`
`161`	`162`	`{`
`162`	`163`	`infoText.text =`
`163`		`- "PupilLabs tracker disconnected!\n If the tracker was selected in UXF, ensure Pupil Capture is running and try again.";`
	`164`	`+ "PupilLabs tracker disconnected!\n If the tracker was selected in the JSON settings, ensure Pupil Capture is running and try again.";`
`164`	`165`	`infoText.color = Color.red;`
`165`	`166`	`}`
`166`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ public void OnEnable()`
`89`	`89`	`_innerStimulusManager = innerStimulus.GetComponent<DotManager>();`
`90`	`90`	`_partition = new AperturePartition(sessionSettings, _outerStimulusSettings, _innerStimulusSettings);`
`91`	`91`	`StaircaseManager = new StaircaseManager(sessionSettings);`
	`92`	`+ SetEnforcedHeadTransform();`
`92`	`93`
`93`	`94`	`confirmInputAction[inputSource].onStateUp += GetUserSelection;`
`94`	`95`	`}`