fix #77, settings

Author: jackbrookes

Assets/Testing/AWS1HourTest.unity

@@ -1203,7 +1203,7 @@ PrefabInstance:
     - target: {fileID: 2834388984357925155, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 1365
+      value: 1625
       objectReference: {fileID: 0}
     - target: {fileID: 2896031059644693069, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
@@ -1253,7 +1253,7 @@ PrefabInstance:
     - target: {fileID: 4267567203292169432, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 2520
+      value: 3000
       objectReference: {fileID: 0}
     - target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}

Assets/UXF/Scripts/Etc/Editor/UXFWizard.cs

@@ -72,9 +72,8 @@ static void OnProjectChanged()
 
         public void OnGUI()
         {
-            GUIStyle labelStyle = new GUIStyle();
+            GUIStyle labelStyle = new GUIStyle(EditorStyles.label);
             labelStyle.wordWrap = true;
-            labelStyle.margin = new RectOffset(6, 0, 0, 0);
 
             var rect = GUILayoutUtility.GetRect(Screen.width, 128, GUI.skin.box);
             if (uxfIcon)

Assets/UXF/Scripts/Etc/Settings.cs

@@ -371,14 +371,14 @@ public List<object> GetObjectList(string key)
         /// <param name="valueIfNotFound">The value returned if the setting does not exist (i.e., a default value).</param>
         public List<object> GetObjectList(string key, List<object> valueIfNotFound) { return ContainsKey(key) ? GetObjectList(key) : valueIfNotFound; }
 
-
+        
         public bool ContainsKey(string key)
         {
-            try
+            if (baseDict.ContainsKey(key))
             {
-                return baseDict.ContainsKey(key);
+                return true;
             }
-            catch (KeyNotFoundException)
+            else
             {
                 if (parentSettingsContainer != null && parentSettingsContainer.settings != null)
                 {

Assets/UXF/Scripts/Session.cs

@@ -14,7 +14,6 @@ namespace UXF
     /// The Session represents a single "run" of an experiment, and contains all information about that run. 
     /// </summary>
     [ExecuteInEditMode]
-    [RequireComponent(typeof(FileSaver))]
     public class Session : MonoBehaviour, ISettingsContainer, IDataAssociatable
     {
         /// <summary>

Assets/UXF/Scripts/UI/UIController.cs

@@ -626,7 +626,16 @@ IEnumerator GetJsonUrl()
             www.timeout = 5;
             yield return www.SendWebRequest();
 
-            if (www.isNetworkError || www.isHttpError)
+            bool error;
+#if UNITY_2020_OR_NEWER
+            error = www.result != UnityWebRequest.Result.Success;
+#else
+#pragma warning disable
+            error = www.isHttpError || www.isNetworkError;
+#pragma warning restore
+#endif
+
+            if (error)
             {
                 Utilities.UXFDebugLogError(www.error);
                 yield break;

Assets/UXF/Tests/Editor/TestSettings.cs

@@ -143,6 +143,26 @@ public void CascadeSettings()
 			Assert.IsNull(s.settings);
 		}
 
+		[Test]
+		public void CascadeSettingsWithDefault()
+		{
+			GameObject go = new GameObject();
+			Session s = go.AddComponent<Session>();
+			Block b = s.CreateBlock();
+			Trial t = b.CreateTrial();
+			
+			Dictionary<string, object> dict = MiniJSON.Json.Deserialize(jsonString) as Dictionary<string, object>;
+			b.settings.UpdateWithDict(dict);
+
+			t.settings.SetValue("key1", "test");
+			t.settings.SetValue("key2", 100);
+
+			Assert.AreEqual(t.settings.GetString("string"), "The quick brown fox \"jumps\" over the lazy dog ");
+			Assert.AreEqual(t.settings.GetString("string", string.Empty), "The quick brown fox \"jumps\" over the lazy dog ");
+			Assert.AreEqual(t.settings.GetObject("string", string.Empty), "The quick brown fox \"jumps\" over the lazy dog ");
+			Assert.AreEqual(t.settings.GetObject("something_not_set", string.Empty), string.Empty);
+		}
+
 	}
 
 }

Assets/UXF/VERSION.txt

@@ -1 +1 @@
-2.1.4
+2.1.5