correction error remove clavier inscription

This commit is contained in:
mpelissi 2023-03-04 17:45:45 +01:00
parent 222b8be864
commit 5a8c88bd84
4 changed files with 264 additions and 1 deletions

View File

@ -0,0 +1,243 @@
{
"identite": {
"Firstname": "marie",
"Name": "pelissier",
"Age": "1",
"Sexe": "F"
},
"tache_N1": {
"obj_file": "dragon_update_user_study.obj",
"mesh": "dragon",
"position_init_idx_i": 3,
"position_init_idx_j": 1,
"theta_init": 0.7853981633974483,
"delta_init": 2.356194490192345,
"choix_poses": [
[
"choix1",
0.7853981633974483,
1.5707963267948966,
2,
1
],
[
"choix2",
0.7853981633974483,
0.7853981633974483,
1,
1
],
[
"choix3",
0.7853981633974483,
0,
0,
1
]
]
},
"tache_N2": {
"obj_file": "camel_update_user_study_normed.obj",
"mesh": "camel",
"position_init_idx_i": 2,
"position_init_idx_j": 3,
"theta_init": -0.7853981633974483,
"delta_init": 1.5707963267948966,
"choix_poses": [
[
"choix1",
-0.7853981633974483,
0,
0,
3
],
[
"choix2",
-0.7853981633974483,
5.497787143782138,
7,
3
],
[
"choix3",
-0.7853981633974483,
4.71238898038469,
6,
3
]
]
},
"Analyse": {
"analyse_N1": {
"mesh": "dragon",
"idx": [
0
],
"mots": [
"1. De face"
]
}
},
"Interactions": [
{
"time": 1677948269287,
"type": "start"
},
{
"time": 1677948271081,
"type": "bouton commencer de contexte[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]"
},
{
"time": 1677948277504,
"type": "bouton commencer d'inscriptionclavier"
},
{
"time": 1677948277557,
"type": "Affichage Mesh random : dragon en idx_i, idx_j : (3, 1)"
},
{
"time": 1677948277557,
"type": "Affichage Mesh random : dragon en theta, delta : (0.7853981633974483, 2.356194490192345)"
},
{
"time": 1677948278738,
"type": "fleche droite"
},
{
"time": 1677948278849,
"type": "bouton pose n°1"
},
{
"time": 1677948278976,
"type": "fleche droite"
},
{
"time": 1677948279088,
"type": "bouton pose n°2"
},
{
"time": 1677948280455,
"type": "bouton valider"
},
{
"time": 1677948280455,
"type": "Affichage error à cause du bouton valider"
},
{
"time": 1677948282472,
"type": "bouton pose n°3"
},
{
"time": 1677948282473,
"type": "Affichage error pose déjà sélectionnée"
},
{
"time": 1677948282949,
"type": "fleche droite"
},
{
"time": 1677948283535,
"type": "bouton valider"
},
{
"time": 1677948283535,
"type": "Affichage error à cause du bouton valider"
},
{
"time": 1677948286449,
"type": "bouton pose n°3"
},
{
"time": 1677948287552,
"type": "bouton valider"
},
{
"time": 1677948287601,
"type": "Affichage Mesh random : camel en idx_i, idx_j : (2, 3)"
},
{
"time": 1677948287601,
"type": "Affichage Mesh random : camel en theta, delta : (-0.7853981633974483, 1.5707963267948966)"
},
{
"time": 1677948288632,
"type": "fleche droite"
},
{
"time": 1677948288976,
"type": "fleche droite"
},
{
"time": 1677948289184,
"type": "bouton pose n°1"
},
{
"time": 1677948289344,
"type": "fleche droite"
},
{
"time": 1677948289456,
"type": "bouton pose n°2"
},
{
"time": 1677948289960,
"type": "bouton valider"
},
{
"time": 1677948289960,
"type": "Affichage error à cause du bouton valider"
},
{
"time": 1677948291135,
"type": "bouton pose n°3"
},
{
"time": 1677948291135,
"type": "Affichage error pose déjà sélectionnée"
},
{
"time": 1677948291368,
"type": "fleche droite"
},
{
"time": 1677948291456,
"type": "bouton pose n°3"
},
{
"time": 1677948291759,
"type": "fleche droite"
},
{
"time": 1677948291872,
"type": "bouton pose n°4"
},
{
"time": 1677948291872,
"type": "Affichage error 3 déjà fait"
},
{
"time": 1677948293016,
"type": "bouton valider"
},
{
"time": 1677948293016,
"type": "fin des choix."
},
{
"time": 1677948293027,
"type": "Début analyse n°1"
},
{
"time": 1677948294920,
"type": "ajout check sur : analyse n°1, mot 1. De face"
},
{
"time": 1677948295455,
"type": "Bouton valider analyse."
},
{
"time": 1677948295459,
"type": "Fin analyse"
}
]
}

View File

@ -23,9 +23,11 @@ function action_bouton_commencer_contexte(){
function traitement_contexte(){
affichage_texte_contexte()
//clignotement_rectangle(1000, 10,10,100,100, "rgb(255,0,0)")
afficher_bouton_commencer() // meme bouton que la page inscription
if (clicked && click_inside(xyMouseDown, x_bouton_commencer, y_bouton_commencer , w_bouton_commencer, h_bouton_commencer)){
// on passe aux choix
action_bouton_commencer_contexte()
}
}

View File

@ -47,6 +47,18 @@ function draw_contour(originex, originey, largeur, hauteur, couleur, alpha=1){
ctx.lineWidth = 1
}
function clignotement_rectangle(periode, originex, originey, largeur, hauteur, couleur){
// temps en milliseconde de la période de clignotement
t = 2*(new Date().getTime()%periode)/periode-1 // nombre entre -1 et 1
draw_rectangle(originex, originey, largeur, hauteur, couleur, Math.abs(t))
}
function clignotement_contour(periode, originex, originey, largeur, hauteur, couleur){
// temps en milliseconde de la période de clignotement
t = 2*(new Date().getTime()%periode)/periode-1 // nombre entre -1 et 1
draw_contour(originex, originey, largeur, hauteur, couleur, Math.abs(t))
}
function print_text(dialogue) {
s = dialogue.texte

View File

@ -381,6 +381,7 @@ function animate() {
time_animate = new Date().getTime()
if (page_contexte){
console.log("boucle contexte")
//init touche clavier
if (premier_tour_page_contexte){
init_clavier_contexte()
@ -391,8 +392,9 @@ function animate() {
// page inscription
if (page_inscription){
console.log("boucle inscription")
// on enlève les touches du clavier associé à la page inscription
document.removeEventListener("keydown", init_clavier_contexte)
document.removeEventListener("keydown", action_clavier_contexte)
//init touche clavier
if (premier_tour_page_inscription){
init_clavier_inscription()
@ -403,6 +405,7 @@ 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
document.removeEventListener("keydown", action_clavier_inscription)
//init touche clavier
@ -452,6 +455,7 @@ function animate() {
}
// page analyse
if (page_analyse){
console.log("boucle analyse")
// on enlève les touches du clavier associé à la page vues
document.removeEventListener("keydown", action_clavier_vues)
// inti clavier
@ -464,8 +468,10 @@ function animate() {
}
// page fin
if (!page_contexte && !page_inscription && !page_vues && !page_analyse){
console.log("boucle fin")
// on enlève les touches du clavier associé à la page vues
document.removeEventListener("keydown", action_clavier_analyse)
// clear la fenetre
ctx.clearRect(0, 0, window.innerWidth, window.innerHeight)
draw_rectangle(0,0,canvas.width, canvas.height, "rgb(3, 26, 33)", 1)
// Texte