plDarkSky

@@ -110,6 +110,9 @@ double calc(EZGDAL_FRAME *f, double **mtx, int **visible) {

   return v;

 }

+int quiet_val = 0;

+

+

 /**********************************

  *     Calculation sky brightness

  */

@@ -125,18 +128,18 @@ void calc_model(EZGDAL_LAYER *ghsl_layer, EZGDAL_LAYER *dem_layer, EZGDAL_LAYER

   r1 = ghsl_layer->stripe->rows/2;

   r2 = ghsl_layer->rows - r1 + 1;

-  printf("  0%%"); fflush(stdout);

+  if(quiet_val!=1) ezgdal_show_progress(stderr,0,rN);

   for(c=0; c<out_layer->cols; c++)

     out_layer->buffer[c] = out_layer->no_data;

   for(r=0; r<=r1; r++) {

-    if(100*r/rN != prc) {prc=100*r/rN; printf("\b\b\b\b%3d%%",prc); fflush(stdout); }

+    if(quiet_val!=1) ezgdal_show_progress(stderr,r,rN);

     ezgdal_write_buffer(out_layer,r);

   }

   for(r=r1+1; r<r2; r++) {

-    if(100*r/rN != prc) {prc=100*r/rN; printf("\b\b\b\b%3d%%",prc); fflush(stdout); }

+    if(quiet_val!=1) ezgdal_show_progress(stderr,r,rN);

     ezgdal_load_stripe_data(ghsl_layer->stripe, r-r1);

     if(dem_layer!=NULL) ezgdal_load_stripe_data(dem_layer->stripe, r-r1);

@@ -157,11 +160,11 @@ void calc_model(EZGDAL_LAYER *ghsl_layer, EZGDAL_LAYER *dem_layer, EZGDAL_LAYER

   for(c=0; c<out_layer->cols; c++)

     out_layer->buffer[c] = out_layer->no_data;

   for(r=r2; r<rN; r++) {

+    if(quiet_val!=1) ezgdal_show_progress(stderr,r,rN);

     if(100*r/rN != prc) {prc=100*r/rN; printf("\b\b\b\b%3d%%",prc); fflush(stdout); }

     ezgdal_write_buffer(out_layer,r);

   }

-  printf("\b\b\b\b100%%");

-  

+  if(quiet_val!=1) ezgdal_show_progress(stderr,rN,rN);

 }

 /*************************************

@@ -217,9 +220,10 @@ int main(int argc, char *argv[])

   struct arg_dbl  *p_resY  = arg_dbl0(NULL,"res_y","<dbl>","scale factor: row to km (default: 0.1)");

   struct arg_dbl  *p_resH  = arg_dbl0(NULL,"res_h","<dbl>","scale factor: height to km (default: 0.001)");

   struct arg_int  *th      = arg_int0("t","threads","<n>","number of threads (default 1)");

+  struct arg_lit  *quiet   = arg_litn("q","quiet",0,2,"print help and exit");

   struct arg_lit  *help    = arg_lit0(NULL,"help","print help and exit");

   struct arg_end  *end     = arg_end(20);

-  void* argtable[] = {ghsl,dem,out,p_par_a,p_par_U,p_par_V,p_par_h,p_par_k,p_par_N,p_resX,p_resY,p_resH,th,help,end};

+  void* argtable[] = {ghsl,dem,out,p_par_a,p_par_U,p_par_V,p_par_h,p_par_k,p_par_N,p_resX,p_resY,p_resH,th,quiet,help,end};

   int nerrors = arg_parse(argc,argv,argtable);

@@ -229,6 +233,8 @@ int main(int argc, char *argv[])

   if(nerrors != 0) 

     usage(argv[0],argtable);

+  quiet_val = quiet->count;

+

   if(!file_exists(ghsl->sval[0])) {

     printf("\nInput file [%s] does not exists!\n\n",ghsl->sval[0]);

     exit(1);

@@ -255,12 +261,14 @@ int main(int argc, char *argv[])

     omp_set_num_threads(1);

+  if(quiet_val==0) {

     printf("\nInput file (GHSL): %s\n",ghsl->sval[0]);

     if(dem->count>0)

       printf("Input file (DEM): %s\n",dem->sval[0]);

     printf("Output file (sky brightness): %s\n",out->sval[0]);

     printf("Berry's model parameters: a=%lf, U=%lf, V=%lf, h=%lf, k=%lf\n",par_a,par_U,par_V,par_h,par_k);

     printf("                  radius: %d\n\n",par_N);

+  }

   int no_data;

@@ -273,7 +281,7 @@ int main(int argc, char *argv[])

   int **visibility;

-  printf(" - preparing environment ... ");

+  if(quiet_val==0) ezgdal_show_message_nolf(stdout, " - preparing environment ... ");

     no_data = -9999;

     if(dem->count>0) {

@@ -302,14 +310,14 @@ int main(int argc, char *argv[])

     if(p_resX->count==0) {

       if(at[2]!=0.0) {

-        printf("\n\nYou have to provide 'res_x' parameter\n\n");

+        ezgdal_show_message(stderr,"\n\nYou have to provide 'res_x' parameter\n\n");

         exit(1);

       } else 

         resX = 0.001*fabs(at[1]);

     }

     if(p_resY->count==0) {

       if(at[4]!=0.0) {

-        printf("\n\nYou have to provide 'res_y' parameter\n\n");

+        ezgdal_show_message(stderr,"\n\nYou have to provide 'res_y' parameter\n\n");

         exit(1);

       } else 

         resY = 0.001*fabs(at[5]);

@@ -320,19 +328,19 @@ int main(int argc, char *argv[])

     model_matrix = init_model_matrix(par_a,par_U,par_V,par_h,par_k,par_N,resX,resY);

     distance = create_dist(2*par_N+1,resX);

     visibility = create_mask(2*par_N+1,distance,par_N*resX);

-  printf("OK\n");

+  if(quiet_val==0) ezgdal_show_message(stdout,"OK");

-  printf(" - calculating ... "); fflush(stdout);

+  if(quiet_val==0) ezgdal_show_message_nolf(stdout," - calculating ... ");

     calc_model(ghsl_layer, dem_layer, out_layer, 

                model_matrix, distance, visibility, 

                par_h, par_N*resX, resH);

-  printf(" ... OK\n");

+  if(quiet_val==0) ezgdal_show_message(stdout," ... OK");

-  printf(" - closing environment ... "); fflush(stdout);

+  if(quiet_val==0) ezgdal_show_message_nolf(stdout," - closing environment ... ");

     ezgdal_close_layer(ghsl_layer);

     if(dem->count>0)

       ezgdal_close_layer(dem_layer);

@@ -340,7 +348,7 @@ int main(int argc, char *argv[])

     free_model_matrix(model_matrix, par_N);

     free_array((void **)distance, 2*par_N+1);

     free_array((void **)visibility, 2*par_N+1);

-  printf("OK\n");

+  if(quiet_val==0) ezgdal_show_message(stdout,"OK");

   arg_freetable(argtable, sizeof(argtable) / sizeof(argtable[0]));