tforgione
/
bvs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

un seul fichier en sortie (tout dans la varibale choix)

This commit is contained in:
mpelissi 2023-03-03 11:21:48 +01:00
parent 2d0e84f18f
commit 8441595bef
4 changed files with 414 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
node_modules node_modules

95
outputs/8e068382-ebb4-4d44-91e5-dc9b7eefe3aa.json Normal file
View File

@ -0,0 +1,95 @@
{
"tache_N1": {
"obj_file": "dragon_update_user_study.obj",
"mesh": "dragon",
"position_init_idx_i": 7,
"position_init_idx_j": 1,
"theta_init": 0.7853981633974483,
"delta_init": 5.497787143782138,
"choix_poses": [
[
"choix1",
0.7853981633974483,
4.71238898038469,
6,
1
],
[
"choix2",
0.7853981633974483,
3.9269908169872414,
5,
1
],
[
"choix3",
0.7853981633974483,
3.141592653589793,
4,
1
]
]
},
"tache_N2": {
"obj_file": "camel_update_user_study_normed.obj",
"mesh": "camel",
"position_init_idx_i": 6,
"position_init_idx_j": 3,
"theta_init": -0.7853981633974483,
"delta_init": 4.71238898038469,
"choix_poses": [
[
"choix1",
-0.7853981633974483,
4.71238898038469,
6,
3
],
[
"choix2",
-0.7853981633974483,
3.9269908169872414,
5,
3
],
[
"choix3",
-0.7853981633974483,
3.141592653589793,
4,
3
]
]
},
"tache_N3": {
"obj_file": "gorgoile_update_user_study_centered_normed.obj",
"mesh": "gorgoile",
"position_init_idx_i": 7,
"position_init_idx_j": 1,
"theta_init": 0.7853981633974483,
"delta_init": 5.497787143782138,
"choix_poses": [
[
"choix1",
0.7853981633974483,
5.497787143782138,
7,
1
],
[
"choix2",
0.7853981633974483,
4.71238898038469,
6,
1
],
[
"choix3",
0.7853981633974483,
3.9269908169872414,
5,
1
]
]
}
}

302
outputs/caf4dd00-d24f-4b9a-bdfb-3960f12e96a3.json Normal file
View File

@ -0,0 +1,302 @@
{
"tache_N1": {
"obj_file": "dragon_update_user_study.obj",
"mesh": "dragon",
"position_init_idx_i": 6,
"position_init_idx_j": 4,
"theta_init": -1.5707963267948966,
"delta_init": 4.71238898038469,
"choix_poses": [
[
"choix1",
-1.5707963267948966,
3.9269908169872414,
5,
4
],
[
"choix3",
-1.5707963267948966,
2.356194490192345,
3,
4
],
[
"choix2",
-1.5707963267948966,
3.141592653589793,
4,
4
]
]
},
"tache_N2": {
"obj_file": "camel_update_user_study_normed.obj",
"mesh": "camel",
"position_init_idx_i": 1,
"position_init_idx_j": 3,
"theta_init": -0.7853981633974483,
"delta_init": 0.7853981633974483,
"choix_poses": [
[
"choix1",
-0.7853981633974483,
0.7853981633974483,
1,
3
],
[
"choix2",
-0.7853981633974483,
0,
0,
3
],
[
"choix3",
-0.7853981633974483,
5.497787143782138,
7,
3
]
]
},
"tache_N3": {
"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
],
[
"choix3",
0.7853981633974483,
0,
0,
1
],
[
"choix3",
0.7853981633974483,
5.497787143782138,
7,
1
]
]
},
"Analyse": {
"analyse_N1": {
"mesh": "dragon",
"idx": [
0
],
"mots": [
"1. De face"
]
},
"analyse_N2": {
"mesh": "camel",
"idx": [
1
],
"mots": [
"2. De profil"
]
},
"analyse_N3": {
"mesh": "gorgoile",
"idx": [
2
],
"mots": [
"3. Debout"
]
}
},
"Interactions": [
{
"time": 1677838666856,
"type": "start"
},
{
"time": 1677838666879,
"type": "Affichage Mesh random : dragon en idx_i, idx_j : (6, 4)"
},
{
"time": 1677838666879,
"type": "Affichage Mesh random : dragon en theta, delta : (-1.5707963267948966, 4.71238898038469)"
},
{
"time": 1677838667858,
"type": "bouton commencerclavier"
},
{
"time": 1677838668905,
"type": "fleche droite"
},
{
"time": 1677838669074,
"type": "bouton pose n°1"
},
{
"time": 1677838669233,
"type": "fleche droite"
},
{
"time": 1677838669350,
"type": "bouton pose n°2"
},
{
"time": 1677838669826,
"type": "fleche droite"
},
{
"time": 1677838670273,
"type": "bouton pose n°3"
},
{
"time": 1677838679013,
"type": "fleche switch bas de la pose n°2"
},
{
"time": 1677838680695,
"type": "bouton valider"
},
{
"time": 1677838680718,
"type": "Affichage Mesh random : camel en idx_i, idx_j : (1, 3)"
},
{
"time": 1677838680718,
"type": "Affichage Mesh random : camel en theta, delta : (-0.7853981633974483, 0.7853981633974483)"
},
{
"time": 1677838681793,
"type": "bouton pose n°1"
},
{
"time": 1677838681906,
"type": "fleche droite"
},
{
"time": 1677838682049,
"type": "bouton pose n°2"
},
{
"time": 1677838682153,
"type": "fleche droite"
},
{
"time": 1677838682258,
"type": "bouton pose n°3"
},
{
"time": 1677838682858,
"type": "bouton valider"
},
{
"time": 1677838682883,
"type": "Affichage Mesh random : gorgoile en idx_i, idx_j : (2, 1)"
},
{
"time": 1677838682883,
"type": "Affichage Mesh random : gorgoile en theta, delta : (0.7853981633974483, 1.5707963267948966)"
},
{
"time": 1677838684417,
"type": "bouton pose n°1"
},
{
"time": 1677838684594,
"type": "fleche droite"
},
{
"time": 1677838684737,
"type": "bouton pose n°2"
},
{
"time": 1677838685642,
"type": "fleche droite"
},
{
"time": 1677838686474,
"type": "bouton pose n°3"
},
{
"time": 1677838688278,
"type": "suppression de la pose n°2"
},
{
"time": 1677838689177,
"type": "bouton pose n°3"
},
{
"time": 1677838689177,
"type": "Affichage error pose déjà sélectionnée"
},
{
"time": 1677838689289,
"type": "fleche droite"
},
{
"time": 1677838689450,
"type": "bouton pose n°3"
},
{
"time": 1677838716760,
"type": "bouton valider"
},
{
"time": 1677838716760,
"type": "fin des choix."
},
{
"time": 1677838716761,
"type": "Début analyse n°1"
},
{
"time": 1677838718112,
"type": "ajout check sur : analyse n°1, mot 1. De face"
},
{
"time": 1677838718641,
"type": "Bouton valider analyse."
},
{
"time": 1677838718641,
"type": "Début analyse n°2"
},
{
"time": 1677838719650,
"type": "ajout check sur : analyse n°2, mot 2. De profil"
},
{
"time": 1677838720057,
"type": "Bouton valider analyse."
},
{
"time": 1677838720057,
"type": "Début analyse n°3"
},
{
"time": 1677838720729,
"type": "ajout check sur : analyse n°3, mot 3. Debout"
},
{
"time": 1677838721384,
"type": "Bouton valider analyse."
},
{
"time": 1677838721393,
"type": "Fin analyse"
}
]
}

31
static/interface3D.js
View File

@ -316,22 +316,21 @@ function init_data(){
ctx.fillStyle = "rgb(255, 255, 255)" ctx.fillStyle = "rgb(255, 255, 255)"
// Data 2D // Data 2D
imgs = {} imgs = {}
imgs["droite"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Fleches_jolie/fleche_droite.png')//new_image("graphics/fleche_droite.png") imgs["droite"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Arrows/fleche_droite.png')
imgs["gauche"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Fleches_jolie/fleche_gauche.png') //new_image("graphics/fleche_gauche.png") imgs["gauche"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Arrows/fleche_gauche.png')
imgs["bas"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Fleches_jolie/fleche_bas.png') //new_image("graphics/fleche_bas.png") imgs["bas"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Arrows/fleche_bas.png')
imgs["haut"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Fleches_jolie/fleche_haut.png') //new_image("graphics/fleche_haut.png") imgs["haut"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Arrows/fleche_haut.png')
imgs["croix"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Autres_jolie/croix.png') imgs["croix"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Choices/croix.png')
//imgs["tmp"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Autres_jolie/tmp.jpg') imgs["check"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Choices/check.png')
imgs["check"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Autres_jolie/check.png') imgs["checkbox"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Choices/empty_checkbox.png')
imgs["checkbox"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Autres_jolie/empty_checkbox.png')
// /// Boutons // /// Boutons
boutons = {} boutons = {}
boutons["reinitialiser"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Boutons_jolie/bouton_reinitialiser.png') boutons["reinitialiser"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Boutons/bouton_reinitialiser.png')
boutons["valider"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Boutons_jolie/bouton_valider.png') boutons["valider"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Boutons/bouton_valider.png')
boutons["choix_pose"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Boutons_jolie/bouton_pose.png') boutons["choix_pose"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Boutons/bouton_pose.png')
boutons["retirer"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Boutons_jolie/bouton_retirer.png') boutons["retirer"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Boutons/bouton_retirer.png')
boutons["commencer"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Boutons_jolie/bouton_commencer.png') boutons["commencer"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Boutons/bouton_commencer.png')
boutons["raz"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/User_study/main/Boutons_jolie/bouton_raz.png') boutons["raz"] = new_image('https://raw.githubusercontent.com/PelissierCombescure/BVS-study/main/graphics/Boutons/bouton_raz.png')
// Mouse // Mouse
xyMouseMove = {"x": -1, "y": -1} xyMouseMove = {"x": -1, "y": -1}
@ -428,7 +427,9 @@ function animate() {
ctx.fillText("Done, thx you :)", (window.innerWidth/2)-450, innerHeight/2 -100) ctx.fillText("Done, thx you :)", (window.innerWidth/2)-450, innerHeight/2 -100)
console.log('Fin interface3DD') console.log('Fin interface3DD')
// ecriture // ECRITURE DES RESULTATS
choix['Analyse'] = checkbox_clicked
choix['Interactions'] = interactions
// Création de la requête HTTP à envoyer au serveur. // Création de la requête HTTP à envoyer au serveur.
let xhr = new XMLHttpRequest(); let xhr = new XMLHttpRequest();
// Préparation de la requête pour l'envoi en POST vers l'url. // Préparation de la requête pour l'envoi en POST vers l'url.