--- a/.hgignore Tue Jul 24 16:35:10 2012 +0200
+++ b/.hgignore Thu Jul 26 14:34:02 2012 +0200
@@ -83,6 +83,11 @@
middleware/src/bin/Documentation - Front IDILL.html
middleware/src/bin/*.txt
middleware/src/bin/*.html
+front_idill/src/img/(6a) - Copy (2).png
+front_idill/src/img/(6a).png
+front_idill/src/img/background.bak.png
+front_idill/src/mosaic/js/pointers - Copy.js
+front_idill/src/pictos/help/img bak/*
syntax: regexp
middleware/extern/.*/(bin|obj)
middleware/src/bin/Debug/*
--- a/front_idill/doc/Documentation - Front IDILL.html Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/doc/Documentation - Front IDILL.html Thu Jul 26 14:34:02 2012 +0200
@@ -111,6 +111,8 @@
<ol type="1" start="2">
<h3><li>Recherche par courbes.</li></h3>
+ <p>Dans le mode d'intéraction souris, une icone d'aide apparaît en haut à droite de la fenêtre. Lorsque la souris passe dessus, il grandit. Un clic sur la grande icone fait apparaître le panneau d'aide. Il est possible de cliquer ou de tracer une nouvelle courbe de recherche pour faire disparaître le panneau d'aide.</p>
+
<ol type="A" start="1">
<h4><li>Tracé de courbes.</li></h4>
@@ -125,7 +127,7 @@
<li>Le tracé correspond à plusieurs courbes : Leurs macarons sont affichés en haut de la fenêtre.</li>
<li>Le tracé correspond à une seule courbe : Le macaron de la courbe est affiché en haut de la fenêtre et on effectue une recherche sur les marqueurs correspondants à cette courbe.</li>
<li>Le tracé correspond à plusieurs courbes, mais le tracé actuel permet de définir une courbe : Si on relâche le bouton de la souris, on valide la courbe qu'on a tracé et on entre dans une recherche.</li>
- <li>Le tracé ne correspond à aucune courbe répertoriée. Un macaron de geste inconnu s'affiche et le panneau d'aide apparaît. Il est possible de cliquer ou de tracer une nouvelle courbe pour faire disparaître le panneau d'aide.</li>
+ <li>Le tracé ne correspond à aucune courbe répertoriée. Un macaron de geste inconnu s'affiche.</li>
</ul>
<p>Une recherche par courbes dans la mosaïque résulte en un filtrage. Plus les vidéos sont opaques et plus le nombre de marqueurs trouvés dans celles-ci sont importants.<br />Une recherche dans une vidéo mettra en surbrillance les marqueurs correspondant au type de marqueur recherché.</p>
<p>Une nouvelle requête de recherche écrase la précédente.</p>
@@ -247,6 +249,7 @@
<tr><td>timeNotifyFade</td><td>int (msec)</td><td>2000</td><td>Temps qu'il faut pour que le panneau d'aide disparaisse.</td></tr>
<tr><td>timeFilterFade</td><td>int (msec)</td><td>2000</td><td>Temps que le filtrage de la mosaïque s'enlève.</td></tr>
<tr><td>timeANFade</td><td>int (msec)</td><td>500</td><td>Temps qu'il faut pour qu'un voisin additionnel disparaisse (voisin de bord de mosaïque).</td></tr>
+ <tr><td>timeShowBigHelp</td><td>int (msec)</td><td>1000</td><td>Temps qu'il faut pour zoomer/dézoomer l'icone d'aide (souris).</td></tr>
<tr><td>timeoutZoom</td><td>int (msec)</td><td>2000</td><td>Temps qu'il faut pour valider la sélection d'une image pour zoomer (Kinect).</td></tr>
<tr><td>timeoutUnzoom</td><td>int (msec)</td><td>1000</td><td>Temps qu'il faut avant de bloquer le dézoom quand les pointeurs quittent les voisins opposés (Kinect).</td></tr>
<tr><td>timeoutMoveToNeighbour</td><td>int (msec)</td><td>250</td><td>Temps qu'il faut avant de bloquer le passage vers un voisin lorsque le pointeur quitte un voisin (Kinect).</td></tr>
@@ -269,6 +272,7 @@
<tr><td>mouseUpDownDeltaTreshold</td><td>int (px)</td><td>15</td><td>Distance à partir de laquelle le déplacement du pointeur de la souris lorsqu'on a appuyé sur le bouton gauche est considéré non plus comme le début d'un click mais le début d'un tracé de courbe de recherche.</td></tr>
<tr><td>curveDictionary</td><td>string (path)</td><td>"./dico.json"</td><td>Chemin du dictionnaire de courbes de recherche.</td></tr>
<tr><td>lang</td><td>string (abréviation)</td><td>""</td><td>Langue utilisée dans le Front (en, fr...). Si elle est vide alors la langue du navigateur est prise.</td></tr>
+ <tr><td>helpBorderSize</td><td>int (px)</td><td>5</td><td>Taille de la bordure affichant l'aide dans le mode d'interaction souris.</td></tr>
</table>
</ul>
</ol>
--- a/front_idill/src/config.json Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/config.json Thu Jul 26 14:34:02 2012 +0200
@@ -4,13 +4,12 @@
"videoConfigFileOnline":"./player/json/online_videos.json",
"mouseInteractions":true,
"noUserModeEnabled":true,
- "length":"5",
+ "imagesByLine":"5",
"imagesToShow":"20",
"totalImages":"22",
"timeReloadAfterResize":"1000",
"timePrezoom":"500",
"timePreUnzoom":"200",
- "timeZoom":"2000",
"zoomTime":"500",
"timeUnzoom":"400",
"timeNeighbourGlowing":"1000",
@@ -20,13 +19,13 @@
"timeNotifyFade":"2000",
"timeFilterFade":"2000",
"timeANFade":"500",
+ "timeShowBigHelp":"1000",
"timeoutZoom":"2000",
"timeoutUnzoom":"1000",
"timeoutMoveToNeighbour":"250",
"timeoutPointersIdle":"2000",
"timeoutAreBothPointersHere":"500",
"timeoutRemoveNotificationByGesture":"1500",
- "timeoutRemoveFailedNotificationByGesture":"1500",
"timeoutNotifySwipe":"1000",
"timeoutSelectTL":"100",
"timeoutSlideTL":"1000",
--- a/front_idill/src/defaults.js Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/defaults.js Thu Jul 26 14:34:02 2012 +0200
@@ -29,7 +29,6 @@
totalImages : 23,
timePrezoom : 500,
timePreUnzoom : 200,
- timeZoom : 2000,
zoomTime : 500,
timeUnzoom : 400,
timeNeighbourGlowing : 1000,
@@ -40,13 +39,13 @@
timeFilterFade : 2000,
timeANFade : 500,
timeFilling : 500,
+ timeShowBigHelp : 1000,
timeoutZoom : 2000,
timeoutUnzoom : 1000,
timeoutMoveToNeighbour : 250,
timeoutPointersIdle : 2000,
timeoutAreBothPointersHere : 500,
timeoutRemoveNotificationByGesture : 1500,
- timeoutRemoveFailedNotificationByGesture : 1500,
timeoutNotifySwipe : 1000,
timeoutSelectTL : 100,
timeoutSlideTL : 1000,
Binary file front_idill/src/img/helpIcon.png has changed
--- a/front_idill/src/lang/en.json Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/lang/en.json Thu Jul 26 14:34:02 2012 +0200
@@ -1,3 +1,45 @@
{
- "gesturesText":["fall", "jump", "spin", "group spin", "bend", "arm carriage", "knee up", "breakdance", "wave", "no motion", "contact"]
+ "gesturesText":["fall", "jump", "spin", "group spin", "bend", "arm carriage", "knee up", "breakdance", "wave", "no motion", "contact"],
+ "notificationStrings":{
+ "select":"Select",
+ "confirm":"Confirm",
+ "timeline":"Timeline move",
+ "move":"Move",
+ "search":"Search",
+ "next":"Next",
+ "previous":"Previous",
+ "unzoom":"Unzoom",
+ "unknown":"Unknown gesture",
+ "fall":"Fall",
+ "jump":"Jump",
+ "circle":"Spin",
+ "screw":"Screw",
+ "bend":"Bend",
+ "arc":"Arc",
+ "knee-up":"Knee up",
+ "right-angle":"Breakdance",
+ "wave":"Wave",
+ "no-motion":"No motion",
+ "contact":"Contact",
+ "grand-jete":"Grand jeté",
+ "up-down":"Up down"
+ },
+ "helpText":{
+ "search_title":"Search",
+ "search_2hands_text":"Curves to be drawn with both hands",
+ "search_mouse_text":"Curves to be mouse-drawn",
+ "search_body_text":"Gestures to be performed with your body",
+ "controls_title":"Controls",
+ "controls_1hand_text":"Gestures to be performed with your hand",
+ "controls_timeline":"Move in timeline",
+ "controls_mos_horizontal":"Unzoom",
+ "controls_mos_vertical":"Unzoom",
+ "controls_move_down":"Move",
+ "controls_move_left":"Move",
+ "controls_move_right":"Move",
+ "controls_move_up":"Move",
+ "controls_next":"Next",
+ "controls_previous":"Previous",
+ "controls_selection":"Selection"
+ }
}
\ No newline at end of file
--- a/front_idill/src/lang/fr.json Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/lang/fr.json Thu Jul 26 14:34:02 2012 +0200
@@ -1,3 +1,45 @@
{
- "gesturesText":["chute", "saut", "rotation", "rotation de groupe", "penché", "port de bras", "levé de genou", "breakdance", "ondulations", "immobilité", "contact"]
+ "gesturesText":["chute", "saut", "rotation", "rotation de groupe", "penché", "port de bras", "levé de genou", "breakdance", "ondulations", "immobilité", "contact"],
+ "notificationStrings":{
+ "select":"Sélectionner",
+ "confirm":"Confirmer",
+ "timeline":"Déplacer",
+ "move":"Changer vidéo",
+ "search":"Recherche",
+ "next":"Suivant",
+ "previous":"Précédent",
+ "unzoom":"Retour mosaïque",
+ "unknown":"Geste inconnu",
+ "fall":"Chute",
+ "jump":"Saut",
+ "circle":"Rotation",
+ "screw":"Rotation de groupe",
+ "bend":"Penché",
+ "arc":"Port de bras",
+ "knee-up":"Levé de genou",
+ "right-angle":"Breakdance",
+ "wave":"Ondulations",
+ "no-motion":"Immobilité",
+ "contact":"Contact",
+ "grand-jete":"Grand jeté",
+ "up-down":"Up down"
+ },
+ "helpText":{
+ "search_title":"Recherche",
+ "search_2hands_text":"Courbes à effectuer avec les deux mains",
+ "search_mouse_text":"Courbes à effectuer avec la souris",
+ "search_body_text":"Gestes à effectuer avec le corps",
+ "controls_title":"Contrôles",
+ "controls_1hand_text":"Gestes à effectuer avec une seule main",
+ "controls_timeline":"Déplacer",
+ "controls_mos_horizontal":"Retour mosaïque",
+ "controls_mos_vertical":"Retour mosaïque",
+ "controls_move_down":"Changer vidéo",
+ "controls_move_left":"Changer vidéo",
+ "controls_move_right":"Changer vidéo",
+ "controls_move_up":"Changer vidéo",
+ "controls_next":"Suivant",
+ "controls_previous":"Précédent",
+ "controls_selection":"Sélection"
+ }
}
\ No newline at end of file
--- a/front_idill/src/mosaic/css/mosaic.less Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/mosaic/css/mosaic.less Thu Jul 26 14:34:02 2012 +0200
@@ -40,6 +40,8 @@
@notify-selection-background-image-path: url("../../pictos/notifications/selectionner.png");
/* Image de notification de recherche. */
@notify-search-background-image-path: url("../../pictos/notifications/rechercher.png");
+/* Image de fond de la timeline. */
+@timeline-background-image-path: url("../../img/timeline.png");
/* Image de notification de confirmation. */
@notify-point-background-image-path: url("../../pictos/notifications/confirmer.png");
/* Image de notification de déplacement dans la timeline. */
@@ -193,6 +195,12 @@
opacity: 0;
margin: 15px;
z-index: 400;
+ text-align: center;
+ font-family: "DINMedium";
+ font-weight:10;
+ font-size:30px;
+ color: #fff;
+ padding-top: 5px;
}
/*
@@ -352,7 +360,7 @@
clear: both;
color: #fff;
//font-family: DIN-Medium, Fallback, sans-serif;
- font-size: 15px;
+ font-size: 20px;
text-align: center;
font-weight: bold;
margin-top: 10px;
@@ -365,11 +373,17 @@
.notify_imgs_small
{
float: left;
- width: 130px;
- height: 130px;
+ width: 120px;
+ height: 120px;
background-position: 0px 0px;
background-repeat: no-repeat;
margin: 4px;
+ text-align: center;
+ font-family: "DINMedium";
+ font-weight:10;
+ font-size:20px;
+ color: #fff;
+ padding: 5px;
}
/*
@@ -424,4 +438,15 @@
background-color: @black;
background-repeat: repeat;
background-position: 0px 0px;
+}
+
+/*
+ * Icone permettant d'afficher l'aide dans le mode d'interaction souris.
+*/
+#helpIcon
+{
+ width: 50px;
+ height: 50px;
+ position: absolute;
+ margin: 20px;
}
\ No newline at end of file
--- a/front_idill/src/mosaic/css/reset.css Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/mosaic/css/reset.css Thu Jul 26 14:34:02 2012 +0200
@@ -1,3 +1,22 @@
+/*
+* 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 : reset.css
+ *
+ * Auteur : alexandre.bastien@iri.centrepompidou.fr
+ *
+ * Fonctionnalités : Initialise les propriétés css.
+ */
+
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
--- a/front_idill/src/mosaic/js/mosaic.js Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/mosaic/js/mosaic.js Thu Jul 26 14:34:02 2012 +0200
@@ -26,7 +26,7 @@
*/
function Mosaic(config, default_conf)
{
- this.gestures = ["fall", "jump", "circle", "screw", "bend", "arc", "pendulum", "knee-up", "right-angle", "wave", "slow", "hello", "no-motion", "wheel", "contact", "run", "up-down", "grand-jete"];
+ this.gestures = ["fall", "jump", "circle", "screw", "bend", "arc", "knee_up", "right_angle", "wave", "slow", "hello", "no_motion", "contact", "up_down", "grand_jete"];
//Chemin du fichier de configuration.
this.config_path = config;
@@ -46,6 +46,48 @@
//Dictionnaire pour les courbes de recherche.
this.dictionary = [];
+
+ //Strings des notifications.
+ this.notificationStrings = {
+ "select":"Select",
+ "confirm":"Confirm",
+ "timeline":"Timeline move",
+ "move":"Move",
+ "search":"Search",
+ "next":"Next",
+ "previous":"Previous",
+ "unzoom":"Unzoom",
+ "unknown":"Unknown gesture",
+ "fall":"Fall",
+ "jump":"Jump",
+ "spin":"Spin",
+ "screw":"Screw",
+ "bend":"Bend",
+ "arc":"Arc",
+ "knee_up":"Knee up",
+ "breakdance":"Breakdance",
+ "wave":"Wave",
+ "no_motion":"No motion",
+ "contact":"Contact"};
+
+ this.helpText = {
+ "search_title":"Search",
+ "search_2hands_text":"Curves to be drawn with both hands",
+ "search_mouse_text":"Curves to be mouse-drawn",
+ "search_body_text":"Gestures to be performed with your body",
+ "controls_title":"Controls",
+ "controls_1hand_text":"Gestures to be performed with your hand",
+ "controls_timeline":"Move in timeline",
+ "controls_mos_horizontal":"Unzoom",
+ "controls_mos_vertical":"Unzoom",
+ "controls_move_down":"Move",
+ "controls_move_left":"Move",
+ "controls_move_right":"Move",
+ "controls_move_up":"Move",
+ "controls_next":"Next",
+ "controls_previous":"Previous",
+ "controls_selection":"Selection"
+ }
//Dernières positions des pointeurs.
this.mainPointerLastX = null;
@@ -148,6 +190,10 @@
this.isMouseDown = false;
//Indique si on est en train de prézoomer.
this.isPrezooming = false;
+ //Indique si l'icone d'aide a été agrandie.
+ this.isHelpIconZoomed = false;
+ //Indique si l'icone d'aide est dans une interaction de zoom/dezoom en cours.
+ this.isHelpIconZooming = false;
//Timeout (attente) pour le zoom après un préZoom.
this.zoomTimeout = null;
@@ -271,7 +317,7 @@
'margin-top': this.MPTop_margin
});
- var len = this.config.length, imgs = this.config.imagesToShow, imgsTotal = this.config.imagesTotal;
+ var len = this.config.imagesByLine, imgs = this.config.imagesToShow, imgsTotal = this.config.imagesTotal;
//S'il s'agit d'un rectangle.
if(imgs % len == 0)
@@ -308,6 +354,20 @@
{
this.isMouseDown = true;
+ //Si on se trouve sur l'icone d'aide et qu'elle est zoomée.
+ if(this.isHelpIconZoomed)
+ {
+ //On affiche différentes aides en fonction de si on se trouve dans une vidéo ou non.
+ if(this.currentMode == 'SEARCH' || this.currentMode == 'VIDEO' || this.currentMode == 'TIMELINE')
+ {
+ this.notifyHelp(false);
+ }
+ else if(this.currentMode == 'FILTER' || this.currentMode == 'MOSAIC')
+ {
+ this.notifyHelp(true);
+ }
+ }
+
//On met à jour les coordonnées de la souris au dernier mouse down.
this.mouseDownPosX = e.pageX;
this.mouseDownPosY = e.pageY;
@@ -330,6 +390,18 @@
*/
Mosaic.prototype.onMouseMove = function(e)
{
+ //On vérifie si la souris n'est pas sur l'icone d'aide.
+ if(this.isOnHelpIcon(this.mousePosX, this.mousePosY))
+ {
+ //On agrandit l'icone d'aide.
+ this.showBigHelp();
+ }
+ else
+ {
+ //On la rétrecit sinon.
+ this.showSmallHelp();
+ }
+
//Si on n'a pas appuyé sur la souris avant, on part.
if(!this.isMouseDown)
{
@@ -574,7 +646,7 @@
}
//Si l'aide est affichée, un clic la ferme.
- if(this.helpDisplayed)
+ if(this.helpDisplayed && !this.isHelpIconZoomed && !this.isHelpIconZooming)
{
this.removeHelp();
}
@@ -607,7 +679,7 @@
//On calcule la taille des divs contenant les snapshots.
this.width = $('#mainPanel').innerWidth();
//On ne calculera pas tout de suite la hauteur de la mosaique étant donnée qu'elle est calculée par la suite dynamiquement.
- this.snapshotWidth = this.width / this.config.length - this.marginWidth;
+ this.snapshotWidth = this.width / this.config.imagesByLine - this.marginWidth;
this.snapshotHeight = this.snapshotWidth*9/16;
$('.snapshotDivs').css('width', this.snapshotWidth).css('height', this.snapshotHeight).css('margin', this.marginWidth/2);
@@ -690,6 +762,9 @@
//Si on est en mode d'intéraction souris.
if(this.config.mouseInteractions)
{
+ //On affiche l'icone d'aide.
+ this.helpIcon();
+
//Si on fait un mouse down sur le body, on vérifie enregistre le déplacement de la souris jusqu'au prochain mouse up.
$(window).mousedown(function (e)
{
@@ -746,7 +821,7 @@
var _this = this;
//Variables censées être des ints.
- var supposedToBeInt = ['length', 'imagesToShow', 'totalImages', 'timeReloadAfterResize', 'timePrezoom', 'timePreUnzoom', 'timeZoom', 'zoomTime', 'timeUnzoom', 'timeNeighbourGlowing', 'timeNeighbourUnglowing', 'timeMovingToNeighbour', 'timeSearchFade', 'timeNotifyFade', 'timeFilterFade', 'timeANFade', 'timeFilling', 'zoomedMargin', 'timeoutZoom', 'timeoutUnzoom', 'timeoutMoveToNeighbour', 'timeoutPointersIdle', 'timeoutAreBothPointersHere', 'timeoutRemoveNotificationByGesture', 'timeoutRemoveFailedNotificationByGesture', 'timeoutNotifySwipe', 'timeoutSelectTL', 'timeoutSlideTL', 'timeoutCanNotifyHelp', 'timeoutRemoveSpinner', 'timeoutNouser', 'timeoutNextDrawCurve', 'mouseUpDownDeltaTreshold'];
+ var supposedToBeInt = ['imagesByLine', 'imagesToShow', 'totalImages', 'timeReloadAfterResize', 'timePrezoom', 'timePreUnzoom', 'zoomTime', 'timeUnzoom', 'timeNeighbourGlowing', 'timeNeighbourUnglowing', 'timeMovingToNeighbour', 'timeSearchFade', 'timeNotifyFade', 'timeFilterFade', 'timeANFade', 'timeFilling', 'zoomedMargin', 'timeoutZoom', 'timeoutUnzoom', 'timeoutMoveToNeighbour', 'timeoutPointersIdle', 'timeoutAreBothPointersHere', 'timeoutRemoveNotificationByGesture', 'timeoutNotifySwipe', 'timeoutSelectTL', 'timeoutSlideTL', 'timeoutCanNotifyHelp', 'timeoutRemoveSpinner', 'timeoutNouser', 'timeoutNextDrawCurve', 'mouseUpDownDeltaTreshold', 'helpBorderSize'];
//Variables censées êtres des floats.
var supposedToBeFloat = ['zoomPercentage', 'prezoomPercentage'];
--- a/front_idill/src/mosaic/js/neighbours.js Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/mosaic/js/neighbours.js Thu Jul 26 14:34:02 2012 +0200
@@ -46,18 +46,18 @@
//On ne peut actuellement pas se déplacer vers un voisin.
this.canMoveToNeighbour = false;
//On calcule la ligne et colonne du snapshot du milieu.
- var currentLine = Math.floor(this.centerId / this.config.length), currentColumn = this.centerId % this.config.length;
+ var currentLine = Math.floor(this.centerId / this.config.imagesByLine), currentColumn = this.centerId % this.config.imagesByLine;
var zoomedImg = $('img', this.previousZoomedSN);
//On cherche l'ID des voisins.
//Si le voisin de gauche est sur la même ligne, on n'est pas sur la bordure de gauche.
this.neighboursIds[0] = (currentColumn > 0) ? (this.centerId - 1) : -1;
//Si le voisin de droite est sur la même ligne, on n'est pas sur la bordure de droite.
- this.neighboursIds[1] = (currentColumn < this.config.length - 1) ? (+this.centerId + 1) : -1;
+ this.neighboursIds[1] = (currentColumn < this.config.imagesByLine - 1) ? (+this.centerId + 1) : -1;
//Si le voisin du haut est sur la même colonne, on n'est pas sur la bordure du haut.
- this.neighboursIds[2] = (currentLine > 0) ? (this.centerId - this.config.length) : -1;
+ this.neighboursIds[2] = (currentLine > 0) ? (this.centerId - this.config.imagesByLine) : -1;
//Si le voisin du bas est sur la même colonne, on n'est pas sur la bordure du bas.
- this.neighboursIds[3] = (currentLine < (this.config.imagesToShow / this.config.length)) ? (+this.centerId + this.config.length) : -1;
+ this.neighboursIds[3] = (currentLine < (this.config.imagesToShow / this.config.imagesByLine)) ? (+this.centerId + this.config.imagesByLine) : -1;
//ID du cadre voisin.
var preId;
@@ -90,7 +90,7 @@
{
return;
}
-
+
//Pour tous les voisins.
var additionalNeighbours = '';
for(var i = 0 ; i < this.neighboursIds.length ; i++)
@@ -459,7 +459,7 @@
var startId = this.previousZoomedSN.attr('id').replace('snapshotDiv-', '');
//On charge les attributs nécessaires aux calculs.
- var length = _this.config.length;
+ var length = _this.config.imagesByLine;
var MPCurrentTop = $('#mainPanel').position().top, MPCurrentLeft = $('#mainPanel').position().left;
var divideCoeffTop = Math.floor(destinationId / length) == 0 ? 1 : Math.floor(destinationId / length);
var divideCoeffLeft = destinationId % length == 0 ? 1 : destinationId % length;
@@ -587,7 +587,7 @@
//Espace de centrage vertical de la mosaïque.
var top_margin = parseInt(this.MPTop_margin);
//Dimensions de la mosaïque en nombre de snapshots.
- var mosW = this.config.length, mosH = this.config.imagesToShow / mosW;
+ var mosW = this.config.imagesByLine, mosH = this.config.imagesToShow / mosW;
//Si le pointeur se trouve au niveau de la mosaïque.
if(x < W * mosW && y >= top_margin && y < H * mosH + top_margin)
--- a/front_idill/src/mosaic/js/notifications.js Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/mosaic/js/notifications.js Thu Jul 26 14:34:02 2012 +0200
@@ -20,7 +20,7 @@
/*
* Affiche l'aide.
* Est appelé dans les fichiers :
- * mosaic > fonction manageControlEvents.
+ * mosaic > fonctions manageControlEvents et onMouseDown.
* curvesDetector > fonction updateDists.
*/
Mosaic.prototype.notifyHelp = function(inMosaic)
@@ -30,7 +30,7 @@
{
return;
}
-
+
//On enlève les autres notifications.
this.removeNotifications();
@@ -39,10 +39,13 @@
//Section des courbes de recherche.
var search_2hands_tab;
+ var search_2hands_tab_text;
//Section des recherches corporelles.
var search_body_tab;
+ var search_body_tab_text;
//Section des actions de contrôle sur l'interface.
var controls_1hand_tab;
+ var controls_1hand_tab_text;
//Opacités (indique si elles sont actuellement implémentées).
var search_2hands_tab_opacities;
var search_body_tab_opacities;
@@ -56,12 +59,15 @@
if(this.config.mouseInteractions)
{
search_2hands_tab = ['arret', 'contact', 'grandjete', 'group_spin', 'port_de_bras', 'spin', 'up_down', 'wave', 'chute', 'knee_up', 'jump', 'bend'];
+ search_2hands_tab_text = ['no-motion', 'contact', 'grand-jete', 'screw', 'arc', 'circle', 'up-down', 'wave', 'fall', 'knee-up', 'jump', 'bend'];
search_2hands_tab_opacities = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
}
else
{
search_2hands_tab = ['arret', 'contact', 'grandjete', 'group_spin', 'port_de_bras', 'spin', 'up_down', 'wave'];
+ search_2hands_tab_text = ['no-motion', 'contact', 'grand-jete', 'screw', 'arc', 'circle', 'up-down', 'wave'];
search_body_tab = ['chute', 'knee_up', 'jump', 'bend'];
+ search_body_tab_text = ['fall', 'knee-up', 'jump', 'bend'];
search_2hands_tab_opacities = [0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5];
search_body_tab_opacities = [1, 1, 1, 1];
}
@@ -70,13 +76,24 @@
if(inMosaic)
{
controls_1hand_tab = ['selection'];
+ controls_1hand_tab_text = ['controls_selection'];
controls_1hand_tab_opacities = [1];
}
//Dans une vidéo, on peut aller d'un voisin à l'autre, bouger dans la timeline, dézoomer et swiper d'un marqueur à l'autre.
else
{
- controls_1hand_tab = ['deplacer', 'precedent', 'suivant', 'mosaique_horizontal', 'mosaique_vertical', 'move_down', 'move_up', 'move_right', 'move_left'];
- controls_1hand_tab_opacities = [1, 1, 1, 1, 1, 1, 1, 1, 1];
+ if(this.config.mouseInteractions)
+ {
+ controls_1hand_tab = ['deplacer', 'move_down', 'move_up', 'move_right', 'move_left'];
+ controls_1hand_tab_text = ['controls_timeline', 'controls_move_down', 'controls_move_up', 'controls_move_right', 'controls_move_left'];
+ controls_1hand_tab_opacities = [1, 1, 1, 1, 1];
+ }
+ else
+ {
+ controls_1hand_tab = ['deplacer', 'precedent', 'suivant', 'mosaique_horizontal', 'mosaique_vertical', 'move_down', 'move_up', 'move_right', 'move_left'];
+ controls_1hand_tab = ['controls_timeline', 'controls_previous', 'controls_next', 'controls_mos_horizontal', 'controls_mos_vertical', 'controls_move_down', 'controls_move_up', 'controls_move_right', 'controls_move_left'];
+ controls_1hand_tab_opacities = [1, 1, 1, 1, 1, 1, 1, 1, 1];
+ }
}
//Colonne de recherche.
@@ -225,45 +242,48 @@
//Longueur de la colonne de recherche.
var search_width = $('#help_search').width();
- $('#search_title').html('Recherche');
+ $('#search_title').html(this.helpText.search_title);
var MI = '';
//Le texte de recherche et les images changent en fonction du mode d'intéraction (souris/Kinect).
if(this.config.mouseInteractions)
{
- $('#search_2hands_text').html('Courbes à effectuer avec la souris');
+ $('#search_2hands_text').html(this.helpText.search_2hands_text);
MI = 'MI/';
}
else
{
- $('#search_2hands_text').html('Gestes à effectuer avec les deux mains');
+ $('#search_2hands_text').html(this.helpText.search_2hands_text);
}
//On affecte les images pour la recherche par courbes.
for(var i = 0 ; i < search_2hands_tab.length ; i++)
{
$("#2hands_" + search_2hands_tab[i]).css("background-image", "url('" + img_directory + MI + search_2hands_tab[i] + ".png')");
+ $("#2hands_" + search_2hands_tab[i]).html(this.notificationStrings[search_2hands_tab_text[i]]);
}
//Si on est en mode Kinect, on affecte les images de recherche corporelle.
if(!this.config.mouseInteractions)
{
- $('#search_body_text').html('Gestes à effectuer avec le corps entier');
+ $('#search_body_text').html(this.helpText.search_body_text);
for(var i = 0 ; i < search_body_tab.length ; i++)
{
$("#body_" + search_body_tab[i]).css("background-image", "url('" + img_directory + search_body_tab[i] + ".png')");
+ $("#body_" + search_body_tab[i]).html(this.notificationStrings[search_body_tab_text[i]]);
}
}
//Actions de contrôle de l'interface.
- $('#controls_title').html('Contrôles');
- $('#controls_1hand_text').html('Gestes à effectuer avec une seule main');
+ $('#controls_title').html(this.helpText.controls_title);
+ $('#controls_1hand_text').html(this.helpText.controls_1hand_text);
//On affecte les images des actions de contrôle de l'interface.
for(var i = 0 ; i < controls_1hand_tab.length ; i++)
{
$("#1hand_" + controls_1hand_tab[i]).css("background-image", "url('" + img_directory + controls_1hand_tab[i] + ".png')");
+ $("#1hand_" + controls_1hand_tab[i]).html(this.helpText[controls_1hand_tab_text[i]]);
}
//On les fait apparaître.
@@ -323,20 +343,44 @@
var notification_selection = "<div id='notify_selection' class='notifications'></div>";
var notification_search = "<div id='notify_search' class='notifications'></div>";
- //On les ajoute à la mosaïque.
- $('body').append(notification_selection + notification_search);
-
- //On calcule leurs coordonnées et dimensions.
- var notify_width = $('.notifications').width(), notify_height = $('.notifications').height();
- var notify_margin = parseInt($('.notifications').css('margin'));
- var selection_left = $(window).width() / 2 - (notify_width * 2 + notify_margin * 3) / 2;
- var search_left = selection_left + notify_width + notify_margin;
+ //On calcule leurs dimensions.
+ var notify_width, notify_height, notify_margin;
+ var selection_left, search_left;
+
+ if(this.config.mouseInteractions)
+ {
+ //On ajoute à la mosaïque seulement la recherche.
+ $('body').append(notification_search);
+ notify_margin = parseInt($('.notifications').css('margin'));
+ notify_width = $('.notifications').width();
+ notify_height = $('.notifications').height();
+ //On calcule leurs coordonnées.
+ search_left = ($(window).width() / 2 - notify_width / 2 - notify_margin);
+ var img = $('#notify_search').css('background-image');
+ $('#notify_search').css('background-image', img.replace('notifications/', 'notifications/MI/'));
+ }
+ else
+ {
+ //On les ajoute à la mosaïque.
+ $('body').append(notification_selection + notification_search);
+ notify_margin = parseInt($('.notifications').css('margin'));
+ notify_width = $('.notifications').width();
+ notify_height = $('.notifications').height();
+ //On calcule leurs coordonnées.
+ selection_left = $(window).width() / 2 - (notify_width * 2 + notify_margin * 3) / 2;
+ search_left = selection_left + notify_width + notify_margin;
+
+ this.putText($('#notify_selection'), this.notificationStrings.select);
+
+ $('#notify_selection').css(
+ {
+ left: selection_left
+ });
+ }
+
+ this.putText($('#notify_search'), this.notificationStrings.search);
//On les positionne.
- $('#notify_selection').css(
- {
- left: selection_left
- });
$('#notify_search').css(
{
left: search_left
@@ -373,6 +417,14 @@
var notify_margin = parseInt($('.notifications').css('margin'));
var selection_left = $(window).width() / 2 - (notify_width) / 2 - notify_margin;
+ if(this.config.mouseInteractions)
+ {
+ var img = $('#notify_selection').css('background-image');
+ $('#notify_selection').css('background-image', img.replace('notifications/', 'notifications/MI/'));
+ }
+
+ this.putText($('#notify_selection'), this.notificationStrings.confirm);
+
//On les positionne.
$('#notify_selection').css(
{
@@ -411,6 +463,14 @@
var notify_margin = parseInt($('.notifications').css('margin'));
var search_left = $(window).width() / 2 - notify_width / 2 - notify_margin;
+ if(this.config.mouseInteractions)
+ {
+ var img = $('#notify_search').css('background-image');
+ $('#notify_search').css('background-image', img.replace('notifications/', 'notifications/MI/'));
+ }
+
+ this.putText($('#notify_search'), this.notificationStrings.search);
+
//On la positionne.
$('#notify_search').css(
{
@@ -440,16 +500,28 @@
//On spécifie les notifications en div.
var notification_selection = "<div id='notify_selection' class='notifications'></div>";
var notification_search = "<div id='notify_search' class='notifications'></div>";
-
- //On les ajoute à la mosaïque.
- $('body').append(notification_selection + notification_search);
-
- //On calcule leurs coordonnées et dimensions.
- var notify_width = $('.notifications').width(), notify_height = $('.notifications').height();
- var notify_margin = parseInt($('.notifications').css('margin'));
- var search_left = $(window).width() / 2 - (notify_width * 2 + notify_margin * 3) / 2;
- var selection_left = search_left + notify_width + notify_margin;
-
+
+ //On les ajoute à la mosaïque.
+ $('body').append(notification_selection + notification_search);
+
+ var notify_width = $('.notifications').width(), notify_height = $('.notifications').height(), notify_margin = parseInt($('.notifications').css('margin'));
+
+ //On calcule leurs coordonnées.
+ var selection_left = $(window).width() / 2 - (notify_width * 2 + notify_margin * 3) / 2;
+ var search_left = selection_left + notify_width + notify_margin;
+
+ if(this.config.mouseInteractions)
+ {
+ var imgSel = $('#notify_selection').css('background-image');
+ $('#notify_selection').css('background-image', imgSel.replace('notifications/', 'notifications/MI/'));
+
+ var imgSearch = $('#notify_search').css('background-image');
+ $('#notify_search').css('background-image', imgSearch.replace('notifications/', 'notifications/MI/'));
+ }
+
+ this.putText($('#notify_selection'), this.notificationStrings.confirm);
+ this.putText($('#notify_search'), this.notificationStrings.search);
+
//On les positionne.
$('#notify_selection').css(
{
@@ -504,6 +576,8 @@
$('#notify_search_1gesture').css('background-image', 'url("./pictos/big/normal/inconnu.png")');
}
+ this.putText($('#notify_search_1gesture'), this.notificationStrings[gestureName]);
+
//On les positionne.
$('#notify_search_1gesture').css(
{
@@ -552,7 +626,16 @@
{
$('#notify_search_1gesture').css('background-image', 'url("./pictos/big/normal/inconnu.png")');
}
-
+
+ if(this.config.mouseInteractions)
+ {
+ var img = $('#notify_selection').css('background-image');
+ $('#notify_selection').css('background-image', img.replace('notifications/', 'notifications/MI/'));
+ }
+
+ this.putText($('#notify_selection'), this.notificationStrings.confirm);
+ this.putText($('#notify_search_1gesture'), this.notificationStrings[gestureName]);
+
//On les positionne.
$('#notify_search_1gesture').css(
{
@@ -599,6 +682,15 @@
var notifyTop = 0, notifyLeft = 0;
+ if(direction.equals("left"))
+ {
+ this.putText($('#notify_swipe'), this.notificationStrings.next);
+ }
+ else
+ {
+ this.putText($('#notify_swipe'), this.notificationStrings.previous);
+ }
+
//On les positionne.
$('#notify_swipe').css(
{
@@ -606,7 +698,7 @@
left: -notifyLeft + ($(window).width() - notify_width - notify_margin) / 2,
'background-image': 'url(./pictos/notifications/swipe_' + direction + '.png)'
});
-
+
//On les fait apparaître.
$('.notifications').css(
{
@@ -651,6 +743,8 @@
var notifyTop = 0, notifyLeft = 0;
+ this.putText($('#notify_move'), this.notificationStrings.move);
+
//On les positionne.
$('#notify_move').css(
{
@@ -706,6 +800,9 @@
var notifyTop = 0, notifyLeft = 0;
+ this.putText($('#notify_move'), this.notificationStrings.move);
+ this.putText($('#notify_unzoom'), this.notificationStrings.unzoom);
+
//On les positionne.
$('#notify_move').css(
{
@@ -764,6 +861,8 @@
var notifyTop = 0, notifyLeft = 0;
+ this.putText($('#notify_unzoom'), this.notificationStrings.unzoom);
+
//On la positionne.
$('#notify_unzoom').css(
{
@@ -807,6 +906,8 @@
var notifyTop = 0, notifyLeft = 0;
+ this.putText($('#notify_timeline'), this.notificationStrings.timeline);
+
//On la positionne.
$('#notify_timeline').css(
{
@@ -851,6 +952,8 @@
var notifyTop = 0, notifyLeft = 0;
+ this.putText($('#notify_search'), this.notificationStrings.search);
+
//On la positionne.
$('#notify_search').css(
{
@@ -895,6 +998,16 @@
var notifyTop = 0, notifyLeft = 0;
+ this.putText($('#notify_search'), this.notificationStrings.search);
+ if(direction.equals("left"))
+ {
+ this.putText($('#notify_swipe'), this.notificationStrings.next);
+ }
+ else
+ {
+ this.putText($('#notify_swipe'), this.notificationStrings.previous);
+ }
+
//On les positionne.
$('#notify_search').css(
{
@@ -952,6 +1065,9 @@
var notifyTop = 0, notifyLeft = 0;
+ this.putText($('#notify_search'), this.notificationStrings.search);
+ this.putText($('#notify_move'), this.notificationStrings.move);
+
//On les positionne.
$('#notify_search').css(
{
@@ -1012,6 +1128,10 @@
var notifyTop = 0, notifyLeft = 0;
+ this.putText($('#notify_search'), this.notificationStrings.search);
+ this.putText($('#notify_move'), this.notificationStrings.move);
+ this.putText($('#notify_unzoom'), this.notificationStrings.unzoom);
+
//On les positionne.
$('#notify_search').css(
{
@@ -1076,6 +1196,9 @@
var notifyTop = 0, notifyLeft = 0;
+ this.putText($('#notify_search'), this.notificationStrings.search);
+ this.putText($('#notify_unzoom'), this.notificationStrings.unzoom);
+
//On les positionne.
$('#notify_move').css(
{
@@ -1136,6 +1259,8 @@
$('#notify_search_1gesture').css('background-image', 'url("./pictos/big/normal/inconnu.png")');
}
+ this.putText($('#notify_search_1gesture'), this.notificationStrings[gestureName]);
+
//On les positionne.
$('#notify_search_1gesture').css(
{
@@ -1186,7 +1311,18 @@
{
$('#notify_search_1gesture').css('background-image', 'url("./pictos/big/normal/inconnu.png")');
}
+
+ if(direction.equals("left"))
+ {
+ this.putText($('#notify_swipe'), this.notificationStrings.next);
+ }
+ else
+ {
+ this.putText($('#notify_swipe'), this.notificationStrings.previous);
+ }
+ this.putText($('#notify_search_1gesture'), this.notificationStrings[gestureName]);
+
//On les positionne.
$('#notify_search_1gesture').css(
{
@@ -1251,6 +1387,9 @@
var sides = ['left', 'right', 'up', 'down'];
+ this.putText($('#notify_move'), this.notificationStrings.move);
+ this.putText($('#notify_search_1gesture'), this.notificationStrings[gestureName]);
+
//On les positionne.
$('#notify_search_1gesture').css(
{
@@ -1318,6 +1457,10 @@
var sides = ['left', 'right', 'up', 'down'];
var unzooms = ['horizontal', 'vertical'];
+ this.putText($('#notify_move'), this.notificationStrings.move);
+ this.putText($('#notify_unzoom'), this.notificationStrings.unzoom);
+ this.putText($('#notify_search_1gesture'), this.notificationStrings[gestureName]);
+
//On les positionne.
$('#notify_search_1gesture').css(
{
@@ -1386,6 +1529,9 @@
var unzooms = ['horizontal', 'vertical'];
+ this.putText($('#notify_unzoom'), this.notificationStrings.unzoom);
+ this.putText($('#notify_search_1gesture'), this.notificationStrings[gestureName]);
+
//On les positionne.
$('#notify_search_1gesture').css(
{
@@ -1429,6 +1575,9 @@
'background-image': 'url("./pictos/big/normal/inconnu.png")',
opacity: '0.9'
});
+
+ this.putText($('#notify_curves'), this.notificationStrings["unknown"]);
+
return;
}
@@ -1467,6 +1616,7 @@
//On les place.
$('#notify_curves_' + gestures_tab[i]).css('left', curves_gestures_left[i]);
+ this.putText($('#notify_curves_' + gestures_tab[i]), this.notificationStrings[gestures_tab[i]]);
}
//On les fait apparaître.
@@ -1491,4 +1641,107 @@
Mosaic.prototype.removeNotifications = function()
{
$('.notifications').remove();
+}
+
+/*
+ * Place un texte sur la notification.
+ * Est appelé dans chaque fonction servant à notifier dans le fichier de notification.
+*/
+Mosaic.prototype.putText = function(notification, text)
+{
+ notification.html(text);
+}
+
+/*
+ * Affiche l'icone d'aide.
+ * Est appelé dans les fichiers :
+ * mosaic > fonction loadMosaic.
+ * zoomInteractions > fonctions zoom et unzoom.
+*/
+Mosaic.prototype.helpIcon = function()
+{
+ this.removeHelpIcon();
+ //On construit le div.
+ var helpIcon = "<img id='helpIcon' src='./img/helpIcon.png' />";
+ //On l'ajoute.
+ $('body').append(helpIcon);
+ //On spécifie ses coordonnées.
+ $('#helpIcon').css(
+ {
+ top: 0,
+ left: $(window).width() - $('#helpIcon').width() - 2 * parseInt($('#helpIcon').css('margin'))
+ });
+}
+
+/*
+ * Supprime l'icone d'aide.
+ * Est appelé dans les fichiers :
+ * zoomInteractions > fonctions zoom et unzoom.
+ * notifications > fonction helpIcon.
+*/
+Mosaic.prototype.removeHelpIcon = function()
+{
+ this.isHelpIconZooming = false;
+ this.isHelpIconZoomed = false;
+ $('#helpIcon').remove();
+}
+
+/*
+ * Agrandit l'icone d'aide.
+ * Est appelé dans le fichier :
+ * mosaic > fonction onMouseMove.
+*/
+Mosaic.prototype.showBigHelp = function()
+{
+ //Si on a déjà zoomé on quitte.
+ if(this.isHelpIconZoomed || this.isHelpIconZooming)
+ {
+ return;
+ }
+
+ this.isHelpIconZooming = true;
+
+ var _this = this;
+
+ $('#helpIcon').animate(
+ {
+ width: 100,
+ height: 100,
+ left: $(window).width() - 100 - 2 * parseInt($('#helpIcon').css('margin'))
+ }, this.config.timeShowBigHelp, function()
+ {
+ _this.isHelpIconZoomed = true;
+ _this.isHelpIconZooming = false;
+ });
+}
+
+/*
+ * Rétrecit l'icone d'aide.
+ * Est appelé dans le fichier :
+ * mosaic > fonction onMouseMove.
+*/
+Mosaic.prototype.showSmallHelp = function()
+{
+ //Si on n'a pas zoomé on quitte.
+ if(!this.isHelpIconZoomed || this.isHelpIconZooming)
+ {
+ return;
+ }
+
+ this.isHelpIconZooming = true;
+
+ var _this = this;
+
+ var helpIconWidth = $('#helpIcon').width();
+
+ $('#helpIcon').animate(
+ {
+ width: 50,
+ height: 50,
+ left: $(window).width() - 50 - 2 * parseInt($('#helpIcon').css('margin'))
+ }, this.config.timeShowBigHelp, function()
+ {
+ _this.isHelpIconZoomed = false;
+ _this.isHelpIconZooming = false;
+ });
}
\ No newline at end of file
--- a/front_idill/src/mosaic/js/pointers.js Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/mosaic/js/pointers.js Thu Jul 26 14:34:02 2012 +0200
@@ -912,4 +912,27 @@
}
}
}
+}
+
+/*
+ * Retourne vrai si la souris est sur la notification d'aide dans le mode d'interaction souris.
+ * Est appelé dans les fichiers :
+ * mosaic > onMouseMove.
+*/
+Mosaic.prototype.isOnHelpIcon = function(x, y)
+{
+ var helpIcon = $('#helpIcon');
+ //S'il n'y a pas d'icone d'aide, on quitte.
+ if(helpIcon.length <= 0)
+ {
+ return;
+ }
+
+ //Si la souris est sur l'icone, on retourne true.
+ if(x > helpIcon.position().left && x < +helpIcon.position().left + helpIcon.width() && y > helpIcon.position().top && y < +helpIcon.position().top + helpIcon.height() + 2 * parseInt(helpIcon.css('margin')))
+ {
+ return true;
+ }
+
+ return false;
}
\ No newline at end of file
--- a/front_idill/src/mosaic/js/search.js Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/mosaic/js/search.js Thu Jul 26 14:34:02 2012 +0200
@@ -90,6 +90,8 @@
$.getJSON(path, function(data)
{
_this.gesturesText = data.gesturesText;
+ _this.notificationStrings = data.notificationStrings;
+ _this.helpText = data.helpText;
});
}
--- a/front_idill/src/mosaic/js/zoomInteractions.js Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/mosaic/js/zoomInteractions.js Thu Jul 26 14:34:02 2012 +0200
@@ -44,7 +44,7 @@
//Dimensions de la mosaïque.
var h = this.height, w = this.width;
//Longueur en images, nombre d'images et taille de bordure de la mosaïque.
- var len = this.config.length, imgs = this.config.imagesToShow, margin = this.marginWidth;
+ var len = this.config.imagesByLine, imgs = this.config.imagesToShow, margin = this.marginWidth;
//Dimensions et position d'un snapshot dans la mosaïque.
var snHeight = this.snapshotHeight, snWidth = this.snapshotWidth;
var sTop = snapshot.position().top, sLeft = snapshot.position().left;
@@ -274,9 +274,15 @@
{
return;
}
+
+ //Si on est en mode d'interaction souris, on enlève la bordure d'aide.
+ if(this.config.mouseInteractions)
+ {
+ this.removeHelpIcon();
+ }
//On prend les attributs nécessaires au calculs.
- var margin = this.marginWidth, len = this.config.length, imgs = this.config.imagesToShow, zoomedMargin = this.config.zoomedMargin;
+ var margin = this.marginWidth, len = this.config.imagesByLine, imgs = this.config.imagesToShow, zoomedMargin = this.config.zoomedMargin;
var zoomPercentage = this.config.zoomPercentage;
var initMPWidth = this.previousZoomedSN.width() * len + margin*len, initMPHeight = this.previousZoomedSN.height() * (imgs / len) + margin*(imgs / len);
var newMPWidth = initMPWidth * len + zoomedMargin * (len), newMPHeight = initMPHeight * (imgs / len) + zoomedMargin * ((imgs / len));
@@ -334,6 +340,12 @@
left: newZoomLeft
}, this.config.zoomTime, function()
{
+ //Si on est en mode d'interaction souris, on affiche la bordure d'aide.
+ if(_this.config.mouseInteractions)
+ {
+ _this.helpIcon();
+ }
+
_this.snTop = (zoomedImg.position().top + newZoomTop + _this.MPTop_margin), _this.snLeft = (zoomedImg.position().left + newZoomLeft);
_this.snWidth = newSnWidth + 1, _this.snHeight = newSnHeight + 1;
@@ -386,6 +398,12 @@
}
var _this = this;
+
+ //Si on est en mode d'interaction souris, on enlève la bordure d'aide.
+ if(this.config.mouseInteractions)
+ {
+ this.removeHelpIcon();
+ }
//Il n'est plus possible de swiper.
this.canSwipe = false;
@@ -485,6 +503,12 @@
left: '0px'
}, this.config.unzoomTime, function()
{
+ //Si on est en mode d'interaction souris, on affiche la bordure d'aide.
+ if(_this.config.mouseInteractions)
+ {
+ _this.helpIcon();
+ }
+
//On n'est plus en plein écran, et on ne peut plus se déplacer vers le prochain voisin.
_this.fullscreen = false;
_this.canMoveToNeighbour = false;
Binary file front_idill/src/pictos/big/MI/hover/arc.png has changed
Binary file front_idill/src/pictos/big/MI/hover/bend.png has changed
Binary file front_idill/src/pictos/big/MI/hover/circle.png has changed
Binary file front_idill/src/pictos/big/MI/hover/contact.png has changed
Binary file front_idill/src/pictos/big/MI/hover/fall.png has changed
Binary file front_idill/src/pictos/big/MI/hover/grand-jete.png has changed
Binary file front_idill/src/pictos/big/MI/hover/jump.png has changed
Binary file front_idill/src/pictos/big/MI/hover/knee-up.png has changed
Binary file front_idill/src/pictos/big/MI/hover/no-motion.png has changed
Binary file front_idill/src/pictos/big/MI/hover/right-angle.png has changed
Binary file front_idill/src/pictos/big/MI/hover/screw.png has changed
Binary file front_idill/src/pictos/big/MI/hover/up-down.png has changed
Binary file front_idill/src/pictos/big/MI/hover/wave.png has changed
Binary file front_idill/src/pictos/big/MI/normal/arc.png has changed
Binary file front_idill/src/pictos/big/MI/normal/bend.png has changed
Binary file front_idill/src/pictos/big/MI/normal/circle.png has changed
Binary file front_idill/src/pictos/big/MI/normal/contact.png has changed
Binary file front_idill/src/pictos/big/MI/normal/fall.png has changed
Binary file front_idill/src/pictos/big/MI/normal/grand-jete.png has changed
Binary file front_idill/src/pictos/big/MI/normal/jump.png has changed
Binary file front_idill/src/pictos/big/MI/normal/knee-up.png has changed
Binary file front_idill/src/pictos/big/MI/normal/no-motion.png has changed
Binary file front_idill/src/pictos/big/MI/normal/right-angle.png has changed
Binary file front_idill/src/pictos/big/MI/normal/screw.png has changed
Binary file front_idill/src/pictos/big/MI/normal/up-down.png has changed
Binary file front_idill/src/pictos/big/MI/normal/wave.png has changed
Binary file front_idill/src/pictos/big/MI/valid/arc.png has changed
Binary file front_idill/src/pictos/big/MI/valid/bend.png has changed
Binary file front_idill/src/pictos/big/MI/valid/circle.png has changed
Binary file front_idill/src/pictos/big/MI/valid/contact.png has changed
Binary file front_idill/src/pictos/big/MI/valid/fall.png has changed
Binary file front_idill/src/pictos/big/MI/valid/grand-jete.png has changed
Binary file front_idill/src/pictos/big/MI/valid/jump.png has changed
Binary file front_idill/src/pictos/big/MI/valid/knee-up.png has changed
Binary file front_idill/src/pictos/big/MI/valid/no-motion.png has changed
Binary file front_idill/src/pictos/big/MI/valid/right-angle.png has changed
Binary file front_idill/src/pictos/big/MI/valid/screw.png has changed
Binary file front_idill/src/pictos/big/MI/valid/up-down.png has changed
Binary file front_idill/src/pictos/big/MI/valid/wave.png has changed
Binary file front_idill/src/pictos/big/hover/arc.png has changed
Binary file front_idill/src/pictos/big/hover/bend.png has changed
Binary file front_idill/src/pictos/big/hover/circle.png has changed
Binary file front_idill/src/pictos/big/hover/contact.png has changed
Binary file front_idill/src/pictos/big/hover/fall.png has changed
Binary file front_idill/src/pictos/big/hover/grand-jete.png has changed
Binary file front_idill/src/pictos/big/hover/hello.png has changed
Binary file front_idill/src/pictos/big/hover/jump.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/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/screw.png has changed
Binary file front_idill/src/pictos/big/hover/slow.png has changed
Binary file front_idill/src/pictos/big/hover/up-down.png has changed
Binary file front_idill/src/pictos/big/hover/wave.png has changed
Binary file front_idill/src/pictos/big/hover/wheel.png has changed
Binary file front_idill/src/pictos/big/normal/arc.png has changed
Binary file front_idill/src/pictos/big/normal/bend.png has changed
Binary file front_idill/src/pictos/big/normal/circle.png has changed
Binary file front_idill/src/pictos/big/normal/contact.png has changed
Binary file front_idill/src/pictos/big/normal/fall.png has changed
Binary file front_idill/src/pictos/big/normal/grand-jete.png has changed
Binary file front_idill/src/pictos/big/normal/hello.png has changed
Binary file front_idill/src/pictos/big/normal/inconnu.png has changed
Binary file front_idill/src/pictos/big/normal/jump.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/run.png has changed
Binary file front_idill/src/pictos/big/normal/rythme.png has changed
Binary file front_idill/src/pictos/big/normal/screw.png has changed
Binary file front_idill/src/pictos/big/normal/slow.png has changed
Binary file front_idill/src/pictos/big/normal/up-down.png has changed
Binary file front_idill/src/pictos/big/normal/wave.png has changed
Binary file front_idill/src/pictos/big/normal/wheel.png has changed
Binary file front_idill/src/pictos/big/valid/arc.png has changed
Binary file front_idill/src/pictos/big/valid/bend.png has changed
Binary file front_idill/src/pictos/big/valid/circle.png has changed
Binary file front_idill/src/pictos/big/valid/contact.png has changed
Binary file front_idill/src/pictos/big/valid/fall.png has changed
Binary file front_idill/src/pictos/big/valid/grand-jete.png has changed
Binary file front_idill/src/pictos/big/valid/hello.png has changed
Binary file front_idill/src/pictos/big/valid/jump.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/run.png has changed
Binary file front_idill/src/pictos/big/valid/rythme.png has changed
Binary file front_idill/src/pictos/big/valid/screw.png has changed
Binary file front_idill/src/pictos/big/valid/slow.png has changed
Binary file front_idill/src/pictos/big/valid/up-down.png has changed
Binary file front_idill/src/pictos/big/valid/wave.png has changed
Binary file front_idill/src/pictos/big/valid/wheel.png has changed
Binary file front_idill/src/pictos/help/MI/arret.png has changed
Binary file front_idill/src/pictos/help/MI/bend.png has changed
Binary file front_idill/src/pictos/help/MI/breakdance.png has changed
Binary file front_idill/src/pictos/help/MI/chute.png has changed
Binary file front_idill/src/pictos/help/MI/contact.png has changed
Binary file front_idill/src/pictos/help/MI/grandjete.png has changed
Binary file front_idill/src/pictos/help/MI/group_spin.png has changed
Binary file front_idill/src/pictos/help/MI/jump.png has changed
Binary file front_idill/src/pictos/help/MI/knee_up.png has changed
Binary file front_idill/src/pictos/help/MI/port_de_bras.png has changed
Binary file front_idill/src/pictos/help/MI/spin.png has changed
Binary file front_idill/src/pictos/help/MI/up_down.png has changed
Binary file front_idill/src/pictos/help/MI/wave.png has changed
Binary file front_idill/src/pictos/help/arret.png has changed
Binary file front_idill/src/pictos/help/bend.png has changed
Binary file front_idill/src/pictos/help/breakdance.png has changed
Binary file front_idill/src/pictos/help/chute.png has changed
Binary file front_idill/src/pictos/help/contact.png has changed
Binary file front_idill/src/pictos/help/deplacer.png has changed
Binary file front_idill/src/pictos/help/grandjete.png has changed
Binary file front_idill/src/pictos/help/group_spin.png has changed
Binary file front_idill/src/pictos/help/hello.png has changed
Binary file front_idill/src/pictos/help/jump.png has changed
Binary file front_idill/src/pictos/help/knee_up.png has changed
Binary file front_idill/src/pictos/help/mosaique_horizontal.png has changed
Binary file front_idill/src/pictos/help/mosaique_vertical.png has changed
Binary file front_idill/src/pictos/help/move_down.png has changed
Binary file front_idill/src/pictos/help/move_left.png has changed
Binary file front_idill/src/pictos/help/move_right.png has changed
Binary file front_idill/src/pictos/help/move_up.png has changed
Binary file front_idill/src/pictos/help/port_de_bras.png has changed
Binary file front_idill/src/pictos/help/precedent.png has changed
Binary file front_idill/src/pictos/help/rythme.png has changed
Binary file front_idill/src/pictos/help/selection.png has changed
Binary file front_idill/src/pictos/help/slow.png has changed
Binary file front_idill/src/pictos/help/spin.png has changed
Binary file front_idill/src/pictos/help/suivant.png has changed
Binary file front_idill/src/pictos/help/up_down.png has changed
Binary file front_idill/src/pictos/help/volant.png has changed
Binary file front_idill/src/pictos/help/wave.png has changed
Binary file front_idill/src/pictos/notifications/MI/confirmer.png has changed
Binary file front_idill/src/pictos/notifications/MI/rechercher.png has changed
Binary file front_idill/src/pictos/notifications/MI/selectionner.png has changed
Binary file front_idill/src/pictos/notifications/confirmer.png has changed
Binary file front_idill/src/pictos/notifications/deplacer.png has changed
Binary file front_idill/src/pictos/notifications/inconnu.png has changed
Binary file front_idill/src/pictos/notifications/move_down.png has changed
Binary file front_idill/src/pictos/notifications/move_left.png has changed
Binary file front_idill/src/pictos/notifications/move_right.png has changed
Binary file front_idill/src/pictos/notifications/move_up.png has changed
Binary file front_idill/src/pictos/notifications/rechercher.png has changed
Binary file front_idill/src/pictos/notifications/selectionner.png has changed
Binary file front_idill/src/pictos/notifications/swipe_left.png has changed
Binary file front_idill/src/pictos/notifications/swipe_right.png has changed
Binary file front_idill/src/pictos/notifications/unzoom_horizontal.png has changed
Binary file front_idill/src/pictos/notifications/unzoom_vertical.png has changed
--- a/front_idill/src/player/metadataplayer/Timeline.js Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/player/metadataplayer/Timeline.js Thu Jul 26 14:34:02 2012 +0200
@@ -48,7 +48,7 @@
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.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"];
var _this = this;
--- a/front_idill/src/search/js/curvesDetector.js Tue Jul 24 16:35:10 2012 +0200
+++ b/front_idill/src/search/js/curvesDetector.js Thu Jul 26 14:34:02 2012 +0200
@@ -207,10 +207,17 @@
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)
+ if(foundGestures.length == 0 && !this.mosaic.helpDisplayed && this.mosaic.mouseInteractions)
{
- //On l'affiche.
- this.mosaic.notifyHelp();
+ //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);
+ }
+ else if(this.mosaic.currentMode == 'FILTER')
+ {
+ this.mosaic.notifyHelp(true);
+ }
foundGestures = '';
//On enlève la recherche.
--- a/middleware/dist/BBM.iss Tue Jul 24 16:35:10 2012 +0200
+++ b/middleware/dist/BBM.iss Thu Jul 26 14:34:02 2012 +0200
@@ -99,6 +99,7 @@
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\player\img\*"; DestDir: "{app}\Front IDILL\player\img\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\player\json\*"; DestDir: "{app}\Front IDILL\player\json\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\player\metadataplayer\*"; DestDir: "{app}\Front IDILL\player\metadataplayer\"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\player\videos\*"; DestDir: "{app}\Front IDILL\player\videos\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\player\index.html"; DestDir: "{app}\Front IDILL\player\"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
