# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1449857034 0
# Node ID 141482fa64feec14f8cc4757e6595f8b6f6fc8b9
# Parent  3539d6c992e4eb40a1eca30098f84819b17eaaec
Synced Specification object. Test create decodes and encodes gain attributes (not implemented in HTML yet)

diff -r 3539d6c992e4 -r 141482fa64fe core.js
--- a/core.js	Fri Dec 11 17:33:14 2015 +0000
+++ b/core.js	Fri Dec 11 18:03:54 2015 +0000
@@ -1548,7 +1548,7 @@
 		}
 		
 		// New check if we need to randomise the test order
-		if (this.randomiseOrder)
+		if (this.randomiseOrder && typeof randomiseOrder === "function")
 		{
 	 		this.audioHolders = randomiseOrder(this.audioHolders);
 	 		for (var i=0; i<this.audioHolders.length; i++)
@@ -1853,7 +1853,7 @@
 				}
 			}
 			
-			if (this.randomiseOrder == true)
+			if (this.randomiseOrder == true && typeof randomiseOrder === "function")
 			{
 				this.audioElements = randomiseOrder(this.audioElements);
 			}
diff -r 3539d6c992e4 -r 141482fa64fe test_create/test_create.html
--- a/test_create/test_create.html	Fri Dec 11 17:33:14 2015 +0000
+++ b/test_create/test_create.html	Fri Dec 11 18:03:54 2015 +0000
@@ -1752,7 +1752,7 @@
 					}
 					
 					// New check if we need to randomise the test order
-					if (this.randomiseOrder)
+					if (this.randomiseOrder && typeof randomiseOrder === "function")
 					{
 				 		this.audioHolders = randomiseOrder(this.audioHolders);
 				 		for (var i=0; i<this.audioHolders.length; i++)
@@ -2057,7 +2057,7 @@
 							}
 						}
 						
-						if (this.randomiseOrder == true)
+						if (this.randomiseOrder == true && typeof randomiseOrder === "function")
 						{
 							this.audioElements = randomiseOrder(this.audioElements);
 						}
@@ -2116,11 +2116,14 @@
 						this.title = undefined;
 						this.options = [];
 						this.scale = [];
+						this.name = undefined;
 						this.decode = function(DOM)
 						{
 							var title = DOM.getElementsByTagName('title');
 							if (title.length == 0) {this.title = null;}
 							else {this.title = title[0].textContent;}
+							var name = DOM.getAttribute("name");
+							if (name != undefined) {this.name = name;}
 							this.options = parent.commonInterface.options;
 							var scale = DOM.getElementsByTagName('scale');
 							this.scale = [];
@@ -2171,18 +2174,23 @@
 						this.type = "normal";
 						this.marker = false;
 						this.enforce = false;
+						this.gain = 1.0;
 						this.decode = function(parent,xml)
 						{
 							this.url = xml.getAttribute('url');
 							this.id = xml.id;
 							this.parent = parent;
 							this.type = xml.getAttribute('type');
+							var gain = xml.getAttribute('gain');
+							if (isNaN(gain) == false && gain != null)
+							{
+								this.gain = decibelToLinear(Number(gain));
+							}
 							if (this.type == null) {this.type = "normal";}
 							if (this.type == 'anchor') {this.anchor = true;}
 							else {this.anchor = false;}
 							if (this.type == 'reference') {this.reference = true;}
 							else {this.reference = false;}
-							
 							if (this.anchor == true || this.reference == true)
 							{
 								this.marker = xml.getAttribute('marker');
@@ -2214,6 +2222,7 @@
 							AENode.id = this.id;
 							AENode.setAttribute("url",this.url);
 							AENode.setAttribute("type",this.type);
+							AENode.setAttribute("gain",linearToDecibel(this.gain));
 							if (this.marker != false)
 							{
 								AENode.setAttribute("marker",this.marker*100);
@@ -2316,6 +2325,16 @@
 					};
 				};
 			}
+			
+			function linearToDecibel(gain)
+			{
+				return 20.0*Math.log10(gain);
+			}
+			
+			function decibelToLinear(gain)
+			{
+				return Math.pow(10,gain/20.0);
+			}
 		
 			function createDeleteNodeButton(node)
 			{