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

update

This commit is contained in:
mpelissi 2023-04-24 15:13:32 +02:00
parent 4c1ba31097
commit 5d4f0a5dd8
6 changed files with 101 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/MAIN.js
View File

@ -47,7 +47,7 @@ function init_variable(premier_appel){
obj_file_random = shuffle(obj_names)
// nombre de mesh a visionner AU TOTAL
nb_mesh = obj_file_random.length
nb_mesh = 3//obj_file_random.length
// nb analyse demandé
nb_analyse_demande = 2
@ -86,13 +86,13 @@ function init_variable(premier_appel){
// Enchainement des pages
if (premier_appel){
page_avertissement = false
page_avertissement = true
page_contexte = false
page_inscription = false
page_explication = false
page_warning = false
page_explication_bis = false
page_vues = true // false
page_vues = false // false
page_explication_analyse = false
page_analyse = false
// cas raz : on recommence juste la partie vues

2
static/fonctions_contexte.js
View File

@ -199,7 +199,7 @@ textes_contexte={
"texte6":{"t":"For example, this is wolf. This perspective highlights the tail and the hind legs, but obscures the head and face.", "y": window.innerHeight*0.45, "c": color_blanc},
"texte7":{"t":"This viewpoint reveal the head, face, and front legs but hides the tail and barely shows the hind legs.", "y": window.innerHeight*0.6, "c": color_blanc},
"texte8":{"t":"What is a good viewpoint?", "y": window.innerHeight*0.15, "c": color_rouge},
"texte9":{"t":"> A good viewpoint is one that offers a relevant view of the object. The one that best showcases the object.", "y": window.innerHeight*0.2, "c": color_blanc},//A more geometrical definition: a good viewpoint is a position from which most representative characteristics of an object (i.e. the parts that make the object the most identifiable), are visible.", "y": window.innerHeight*0.2, "c": color_blanc},
"texte9":{"t":"> A good viewpoint is one that offers a RELEVANT view of the object. The one that BEST showcases/highlights the and the one that is the most REPRENSATATIVE of the object. ", "y": window.innerHeight*0.2, "c": color_blanc},//A more geometrical definition: a good viewpoint is a position from which most representative characteristics of an object (i.e. the parts that make the object the most identifiable), are visible.", "y": window.innerHeight*0.2, "c": color_blanc},
"texte10":{"t":"Let's imagine that you have to create an advertising display to promote the movie Dances with Wolves.", "y": window.innerHeight*0.35, "c": color_blanc},
//"texte11":{"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. This subjective information is what I am interested in.", "y": window.innerHeight*0.7, "c": color_blanc},
"texte11": {"t":"Which viewpoint would you choose between both?", "y": window.innerHeight*0.8, "c": "rgb(255, 209, 102)"},

4
static/fonctions_explication_analyse.js
View File

@ -163,9 +163,9 @@ color_blanc = "rgb(255,255,255)"
color_rouge = "rgb(239, 71, 111)"
explications_analyse={
"texte0":{"t":"You have finished selecting the best viewpoints for each object.", "y": window.innerHeight*0.15, "c": color_blanc},
"texte1":{"t":"Now I ask you to justify your choices.", "y":window.innerHeight*0.25, "c": color_blanc},
"texte1":{"t":"Now I ask you to JUSTIFY your choices.", "y":window.innerHeight*0.25, "c": color_blanc},
"texte2":{"t":"For this, for some objects, the views you have chosen will reappear.", "y":window.innerHeight*0.38, "c": color_blanc},
"texte3":{"t":"For each of the viewpoints, you will have to select one or more reasons that made you decide to select these viewpoints. And order them from the most significant to the least.", "y": window.innerHeight*0.52, "c": color_blanc},
"texte3":{"t":"For each of the viewpoints, you will have to SELECT ONE OR MORE reasons that made you decide to select these viewpoints. And ORDER them from the most significant to the least.", "y": window.innerHeight*0.52, "c": color_blanc},
}
explications_analyse_page_1 = [explications_analyse["texte0"], explications_analyse["texte1"], explications_analyse["texte2"], explications_analyse["texte3"]]

6
static/fonctions_explications.js
View File

@ -565,9 +565,11 @@ function action_clavier_explication(event){
action_suivante()}
}
if (page_warning && num_warning < (warnings_page_1.length-1)){
if (page_warning && num_warning < (warnings_page_1.length)){
console.log("cc")
action_bouton_suivant_warning()}
if (page_warning && num_warning == (warnings_page_1.length-1)){
if (page_warning && num_warning == (warnings_page_1.length)){
console.log("ee")
action_bouton_commencer_warning()
}

24
static/fonctions_warnings.js
View File

@ -105,7 +105,17 @@ function traitement_warnings(){
// affichage texte
for(let p=0; p<warnings_a_afficher.length; p++){
dict_texte = warnings_a_afficher[p]
affichage_texte_warning(dict_texte.t, font_texte, dict_texte.c, x_texte, dict_texte.y, w_texte)
// message : problems --> refresh
if (p==4){
affichage_titre(dict_texte.t, (0.016*window.innerWidth)+"pt Courier", "#EF476F", dict_texte.y)
//affichage_texte_warning(dict_texte.t, font_texte, "#EF476F", x_texte, dict_texte.y, w_texte)
}
else if (p==5){
affichage_titre(dict_texte.t, font_texte, dict_texte.c, dict_texte.y)
//affichage_texte_warning(dict_texte.t, font_texte, "#EF476F", x_texte, dict_texte.y, w_texte)
}
else {
affichage_texte_warning(dict_texte.t, font_texte, dict_texte.c, x_texte, dict_texte.y, w_texte)}
}
if (num_warning < (warnings_page_1.length)-1){
@ -152,13 +162,15 @@ color_blanc = "rgb(255,255,255)"
color_rouge = "rgb(239, 71, 111)"
warnings={
"texte0":{"t":"The following is a list of warnings to keep in mind during the study:", "y": window.innerHeight*0.15, "c": color_blanc},
"texte1":{"t":"- During the study, you should not change the size of the web page or computer screen. Changing the size may cause annoyance.", "y":window.innerHeight*0.25, "c": color_blanc},
"texte2":{"t":"- The loading time of the objects can take time. The 3D screen may be completely black for a few seconds. Be patient, the objects will appear.", "y":window.innerHeight*0.38, "c": color_blanc},
"texte3":{"t":"- Once you have finished the study, wait a few seconds before leaving the web page, to allow time for the data to fully commit to the server. A message will indicate when the registration is complete.", "y": window.innerHeight*0.52, "c": color_blanc},
"texte4":{"t":"- If during the study there are some problems that you can't solve with the interface features, you can refresh the web page.All your data will be lost and you will have to start all over again. ", "y": window.innerHeight*0.68, "c": color_blanc},
"texte1":{"t":"- During the study, you should NOT CHANGE the size of the web page or computer screen. Changing the size may cause annoyance.", "y":window.innerHeight*0.25, "c": color_blanc},
"texte2":{"t":"- The loading time of the objects can take time. The 3D screen may be completely black for a few seconds. BE PATIENT, the objects will appear.", "y":window.innerHeight*0.38, "c": color_blanc},
"texte3":{"t":"- Once you have finished the study, WAIT A FEW before leaving the web page, to allow time for the data to fully commit to the server. A message will indicate when the registration is complete.", "y": window.innerHeight*0.52, "c": color_blanc},
//"texte4":{"t":"- If during the study there are some PROBLEMS that you can't solve with the interface features, you can REFRESH the web page. All your data will be lost and you will have to start all over again. ", "y": window.innerHeight*0.68, "c": color_blanc},
"texte4":{"t":"If ANY PROBLEMS occur during the study --> REFRESH your web page", "y": window.innerHeight*0.72, "c": color_blanc},
"texte5":{"t":"(don't be afraid, you will start all over again)", "y": window.innerHeight*0.78, "c": color_blanc}
}
warnings_page_1 = [warnings["texte0"], warnings["texte1"], warnings["texte2"], warnings["texte3"], warnings["texte4"]]
warnings_page_1 = [warnings["texte0"], warnings["texte1"], warnings["texte2"], warnings["texte3"], warnings["texte4"], warnings["texte5"]]
warnings_a_afficher = [warnings["texte0"]]
}

143
static/mesh_names.js
View File

@ -1,76 +1,79 @@
//obj_names = ['backpack_regulier_tri_normed_centered_user_study.obj']
// obj_names = ['octopus_update_normed_centered_user_study.obj',
// 'casting_update_normed_centered_user_study.obj',
// 'carVasa_update_normed_centered_user_study.obj',
// 'blade_update_normed_centered_user_study.obj',
// 'bunny_update_normed_centered_user_study.obj',
// 'igea_update_normed_centered_user_study.obj',
// 'camel_update_normed_centered_user_study.obj',
// 'Harley_update_normed_centered_user_study.obj',
// 'MaxPlanck_update_normed_centered_user_study.obj',
// 'gorgoile_update_normed_centered_user_study.obj',
// 'prot_update_normed_centered_user_study.obj',
// 'michael3_update_normed_centered_user_study.obj',
// 'A380_update_normed_centered_user_study.obj',
// 'chair107_update_normed_centered_user_study.obj',
// 'dragon_update_normed_centered_user_study.obj',
// 'rockerArm_update_normed_centered_user_study.obj',
// 'michael8_update_normed_centered_user_study.obj',
// 'vase_update_normed_centered_user_study.obj',
// 'fandisk_update_normed_centered_user_study.obj',
// 'james_update_normed_centered_user_study.obj',
// 'cow_update_normed_centered_user_study.obj',
// 'dinosaur_update_normed_centered_user_study.obj',
// 'flowerpot_update_normed_centered_user_study.obj',
// 'bimba_update_normed_centered_user_study.obj',
// 'horse_update_normed_centered_user_study.obj',
// 'turbine_update_normed_centered_user_study.obj',
// 'basket_regulier_tri_normed_centered_user_study.obj',
// 'calculator_regulier_tri_normed_centered_user_study.obj',
// 'eyeglasses_regulier_tri_normed_centered_user_study.obj',
// 'cap_regulier_tri_normed_centered_user_study.obj',
// 'camera_regulier_tri_normed_centered_user_study.obj',
// 'bus_regulier_tri_normed_centered_user_study.obj',
// 'cup_regulier_tri_normed_centered_user_study.obj',
// 'backpack_regulier_tri_normed_centered_user_study.obj',
// 'comb_regulier_tri_normed_centered_user_study.obj',
// 'fire_extinguisher_regulier_tri_normed_centered_user_study.obj',
// 'bicycle_regulier_tri_normed_centered_user_study.obj',
// 'coffee_regulier_tri_normed_centered_user_study.obj',
// 'boat_regulier_tri_normed_centered_user_study.obj',
// 'ashtray_regulier_tri_normed_centered_user_study.obj',
// 'eraser_regulier_tri_normed_centered_user_study.obj',
// 'bucket_regulier_tri_normed_centered_user_study.obj',
// 'bench_regulier_tri_normed_centered_user_study.obj',
// 'cabinet_regulier_tri_normed_centered_user_study.obj']
obj_names = ['octopus_update_normed_centered_user_study.obj',
'casting_update_normed_centered_user_study.obj',
'carVasa_update_normed_centered_user_study.obj',
'blade_update_normed_centered_user_study.obj',
'bunny_update_normed_centered_user_study.obj',
'igea_update_normed_centered_user_study.obj',
'camel_update_normed_centered_user_study.obj',
'Harley_update_normed_centered_user_study.obj',
'MaxPlanck_update_normed_centered_user_study.obj',
'gorgoile_update_normed_centered_user_study.obj',
'prot_update_normed_centered_user_study.obj',
'michael3_update_normed_centered_user_study.obj',
'A380_update_normed_centered_user_study.obj',
'chair107_update_normed_centered_user_study.obj',
'dragon_update_normed_centered_user_study.obj',
'rockerArm_update_normed_centered_user_study.obj',
'michael8_update_normed_centered_user_study.obj',
'vase_update_normed_centered_user_study.obj',
'fandisk_update_normed_centered_user_study.obj',
'james_update_normed_centered_user_study.obj',
'cow_update_normed_centered_user_study.obj',
'dinosaur_update_normed_centered_user_study.obj',
'flowerpot_update_normed_centered_user_study.obj',
'bimba_update_normed_centered_user_study.obj',
'horse_update_normed_centered_user_study.obj',
'turbine_update_normed_centered_user_study.obj',
'basket_regulier_tri_normed_centered_user_study.obj',
'calculator_regulier_tri_normed_centered_user_study.obj',
'eyeglasses_regulier_tri_normed_centered_user_study.obj',
'cap_regulier_tri_normed_centered_user_study.obj',
'camera_regulier_tri_normed_centered_user_study.obj',
'bus_regulier_tri_normed_centered_user_study.obj',
'cup_regulier_tri_normed_centered_user_study.obj',
'backpack_regulier_tri_normed_centered_user_study.obj',
'comb_regulier_tri_normed_centered_user_study.obj',
'fire_extinguisher_regulier_tri_normed_centered_user_study.obj',
'bicycle_regulier_tri_normed_centered_user_study.obj',
'coffee_regulier_tri_normed_centered_user_study.obj',
'boat_regulier_tri_normed_centered_user_study.obj',
'ashtray_regulier_tri_normed_centered_user_study.obj',
'eraser_regulier_tri_normed_centered_user_study.obj',
'bucket_regulier_tri_normed_centered_user_study.obj',
'bench_regulier_tri_normed_centered_user_study.obj',
'cabinet_regulier_tri_normed_centered_user_study.obj']
obj_names = [ 'octopus_update_normed_centered_user_study.obj',
'casting_update_normed_centered_user_study.obj',
'carVasa_update_normed_centered_user_study.obj',
'blade_update_normed_centered_user_study.obj',
'bunny_update_normed_centered_user_study.obj',
'igea_update_normed_centered_user_study.obj',
'camel_update_normed_centered_user_study.obj',
'Harley_update_normed_centered_user_study.obj',
'MaxPlanck_update_normed_centered_user_study.obj',
'gorgoile_update_normed_centered_user_study.obj',
'prot_update_normed_centered_user_study.obj',
'michael3_update_normed_centered_user_study.obj',
'A380_update_normed_centered_user_study.obj',
'chair107_update_normed_centered_user_study.obj',
'dragon_update_normed_centered_user_study.obj',
'rockerArm_update_normed_centered_user_study.obj',
'michael8_update_normed_centered_user_study.obj',
'vase_update_normed_centered_user_study.obj',
'fandisk_update_normed_centered_user_study.obj',
'james_update_normed_centered_user_study.obj',
'cow_update_normed_centered_user_study.obj',
'dinosaur_update_normed_centered_user_study.obj',
'flowerpot_update_normed_centered_user_study.obj',
'bimba_update_normed_centered_user_study.obj',
'horse_update_normed_centered_user_study.obj',
'turbine_update_normed_centered_user_study.obj']
// obj_names = [
// 'octopus_update_normed_centered_user_study.obj',
// 'casting_update_normed_centered_user_study.obj',
// 'carVasa_update_normed_centered_user_study.obj',
// 'blade_update_normed_centered_user_study.obj',
// 'bunny_update_normed_centered_user_study.obj',
// 'igea_update_normed_centered_user_study.obj',
// 'camel_update_normed_centered_user_study.obj',
// 'Harley_update_normed_centered_user_study.obj',
// 'MaxPlanck_update_normed_centered_user_study.obj',
// 'gorgoile_update_normed_centered_user_study.obj',
// 'prot_update_normed_centered_user_study.obj',
// 'michael3_update_normed_centered_user_study.obj',
// 'A380_update_normed_centered_user_study.obj',
// 'chair107_update_normed_centered_user_study.obj',
// 'dragon_update_normed_centered_user_study.obj',
// 'rockerArm_update_normed_centered_user_study.obj',
// 'michael8_update_normed_centered_user_study.obj',
// 'vase_update_normed_centered_user_study.obj',
// 'fandisk_update_normed_centered_user_study.obj',
// 'james_update_normed_centered_user_study.obj',
// 'cow_update_normed_centered_user_study.obj',
// 'dinosaur_update_normed_centered_user_study.obj',
// 'flowerpot_update_normed_centered_user_study.obj',
// 'bimba_update_normed_centered_user_study.obj',
// 'horse_update_normed_centered_user_study.obj',
// 'turbine_update_normed_centered_user_study.obj'
//]
//obj_names = [//'basket_regulier_tri_normed_centered_user_study.obj',