--- a/front_idill/src/communication/js/client.js Tue Jul 31 16:26:00 2012 +0200
+++ b/front_idill/src/communication/js/client.js Tue Jul 31 17:43:53 2012 +0200
@@ -256,7 +256,7 @@
//Si on est dans un des modes de recherche et que les mains ont été retirées après la précédente recherche.
if((this.mosaic.currentMode == 'FILTER' || this.mosaic.currentMode == 'SEARCH') && !this.mosaic.mustTakeOutHands)
{
- console.log('ON');
+ // console.log('ON');
if(this.mosaic.searchCanvas)
{
var mainPointerX = +$('#mainPointer').position().left + $('#mainPointer').width() / 2;
Binary file front_idill/src/pictos/big/hover/grand_jete.png has changed
Binary file front_idill/src/pictos/big/hover/knee_up.png has changed
Binary file front_idill/src/pictos/big/hover/no_motion.png has changed
Binary file front_idill/src/pictos/big/hover/up_down.png has changed
Binary file front_idill/src/pictos/big/normal/grand_jete.png has changed
Binary file front_idill/src/pictos/big/normal/knee_up.png has changed
Binary file front_idill/src/pictos/big/normal/no_motion.png has changed
Binary file front_idill/src/pictos/big/normal/right_angle.png has changed
Binary file front_idill/src/pictos/big/normal/up_down.png has changed
Binary file front_idill/src/pictos/big/valid/grand_jete.png has changed
Binary file front_idill/src/pictos/big/valid/knee_up.png has changed
Binary file front_idill/src/pictos/big/valid/no_motion.png has changed
Binary file front_idill/src/pictos/big/valid/right_angle.png has changed
Binary file front_idill/src/pictos/big/valid/up_down.png has changed
--- a/front_idill/src/search/js/curvesDetector.js Tue Jul 31 16:26:00 2012 +0200
+++ b/front_idill/src/search/js/curvesDetector.js Tue Jul 31 17:43:53 2012 +0200
@@ -424,11 +424,11 @@
//On affiche différentes aides en fonction de si on se trouve dans une vidéo ou non.
if(this.mosaic.currentMode == 'SEARCH')
{
- this.mosaic.notifyHelp(false);
+ // this.mosaic.notifyHelp(false);
}
else if(this.mosaic.currentMode == 'FILTER')
{
- this.mosaic.notifyHelp(true);
+ // this.mosaic.notifyHelp(true);
}
foundGestures = '';
@@ -452,7 +452,7 @@
//Si l'aide est déjà affichée, on l'enlève.
else if(foundGestures.split(';').length != 1 && this.mosaic.helpDisplayed && !this.mosaic.mustTakeOutHands)
{
- this.mosaic.removeHelp();
+ // this.mosaic.removeHelp();
}
}
//Si on a un seul résultat.
--- a/front_idill/src/search/js/searchCanvas.js Tue Jul 31 16:26:00 2012 +0200
+++ b/front_idill/src/search/js/searchCanvas.js Tue Jul 31 17:43:53 2012 +0200
@@ -186,7 +186,7 @@
// console.log('MOVE');
//Si on est dans une video, on réhausse
- if(this.mosaic.currentMode != 'MOSAIC' && this.mosaic.currentMode != 'FILTER')
+ if(this.mosaic.currentMode != 'MOSAIC' && this.mosaic.currentMode != 'FILTER' && this.mosaic.config.mouseInteractions)
{
mainPointerX -= 130;
mainPointerY -= 60;