# HG changeset patch
# User bastiena
# Date 1343832242 -7200
# Node ID 0947deb9ab6d18c4af89fc09b93a7f22d36bbec8
# Parent e960d66dff2b2c61d6f89f0ce57a04dffb5afd3b
Front IDILL:
menu fixed + default language added
diff -r e960d66dff2b -r 0947deb9ab6d front_idill/src/config_kinect.json
--- a/front_idill/src/config_kinect.json Wed Aug 01 16:16:30 2012 +0200
+++ b/front_idill/src/config_kinect.json Wed Aug 01 16:44:02 2012 +0200
@@ -46,5 +46,6 @@
"kinectUpDownDeltaTreshold":"20",
"curveDictionaryMI":"./dicoMI.json",
"curveDictionaryKI":"./dicoKI.json",
- "lang":""
+ "lang":"",
+ "langs":["en", "fr"]
}
\ No newline at end of file
diff -r e960d66dff2b -r 0947deb9ab6d front_idill/src/config_souris.json
--- a/front_idill/src/config_souris.json Wed Aug 01 16:16:30 2012 +0200
+++ b/front_idill/src/config_souris.json Wed Aug 01 16:44:02 2012 +0200
@@ -46,5 +46,6 @@
"kinectUpDownDeltaTreshold":"20",
"curveDictionaryMI":"./dicoMI.json",
"curveDictionaryKI":"./dicoKI.json",
- "lang":""
+ "lang":"",
+ "langs":["en", "fr"]
}
\ No newline at end of file
diff -r e960d66dff2b -r 0947deb9ab6d front_idill/src/defaults.js
--- a/front_idill/src/defaults.js Wed Aug 01 16:16:30 2012 +0200
+++ b/front_idill/src/defaults.js Wed Aug 01 16:44:02 2012 +0200
@@ -66,5 +66,6 @@
mouseUpDownDeltaTreshold : 100,
curveDictionaryMI : './dicoMI.json',
curveDictionaryKI : './dicoKI.json',
- lang : navigator.language
+ lang : navigator.language,
+ langs : ["en", "fr"]
}
\ No newline at end of file
diff -r e960d66dff2b -r 0947deb9ab6d front_idill/src/lang/en.json
--- a/front_idill/src/lang/en.json Wed Aug 01 16:16:30 2012 +0200
+++ b/front_idill/src/lang/en.json Wed Aug 01 16:44:02 2012 +0200
@@ -41,5 +41,10 @@
"controls_next":"Next",
"controls_previous":"Previous",
"controls_selection":"Selection"
+ },
+ "choice":{
+ "caution":"Warning. This prototype was designed to be launched on Google Chrome 20 or greater.",
+ "mouse":"Mouse interaction mode",
+ "kinect":"Kinect interaction mode"
}
}
\ No newline at end of file
diff -r e960d66dff2b -r 0947deb9ab6d front_idill/src/lang/fr.json
--- a/front_idill/src/lang/fr.json Wed Aug 01 16:16:30 2012 +0200
+++ b/front_idill/src/lang/fr.json Wed Aug 01 16:44:02 2012 +0200
@@ -41,5 +41,10 @@
"controls_next":"Suivant",
"controls_previous":"Précédent",
"controls_selection":"Sélection"
+ },
+ "choice":{
+ "caution":"Attention. Ce prototype est conçu pour fonctionner sous Google Chrome 20 ou supérieur.",
+ "mouse":"Mode d'interaction souris",
+ "kinect":"Mode d'interaction kinect"
}
}
\ No newline at end of file
diff -r e960d66dff2b -r 0947deb9ab6d front_idill/src/mosaic/js/localMosaic.js
--- a/front_idill/src/mosaic/js/localMosaic.js Wed Aug 01 16:16:30 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
-* This file is part of the TraKERS\Front IDILL package.
-*
-* (c) IRI
-*
-* 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 : localMosaic.js
- *
- * Auteur : alexandre.bastien@iri.centrepompidou.fr
- *
- * Fonctionnalités : Définit la "classe" mosaïque locale (lors d'un zoom sur une mosaïque) et définit des fonctions d'intéractions.
- */
-
-/*
- * Classe définissant la mosaïque locale.
- * Elle sera toujours de la forme 3x3, même si toutes les cases ne seront pas remplies par des snapshots (cas des bords et coins).
-*/
-function localMosaic(len, imgToShow, marginWidth)
-{
- if(imgToShow % len == 0)
- {
- this.length = len;
- this.imagesToShow = imgToShow;
- this.centerId;
- this.urls = [];
- this.imgs = [];
- this.ids = [];
- this.width;
- this.height;
- this.marginWidth = marginWidth;
- this.zoomed;
- this.snapshotTop;
- this.snapshotLeft;
- this.snapshotWidth;
- this.snapshotHeight;
- }
- else
- {
- //Affiche un message d'erreur.
- }
-}
-
-/*
- * Crée la mosaïque locale, qui est une partie de la mosaïque de mosaic.js.
- * Il y a le snapshot sur lequel on a zoomé, et les 8 snapshots voisins.
-*/
-localMosaic.prototype.createLocalMosaic = function()
-{
- var str = '';
-
- var t = this.coord1Dto2D(this.centerId);
- var localId;
-
- for(var a = t[1] - 1 ; a < t[1] + 2 ; a++)
- for(var b = t[0] - 1 ; b < t[0] + 2 ; b++)
- if(a > -1 && a < this.imagesToShow / this.length && b > -1 && b < this.length)
- {
- localId = this.coord2Dto1D(a, b);
- str += '';
- }
- else
- str += '';
-
- return str;
-}
-
-/*
- * Permet de charger la mosaïque locale.
-*/
-localMosaic.prototype.loadLocalMosaic = function(snTop, snLeft, snWidth, snHeight, imgsTab, id)
-{
- //On affecte les chemins vers les images à la mosaïque.
- this.imgs = imgsTab;
- this.centerId = id;
- this.snapshotTop = snTop;//*(newPreMPHeight/initMPHeight) - this.zoomedMargin/2 + (initMPHeight - initMPHeight * this.zoomPercentage)/2 + 'px';
- this.previousMPLeft = snLeft;
- this.snapshotWidth = snWidth;
- this.snapshotHeight = snHeight;
- //On met à jour la mosaïque.
- $('#mainPanel').html(this.createLocalMosaic(id));
- $('.snapshotDivs').css('width', snWidth).css('height', snHeight).css('margin', this.marginWidth/2);
- // var lMosTop = , newZoomLeft = -this.previousZoomedSN.position().left*(newPreMPWidth/initMPWidth) - this.zoomedMargin/2 + (initMPWidth - initMPWidth * this.zoomPercentage)/2 + 'px';
- $('#mainPanel').css('top', 0).css('left', 0);
-}
-
-/*
- * Change de 1 à 2 dimensions pour les coordonnées des snapshots dans la mosaïque.
-*/
-localMosaic.prototype.coord1Dto2D = function(i)
-{
- return [i%length, Math.floor(i/this.length)];
-}
-
-/*
- * Change de 2 à 1 dimension pour les coordonnées des snapshots dans la mosaïque.
-*/
-localMosaic.prototype.coord2Dto1D = function(i, j)
-{
- return j * this.length + i;
-}
\ No newline at end of file
diff -r e960d66dff2b -r 0947deb9ab6d front_idill/src/mosaic/js/search.js
--- a/front_idill/src/mosaic/js/search.js Wed Aug 01 16:16:30 2012 +0200
+++ b/front_idill/src/mosaic/js/search.js Wed Aug 01 16:44:02 2012 +0200
@@ -83,6 +83,12 @@
*/
Mosaic.prototype.getLang = function(lang)
{
+ //Si la langue choisie n'est pas disponible, on met l'anglais par défaut.
+ if(this.config.langs.indexOf(this.config.lang) == -1)
+ {
+ this.config.lang = "en";
+ }
+
var path = 'lang/' + this.config.lang + '.json';
var _this = this;
diff -r e960d66dff2b -r 0947deb9ab6d middleware/Debug/DebugWindow.xaml.cs
--- a/middleware/Debug/DebugWindow.xaml.cs Wed Aug 01 16:16:30 2012 +0200
+++ b/middleware/Debug/DebugWindow.xaml.cs Wed Aug 01 16:44:02 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 = "BBM";
+ private String projectName = "TraKERS";
//Chemins du fichier de config.
private String configPath;
//private String projectName = "BBM";
diff -r e960d66dff2b -r 0947deb9ab6d middleware/dist/BBM.iss
--- a/middleware/dist/BBM.iss Wed Aug 01 16:16:30 2012 +0200
+++ b/middleware/dist/BBM.iss Wed Aug 01 16:44:02 2012 +0200
@@ -91,9 +91,12 @@
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\search\*"; DestDir: "{app}\Front IDILL\search\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\snapshots\*"; DestDir: "{app}\Front IDILL\snapshots\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\snapshots-little\*"; DestDir: "{app}\Front IDILL\snapshots-little\"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\config.json"; DestDir: "{app}\Front IDILL\"; Flags: ignoreversion
+Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\config_kinect.json"; DestDir: "{app}\Front IDILL\"; Flags: ignoreversion
+Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\config_souris.json"; DestDir: "{app}\Front IDILL\"; Flags: ignoreversion
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\defaults.js"; DestDir: "{app}\Front IDILL\"; Flags: ignoreversion
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\dico.json"; DestDir: "{app}\Front IDILL\"; Flags: ignoreversion
+Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\index_kinect.html"; DestDir: "{app}\Front IDILL\"; Flags: ignoreversion
+Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\index_souris.html"; DestDir: "{app}\Front IDILL\"; Flags: ignoreversion
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\index.html"; DestDir: "{app}\Front IDILL\"; Flags: ignoreversion
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\player\fonts\*"; DestDir: "{app}\Front IDILL\player\fonts\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\Users\bastiena\Documents\trakers\front_idill\src\player\img\*"; DestDir: "{app}\Front IDILL\player\img\"; Flags: ignoreversion recursesubdirs createallsubdirs