# HG changeset patch
# User bastiena
# Date 1348228460 -7200
# Node ID 62bfe94d77386c074e64167619ce9ddac5ea7f60
# Parent  af33e06d06b9a2ef666d88da036530a3acb04348
Front IDILL:

Help details usage text depending on kinect/mouse interactions.

diff -r af33e06d06b9 -r 62bfe94d7738 .hgignore
--- a/.hgignore	Thu Sep 20 12:59:30 2012 +0200
+++ b/.hgignore	Fri Sep 21 13:54:20 2012 +0200
@@ -94,6 +94,7 @@
 .hgtags.orig
 front_idill/src/lang/en.json.orig
 front_idill/src/lang/fr.json.orig
+*.orig
 syntax: regexp
 middleware/extern/.*/(bin|obj)
 middleware/src/bin/Debug/*
diff -r af33e06d06b9 -r 62bfe94d7738 front_idill/src/lang/en.json
--- a/front_idill/src/lang/en.json	Thu Sep 20 12:59:30 2012 +0200
+++ b/front_idill/src/lang/en.json	Fri Sep 21 13:54:20 2012 +0200
@@ -68,75 +68,75 @@
 	},
 	"gestures_help":[
 		{
-			"codename":"no_motion",
 			"name":"no motion",
-			"usage":"draw a cross from the top",
+			"usage_KI":"draw a cross from the top",
+			"usage_MI":"draw a cross starting from the top left in one whole figure",
 			"desc":"this gesture represents a stopped or paused movement in the choregraphy"
 		},
 		{
-			"codename":"fall",
 			"name":"fall",
-			"usage":"simulate a fall by crouching",
+			"usage_KI":"simulate a fall by crouching",
+			"usage_MI":"draw a line toward the bottom",
 			"desc":"this gesture represents falls in the choregraphy"
 		},
 		{
-			"codename":"contact",
 			"name":"contact",
-			"usage":"draw twho horizontal lines that meet",
+			"usage_KI":"draw two horizontal lines that meet",
+			"usage_MI":"draw a line toward the right and go toward the top then go toward the bottom",
 			"desc":"this gesture represents contact points between dancers or a dancer body parts"
 		},
 		{
-			"codename":"group_spin",
 			"name":"group spin",
-			"usage":"draw two inverted circles",
+			"usage_KI":"draw two inverted circles",
+			"usage_MI":"draw two circles linked to each other, starting from a line oriented toward the left",
 			"desc":"this gesture represents two or more dancers spinning around themselves or moving synchroneously in circles"
 		},
 		{
-			"codename":"bend",
 			"name":"bend",
-			"usage":"bend forward",
+			"usage_KI":"bend forward",
+			"usage_MI":"draw a line toward the right then go toward the bottom to make a right angle",
 			"desc":"this gesture represents bend movements of body parts"
 		},
 		{
-			"codename":"knee_up",
 			"name":"knee up",
-			"usage":"just raise a knee",
+			"usage_KI":"just raise a knee",
+			"usage_MI":"draw a vertical line toward the bottom, then toward the bottom right and toward the bottom again",
 			"desc":"this gesture represents raising knees or legs"
 		},
 		{
-			"codename":"arm_carriage",
 			"name":"arm carriage",
-			"usage":"draw two circle arcs symetrically opposed from the center",
+			"usage_KI":"draw two circle arcs symetrically opposed from the center",
+			"usage_MI":"draw a line toward the top right",
 			"desc":"this gesture represents arm carriages"
 		},
 		{
-			"codename":"lift",
 			"name":"lift",
-			"usage":"raise your hands and join them like you would do to lift an object",
+			"usage_KI":"raise your hands and join them like you would do to lift an object",
+			"usage_MI":"draw a line toward the bottom right, then toward the top right",
 			"desc":"this gesture represents a lift, which is a dancer lifting another dancer"
 		},
 		{
-			"codename":"jump",
 			"name":"jump",
-			"usage":"jump vertically",
+			"usage_KI":"jump vertically",
+			"usage_MI":"draw a line toward the top",
 			"desc":"this gesture represents jumps"
 		},
 		{
-			"codename":"spin",
 			"name":"spin",
-			"usage":"draw a circle with your hands joined",
+			"usage_KI":"draw a circle with your hands joined",
+			"usage_MI":"draw a circle starting from a line toward the left",
 			"desc":"this gesture represents a spin or a circle performed by a dancer"
 		},
 		{
-			"codename":"up_down",
 			"name":"up and down",
-			"usage":"draw a vertical line from the bottom to the up side of the window then go back down toward each side of the line",
+			"usage_KI":"draw a vertical line from the bottom to the up side of the window then go back down toward each side of the line",
+			"usage_MI":"draw a line toward the top, then toward the bottom right",
 			"desc":"this gesture represents a body that goes up then down"
 		},
 		{
-			"codename":"wave",
 			"name":"wave",
-			"usage":"draw two sinuzoides that get away from each other",
+			"usage_KI":"draw two sinuzoides that get away from each other",
+			"usage_MI":"draw one sinuzoide toward the right",
 			"desc":"this gesture represents aquatic movements"
 		}
 	]
diff -r af33e06d06b9 -r 62bfe94d7738 front_idill/src/lang/fr.json
--- a/front_idill/src/lang/fr.json	Thu Sep 20 12:59:30 2012 +0200
+++ b/front_idill/src/lang/fr.json	Fri Sep 21 13:54:20 2012 +0200
@@ -68,75 +68,75 @@
 	},
 	"gestures_help":[
 		{
-			"codename":"no_motion",
 			"name":"arrêt",
-			"usage":"tracer une croix en partant du haut",
+			"usage_KI":"tracer une croix en partant du haut",
+			"usage_MI":"tracer une croix d'un seul tracé en partant du haut à gauche",
 			"desc":"ce geste symbolise un temps d'arrêt ou un geste suspendu dans la chorégraphie"
 		},
 		{
-			"codename":"fall",
 			"name":"chute",
-			"usage":"simuler une chute en s'accroupissant",
+			"usage_KI":"simuler une chute en s'accroupissant",
+			"usage_MI":"tracer une verticale vers le bas",
 			"desc":"ce geste marque des chutes dans la chorégraphie"
 		},
 		{
-			"codename":"contact",
 			"name":"contact",
-			"usage":"tracer deux lignes horizontales qui se rencontrent",
+			"usage_KI":"tracer deux lignes horizontales qui se rencontrent",
+			"usage_MI":"tracer une ligne horizontale vers la droite, former un pic vers le haut puis redescendre",
 			"desc":"ce geste symbolise des points de contact entre danseurs ou même entre les membres d'un même danseur"
 		},
 		{
-			"codename":"group_spin",
 			"name":"rotation de groupe",
-			"usage":"tracer deux cercles inversés",
+			"usage_KI":"tracer deux cercles inversés",
+			"usage_MI":"tracer une boucle composée de deux cercles en partant d'un segment horizontal dirigé vers la gauche",
 			"desc":"ce geste symbolise deux ou plusieurs danseurs tournant sur eux-mêmes ou se déplaçant synchronisés en cercle"
 		},
 		{
-			"codename":"bend",
 			"name":"inclinaison",
-			"usage":"se pencher en avant",
+			"usage_KI":"se pencher en avant",
+			"usage_MI":"tracer un segment horizontal dirigé vers la droite, puis aller vers le bas en formant un angle droit",
 			"desc":"ce geste marque des mouvements d'inclinaison de membres (bras, jambe, buste, etc.)"
 		},
 		{
-			"codename":"knee_up",
 			"name":"levé de jambe",
-			"usage":"lever simplement un genou",
+			"usage_KI":"lever simplement un genou",
+			"usage_MI":"tracer un segment vertical dirigé vers le bas, remontez vers la droite puis redescendez à la verticale",
 			"desc":"ce geste indique les levés de jambe"
 		},
 		{
-			"codename":"arm_carriage",
 			"name":"port de bras",
-			"usage":"tracer deux arcs de cercle symétriquement opposés depuis le centre",
+			"usage_KI":"tracer deux arcs de cercle symétriquement opposés depuis le centre",
+			"usage_MI":"tracer un segment diagonal allant en haut à droite",
 			"desc":"ce geste symbolise les mouvements de bras"
 		},
 		{
-			"codename":"lift",
 			"name":"porté",
-			"usage":"lever les mains en les joignant comme pour soulever un objet",
+			"usage_KI":"lever les mains en les joignant comme pour soulever un objet",
+			"usage_MI":"tracer une diagonale allant en bas à droite, puis remontant en haut à droite",
 			"desc":"ce geste symbolise un porté, c'est-à-dire un danseur portant un autre danseur"
 		},
 		{
-			"codename":"jump",
 			"name":"saut",
-			"usage":"sauter sur place",
+			"usage_KI":"sauter sur place",
+			"usage_MI":"tracer un segment vertical dirigé vers le haut",
 			"desc":"ce geste marque les sauts"
 		},
 		{
-			"codename":"spin",
-			"name":"rotation",
-			"usage":"tracer un cercle avec les deux mains jointes",
+			"name":"spin",
+			"usage_KI":"tracer un cercle avec les deux mains jointes",
+			"usage_MI":"tracer un cercle en partant d'un segment horizontal dirigé vers la gauche",
 			"desc":"ce geste symbolise un tour ou un cercle effectué par un danseur"
 		},
 		{
-			"codename":"up_down",
 			"name":"up et down",
-			"usage":"tracer une verticale de bas en haut qui se termine par une descente de chaque côté",
+			"usage_KI":"tracer une verticale de bas en haut qui se termine par une descente de chaque côté",
+			"usage_MI":"tracer un segment vertical dirigé vers le haut et descendre par une diagonale allant en bas à droite",
 			"desc":"ce geste indique un corps qui se dresse puis qui se baisse"
 		},
 		{
-			"codename":"wave",
 			"name":"vague",
-			"usage":"tracer deux sinusoïdes qui s'éloignent l'une de l'autre",
+			"usage_KI":"tracer deux sinusoïdes qui s'éloignent l'une de l'autre",
+			"usage_MI":"tracer une sinusoïde dirigé vers la droite",
 			"desc":"ce geste symbolise des mouvements aquatiques"
 		}
 	]
diff -r af33e06d06b9 -r 62bfe94d7738 front_idill/src/mosaic/js/notifications.js
--- a/front_idill/src/mosaic/js/notifications.js	Thu Sep 20 12:59:30 2012 +0200
+++ b/front_idill/src/mosaic/js/notifications.js	Fri Sep 21 13:54:20 2012 +0200
@@ -177,7 +177,7 @@
     
     //Panneau d'aide.
 	//On crée les flèches au niveau du panneau d'aide.
-    var notification_help = "<div id='notify_help'><div id='help_details_upArrow' class='help_details_arrows'></div>" + help_search + "<div id='help_sep'></div>" + help_controls + "<div id='help_details_upArrow' class='help_details_arrows'></div></div>";
+    var notification_help = "<div id='notify_help'><div id='help_details_upArrow' class='help_details_arrows'></div>" + help_search + "<div id='help_sep'></div>" + help_controls + "<div id='help_details_downArrow' class='help_details_arrows'></div></div>";
     
     //On les ajoute à la mosaïque.
     $('body').append(notification_help);
@@ -375,9 +375,6 @@
 		//Dimensions des flèches.
 		var arrowWidth = 50, arrowHeight = 50;
 		
-		//On ajoute les flèches pour accéder aux détails du panneau d'aide.
-		var help_details_arrows = "<div id='help_details_upArrow' class='help_details_arrows'></div><div id='help_details_downArrow' class='help_details_arrows'></div>";
-		
 		//Nombre d'éléments présents dans les 2 divs de stockage des détails de l'aide.
 		var helpDetailsLeftContainerLength = Math.ceil(this.helpDetailsGestures.length / 2), helpDetailsRightContainerLength = Math.floor(this.helpDetailsGestures.length / 2);
 		
@@ -388,14 +385,36 @@
 		var i = 0;
 		for(i ; i < helpDetailsLeftContainerLength ; i++)
 		{
+			//On récupère l'usage pour kinect/souris.
+			var usage;
+			if(this.config.mouseInteractions)
+			{
+				usage = this.helpDetailsGestures[i].usage_MI;
+			}
+			else
+			{
+				usage = this.helpDetailsGestures[i].usage_KI;
+			}
+			
 			help_details_gestures += "<div><table border='0'><tr><td rowspan='4'><img class='helpDetailsImgs' src='" + imgPath + MI + all_gestures_img[i] + ".png' /></td><td><b>" +
 			this.helpDetailsGesturesMetadata.name + '</b> : ' + this.helpDetailsGestures[i].name + "</td></tr><tr><td><b>" +
-			this.helpDetailsGesturesMetadata.usage + '</b> : ' + this.helpDetailsGestures[i].usage + "</td></tr><tr><td><b>" +
+			this.helpDetailsGesturesMetadata.usage + '</b> : ' + usage + "</td></tr><tr><td><b>" +
 			this.helpDetailsGesturesMetadata.desc + '</b> : ' + this.helpDetailsGestures[i].desc + "</td></tr></table></div>";
 		}
 		help_details_gestures += "</div><div id='help_details_right_container' class='help_details_containers'>";
 		for(i ; i < this.helpDetailsGestures.length ; i++)
 		{
+			//On récupère l'usage pour kinect/souris.
+			var usage;
+			if(this.config.mouseInteractions)
+			{
+				usage = this.helpDetailsGestures[i].usage_MI;
+			}
+			else
+			{
+				usage = this.helpDetailsGestures[i].usage_KI;
+			}
+			
 			help_details_gestures += "<div><table border='0'><tr><td rowspan='4'><img class='helpDetailsImgs' src='" + imgPath + MI + all_gestures_img[i] + ".png' /></td><td><b>" +
 			this.helpDetailsGesturesMetadata.name + '</b> : ' + this.helpDetailsGestures[i].name + "</td></tr><tr><td><b>" +
 			this.helpDetailsGesturesMetadata.usage + '</b> : ' + this.helpDetailsGestures[i].usage + "</td></tr><tr><td><b>" +
@@ -404,7 +423,7 @@
 		
 		help_details_gestures += "</div>";
 		
-		notify_help.append(help_details_arrows + help_details_gestures);
+		notify_help.append(help_details_gestures);
 		
 		//Hauteur totale de la plus longue colonne.
 		var helpDetailsMaxContainerHeight = $('#help_details_left_container').height();