modif thierry

static/MAIN.js

@@ -401,8 +401,11 @@ function animate() {
     // page de choix
     if (page_vues && num_tache <= nb_mesh){
         //console.log("boucle choix")
-        // on enlève les touches du clavier associé à la page inscription
+        if (skiped){document.removeEventListener("keydown", action_clavier_inscription)}
-        document.removeEventListener("keydown", action_clavier_explication)
+        else{
+            // on enlève les touches du clavier associé à la page inscription
+            document.removeEventListener("keydown", action_clavier_explication)}
+        
         //init touche clavier
         if(premier_tour_page_vues){
             // init clavier pour les vues

static/fonctions_contexte.js

@@ -170,21 +170,22 @@ color_blanc = "rgb(255,255,255)"
 color_rouge = "rgb(239, 71, 111)"
 textes={
 "texte0":{"t":"Hello, I am Marie Pelissier, a 3rd year PhD student. I work in the field of computer science and more precisely in computer vision.", "y": window.innerHeight*0.15, "c": color_blanc},
-"texte1":{"t":"You are currently participating in my user study which will allow me to collect data. These data are precious because they will be used to demonstrate the effectiveness of my work. Unfortunately, such data are not available today in the scientific literature.", "y":window.innerHeight*0.35, "c": color_blanc},
+"texte1":{"t":"You are currently participating in my user study which will allow me to collect data related to my research. These data are precious because they will be used to demonstrate the effectiveness of my work. Unfortunately, such data are not available today in the scientific literature.", "y":window.innerHeight*0.35, "c": color_blanc},
 "texte2":{"t":"My work is dedicated to the automatic selection of the best viewpoint for a given 3D object. I will give you more details.", "y":window.innerHeight*0.65, "c": color_blanc},
 "texte3":{"t":"What is a viewpoint? ", "y": window.innerHeight*0.15, "c": color_rouge},
 "texte4":{"t":"> A point of view of a object corresponds to the position from which we observe a object.", "y": window.innerHeight*0.2, "c": color_blanc},
-"texte5":{"t":"Depending on this position, we can observe different parts of this object. However, from any position, it is often not possible to observe all the parts of this object. Some of them, are not visible because they form the 'back' of the object.", "y": window.innerHeight*0.32, "c": color_blanc},
+"texte5":{"t":"Depending on this position, we can observe different parts of this object. However, from any position, it is often not possible to observe all the parts of this object.", "y": window.innerHeight*0.32, "c": color_blanc},
+//"texte5":{"t":"Depending on this position, we can observe different parts of this object. However, from any position, it is often not possible to observe all the parts of this object. Some of them, are not visible because they form the 'back' of the object.", "y": window.innerHeight*0.32, "c": color_blanc},
 "texte6":{"t":"For example, let's look at this object (which represents a wolf) from this position/viewpoint. Here we cannot see the head of the wolf  but its four legs and tail are visible.", "y": window.innerHeight*0.55, "c": color_blanc},
 "texte7":{"t":"There, we cannot see its right eye, left rear leg and tail but the head of the wolf is visible.", "y": window.innerHeight*0.75, "c": color_blanc},
 "texte8":{"t":"What is a good viewpoint?", "y": window.innerHeight*0.15, "c": color_rouge},
-"texte9":{"t":"> A good point of view corresponds to the position from which we can observe representative parts of our objects that allow us to identify it at first. But also to observe the most salient elements. The more characteristic elements a viewpoint contains, the better the viewpoint will be considered.", "y": window.innerHeight*0.2, "c": color_blanc},
+"texte9":{"t":"> A good point of view corresponds to a position from which we can observe representative parts of an object that allow us to identify it. And also to observe the most salient elements. The more characteristic elements a viewpoint contains, the better the viewpoint will be considered.", "y": window.innerHeight*0.2, "c": color_blanc},
-"texte10":{"t":"The purpose of this study is to ask you, for a given object, which are for you the best viewpoints and why. The answers will of course be subjective because everyone will have their own opinion. It is this subjective information that interests me.", "y": window.innerHeight*0.45, "c": color_blanc},
+"texte10":{"t":"The purpose of this study is to ask you, for a given object, which are for you the best viewpoints and why. The answers will of course be subjective because everyone has their own opinion. Thsi subjective information is what I am interested in.", "y": window.innerHeight*0.45, "c": color_blanc},
 "texte11":{"t":"Now that you know the context of this study, here are the instructions:", "y": window.innerHeight*0.15, "c": color_blanc},
 "texte12":{"t":"- you will study "+nb_mesh+" different objects,", "y": window.innerHeight*0.25, "c": color_blanc},
-"texte13":{"t":"- for each of them, you will have to select "+nb_choix_demande+" viewpoints,", "y": window.innerHeight*0.30, "c": color_blanc},
+"texte13":{"t":"- for each of them, you will have to select the "+nb_choix_demande+" best viewpoints in your opinion,", "y": window.innerHeight*0.35, "c": color_blanc},
-"texte14":{"t":"- once this is done, you will have to fill in a questionnaire to justify your choice of viewpoint.", "y": window.innerHeight*0.35, "c": color_blanc},
+"texte14":{"t":"- once this is done, you will have to fill in a questionnaire to justify your choice of viewpoint.", "y": window.innerHeight*0.47, "c": color_blanc},
-"texte15":{"t":"To learn how to use this interface and make your viewpoint selection correctly, a tutorial has been created. But first, you have to register.", "y": window.innerHeight*0.5, "c": color_blanc},
+"texte15":{"t":"To learn how to use this interface and make your viewpoint selection correctly, a tutorial has been created. But first, you have to register.", "y": window.innerHeight*0.65, "c": color_blanc},
 }
 
 textes_page_1 = [textes["texte0"], textes["texte1"], textes["texte2"]]

static/fonctions_inscription.js

@@ -54,6 +54,34 @@ function action_bouton_commencer_inscription(){
         
 }
 
+//////////////////////////////////////////////////////////////
+/// BOUTON COMMENCER SKIP (POUUR ALLER VERS LE TUTO)
+
+function afficher_bouton_skip_inscription(){
+    w_bouton_skip = scale_bouton_commencer*boutons["commencer_tuto"].width
+    h_bouton_skip = scale_bouton_commencer*boutons["commencer_tuto"].height
+    x_bouton_skip = (window.innerWidth/2)-(w_bouton_skip/2)
+    y_bouton_skip =  (window.innerHeight/2) + (h_bouton_skip/2) + 20
+
+    // Bouton commencer
+    ctx.drawImage(boutons["commencer_tuto"], x_bouton_skip, y_bouton_skip , w_bouton_skip, h_bouton_skip)
+
+    // Survol
+    if(xyMouseMove.x >= x_bouton_skip && xyMouseMove.x <= x_bouton_skip + w_bouton_skip && xyMouseMove.y > y_bouton_skip && xyMouseMove.y < y_bouton_skip + h_bouton_skip){
+        draw_rectangle(x_bouton_skip, y_bouton_skip , w_bouton_skip, h_bouton_skip, "rgb(200, 200, 200)", 0.6)
+    }
+}
+
+function action_bouton_skip_inscription(){
+    page_inscription = false 
+    page_vues = true
+    skiped = true
+    interactions.push({"time": new Date().getTime(), "type": "Skip tutorial -- Debut choix vues"})
+    //gestion des données personnelle de l'utilisateur
+    //gestion_donnees_personnelles()
+        
+}
+
 //////////////////////////////////////////////////////////////
 /// BOUTON SUIVANT INSCRIPTION
 function afficher_bouton_suivant_inscription(){
@@ -255,12 +283,17 @@ function traitement_inscription(){
         ctx.fillText(texte, (window.innerWidth/2)- (largeur/2), 100)
         ctx.fillText(texte2, (window.innerWidth/2)- (largeur2/2), 160)
         //print_text(handle_text(texte, (window.innerWidth/2) - (window.innerWidth/2)/2,  (window.innerHeight/4), font, (window.innerWidth/2), color="#FFFFFF", interligne=50))
-        // affichager le bouton commencer
+        // affichager le bouton commencer tutorial
         afficher_bouton_commencer_inscription()
-        // si on appuie 
+        // affichager le bouton skipi
+        afficher_bouton_skip_inscription()
+        // si on appuie sur start tutorial
         if (clicked && click_inside(xyMouseDown, x_bouton_commencer, y_bouton_commencer , w_bouton_commencer, h_bouton_commencer)){
             action_bouton_commencer_inscription()
         }
+        if (clicked && click_inside(xyMouseDown, x_bouton_skip, y_bouton_skip , w_bouton_skip, h_bouton_skip)){
+            action_bouton_skip_inscription()
+        }