# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1452770551 0
# Node ID aad881fa089132260a26f1d514f8b59a3895789a
# Parent  63461187a425cfc15f5aae70849ae211a1c702fe
discrete.js interface built with correct styling. Example discrete is DCR

diff -r 63461187a425 -r aad881fa0891 example_eval/radio_example.xml
--- a/example_eval/radio_example.xml	Wed Jan 13 16:49:59 2016 +0000
+++ b/example_eval/radio_example.xml	Thu Jan 14 11:22:31 2016 +0000
@@ -20,9 +20,11 @@
 	<page id='test-0' hostURL="example_eval/" randomiseOrder='true' repeatCount='0' loop='true' showElementComments='true' loudness="-12">
 		<interface>
 			<scales>
-				<scalelabel position="0">-50</scalelabel>
-				<scalelabel position="50">0</scalelabel>
-				<scalelabel position="100">50</scalelabel>
+				<scalelabel position="0">(1) Very Annoying</scalelabel>
+				<scalelabel position="25">(2) Annoying</scalelabel>
+				<scalelabel position="50">(3) Slightly Annoying</scalelabel>
+				<scalelabel position="75">(4) Audible but not Annoying</scalelabel>
+				<scalelabel position="100">(5) Inaudible</scalelabel>
 			</scales>
 		</interface>
 		<audioelement url="1.wav" id="track-1"/>
diff -r 63461187a425 -r aad881fa0891 interfaces/discrete.css
--- a/interfaces/discrete.css	Wed Jan 13 16:49:59 2016 +0000
+++ b/interfaces/discrete.css	Thu Jan 14 11:22:31 2016 +0000
@@ -44,7 +44,6 @@
 }
 
 div#scale-holder {
-	height: inherit;
 	position: absolute;
 	left: 0px;
 	z-index: 2;
@@ -78,7 +77,8 @@
 div.track-slider-range {
 	float: left;
 	height: 100%;
-	margin: 0px 10px;
+	margin: 0px 50px;
+	position: relative;
 }
 
 div.track-slider-title {
@@ -93,6 +93,10 @@
 	height: 30px;
 }
 
+input.track-radio {
+	position: absolute;
+	margin: 9px 0px;
+}
 
 button.outside-reference {
 	width:120px;
diff -r 63461187a425 -r aad881fa0891 interfaces/discrete.js
--- a/interfaces/discrete.js	Wed Jan 13 16:49:59 2016 +0000
+++ b/interfaces/discrete.js	Thu Jan 14 11:22:31 2016 +0000
@@ -80,7 +80,7 @@
 	scaleHolder.appendChild(scaleText);
 	var scaleCanvas = document.createElement('canvas');
 	scaleCanvas.id = "scale-canvas";
-	scaleCanvas.style.marginLeft = "100px";
+	scaleCanvas.style.marginLeft = "150px";
 	scaleHolder.appendChild(scaleCanvas);
 	var sliderObjectHolder = document.createElement('div');
 	sliderObjectHolder.id = 'slider-holder';
@@ -147,7 +147,7 @@
 	
 	// Find all the audioElements from the audioHolder
 	var label = 0;
-	var numScales = testState.currentStateMap.interfaces[0].scales.length;
+	var interfaceScales = testState.currentStateMap.interfaces[0].scales;
 	$(page.audioElements).each(function(index,element){
 		// Find URL of track
 		// In this jQuery loop, variable 'this' holds the current audioElement.
@@ -162,7 +162,7 @@
 			var node = interfaceContext.createCommentBox(audioObject);
 		
 			// Create a slider per track
-			var sliderObj = new discreteObject(audioObject,label,numScales);
+			var sliderObj = new discreteObject(audioObject,label,interfaceScales);
 			sliderBox.appendChild(sliderObj.holder);
 			audioObject.bindInterface(sliderObj);
 			label += 1;
@@ -174,12 +174,12 @@
 	resizeWindow(null);
 }
 
-function discreteObject(audioObject,label,numOptions)
+function discreteObject(audioObject,label,interfaceScales)
 {
 	// An example node, you can make this however you want for each audioElement.
 	// However, every audioObject (audioEngineContext.audioObject) MUST have an interface object with the following
 	// You attach them by calling audioObject.bindInterface( )
-	if (numOptions == null || numOptions == 0)
+	if (interfaceScales == null || interfaceScales.length == 0)
 	{
 		console.log("WARNING: The discrete radio's are built depending on the number of scale points specified! Ensure you have some specified. Defaulting to 5 for now!");
 		numOptions = 5;
@@ -202,21 +202,29 @@
 	this.title.className = 'track-slider-title';
 	
 	this.discreteHolder.className = "track-slider-range";
-	this.discreteHolder.style.width = window.innerWidth-420 + 'px';
-	for (var i=0; i<numOptions; i++)
+	this.discreteHolder.style.width = window.innerWidth-500 + 'px';
+	for (var i=0; i<interfaceScales.length; i++)
 	{
 		var node = document.createElement('input');
 		node.setAttribute('type','radio');
+		node.className = 'track-radio';
+		node.setAttribute('position',interfaceScales[i].position);
 		node.setAttribute('name',audioObject.specification.id);
 		node.setAttribute('id',audioObject.specification.id+'-'+String(i));
 		this.discretes.push(node);
 		this.discreteHolder.appendChild(node);
-		node.onchange = function(event)
+		node.onclick = function(event)
 		{
+			if (audioEngineContext.status == 0)
+			{
+				event.currentTarget.checked = false;
+				return;
+			}
 			var time = audioEngineContext.timer.getTestTime();
 			var id = Number(event.currentTarget.parentNode.parentNode.getAttribute('trackIndex'));
-			audioEngineContext.audioObjects[id].metric.moved(time,this.value);
-			console.log('slider '+id+' moved to '+this.value+' ('+time+')');
+			var value = event.currentTarget.getAttribute('position') / 100.0;
+			audioEngineContext.audioObjects[id].metric.moved(time,value);
+			console.log('slider '+id+' moved to '+value+' ('+time+')');
 		};
 	}
 	
@@ -239,8 +247,17 @@
 	this.resize = function(event)
 	{
 		this.holder.style.width = window.innerWidth-200 + 'px';
-		this.discreteHolder.style.width = window.innerWidth-420 + 'px';
-		
+		this.discreteHolder.style.width = window.innerWidth-500 + 'px';
+		//text.style.left = (posPix+150-($(text).width()/2)) +'px';
+		for (var i=0; i<this.discretes.length; i++)
+		{
+			var width = $(this.discreteHolder).width() - 20;
+			var node = this.discretes[i];
+			var nodeW = $(node).width();
+			var position = node.getAttribute('position');
+			var posPix = Math.round(width * (position / 100.0));
+			node.style.left = (posPix+10 - (nodeW/2)) + 'px';
+		}
 	};
 	this.enable = function()
 	{
@@ -255,8 +272,17 @@
 	};
 	this.getValue = function()
 	{
-		// Return the current value of the object. If there is no value, return 0
-		return 0;
+		// Return the current value of the object. If there is no value, return -1
+		var value = -1;
+		for (var i=0; i<this.discretes.length; i++)
+		{
+			if (this.discretes[i].checked == true)
+			{
+				value = this.discretes[i].getAttribute('position') / 100.0;
+				break;
+			}
+		}
+		return value;
 	};
 	this.getPresentedId = function()
 	{
@@ -274,7 +300,9 @@
 		// If there is no value node (such as outside reference), return null
 		// If there are multiple value nodes (such as multiple scale / 2D scales), return an array of nodes with each value node having an 'interfaceName' attribute
 		// Use storage.document.createElement('value'); to generate the XML node.
-		
+		var node = storage.document.createElement('value');
+		node.textContent = this.getValue();
+		return node;
 	};
 };
 
@@ -286,7 +314,7 @@
 	var totalHeight = (numObj * 66)-30;
 	document.getElementById('scale-holder').style.width = window.innerWidth-220 + 'px';
 	var canvas = document.getElementById('scale-canvas');
-	canvas.width = window.innerWidth-420;
+	canvas.width = window.innerWidth-520;
 	canvas.height = totalHeight;
 	for (var i in audioEngineContext.audioObjects)
 	{
@@ -329,8 +357,8 @@
 		text.appendChild(textC);
 		text.className = "scale-text";
 		textHolder.appendChild(text);
-		text.style.width = Math.ceil($(text).width())+'px';
-		text.style.left = (posPix+100-($(text).width()/2)) +'px';
+		text.style.width = $(text.children[0]).width()+'px';
+		text.style.left = (posPix+150-($(text).width()/2)) +'px';
 	}
 }