--- ray/src/util/evalglare.c 2017/05/18 02:25:27 2.6 +++ ray/src/util/evalglare.c 2018/08/31 16:01:45 2.8 @@ -1,7 +1,7 @@ #ifndef lint -static const char RCSid[] = "$Id: evalglare.c,v 2.6 2017/05/18 02:25:27 greg Exp $"; +static const char RCSid[] = "$Id: evalglare.c,v 2.8 2018/08/31 16:01:45 greg Exp $"; #endif -/* EVALGLARE V2.00 +/* EVALGLARE V2.06 * Evalglare Software License, Version 2.0 * * Copyright (c) 1995 - 2016 Fraunhofer ISE, EPFL. @@ -317,10 +317,27 @@ changed masking threshold to 0.05 cd/m2 /* evalglare.c, v2.01 2016/11/16 change of -2 option (now -2 dir_illum). External provision of the direct illuminance necessary, since the sun interpolation of daysim is causing problems in calculation of the background luminance. */ /* evalglare.c, v2.02 2017/02/28 change of warning message, when invalid exposure setting is found. Reason: tab removal is not in all cases the right measure - it depends which tool caused the invalid exposure entry */ + +/* evalglare.c, v2.03 2017/08/04 ad of -O option - disk replacement by providing luminance, not documented + */ + +/* evalglare.c, v2.04 2017/08/04 adding -q option: use of Ev/pi as background luminance. not documented. no combination with -n option!!! + */ + +/* evalglare.c, v2.05 2018/08/28 change of the -q option for the choice of the background luminance calculation mode: 0: CIE method (Ev-Edir)/pi, 1: mathematical correct average background luminance, 2: Ev/pi. +change of default options: +- cosinus weighted calculation of the background luminance (according to CIE) is now default. +- absolute threshold for the glare source detection is now default (2000cd/m2), based on study of C. Pierson + */ + +/* evalglare.c, v2.06 2018/08/29 +change of default value of multiplier b to 5.0, if task options (-t or -T ) are activated AND -b NOT used. To be downward compatible when using the task method. + */ + #define EVALGLARE #define PROGNAME "evalglare" -#define VERSION "2.02 release 28.02.2017 by EPFL, J.Wienold" +#define VERSION "2.06 release 29.08.2018 by EPFL, J.Wienold" #define RELEASENAME PROGNAME " " VERSION @@ -1385,10 +1402,10 @@ int main(int argc, char **argv) pict *pm = pict_create(); int skip_second_scan,calcfast,age_corr,cut_view,cut_view_type,calc_vill, output, detail_out2, x1,y1, fill, yfillmax, yfillmin, ext_vill, set_lum_max, set_lum_max2, img_corr,x_disk,y_disk,task_color, i_splitstart,zones,act_gsn,splitgs, - i_split, posindex_2, task_lum, checkfile, rval, i, i_max, x, y,x2,y2,x_zone,y_zone, i_z1, i_z2, + i_split, posindex_2, task_lum, checkfile, rval, i, i_max, x, y,x2,y2,x_zone,y_zone, i_z1, i_z2, thres_activate, igs, actual_igs, lastpixelwas_gs, icol, xt, yt, change,checkpixels, before_igs, sgs, splithigh,uniform_gs,x_max, y_max,y_mid, detail_out, posindex_picture, non_cos_lb, rx, ry, rmx,rmy,apply_disability,band_calc,band_color,masking,i_mask,no_glaresources,force; - double lum_total_max,age_corr_factor,age,dgp_ext,dgp,low_light_corr,omega_cos_contr, setvalue, lum_ideal, E_v_contr, sigma,om,delta_E, + double LUM_replace,lum_total_max,age_corr_factor,age,dgp_ext,dgp,low_light_corr,omega_cos_contr, setvalue, lum_ideal, E_v_contr, sigma,om,delta_E, E_vl_ext, lum_max, new_lum_max, r_center, ugp, ugr_exp, dgi_mod,lum_a, pgsv,E_v_mask,pgsv_sat,angle_disk,dist,n_corner_px,zero_corner_px, search_pix, a1, a2, a3, a4, a5, c3, c1, c2, r_split, max_angle,r_actual,lum_actual,dir_ill, omegat, sang, E_v, E_v2, E_v_dir, avlum, act_lum, ang, angle_z1, angle_z2,per_95_band,per_75_band,pos, @@ -1502,7 +1519,7 @@ int main(int argc, char **argv) omega_cos_contr = 0.0; lum_ideal = 0.0; max_angle = 0.2; - lum_thres = 5.0; + lum_thres = 2000.0; task_lum = 0; sgs = 0; splithigh = 1; @@ -1520,7 +1537,7 @@ int main(int argc, char **argv) c1 = 5.87e-05; c2 = 0.092; c3 = 0.159; - non_cos_lb = 1; + non_cos_lb = 0; posindex_2 = 0; task_color = 0; limit = 50000.0; @@ -1542,6 +1559,8 @@ int main(int argc, char **argv) omega_mask=0.0; i_mask=0; actual_igs=0; + LUM_replace=0; + thres_activate=0; /* command line for output picture*/ cline = (char *) malloc(CLINEMAX+1); @@ -1592,6 +1611,7 @@ int main(int argc, char **argv) break; case 'b': lum_thres = atof(argv[++i]); + thres_activate = 1; break; case 'c': checkfile = 1; @@ -1680,10 +1700,25 @@ int main(int argc, char **argv) strcpy(file_out2, argv[++i]); /* printf("max lum set to %f\n",new_lum_max);*/ break; + case 'O': + img_corr = 1; + set_lum_max2 = 3; + x_disk = atoi(argv[++i]); + y_disk = atoi(argv[++i]); + angle_disk = atof(argv[++i]); + LUM_replace = atof(argv[++i]); + strcpy(file_out2, argv[++i]); +/* printf("max lum set to %f\n",new_lum_max);*/ + break; - case 'n': + +/* deactivated case 'n': non_cos_lb = 0; break; +*/ + case 'q': + non_cos_lb = atoi(argv[++i]); + break; case 't': task_lum = 1; @@ -1785,6 +1820,11 @@ int main(int argc, char **argv) } } +/* set multiplier for task method to 5, if not specified */ + +if ( task_lum == 1 && thres_activate == 0){ + lum_thres = 5.0; +} /*fast calculation, if gendgp_profile is used: No Vertical illuminance calculation, only dgp is calculated*/ if (output == 1 && ext_vill == 1 ) { @@ -2083,8 +2123,9 @@ if (cut_view==2) { lum_pos_mean= lum_pos_mean/sang; lum_pos2_mean= lum_pos2_mean/sang; - if (set_lum_max2 >= 1 && E_v_contr > 0 && (E_vl_ext - E_v) > 0) { + if ((set_lum_max2 >= 1 && E_v_contr > 0 && (E_vl_ext - E_v) > 0 ) || set_lum_max2==3) { + if (set_lum_max2<3){ lum_ideal = (E_vl_ext - E_v + E_v_contr) / omega_cos_contr; if (set_lum_max2 == 2 && lum_ideal >= 2e9) { printf("warning! luminance of replacement pixels would be larger than 2e9 cd/m2. Value set to 2e9cd/m2!\n") ; @@ -2095,6 +2136,8 @@ if (cut_view==2) { } printf("change luminance values!! lum_ideal,setvalue,E_vl_ext,E_v,E_v_contr %f %f %f %f %f\n", lum_ideal, setvalue, E_vl_ext, E_v, E_v_contr); + }else{setvalue=LUM_replace; + } for (x = 0; x < pict_get_xsize(p); x++) @@ -2114,7 +2157,7 @@ if (cut_view==2) { pict_get_color(p, x, y)[BLU] = setvalue / 179.0; - }else{ if(set_lum_max2 ==2 ) { + }else{ if(set_lum_max2 >1 ) { r_actual =acos(DOT(pict_get_cached_dir(p, x_disk, y_disk), pict_get_cached_dir(p, x, y))) * 2; if (x_disk == x && y_disk==y ) r_actual=0.0; @@ -2127,9 +2170,7 @@ if (cut_view==2) { pict_get_color(p, x, y)[BLU] = setvalue / 179.0; - } - - + } } } } @@ -2512,6 +2553,11 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 if (non_cos_lb == 0) { lum_backg = lum_backg_cos; } + + if (non_cos_lb == 2) { + lum_backg = E_v / 3.1415927; + } + /* file writing NOT here if (checkfile == 1) {