CamelCase properties (fix issue #3)

Author: jackbrookes

Assets/UXF/Examples/Advanced/Scripts/ExperimentGenerator.cs

@@ -21,7 +21,7 @@ public void Generate(Session session)
             MakeCatchTrials(block2);
 
 			// for each trial in the session, 50/50 chance of correct target being on left or right
-            foreach (Trial trial in session.trials)
+            foreach (Trial trial in session.Trials)
 			{
                 TargetPosition pos = Random.value > 0.5 ? TargetPosition.Left : TargetPosition.Right;
 				trial.settings["correct_target_position"] = pos;

Assets/UXF/Examples/Advanced/Scripts/InstructionsController.cs

@@ -32,7 +32,7 @@ public void UpdateInstructions()
 
 			try
 			{
-                nextTrial = session.nextTrial;
+                nextTrial = session.NextTrial;
 			}
 			catch (NoSuchTrialException)
 			{

Assets/UXF/Examples/Advanced/Scripts/StartBlockController.cs

@@ -40,7 +40,7 @@ IEnumerator RunSequence()
             // Take the delay time (seconds) for the next trial, wait for that time
             // If we move from the start block too early, StopCoroutine(runningSequence); will halt the execution of this coroutine
             // System.Convert: Safely convert to single (float)
-            float delayTime = System.Convert.ToSingle(session.nextTrial.settings["delay_time"]);
+            float delayTime = System.Convert.ToSingle(session.NextTrial.settings["delay_time"]);
 			yield return new WaitForSeconds(delayTime);
 
 			Go();
@@ -110,7 +110,7 @@ void OnMouseExit()
                     break;
 				case StartBlockState.Go:
 					// record the time we moved
-                    session.currentTrial.result["moved_time"] = Time.time;
+                    session.CurrentTrial.result["moved_time"] = Time.time;
 					break;
             }
         }

Assets/UXF/Examples/Advanced/Scripts/TargetManager.cs

@@ -38,7 +38,7 @@ public void SetupTargets(Trial trial) // can be called from OnTrialBegin in the
 
 		public void TargetHit(TargetController target)
 		{
-			Trial currentTrial = session.currentTrial;
+			Trial currentTrial = session.CurrentTrial;
 			currentTrial.result["correct"] = target.isCorrect;
             currentTrial.End();
 		}

Assets/UXF/Examples/Advanced/Scripts/TaskManager.cs

@@ -17,7 +17,7 @@ void Start()
 
         public void EndIfLastTrial(Trial trial)
         {
-            if (trial == trial.session.lastTrial)
+            if (trial == trial.session.LastTrial)
             {
                 trial.session.End();
             }

Assets/UXF/Examples/Basic/BasicExampleScript.cs

@@ -89,9 +89,9 @@ public void PresentStimulus(Trial trial)
     void EndAndPrepare()
     {
         Debug.Log("Ending trial");
-        session.currentTrial.End();
+        session.CurrentTrial.End();
 
-        if (session.currentTrial == session.lastTrial)
+        if (session.CurrentTrial == session.LastTrial)
         {
             session.End();
         }

Assets/UXF/Examples/TrialLoop/TrialLoop.cs

@@ -46,7 +46,7 @@ public void StartLoop()
 
         IEnumerator Loop()
         {
-            foreach (Trial trial in session.trials)
+            foreach (Trial trial in session.Trials)
             {
                 trial.Begin();
                 PresentStimulus(trial);

Assets/UXF/Scripts/Etc/Trial.cs

@@ -19,7 +19,7 @@ public class Trial
         /// <summary>
         /// Returns non-zero indexed trial number. This is generated based on its position in the block, and the ordering of the blocks within the session.
         /// </summary>
-        public int number { get { return session.trials.ToList().IndexOf(this) + 1; } }
+        public int number { get { return session.Trials.ToList().IndexOf(this) + 1; } }
 
         /// <summary>
         /// Returns non-zero indexed trial number for the current block.
@@ -83,10 +83,10 @@ public void Begin()
             status = TrialStatus.InProgress;
             startTime = Time.time;
             result = new OrderedResultDict();
-            foreach (string h in session.headers)
+            foreach (string h in session.Headers)
                 result.Add(h, string.Empty);
 
-            result["directory"] = Extensions.CombinePaths(session.experimentName, session.ppid, session.folderName).Replace('\\', '/');
+            result["directory"] = Extensions.CombinePaths(session.experimentName, session.ppid, session.FolderName).Replace('\\', '/');
             result["experiment"] = session.experimentName;
             result["ppid"] = session.ppid;
             result["session_num"] = session.number;