diff --git a/outputs/87426147-0c0f-4327-aa55-d8fbb1c599c0.json b/outputs/87426147-0c0f-4327-aa55-d8fbb1c599c0.json new file mode 100644 index 0000000..148d426 --- /dev/null +++ b/outputs/87426147-0c0f-4327-aa55-d8fbb1c599c0.json @@ -0,0 +1,311 @@ +{ + "tache_N1": { + "obj_file": "horse_update_user_study_normed.obj", + "mesh": "horse", + "position_init_idx_i": 3, + "position_init_idx_j": 3, + "theta_init": -0.7853981633974483, + "delta_init": 2.356194490192345, + "choix_poses": [ + [ + "choix1", + -0.7853981633974483, + 2.356194490192345, + 3, + 3 + ], + [ + "choix2", + -0.7853981633974483, + 1.5707963267948966, + 2, + 3 + ], + [ + "choix3", + -0.7853981633974483, + 0.7853981633974483, + 1, + 3 + ] + ] + }, + "tache_N2": { + "obj_file": "gorgoile_update_user_study_centered_normed.obj", + "mesh": "gorgoile", + "position_init_idx_i": 0, + "position_init_idx_j": 3, + "theta_init": -0.7853981633974483, + "delta_init": 0, + "choix_poses": [ + [ + "choix1", + -0.7853981633974483, + 0, + 0, + 3 + ], + [ + "choix2", + -0.7853981633974483, + 5.497787143782138, + 7, + 3 + ], + [ + "choix3", + -0.7853981633974483, + 4.71238898038469, + 6, + 3 + ] + ] + }, + "tache_N3": { + "obj_file": "camel_update_user_study_normed.obj", + "mesh": "camel", + "position_init_idx_i": 1, + "position_init_idx_j": 0, + "theta_init": 1.5707963267948966, + "delta_init": 0.7853981633974483, + "choix_poses": [ + [ + "choix1", + 1.5707963267948966, + 0.7853981633974483, + 1, + 0 + ], + [ + "choix2", + 1.5707963267948966, + 0, + 0, + 0 + ], + [ + "choix3", + 1.5707963267948966, + 5.497787143782138, + 7, + 0 + ] + ] + }, + "tache_N4": { + "obj_file": "dragon_update_user_study_normed.obj", + "mesh": "dragon", + "position_init_idx_i": 5, + "position_init_idx_j": 0, + "theta_init": 1.5707963267948966, + "delta_init": 3.9269908169872414, + "choix_poses": [ + [ + "choix1", + 1.5707963267948966, + 3.9269908169872414, + 5, + 0 + ], + [ + "choix2", + 1.5707963267948966, + 3.141592653589793, + 4, + 0 + ], + [ + "choix3", + 1.5707963267948966, + 2.356194490192345, + 3, + 0 + ] + ] + }, + "Analyse": { + "analyse_N1": { + "mesh": "horse", + "idx": [ + 0 + ], + "mots": [ + "1. De face" + ] + } + }, + "Interactions": [ + { + "time": 1678465379722, + "type": "start" + }, + { + "time": 1678465379752, + "type": "Affichage Mesh random : horse en idx_i, idx_j : (3, 3)" + }, + { + "time": 1678465379752, + "type": "Affichage Mesh random : horse en theta, delta : (-0.7853981633974483, 2.356194490192345)" + }, + { + "time": 1678465388781, + "type": "bouton pose n°1" + }, + { + "time": 1678465388893, + "type": "fleche droite" + }, + { + "time": 1678465389021, + "type": "bouton pose n°2" + }, + { + "time": 1678465389085, + "type": "fleche droite" + }, + { + "time": 1678465389181, + "type": "bouton pose n°3" + }, + { + "time": 1678465389453, + "type": "bouton valider" + }, + { + "time": 1678465389476, + "type": "Affichage Mesh random : gorgoile en idx_i, idx_j : (0, 3)" + }, + { + "time": 1678465389476, + "type": "Affichage Mesh random : gorgoile en theta, delta : (-0.7853981633974483, 0)" + }, + { + "time": 1678465390077, + "type": "bouton pose n°1" + }, + { + "time": 1678465390126, + "type": "fleche droite" + }, + { + "time": 1678465390285, + "type": "bouton pose n°2" + }, + { + "time": 1678465390381, + "type": "fleche droite" + }, + { + "time": 1678465390477, + "type": "bouton pose n°3" + }, + { + "time": 1678465390877, + "type": "bouton valider" + }, + { + "time": 1678465390901, + "type": "Affichage Mesh random : camel en idx_i, idx_j : (1, 0)" + }, + { + "time": 1678465390901, + "type": "Affichage Mesh random : camel en theta, delta : (1.5707963267948966, 0.7853981633974483)" + }, + { + "time": 1678465392973, + "type": "bouton pose n°1" + }, + { + "time": 1678465393069, + "type": "fleche droite" + }, + { + "time": 1678465393181, + "type": "bouton pose n°2" + }, + { + "time": 1678465393245, + "type": "fleche droite" + }, + { + "time": 1678465395965, + "type": "bouton pose n°3" + }, + { + "time": 1678465396685, + "type": "bouton valider" + }, + { + "time": 1678465396711, + "type": "Affichage Mesh random : dragon en idx_i, idx_j : (5, 0)" + }, + { + "time": 1678465396711, + "type": "Affichage Mesh random : dragon en theta, delta : (1.5707963267948966, 3.9269908169872414)" + }, + { + "time": 1678465397069, + "type": "bouton pose n°1" + }, + { + "time": 1678465397165, + "type": "fleche droite" + }, + { + "time": 1678465397261, + "type": "bouton pose n°2" + }, + { + "time": 1678465397325, + "type": "fleche droite" + }, + { + "time": 1678465397421, + "type": "bouton pose n°3" + }, + { + "time": 1678465400957, + "type": "bouton pose n°4" + }, + { + "time": 1678465400957, + "type": "Affichage error 3 déjà fait" + }, + { + "time": 1678465401103, + "type": "fleche droite" + }, + { + "time": 1678465401181, + "type": "bouton pose n°4" + }, + { + "time": 1678465401181, + "type": "Affichage error 3 déjà fait" + }, + { + "time": 1678465401533, + "type": "bouton valider" + }, + { + "time": 1678465401533, + "type": "fin des choix." + }, + { + "time": 1678465401534, + "type": "Début analyse n°1" + }, + { + "time": 1678465403325, + "type": "ajout check sur : analyse n°1, mot 1. De face" + }, + { + "time": 1678465403581, + "type": "Bouton valider analyse." + }, + { + "time": 1678465403585, + "type": "Fin analyse" + } + ] +} \ No newline at end of file diff --git a/outputs/c3648e92-a53f-41fe-a489-301d694e7d24.json b/outputs/c3648e92-a53f-41fe-a489-301d694e7d24.json new file mode 100644 index 0000000..6ef1024 --- /dev/null +++ b/outputs/c3648e92-a53f-41fe-a489-301d694e7d24.json @@ -0,0 +1,333 @@ +{ + "tache_N1": { + "obj_file": "camel_update_user_study_normed.obj", + "mesh": "camel", + "position_init_idx_i": 0, + "position_init_idx_j": 3, + "theta_init": -0.7853981633974483, + "delta_init": 0, + "choix_poses": [ + [ + "choix1", + -0.7853981633974483, + 0, + 0, + 3 + ], + [ + "choix2", + -0.7853981633974483, + 5.497787143782138, + 7, + 3 + ], + [ + "choix3", + -0.7853981633974483, + 4.71238898038469, + 6, + 3 + ] + ] + }, + "tache_N2": { + "obj_file": "gorgoile_update_user_study_centered_normed.obj", + "mesh": "gorgoile", + "position_init_idx_i": 2, + "position_init_idx_j": 1, + "theta_init": 0.7853981633974483, + "delta_init": 1.5707963267948966, + "choix_poses": [ + [ + "choix1", + 0.7853981633974483, + 1.5707963267948966, + 2, + 1 + ], + [ + "choix2", + 0.7853981633974483, + 0.7853981633974483, + 1, + 1 + ], + [ + "choix3", + 0.7853981633974483, + 0, + 0, + 1 + ] + ] + }, + "tache_N3": { + "obj_file": "horse_update_user_study_normed.obj", + "mesh": "horse", + "position_init_idx_i": 1, + "position_init_idx_j": 2, + "theta_init": 0, + "delta_init": 0.7853981633974483, + "choix_poses": [ + [ + "choix1", + 0, + 0.7853981633974483, + 1, + 2 + ], + [ + "choix2", + 0, + 0, + 0, + 2 + ], + [ + "choix3", + 0, + 5.497787143782138, + 7, + 2 + ] + ] + }, + "tache_N4": { + "obj_file": "dragon_update_user_study_normed.obj", + "mesh": "dragon", + "position_init_idx_i": 7, + "position_init_idx_j": 0, + "theta_init": 1.5707963267948966, + "delta_init": 5.497787143782138, + "choix_poses": [ + [ + "choix1", + 1.5707963267948966, + 5.497787143782138, + 7, + 0 + ], + [ + "choix2", + 1.5707963267948966, + 4.71238898038469, + 6, + 0 + ], + [ + "choix3", + 1.5707963267948966, + 3.9269908169872414, + 5, + 0 + ] + ] + }, + "Analyse": { + "analyse_N1": { + "mesh": "camel", + "idx": [ + 0 + ], + "mots": [ + "1. De face" + ] + }, + "analyse_N2": { + "mesh": "gorgoile", + "idx": [ + 0 + ], + "mots": [ + "1. De face" + ] + }, + "analyse_N3": { + "mesh": "horse", + "idx": [ + 0 + ], + "mots": [ + "1. De face" + ] + } + }, + "Interactions": [ + { + "time": 1678465420282, + "type": "start" + }, + { + "time": 1678465420309, + "type": "Affichage Mesh random : camel en idx_i, idx_j : (0, 3)" + }, + { + "time": 1678465420309, + "type": "Affichage Mesh random : camel en theta, delta : (-0.7853981633974483, 0)" + }, + { + "time": 1678465421134, + "type": "bouton pose n°1" + }, + { + "time": 1678465421213, + "type": "fleche droite" + }, + { + "time": 1678465421309, + "type": "bouton pose n°2" + }, + { + "time": 1678465421389, + "type": "fleche droite" + }, + { + "time": 1678465421485, + "type": "bouton pose n°3" + }, + { + "time": 1678465421773, + "type": "bouton valider" + }, + { + "time": 1678465421794, + "type": "Affichage Mesh random : gorgoile en idx_i, idx_j : (2, 1)" + }, + { + "time": 1678465421794, + "type": "Affichage Mesh random : gorgoile en theta, delta : (0.7853981633974483, 1.5707963267948966)" + }, + { + "time": 1678465421997, + "type": "bouton pose n°1" + }, + { + "time": 1678465422045, + "type": "fleche droite" + }, + { + "time": 1678465422205, + "type": "bouton pose n°2" + }, + { + "time": 1678465422286, + "type": "fleche droite" + }, + { + "time": 1678465422381, + "type": "bouton pose n°3" + }, + { + "time": 1678465422909, + "type": "bouton valider" + }, + { + "time": 1678465422929, + "type": "Affichage Mesh random : horse en idx_i, idx_j : (1, 2)" + }, + { + "time": 1678465422929, + "type": "Affichage Mesh random : horse en theta, delta : (0, 0.7853981633974483)" + }, + { + "time": 1678465423181, + "type": "bouton pose n°1" + }, + { + "time": 1678465423325, + "type": "fleche droite" + }, + { + "time": 1678465423421, + "type": "bouton pose n°2" + }, + { + "time": 1678465423517, + "type": "fleche droite" + }, + { + "time": 1678465423597, + "type": "bouton pose n°3" + }, + { + "time": 1678465423789, + "type": "bouton valider" + }, + { + "time": 1678465423810, + "type": "Affichage Mesh random : dragon en idx_i, idx_j : (7, 0)" + }, + { + "time": 1678465423810, + "type": "Affichage Mesh random : dragon en theta, delta : (1.5707963267948966, 5.497787143782138)" + }, + { + "time": 1678465424141, + "type": "bouton pose n°1" + }, + { + "time": 1678465424237, + "type": "fleche droite" + }, + { + "time": 1678465424349, + "type": "bouton pose n°2" + }, + { + "time": 1678465424445, + "type": "fleche droite" + }, + { + "time": 1678465424525, + "type": "bouton pose n°3" + }, + { + "time": 1678465424845, + "type": "bouton valider" + }, + { + "time": 1678465424845, + "type": "fin des choix." + }, + { + "time": 1678465424853, + "type": "Début analyse n°1" + }, + { + "time": 1678465425805, + "type": "ajout check sur : analyse n°1, mot 1. De face" + }, + { + "time": 1678465426189, + "type": "Bouton valider analyse." + }, + { + "time": 1678465426189, + "type": "Début analyse n°2" + }, + { + "time": 1678465426541, + "type": "ajout check sur : analyse n°2, mot 1. De face" + }, + { + "time": 1678465426781, + "type": "Bouton valider analyse." + }, + { + "time": 1678465426781, + "type": "Début analyse n°3" + }, + { + "time": 1678465427149, + "type": "ajout check sur : analyse n°3, mot 1. De face" + }, + { + "time": 1678465427437, + "type": "Bouton valider analyse." + }, + { + "time": 1678465427438, + "type": "Fin analyse" + } + ] +} \ No newline at end of file diff --git a/outputs/dc5957cb-5399-4573-80fc-919985efca12.json b/outputs/dc5957cb-5399-4573-80fc-919985efca12.json new file mode 100644 index 0000000..6625f47 --- /dev/null +++ b/outputs/dc5957cb-5399-4573-80fc-919985efca12.json @@ -0,0 +1,341 @@ +{ + "tache_N1": { + "obj_file": "horse_update_user_study_normed.obj", + "mesh": "horse", + "position_init_idx_i": 3, + "position_init_idx_j": 4, + "theta_init": -1.5707963267948966, + "delta_init": 2.356194490192345, + "choix_poses": [ + [ + "choix1", + -1.5707963267948966, + 2.356194490192345, + 3, + 4 + ], + [ + "choix2", + -1.5707963267948966, + 1.5707963267948966, + 2, + 4 + ], + [ + "choix3", + -1.5707963267948966, + 0.7853981633974483, + 1, + 4 + ] + ] + }, + "tache_N2": { + "obj_file": "dragon_update_user_study_normed.obj", + "mesh": "dragon", + "position_init_idx_i": 0, + "position_init_idx_j": 3, + "theta_init": -0.7853981633974483, + "delta_init": 0, + "choix_poses": [ + [ + "choix1", + -0.7853981633974483, + 0, + 0, + 3 + ], + [ + "choix2", + -0.7853981633974483, + 5.497787143782138, + 7, + 3 + ], + [ + "choix3", + -0.7853981633974483, + 4.71238898038469, + 6, + 3 + ] + ] + }, + "tache_N3": { + "obj_file": "gorgoile_update_user_study_centered_normed.obj", + "mesh": "gorgoile", + "position_init_idx_i": 0, + "position_init_idx_j": 2, + "theta_init": 0, + "delta_init": 0, + "choix_poses": [ + [ + "choix1", + 0, + 0, + 0, + 2 + ], + [ + "choix2", + 0, + 5.497787143782138, + 7, + 2 + ], + [ + "choix3", + 0, + 4.71238898038469, + 6, + 2 + ] + ] + }, + "tache_N4": { + "obj_file": "camel_update_user_study_normed.obj", + "mesh": "camel", + "position_init_idx_i": 5, + "position_init_idx_j": 0, + "theta_init": 1.5707963267948966, + "delta_init": 3.9269908169872414, + "choix_poses": [ + [ + "choix1", + 1.5707963267948966, + 3.9269908169872414, + 5, + 0 + ], + [ + "choix2", + 1.5707963267948966, + 3.141592653589793, + 4, + 0 + ], + [ + "choix3", + 1.5707963267948966, + 2.356194490192345, + 3, + 0 + ] + ] + }, + "Analyse": { + "analyse_N1": { + "mesh": "dragon", + "idx": [ + 0 + ], + "mots": [ + "1. De face" + ] + }, + "analyse_N2": { + "mesh": "gorgoile", + "idx": [ + 0 + ], + "mots": [ + "1. De face" + ] + }, + "analyse_N3": { + "mesh": "camel", + "idx": [ + 0 + ], + "mots": [ + "1. De face" + ] + } + }, + "Interactions": [ + { + "time": 1678465959826, + "type": "start" + }, + { + "time": 1678465959854, + "type": "Affichage Mesh random : horse en idx_i, idx_j : (3, 4)" + }, + { + "time": 1678465959854, + "type": "Affichage Mesh random : horse en theta, delta : (-1.5707963267948966, 2.356194490192345)" + }, + { + "time": 1678465960301, + "type": "bouton pose n°1" + }, + { + "time": 1678465962365, + "type": "bouton pose n°2" + }, + { + "time": 1678465962365, + "type": "Affichage error pose déjà sélectionnée" + }, + { + "time": 1678465962445, + "type": "fleche droite" + }, + { + "time": 1678465962541, + "type": "bouton pose n°2" + }, + { + "time": 1678465962653, + "type": "fleche droite" + }, + { + "time": 1678465962701, + "type": "bouton pose n°3" + }, + { + "time": 1678465963325, + "type": "bouton valider" + }, + { + "time": 1678465963346, + "type": "Affichage Mesh random : dragon en idx_i, idx_j : (0, 3)" + }, + { + "time": 1678465963346, + "type": "Affichage Mesh random : dragon en theta, delta : (-0.7853981633974483, 0)" + }, + { + "time": 1678465966061, + "type": "bouton pose n°1" + }, + { + "time": 1678465966125, + "type": "fleche droite" + }, + { + "time": 1678465966237, + "type": "bouton pose n°2" + }, + { + "time": 1678465966333, + "type": "fleche droite" + }, + { + "time": 1678465966397, + "type": "bouton pose n°3" + }, + { + "time": 1678465966733, + "type": "bouton valider" + }, + { + "time": 1678465966758, + "type": "Affichage Mesh random : gorgoile en idx_i, idx_j : (0, 2)" + }, + { + "time": 1678465966758, + "type": "Affichage Mesh random : gorgoile en theta, delta : (0, 0)" + }, + { + "time": 1678465968957, + "type": "bouton pose n°1" + }, + { + "time": 1678465969022, + "type": "fleche droite" + }, + { + "time": 1678465969165, + "type": "bouton pose n°2" + }, + { + "time": 1678465969245, + "type": "fleche droite" + }, + { + "time": 1678465969325, + "type": "bouton pose n°3" + }, + { + "time": 1678465969741, + "type": "bouton valider" + }, + { + "time": 1678465969771, + "type": "Affichage Mesh random : camel en idx_i, idx_j : (5, 0)" + }, + { + "time": 1678465969771, + "type": "Affichage Mesh random : camel en theta, delta : (1.5707963267948966, 3.9269908169872414)" + }, + { + "time": 1678465972733, + "type": "bouton pose n°1" + }, + { + "time": 1678465972781, + "type": "fleche droite" + }, + { + "time": 1678465972909, + "type": "bouton pose n°2" + }, + { + "time": 1678465972973, + "type": "fleche droite" + }, + { + "time": 1678465973085, + "type": "bouton pose n°3" + }, + { + "time": 1678465973469, + "type": "bouton valider" + }, + { + "time": 1678465973469, + "type": "fin des choix." + }, + { + "time": 1678465973474, + "type": "Début analyse n°1" + }, + { + "time": 1678465974333, + "type": "ajout check sur : analyse n°1, mot 1. De face" + }, + { + "time": 1678465976573, + "type": "Bouton valider analyse." + }, + { + "time": 1678465976573, + "type": "Début analyse n°2" + }, + { + "time": 1678465979277, + "type": "ajout check sur : analyse n°2, mot 1. De face" + }, + { + "time": 1678465979949, + "type": "Bouton valider analyse." + }, + { + "time": 1678465979949, + "type": "Début analyse n°3" + }, + { + "time": 1678465982173, + "type": "ajout check sur : analyse n°3, mot 1. De face" + }, + { + "time": 1678465982765, + "type": "Bouton valider analyse." + }, + { + "time": 1678465982765, + "type": "Fin analyse" + } + ] +} \ No newline at end of file diff --git a/outputs/eeba07b8-ca6e-472c-8bcc-eab770ee5f35.json b/outputs/eeba07b8-ca6e-472c-8bcc-eab770ee5f35.json new file mode 100644 index 0000000..ebe5bb2 --- /dev/null +++ b/outputs/eeba07b8-ca6e-472c-8bcc-eab770ee5f35.json @@ -0,0 +1,399 @@ +{ + "identite": { + "Firstname": "k", + "Name": "k", + "Age": "1", + "Sexe": "M" + }, + "tache_N1": { + "obj_file": "gorgoile_update_user_study_centered_normed.obj", + "mesh": "gorgoile", + "position_init_idx_i": 5, + "position_init_idx_j": 1, + "theta_init": 0.7853981633974483, + "delta_init": 3.9269908169872414, + "choix_poses": [ + [ + "choix1", + 0.7853981633974483, + 3.9269908169872414, + 5, + 1 + ], + [ + "choix2", + 0.7853981633974483, + 3.141592653589793, + 4, + 1 + ], + [ + "choix3", + 0.7853981633974483, + 2.356194490192345, + 3, + 1 + ] + ] + }, + "tache_N2": { + "obj_file": "camel_update_user_study_normed.obj", + "mesh": "camel", + "position_init_idx_i": 5, + "position_init_idx_j": 1, + "theta_init": 0.7853981633974483, + "delta_init": 3.9269908169872414, + "choix_poses": [ + [ + "choix1", + 0.7853981633974483, + 3.9269908169872414, + 5, + 1 + ], + [ + "choix2", + 0.7853981633974483, + 3.141592653589793, + 4, + 1 + ], + [ + "choix3", + 0.7853981633974483, + 2.356194490192345, + 3, + 1 + ] + ] + }, + "tache_N3": { + "obj_file": "dragon_update_user_study_normed.obj", + "mesh": "dragon", + "position_init_idx_i": 4, + "position_init_idx_j": 3, + "theta_init": -0.7853981633974483, + "delta_init": 3.141592653589793, + "choix_poses": [ + [ + "choix1", + -0.7853981633974483, + 3.141592653589793, + 4, + 3 + ], + [ + "choix2", + -0.7853981633974483, + 2.356194490192345, + 3, + 3 + ], + [ + "choix3", + -0.7853981633974483, + 1.5707963267948966, + 2, + 3 + ] + ] + }, + "tache_N4": { + "obj_file": "horse_update_user_study_normed.obj", + "mesh": "horse", + "position_init_idx_i": 4, + "position_init_idx_j": 2, + "theta_init": 0, + "delta_init": 3.141592653589793, + "choix_poses": [ + [ + "choix1", + 0, + 3.141592653589793, + 4, + 2 + ], + [ + "choix2", + 0, + 2.356194490192345, + 3, + 2 + ], + [ + "choix3", + 0, + 1.5707963267948966, + 2, + 2 + ] + ] + }, + "Analyse": { + "analyse_N1": { + "mesh": "dragon", + "idx": [ + 0 + ], + "mots": [ + "1. De face" + ] + }, + "analyse_N2": { + "mesh": "camel", + "idx": [ + 1 + ], + "mots": [ + "2. De profil" + ] + }, + "analyse_N3": { + "mesh": "horse", + "idx": [ + 2 + ], + "mots": [ + "3. Debout" + ] + } + }, + "Interactions": [ + { + "time": 1678466013163, + "type": "start" + }, + { + "time": 1678466019494, + "type": "Fin contexte - Début inscription" + }, + { + "time": 1678466025099, + "type": "Fin inscription" + }, + { + "time": 1678466026584, + "type": "Début explications" + }, + { + "time": 1678466026616, + "type": "Affichage Mesh random : gorgoile en idx_i, idx_j : (4, 1)" + }, + { + "time": 1678466026616, + "type": "Affichage Mesh random : gorgoile en theta, delta : (0.7853981633974483, 3.141592653589793)" + }, + { + "time": 1678466035133, + "type": "fleche droite" + }, + { + "time": 1678466035421, + "type": "fleche haut" + }, + { + "time": 1678466035549, + "type": "fleche haut" + }, + { + "time": 1678466035549, + "type": "Affichage error à cause de fleche haut" + }, + { + "time": 1678466035757, + "type": "fleche bas" + }, + { + "time": 1678466035885, + "type": "fleche bas" + }, + { + "time": 1678466036029, + "type": "fleche droite" + }, + { + "time": 1678466036253, + "type": "bouton pose n°1" + }, + { + "time": 1678466042764, + "type": "Fin explication" + }, + { + "time": 1678466044477, + "type": "Début étude" + }, + { + "time": 1678466044557, + "type": "Affichage Mesh random : gorgoile en idx_i, idx_j : (5, 1)" + }, + { + "time": 1678466044557, + "type": "Affichage Mesh random : gorgoile en theta, delta : (0.7853981633974483, 3.9269908169872414)" + }, + { + "time": 1678466046461, + "type": "bouton pose n°1" + }, + { + "time": 1678466046605, + "type": "fleche droite" + }, + { + "time": 1678466046685, + "type": "bouton pose n°2" + }, + { + "time": 1678466046813, + "type": "fleche droite" + }, + { + "time": 1678466046877, + "type": "bouton pose n°3" + }, + { + "time": 1678466047741, + "type": "bouton valider" + }, + { + "time": 1678466047764, + "type": "Affichage Mesh random : camel en idx_i, idx_j : (5, 1)" + }, + { + "time": 1678466047764, + "type": "Affichage Mesh random : camel en theta, delta : (0.7853981633974483, 3.9269908169872414)" + }, + { + "time": 1678466048813, + "type": "bouton pose n°1" + }, + { + "time": 1678466048925, + "type": "fleche droite" + }, + { + "time": 1678466049021, + "type": "bouton pose n°2" + }, + { + "time": 1678466049133, + "type": "fleche droite" + }, + { + "time": 1678466049197, + "type": "bouton pose n°3" + }, + { + "time": 1678466050477, + "type": "bouton valider" + }, + { + "time": 1678466050500, + "type": "Affichage Mesh random : dragon en idx_i, idx_j : (4, 3)" + }, + { + "time": 1678466050500, + "type": "Affichage Mesh random : dragon en theta, delta : (-0.7853981633974483, 3.141592653589793)" + }, + { + "time": 1678466051293, + "type": "bouton pose n°1" + }, + { + "time": 1678466051373, + "type": "fleche droite" + }, + { + "time": 1678466051501, + "type": "bouton pose n°2" + }, + { + "time": 1678466051597, + "type": "fleche droite" + }, + { + "time": 1678466051677, + "type": "bouton pose n°3" + }, + { + "time": 1678466052381, + "type": "bouton valider" + }, + { + "time": 1678466052403, + "type": "Affichage Mesh random : horse en idx_i, idx_j : (4, 2)" + }, + { + "time": 1678466052403, + "type": "Affichage Mesh random : horse en theta, delta : (0, 3.141592653589793)" + }, + { + "time": 1678466053229, + "type": "bouton pose n°1" + }, + { + "time": 1678466053341, + "type": "fleche droite" + }, + { + "time": 1678466053437, + "type": "bouton pose n°2" + }, + { + "time": 1678466053549, + "type": "fleche droite" + }, + { + "time": 1678466053629, + "type": "bouton pose n°3" + }, + { + "time": 1678466054701, + "type": "bouton valider" + }, + { + "time": 1678466054701, + "type": "fin des choix." + }, + { + "time": 1678466054706, + "type": "Début analyse n°1" + }, + { + "time": 1678466055501, + "type": "ajout check sur : analyse n°1, mot 1. De face" + }, + { + "time": 1678466055885, + "type": "Bouton valider analyse." + }, + { + "time": 1678466055885, + "type": "Début analyse n°2" + }, + { + "time": 1678466056349, + "type": "ajout check sur : analyse n°2, mot 2. De profil" + }, + { + "time": 1678466057117, + "type": "Bouton valider analyse." + }, + { + "time": 1678466057117, + "type": "Début analyse n°3" + }, + { + "time": 1678466057597, + "type": "ajout check sur : analyse n°3, mot 3. Debout" + }, + { + "time": 1678466058125, + "type": "Bouton valider analyse." + }, + { + "time": 1678466058125, + "type": "Fin analyse" + } + ] +} \ No newline at end of file diff --git a/static/MAIN.js b/static/MAIN.js index c69c2ee..4cf111a 100644 --- a/static/MAIN.js +++ b/static/MAIN.js @@ -25,7 +25,6 @@ function init_variable(premier_appel){ /////////////////////////////////////////////////////// /////////////////////////////////////////////////////// - // SOURIS // gestion de la souris : pour savoir si on a clické et sur quelle image on a clické clicked = false @@ -33,9 +32,7 @@ function init_variable(premier_appel){ which_clicked_fleche = -1 bouton_raz_clicked = false - // TEMPS - // pour avoir un délai après le click - //time_click = new Date().getTime() + // Au premier appel on init : les interactions if (premier_appel){interactions = [{"time" : new Date().getTime(), "type": "start"}]} // Couleur @@ -45,7 +42,15 @@ function init_variable(premier_appel){ indice_mesh = 0 // indice du premier mesh à visionner mesh_courant = "nope" // nom des mesh // nombre de mesh a visionner AU TOTAL - nb_mesh = 2 //3 + nb_mesh = 4 //3 + // random nom mesh + obj_file = shuffle(['dragon_update_user_study_normed.obj', 'camel_update_user_study_normed.obj', 'gorgoile_update_user_study_centered_normed.obj', 'horse_update_user_study_normed.obj']) + + // nb analyse demandé + nb_analyse_demande = 3 + list_idx_tache =[] + for (let p=0; p0){ // sauvegarde des checkbox clikée et les mesh - checkbox_clicked['analyse_N'+(num_analyse+1)] = {"mesh" : choix["tache_N"+idx_tache].mesh ,"idx" : checkbox_clicked_courant.idx_checkbox, "mots": checkbox_clicked_courant.mots} + checkbox_clicked['analyse_N'+(num_analyse+1)] = {"mesh" : choix["tache_N"+list_idx_tache[idx_tache]].mesh ,"idx" : checkbox_clicked_courant.idx_checkbox, "mots": checkbox_clicked_courant.mots} //RAZ pour la prochaine analyse checkbox_clicked_courant = {idx_checkbox:[], mots:[]} // analyse suivant diff --git a/static/fonctions_choix_vues.js b/static/fonctions_choix_vues.js index a79bc7a..b1f1d50 100644 --- a/static/fonctions_choix_vues.js +++ b/static/fonctions_choix_vues.js @@ -208,23 +208,23 @@ function traitement_fleche(){ //console.log(which_clicked_fleche) switch (which_clicked_fleche){ case'gauche' : - console.log("deplacement G") + //console.log("deplacement G") action_fleche_gauche() //idx_i = (idx_i+1)%8 break; case 'droite' : - console.log("deplacement D") + //console.log("deplacement D") //idx_i = (idx_i+7)%8 action_fleche_droite() break; case'haut' : - console.log("deplacement H") + //console.log("deplacement H") action_fleche_haut() //idx_j = Math.max(idx_j-1,0) //idx_j = Math.max(idx_j-1,1) break; case 'bas' : - console.log("deplacement B") + //console.log("deplacement B") action_fleche_bas() //idx_j = Math.min(idx_j+1,4) //idx_j = Math.min(idx_j+1,3) @@ -329,13 +329,13 @@ function action_bouton_pose(){ // on regarde si la pose sélectionnée n'a pas déjà été choisie avant pose_deja_choisie(liste_poses, idx_i, idx_j) if (deja_choisie && !(nb_choix_fait == nb_choix_demande)){ - console.log("Cette pose a déjà été sélectionnée.") + //console.log("Cette pose a déjà été sélectionnée.") texte_temporaire = {"text": "This viewpoint has already been selected.", "x": x_pop_up, "y": y_pop_up, "t_end": new Date().getTime()+temps_pop} interactions.push({"time": new Date().getTime(), "type": "Affichage error pose déjà sélectionnée"})} // plus de choix possible if (nb_choix_fait == nb_choix_demande) { - console.log("Tu as déjà fait tes "+nb_choix_demande+" choix.") + //console.log("Tu as déjà fait tes "+nb_choix_demande+" choix.") texte_temporaire = {"text": "You have already selected your "+nb_choix_demande+" viewpoints.", "x": x_pop_up, "y": y_pop_up, "t_end": new Date().getTime()+temps_pop} interactions.push({"time": new Date().getTime(), "type": "Affichage error "+nb_choix_demande+" déjà fait"})} @@ -362,7 +362,7 @@ function action_bouton_retirer(){ } // S'il n'y a pas de pose choisie else { - console.log("Il n'y a pas de pose à retirer.") + //console.log("Il n'y a pas de pose à retirer.") texte_temporaire = {"text": "There are no selected viewpoints to remove.", "x": x_pop_up, "y": y_pop_up, "t_end": new Date().getTime()+temps_pop} interactions.push({"time": new Date().getTime(), "type": "Affichage error pas de pose à retirer"}) } @@ -378,7 +378,7 @@ function action_bouton_reinitialiser(){ ctxMins[i].clearRect(0, 0, canvasMins[i].width, canvasMins[i].height) } } - else {console.log("Il n'y a pas de pose à reintialiser.") + else {//console.log("Il n'y a pas de pose à reintialiser.") texte_temporaire = {"text": "There are no selected viewpoints to resart.", "x":x_pop_up, "y": y_pop_up, "t_end": new Date().getTime()+temps_pop} interactions.push({"time": new Date().getTime(), "type": "Affichage error aucun choix fait donc pas de reinitialisation possible"})} } @@ -425,7 +425,7 @@ function action_bouton_valider(){ //console.log("Tu n'as pas fait tes 3 choix") texte_temporaire = {"text": "You did not select your "+nb_choix_demande+" viewpoints.", "x": x_pop_up, "y": y_pop_up, "t_end": new Date().getTime()+temps_pop} interactions.push({"time": new Date().getTime(), "type": "Affichage error à cause du bouton valider"}) - console.log("ccc")} + } // Error : un pbl à identifier else{ console.log("PBL bouton valider") @@ -492,7 +492,7 @@ function traitement_bouton(){ break; case 'bouton_raz': bouton_raz_clicked = true - console.log("bouton raz") + //console.log("bouton raz") break; } } diff --git a/static/fonctions_clavier.js b/static/fonctions_clavier.js index 6ff250c..01df52d 100644 --- a/static/fonctions_clavier.js +++ b/static/fonctions_clavier.js @@ -38,22 +38,22 @@ function action_clavier_inscription(event){ function action_clavier_vues(event){ switch (event.key){ case 'ArrowLeft': - console.log("deplacement K-G") + //console.log("deplacement K-G") action_fleche_gauche() //idx_i = (idx_i+1)%8 break; case 'ArrowRight' : - console.log("deplacement K-D") + //console.log("deplacement K-D") action_fleche_droite() //idx_i = (idx_i+7)%8 break; case 'ArrowDown' : - console.log("deplacement K-B") + //console.log("deplacement K-B") action_fleche_bas() //idx_j = Math.min(idx_j+1,4) break; case 'ArrowUp' : - console.log("deplacement K-H") + //console.log("deplacement K-H") action_fleche_haut() //idx_j = Math.max(idx_j-1,0) break; diff --git a/static/fonctions_explications.js b/static/fonctions_explications.js index c02ba94..15330cf 100644 --- a/static/fonctions_explications.js +++ b/static/fonctions_explications.js @@ -391,36 +391,35 @@ function traitement_explications(idx_i_explication, idx_j_explication){ ///////// si on clique sur NEXT if (condition_suivant.type =="bouton" && clicked && click_inside(xyMouseDown, condition_suivant.x, condition_suivant.y, condition_suivant.w, condition_suivant.h)){ - console.log("next") - action_suivante() - + //console.log("next") + action_suivante() } //////// Si on clique sur PREVIOUS //if (condition_suivant.type =="bouton" && num_action >0 && clicked && click_inside(xyMouseDown, condition_suivant.x- w_bouton_suivant - marge_texte_x, condition_suivant.y, condition_suivant.w, condition_suivant.h)){ if (num_action >0 && clicked && click_inside(xyMouseDown, position_bouton.x- w_bouton_suivant - marge_texte_x, position_bouton.y, position_bouton.w, position_bouton.h)){ - console.log("previous") + //console.log("previous") action_previous_explication() } // Si on clique sur Fleche droite if (condition_suivant.type =="fleche_d" && num_action > 0 && clicked && click_inside(xyMouseDown, condition_suivant.x, condition_suivant.y, condition_suivant.w, condition_suivant.h)){ - console.log("fleche_d") + //console.log("fleche_d") action_droite_explication() } // Si on clique sur Fleche Haut if (condition_suivant.type =="fleche_h" && num_action > 0 && clicked && click_inside(xyMouseDown, condition_suivant.x, condition_suivant.y, condition_suivant.w, condition_suivant.h)){ - console.log("fleche_h") + //console.log("fleche_h") action_haut_explication() } // Si on clique sur Fleche bas if (condition_suivant.type =="fleche_b" && num_action > 0 && clicked && click_inside(xyMouseDown, condition_suivant.x, condition_suivant.y, condition_suivant.w, condition_suivant.h)){ - console.log("fleche_b") + //console.log("fleche_b") texte_temporaire = {} action_bas_explication() } // Si on clique sur select if (condition_suivant.type =="bouton_pose" && num_action > 0 && clicked && click_inside(xyMouseDown, condition_suivant.x, condition_suivant.y, condition_suivant.w, condition_suivant.h)){ - console.log("bouton_pose") + //console.log("bouton_pose") action_bouton_pose() action_suivante() } @@ -518,7 +517,7 @@ function action_clavier_explication(event){ // selectionner pose case ' ' : if (num_action==12){ - console.log("pose clavier") + //console.log("pose clavier") action_bouton_pose() action_suivante() } break; @@ -538,26 +537,26 @@ function action_clavier_explication(event){ if (num_action > 0){ if (num_action == 7){action_fleche_gauche(); update_mesh(idx_i, idx_j)} if ((num_action == 8) ){action_fleche_bas(); update_mesh(idx_i, idx_j)} - console.log("previous clavier") + //console.log("previous clavier") action_precedente()} break; case 'ArrowRight' : if (condition_suivant.type =="fleche_d"){ - console.log("fleche_d clavier") + //console.log("fleche_d clavier") action_droite_explication() } break case 'ArrowUp' : if (condition_suivant.type =="fleche_h"){ - console.log("fleche_h clavier") + //console.log("fleche_h clavier") action_haut_explication() } break case 'ArrowDown' : if (condition_suivant.type =="fleche_b"){ - console.log("fleche_b clavier") + //console.log("fleche_b clavier") action_bas_explication() } break