Front IDILL :
Split between mouse/kinect interactions.
Unused pictures removed.
--- a/front_idill/src/config.json Wed Aug 01 12:13:22 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-{
- "local":true,
- "videoConfigFileLocal":"./player/json/local_videos.json",
- "videoConfigFileOnline":"./player/json/online_videos.json",
- "mouseInteractions":false,
- "noUserModeEnabled":true,
- "kinectMinCoordX":"40",
- "kinectMinCoordY":"30",
- "kinectMaxCoordX":"520",
- "kinectMaxCoordY":"260",
- "imagesByLine":"5",
- "imagesToShow":"20",
- "totalImages":"22",
- "timeReloadAfterResize":"1000",
- "timePrezoom":"500",
- "timePreUnzoom":"200",
- "zoomTime":"500",
- "timeUnzoom":"400",
- "timeNeighbourGlowing":"1000",
- "timeNeighbourUnglowing":"1000",
- "timeMovingToNeighbour":"1000",
- "timeSearchFade":"2000",
- "timeNotifyFade":"2000",
- "timeFilterFade":"2000",
- "timeANFade":"500",
- "timeShowBigHelp":"1000",
- "timeoutZoom":"2000",
- "timeoutUnzoom":"1000",
- "timeoutMoveToNeighbour":"250",
- "timeoutPointersIdle":"2000",
- "timeoutAreBothPointersHere":"500",
- "timeoutRemoveNotificationByGesture":"1500",
- "timeoutNotifySwipe":"1000",
- "timeoutSelectTL":"100",
- "timeoutSlideTL":"1000",
- "timeoutCanNotifyHelp":"1000",
- "timeoutRemoveSpinner":"1000",
- "timeoutNouser":"3000",
- "timeoutNextDrawCurve":"500",
- "zoomPercentage":"0.80",
- "prezoomPercentage":"0.25",
- "zoomedMargin":"42",
- "host":"127.0.0.1",
- "port":"8090",
- "mouseUpDownDeltaTreshold":"15",
- "kinectUpDownDeltaTreshold":"20",
- "curveDictionaryMI":"./dicoMI.json",
- "curveDictionaryKI":"./dicoKI.json",
- "lang":""
-}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/front_idill/src/config_kinect.json Wed Aug 01 15:07:15 2012 +0200
@@ -0,0 +1,50 @@
+{
+ "local":true,
+ "videoConfigFileLocal":"./player/json/local_videos.json",
+ "videoConfigFileOnline":"./player/json/online_videos.json",
+ "mouseInteractions":false,
+ "noUserModeEnabled":true,
+ "kinectMinCoordX":"40",
+ "kinectMinCoordY":"30",
+ "kinectMaxCoordX":"520",
+ "kinectMaxCoordY":"260",
+ "imagesByLine":"5",
+ "imagesToShow":"20",
+ "totalImages":"22",
+ "timeReloadAfterResize":"1000",
+ "timePrezoom":"500",
+ "timePreUnzoom":"200",
+ "zoomTime":"500",
+ "timeUnzoom":"400",
+ "timeNeighbourGlowing":"1000",
+ "timeNeighbourUnglowing":"1000",
+ "timeMovingToNeighbour":"1000",
+ "timeSearchFade":"2000",
+ "timeNotifyFade":"2000",
+ "timeFilterFade":"2000",
+ "timeANFade":"500",
+ "timeShowBigHelp":"1000",
+ "timeoutZoom":"2000",
+ "timeoutUnzoom":"1000",
+ "timeoutMoveToNeighbour":"250",
+ "timeoutPointersIdle":"2000",
+ "timeoutAreBothPointersHere":"500",
+ "timeoutRemoveNotificationByGesture":"1500",
+ "timeoutNotifySwipe":"1000",
+ "timeoutSelectTL":"100",
+ "timeoutSlideTL":"1000",
+ "timeoutCanNotifyHelp":"1000",
+ "timeoutRemoveSpinner":"1000",
+ "timeoutNouser":"3000",
+ "timeoutNextDrawCurve":"500",
+ "zoomPercentage":"0.80",
+ "prezoomPercentage":"0.25",
+ "zoomedMargin":"42",
+ "host":"127.0.0.1",
+ "port":"8090",
+ "mouseUpDownDeltaTreshold":"15",
+ "kinectUpDownDeltaTreshold":"20",
+ "curveDictionaryMI":"./dicoMI.json",
+ "curveDictionaryKI":"./dicoKI.json",
+ "lang":""
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/front_idill/src/config_souris.json Wed Aug 01 15:07:15 2012 +0200
@@ -0,0 +1,50 @@
+{
+ "local":true,
+ "videoConfigFileLocal":"./player/json/local_videos.json",
+ "videoConfigFileOnline":"./player/json/online_videos.json",
+ "mouseInteractions":true,
+ "noUserModeEnabled":true,
+ "kinectMinCoordX":"40",
+ "kinectMinCoordY":"30",
+ "kinectMaxCoordX":"520",
+ "kinectMaxCoordY":"260",
+ "imagesByLine":"5",
+ "imagesToShow":"20",
+ "totalImages":"22",
+ "timeReloadAfterResize":"1000",
+ "timePrezoom":"500",
+ "timePreUnzoom":"200",
+ "zoomTime":"500",
+ "timeUnzoom":"400",
+ "timeNeighbourGlowing":"1000",
+ "timeNeighbourUnglowing":"1000",
+ "timeMovingToNeighbour":"1000",
+ "timeSearchFade":"2000",
+ "timeNotifyFade":"2000",
+ "timeFilterFade":"2000",
+ "timeANFade":"500",
+ "timeShowBigHelp":"1000",
+ "timeoutZoom":"2000",
+ "timeoutUnzoom":"1000",
+ "timeoutMoveToNeighbour":"250",
+ "timeoutPointersIdle":"2000",
+ "timeoutAreBothPointersHere":"500",
+ "timeoutRemoveNotificationByGesture":"1500",
+ "timeoutNotifySwipe":"1000",
+ "timeoutSelectTL":"100",
+ "timeoutSlideTL":"1000",
+ "timeoutCanNotifyHelp":"1000",
+ "timeoutRemoveSpinner":"1000",
+ "timeoutNouser":"3000",
+ "timeoutNextDrawCurve":"500",
+ "zoomPercentage":"0.80",
+ "prezoomPercentage":"0.25",
+ "zoomedMargin":"42",
+ "host":"127.0.0.1",
+ "port":"8090",
+ "mouseUpDownDeltaTreshold":"15",
+ "kinectUpDownDeltaTreshold":"20",
+ "curveDictionaryMI":"./dicoMI.json",
+ "curveDictionaryKI":"./dicoKI.json",
+ "lang":""
+}
\ No newline at end of file
--- a/front_idill/src/dicoKI.json Wed Aug 01 12:13:22 2012 +0200
+++ b/front_idill/src/dicoKI.json Wed Aug 01 15:07:15 2012 +0200
@@ -16,7 +16,7 @@
},
{
"name":"grand-jete",
- "codes":["D4:D1", "D5:D0"]
+ "codes":["D5:D0"]
},
{
"name":"wave",
Binary file front_idill/src/img/pointer.png has changed
Binary file front_idill/src/img/pointer2.png has changed
--- a/front_idill/src/index.html Wed Aug 01 12:13:22 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<!--
-/*
-* This file is part of the TraKERS\Front IDILL package.
-*
-* (c) IRI <http://www.iri.centrepompidou.fr/>
-*
-* For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
-*/
-
-/*
- * Projet : TraKERS
- * Module : Front IDILL
- * Fichier : index.html
- *
- * Auteur : alexandre.bastien@iri.centrepompidou.fr
- *
- * Fonctionnalités : Centralise les différents éléments du Front IDILL, tels que les classes javascript, les fonctions jQuery, les css.
- */
--->
-
-<!doctype html>
-<html>
- <head>
- <!-- On inclut les styles et les scripts utilisés. -->
- <title>IDILL</title>
- <meta charset="UTF-8" />
- <link rel="stylesheet" type="text/css" href="./mosaic/css/reset.css" />
- <link rel="stylesheet/less" type="text/css" href="./mosaic/css/mosaic.less" />
- <script type="text/javascript" src="../lib/less-1.3.0.min.js"></script>
- <script type="text/javascript" src="../lib/underscore-min.js"></script>
- <script type="text/javascript" src="../lib/jquery.min.js"></script>
- <script type="text/javascript" src="../lib/jquery-ui.min.js"></script>
- <script type="text/javascript" src="../lib/jquery.mousewheel-2.0.0.min.js"></script>
- <script type="text/javascript" src="./defaults.js"></script>
- <script type="text/javascript" src="./mosaic/js/mosaic.js"></script>
- <script type="text/javascript" src="./mosaic/js/notifications.js"></script>
- <script type="text/javascript" src="./mosaic/js/pointers.js"></script>
- <script type="text/javascript" src="./mosaic/js/zoomInteractions.js"></script>
- <script type="text/javascript" src="./mosaic/js/neighbours.js"></script>
- <script type="text/javascript" src="./mosaic/js/search.js"></script>
- <script type="text/javascript" src="./mosaic/js/playerControl.js"></script>
- <script type="text/javascript" src="./mosaic/js/localMosaic.js"></script>
- <script type="text/javascript" src="./player/metadataplayer/LdtPlayer-core.js"></script>
- <script type="text/javascript" src="../lib/paper.js"></script>
- <link rel="stylesheet" type="text/css" href="./search/css/searchCanvas.css" />
- <script type="text/javascript" src="./search/js/searchCanvas.js"></script>
- <script type="text/javascript" src="./search/js/curvesDetector.js"></script>
- <script type="text/javascript" src="./communication/js/client.js"></script>
- </head>
-
- <body>
- <!-- /!\ ATTENTION : Si vous souhaitez modifier la configuration, veuillez modifier les valeurs de config.json situé à la racine du dossier Front IDILL. /!\ -->
-
- <!-- Ce div stocke la mosaïque. -->
- <div id="mainPanel"></div>
-
- <!-- SET AN EMPTY DIV TO BE POPULATED WITH CONTENT VIA JQUERY -->
- <div class="test" style="color: #FFFFFF"></div>
-
- <!-- Scripts principaux. -->
- <script type="text/javascript">
- var mos;
- //Si la page a chargé, on raffraichit la mosaïque.
- $(document).ready(function ()
- {
- mos = new Mosaic('./config.json', default_parameters);
- });
- </script>
- </body>
-</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/front_idill/src/index_kinect.html Wed Aug 01 15:07:15 2012 +0200
@@ -0,0 +1,70 @@
+<!--
+/*
+* This file is part of the TraKERS\Front IDILL package.
+*
+* (c) IRI <http://www.iri.centrepompidou.fr/>
+*
+* For the full copyright and license information, please view the LICENSE
+* file that was distributed with this source code.
+*/
+
+/*
+ * Projet : TraKERS
+ * Module : Front IDILL
+ * Fichier : index.html
+ *
+ * Auteur : alexandre.bastien@iri.centrepompidou.fr
+ *
+ * Fonctionnalités : Centralise les différents éléments du Front IDILL, tels que les classes javascript, les fonctions jQuery, les css.
+ */
+-->
+
+<!doctype html>
+<html>
+ <head>
+ <!-- On inclut les styles et les scripts utilisés. -->
+ <title>IDILL - Mode d'interaction kinect</title>
+ <meta charset="UTF-8" />
+ <link rel="stylesheet" type="text/css" href="./mosaic/css/reset.css" />
+ <link rel="stylesheet/less" type="text/css" href="./mosaic/css/mosaic.less" />
+ <script type="text/javascript" src="../lib/less-1.3.0.min.js"></script>
+ <script type="text/javascript" src="../lib/underscore-min.js"></script>
+ <script type="text/javascript" src="../lib/jquery.min.js"></script>
+ <script type="text/javascript" src="../lib/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="../lib/jquery.mousewheel-2.0.0.min.js"></script>
+ <script type="text/javascript" src="./defaults.js"></script>
+ <script type="text/javascript" src="./mosaic/js/mosaic.js"></script>
+ <script type="text/javascript" src="./mosaic/js/notifications.js"></script>
+ <script type="text/javascript" src="./mosaic/js/pointers.js"></script>
+ <script type="text/javascript" src="./mosaic/js/zoomInteractions.js"></script>
+ <script type="text/javascript" src="./mosaic/js/neighbours.js"></script>
+ <script type="text/javascript" src="./mosaic/js/search.js"></script>
+ <script type="text/javascript" src="./mosaic/js/playerControl.js"></script>
+ <script type="text/javascript" src="./player/metadataplayer/LdtPlayer-core.js"></script>
+ <script type="text/javascript" src="../lib/paper.js"></script>
+ <link rel="stylesheet" type="text/css" href="./search/css/searchCanvas.css" />
+ <script type="text/javascript" src="./search/js/searchCanvas.js"></script>
+ <script type="text/javascript" src="./search/js/curvesDetector.js"></script>
+ <script type="text/javascript" src="./communication/js/client.js"></script>
+ </head>
+
+ <body>
+ <!-- /!\ ATTENTION : Si vous souhaitez modifier la configuration, veuillez modifier les valeurs de config.json situé à la racine du dossier Front IDILL. /!\ -->
+
+ <!-- Ce div stocke la mosaïque. -->
+ <div id="mainPanel"></div>
+
+ <!-- SET AN EMPTY DIV TO BE POPULATED WITH CONTENT VIA JQUERY -->
+ <div class="test" style="color: #FFFFFF"></div>
+
+ <!-- Scripts principaux. -->
+ <script type="text/javascript">
+ var mos;
+ //Si la page a chargé, on raffraichit la mosaïque.
+ $(document).ready(function ()
+ {
+ mos = new Mosaic('./config_kinect.json', default_parameters);
+ });
+ </script>
+ </body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/front_idill/src/index_souris.html Wed Aug 01 15:07:15 2012 +0200
@@ -0,0 +1,70 @@
+<!--
+/*
+* This file is part of the TraKERS\Front IDILL package.
+*
+* (c) IRI <http://www.iri.centrepompidou.fr/>
+*
+* For the full copyright and license information, please view the LICENSE
+* file that was distributed with this source code.
+*/
+
+/*
+ * Projet : TraKERS
+ * Module : Front IDILL
+ * Fichier : index.html
+ *
+ * Auteur : alexandre.bastien@iri.centrepompidou.fr
+ *
+ * Fonctionnalités : Centralise les différents éléments du Front IDILL, tels que les classes javascript, les fonctions jQuery, les css.
+ */
+-->
+
+<!doctype html>
+<html>
+ <head>
+ <!-- On inclut les styles et les scripts utilisés. -->
+ <title>IDILL - Mode d'interaction souris</title>
+ <meta charset="UTF-8" />
+ <link rel="stylesheet" type="text/css" href="./mosaic/css/reset.css" />
+ <link rel="stylesheet/less" type="text/css" href="./mosaic/css/mosaic.less" />
+ <script type="text/javascript" src="../lib/less-1.3.0.min.js"></script>
+ <script type="text/javascript" src="../lib/underscore-min.js"></script>
+ <script type="text/javascript" src="../lib/jquery.min.js"></script>
+ <script type="text/javascript" src="../lib/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="../lib/jquery.mousewheel-2.0.0.min.js"></script>
+ <script type="text/javascript" src="./defaults.js"></script>
+ <script type="text/javascript" src="./mosaic/js/mosaic.js"></script>
+ <script type="text/javascript" src="./mosaic/js/notifications.js"></script>
+ <script type="text/javascript" src="./mosaic/js/pointers.js"></script>
+ <script type="text/javascript" src="./mosaic/js/zoomInteractions.js"></script>
+ <script type="text/javascript" src="./mosaic/js/neighbours.js"></script>
+ <script type="text/javascript" src="./mosaic/js/search.js"></script>
+ <script type="text/javascript" src="./mosaic/js/playerControl.js"></script>
+ <script type="text/javascript" src="./player/metadataplayer/LdtPlayer-core.js"></script>
+ <script type="text/javascript" src="../lib/paper.js"></script>
+ <link rel="stylesheet" type="text/css" href="./search/css/searchCanvas.css" />
+ <script type="text/javascript" src="./search/js/searchCanvas.js"></script>
+ <script type="text/javascript" src="./search/js/curvesDetector.js"></script>
+ <script type="text/javascript" src="./communication/js/client.js"></script>
+ </head>
+
+ <body>
+ <!-- /!\ ATTENTION : Si vous souhaitez modifier la configuration, veuillez modifier les valeurs de config.json situé à la racine du dossier Front IDILL. /!\ -->
+
+ <!-- Ce div stocke la mosaïque. -->
+ <div id="mainPanel"></div>
+
+ <!-- SET AN EMPTY DIV TO BE POPULATED WITH CONTENT VIA JQUERY -->
+ <div class="test" style="color: #FFFFFF"></div>
+
+ <!-- Scripts principaux. -->
+ <script type="text/javascript">
+ var mos;
+ //Si la page a chargé, on raffraichit la mosaïque.
+ $(document).ready(function ()
+ {
+ mos = new Mosaic('./config_souris.json', default_parameters);
+ });
+ </script>
+ </body>
+</html>
\ No newline at end of file
--- a/front_idill/src/lang/fr.json Wed Aug 01 12:13:22 2012 +0200
+++ b/front_idill/src/lang/fr.json Wed Aug 01 15:07:15 2012 +0200
@@ -22,7 +22,7 @@
"no-motion":"Immobilité",
"contact":"Contact",
"grand-jete":"Grand jeté",
- "up-down":"Up down"
+ "up-down":"De haut en bas"
},
"helpText":{
"search_title":"Recherche",
--- a/front_idill/src/mosaic/js/zoomInteractions.js Wed Aug 01 12:13:22 2012 +0200
+++ b/front_idill/src/mosaic/js/zoomInteractions.js Wed Aug 01 15:07:15 2012 +0200
@@ -444,6 +444,7 @@
{
_this.timeToGoAt[_this.centerId] = Math.floor(_this.player.popcorn.currentTime());
_this.player.widgets[0].freePlayer();
+ _this.player = null;
}
//On indique que le player n'est pas prêt et on le supprime.
Binary file front_idill/src/pictos/big/hover/hello.png has changed
Binary file front_idill/src/pictos/big/hover/right-angle.png has changed
Binary file front_idill/src/pictos/big/hover/right_angle.png has changed
Binary file front_idill/src/pictos/big/hover/run.png has changed
Binary file front_idill/src/pictos/big/hover/rythme.png has changed
Binary file front_idill/src/pictos/big/hover/slow.png has changed
Binary file front_idill/src/pictos/big/hover/wheel.png has changed
Binary file front_idill/src/pictos/big/normal/hello.png has changed
Binary file front_idill/src/pictos/big/normal/run.png has changed
Binary file front_idill/src/pictos/big/normal/rythme.png has changed
Binary file front_idill/src/pictos/big/normal/wheel.png has changed
Binary file front_idill/src/pictos/big/valid/hello.png has changed
Binary file front_idill/src/pictos/big/valid/run.png has changed
Binary file front_idill/src/pictos/big/valid/rythme.png has changed
Binary file front_idill/src/pictos/big/valid/slow.png has changed
Binary file front_idill/src/pictos/big/valid/wheel.png has changed
--- a/front_idill/src/player/metadataplayer/Timeline.js Wed Aug 01 12:13:22 2012 +0200
+++ b/front_idill/src/player/metadataplayer/Timeline.js Wed Aug 01 15:07:15 2012 +0200
@@ -48,8 +48,8 @@
this.currentMarkerId;
//Gestures et noms par défaut.
- this.gestures = ["fall", "jump", "circle", "screw", "bend", "arc", "knee_up", "right_angle", "wave", "no_motion", "contact"];
- this.gesturesText = ["chute", "saut", "rotation", "rotation de groupe", "inclinaison", "port de bras", "levé de genou", "angle droit", "ondulation", "immobilité", "contact"];
+ this.gestures = ["fall", "jump", "circle", "screw", "bend", "arc", "knee-up", "right-angle", "wave", "no-motion", "contact", "up-down"];
+ this.gesturesText = ["chute", "saut", "rotation", "rotation de groupe", "inclinaison", "port de bras", "levé de genou", "angle droit", "ondulation", "immobilité", "contact", "de haut en bas"];
var _this = this;
this.annotations = this.source.getAnnotations().filter(function(annotation)
@@ -183,34 +183,14 @@
* Timeline > fonctions processMarkers, onTimeupdate et timeDisplayUpdater.
*/
IriSP.Widgets.Timeline.prototype.scaleIntervals = function(A, B, C, D, val) {
- if(C == D)
- {
- return C;
- }
- if(B != A)
- {
- return D / (B - A) * (val - A);
- }
- else
- {
- //Si A et B ont le même signe.
- if(A * B > 0)
- {
- //S'ils sont positifs.
- if(A > 0)
- {
- return (D - C)/2;
- }
- else
- {
- return (C - D)/2;
- }
- }
- else
- {
- return (C + D)/2;
- }
- }
+ if(A == B)
+ {
+ return (D - C) / 2;
+ }
+ else
+ {
+ return (D - C) * (val - A) / (B - A) + C;
+ }
}
/*
@@ -830,9 +810,7 @@
*/
IriSP.Widgets.Timeline.prototype.switchToMarker = function(isSwipeLeft, searchedGesture)
{
- console.log((isSwipeLeft == true) ? 'SWIPE LEFT' : 'SWIPE RIGHT');
-
- //On prend le temps actuel du curseur en ms.
+ //On prend le temps actuel du curseur en ms.
var currentCursorPosition = this.player.popcorn.currentTime() * 1000;
//Position visée.
var targetCursorPosition = currentCursorPosition;
@@ -840,7 +818,7 @@
var minDistance = this.source.getDuration().milliseconds, minIdx = 0, mindIdx_1 = 0;
//Condition de sélection du marqueur selon le type de swipe.
- var swipeCondition = (isSwipeLeft ? (currentCursorPosition < this.annotations[i].begin && minDistance > Math.abs(currentCursorPosition - this.annotations[i].begin)) : (currentCursorPosition > this.annotations[i].begin && minDistance > Math.abs(currentCursorPosition - this.annotations[i].begin)));
+ var swipeCondition;
//Si il y a au moins 1 annotation.
if(this.annotations && this.annotations.length > 0)
@@ -848,6 +826,8 @@
//Pour toutes les annotations, on prend celle qui est la plus proche et supérieure à la position.
for(var i = 0 ; i < this.annotations.length ; i++)
{
+ swipeCondition = (isSwipeLeft ? (currentCursorPosition < this.annotations[i].begin && minDistance > Math.abs(currentCursorPosition - this.annotations[i].begin)) : (currentCursorPosition > this.annotations[i].begin && minDistance > Math.abs(currentCursorPosition - this.annotations[i].begin)));
+
if(swipeCondition)
{
//Si on recherche une gesture.
--- a/front_idill/src/search/js/curvesDetector.js Wed Aug 01 12:13:22 2012 +0200
+++ b/front_idill/src/search/js/curvesDetector.js Wed Aug 01 15:07:15 2012 +0200
@@ -415,13 +415,13 @@
this.mosaic.removeNotifications();
this.mosaic.curvesGestures(foundGestures);
- //Si ce qu'on a trouvé est vide et si l'aide n'est pas affichée.
- if(foundGestures.length == 0 && !this.mosaic.helpDisplayed && !this.mosaic.config.mouseInteractions)
+ //Si ce qu'on a trouvé est vide en mode d'interaction Kinect.
+ if(foundGestures.length == 0 && !this.mosaic.config.mouseInteractions)
{
//Si on est en mode d'interaction Kinect, on désactive les courbes jusqu'à ce que l'utilisateur n'a plus les deux mains dans la zone (pour éviter les erreurs de manipulation).
this.mosaic.mustTakeOutHands = true;
- //On affiche différentes aides en fonction de si on se trouve dans une vidéo ou non.
+ /*//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);
@@ -429,7 +429,7 @@
else if(this.mosaic.currentMode == 'FILTER')
{
// this.mosaic.notifyHelp(true);
- }
+ }*/
foundGestures = '';
//On enlève la recherche.
@@ -444,16 +444,16 @@
this.mosaic.isMosaicFiltered = false;
}
//Sinon si on était en mode recherche dans une video et qu'aucune gesture n'avait été détectée avant ca, on revient en mode video.
- if(this.mosaic.currentMode == "SEARCH" && this.mosaic.currentSearchGesture[this.centerId] == "")
+ if(this.mosaic.currentMode == "SEARCH" && this.mosaic.currentSearchGesture[this.mosaic.centerId] == "")
{
this.mosaic.currentMode = "VIDEO";
}
}
- //Si l'aide est déjà affichée, on l'enlève.
+ /*//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();
- }
+ }*/
}
//Si on a un seul résultat.
else
--- a/middleware/Debug/DebugWindow.xaml.cs Wed Aug 01 12:13:22 2012 +0200
+++ b/middleware/Debug/DebugWindow.xaml.cs Wed Aug 01 15:07:15 2012 +0200
@@ -39,7 +39,7 @@
public partial class DebugWindow : Window
{
//Nom du projet, afin de savoir quel menu charger et quel fichier de configuration utiliser (TraKERS ou BBM).
- private String projectName = "TraKERS";
+ private String projectName = "BBM";
//Chemins du fichier de config.
private String configPath;
//private String projectName = "BBM";
