From b92f9f20290bfb965d4c78bf0485f7ab5ba0f181 Mon Sep 17 00:00:00 2001 From: mpelissi Date: Sat, 1 Apr 2023 15:00:45 +0200 Subject: [PATCH] analyse avec ordre des choix --- static/MAIN.js | 6 ++-- static/fonctions_analyse.js | 47 ++++++++++++++++--------- static/fonctions_explication_analyse.js | 2 +- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/static/MAIN.js b/static/MAIN.js index d898946..a4e3fcc 100644 --- a/static/MAIN.js +++ b/static/MAIN.js @@ -47,10 +47,10 @@ function init_variable(premier_appel){ obj_file_random = shuffle(obj_names) // nombre de mesh a visionner AU TOTAL - nb_mesh = 10 //obj_file_random.length + nb_mesh = 3 //obj_file_random.length // nb analyse demandé - nb_analyse_demande = 5 + nb_analyse_demande = 2 list_idx_tache =[] for (let p=0; p=0){ l = 0 - for (let p = 0; p<=pos; p++){ - l = l + ctx.measureText(keywords[p]).width + 0.05*window.innerWidth + for (let p = debut; p<=debut+pos; p++){ + l = l + ctx.measureText(keywords[p]).width + 0.05*window.innerWidth } return l } - else{return 0} + else{return 15} } function traitement_empty_checkbox(){ @@ -150,11 +158,14 @@ function traitement_empty_checkbox(){ for (let i = 0 ; i < keywords.length; i++){ // checkbox vide //i*((window.innerWidth * 8/10)/6) - if(i 5){p = (pos%5)-1; x_checkbox = window.innerWidth*1/10 + measure_largeur(6, p-1); y_checkbox = y_checkbox_init + 2*h_checkbox} else{ - x_checkbox = window.innerWidth*1/10 + measure_largeur(pos-1) + x_checkbox = window.innerWidth*1/10 + measure_largeur(0, pos-1) y_checkbox = y_checkbox_init } - ctx.drawImage(imgs["check"], x_checkbox-5 , y_checkbox-5, w_checkbox+10, h_checkbox+10) + //ctx.drawImage(imgs["check"], x_checkbox-5 , y_checkbox-5, w_checkbox+10, h_checkbox+10) + print_text(handle_text(""+(i+1), x_checkbox + 0.2*w_checkbox, y_checkbox + h_checkbox*0.75, taille_texte_explication+"pt Courier", longueur_max_error, '#EF476F')) + } } @@ -213,8 +226,8 @@ function zone_texte(){ h_text_zone = 0.15*window.innerHeight nb_caract_min = 1 nb_caract_max = 250 - x_texte_zone = (window.innerWidth/4) - y_texte_zone = y_checkbox_init + 3*h_checkbox + x_texte_zone = (window.innerWidth/3) + y_texte_zone = y_checkbox_init + 2*h_checkbox ecart_texte_zone = 0.2*window.innerHeight // Zone de texte : Name diff --git a/static/fonctions_explication_analyse.js b/static/fonctions_explication_analyse.js index 313a09c..3bafb3f 100644 --- a/static/fonctions_explication_analyse.js +++ b/static/fonctions_explication_analyse.js @@ -165,7 +165,7 @@ 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}, "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.", "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"]]