Changeset 61096

Timestamp:

Jul 1, 2014, 2:24:45 AM (10 years ago)

Author:

zarch

Message:

r.horizon: Change parameters name as discussed in #2338, add new parameters: start and end as discussed in #2331, and change the output name using the angle instead of the angle index, as discussed in #2332

File:

• grass/trunk/raster/r.horizon/main.c (modified) (18 diffs)

grass/trunk/raster/r.horizon/main.c

@@ -70 +70 @@
 const char *mapset = NULL;
 const char *per;
-char shad_filename[GNAME_MAX];
+char *shad_filename;
 char *outfile;
 
@@ -120 +120 @@
 int d, day, tien = 0;
 
-double length, maxlength = BIG, zmult = 1.0, step = 0.0, dist;
-double fixedMaxLength = BIG;
+double length, maxlength = BIG, zmult = 1.0, dist;
+double fixedMaxLength = BIG, step = 0.0, start = 0.0, end = 0.0;
 char *tt, *lt;
 double z_orig, zp;
@@ -128 +128 @@
     distcosangle;
 double TOLER;
+const char *str_step;
 
 int mode;
@@ -141 +142 @@
 int ll_correction = FALSE;
 double coslatsq;
+
 
 /* why not use G_distance() here which switches to geodesic/great
@@ -156 +158 @@
 
 
-
 int main(int argc, char *argv[])
 {
@@ -164 +165 @@
     struct
     {
-        struct Option *elevin, *dist, *coord, *direction, *horizon, *step,
-            *bufferzone, *e_buff, *w_buff, *n_buff, *s_buff, *maxdistance, *output;
+        struct Option *elevin, *dist, *coord, *direction, *horizon, 
+                      *step, *start, *end, *bufferzone, *e_buff, *w_buff, 
+                      *n_buff, *s_buff, *maxdistance, *output;
     } parm;
 
@@ -190 +192 @@
          " counterclockwise with east=0, north=90 etc. The output is the horizon height in radians.");
 
-    parm.elevin = G_define_option();
-    parm.elevin->key = "elev_in";
-    parm.elevin->type = TYPE_STRING;
-    parm.elevin->required = YES;
-    parm.elevin->gisprompt = "old,cell,raster";
-    parm.elevin->description =
-        _("Name of the input elevation raster map [meters]");
+    parm.elevin = G_define_standard_option(G_OPT_R_ELEV);
     parm.elevin->guisection = _("Input options");
 
@@ -209 +205 @@
 
     parm.step = G_define_option();
-    parm.step->key = "horizon_step";
+    parm.step->key = "step";
     parm.step->type = TYPE_DOUBLE;
     parm.step->required = NO;
@@ -215 +211 @@
         _("Angle step size for multidirectional horizon [degrees]");
     parm.step->guisection = _("Input options");
+
+    parm.start = G_define_option();
+    parm.start->key = "start";
+    parm.start->type = TYPE_DOUBLE;
+    parm.start->answer = "0.0";
+    parm.start->required = NO;
+    parm.start->description =
+        _("Start angle for multidirectional horizon [degrees]");
+    parm.start->guisection = _("Input options");
+
+    parm.end = G_define_option();
+    parm.end->key = "end";
+    parm.end->type = TYPE_DOUBLE;
+    parm.end->answer = "360.0";
+    parm.end->required = NO;
+    parm.end->description =
+        _("End angle for multidirectional horizon [degrees]");
+    parm.end->guisection = _("Input options");
 
     parm.bufferzone = G_define_option();
@@ -265 +279 @@
 
 
-    parm.horizon = G_define_option();
-    parm.horizon->key = "horizon";
-    parm.horizon->type = TYPE_STRING;
+    parm.horizon = G_define_standard_option(G_OPT_R_BASENAME_OUTPUT);
     parm.horizon->required = NO;
-    parm.horizon->gisprompt = "old,cell,raster";
-    parm.horizon->description = _("Prefix of the horizon raster output maps");
     parm.horizon->guisection = _("Output options");
 
@@ -342 +352 @@
 
     if (parm.coord->answer == NULL) {
+        G_debug(1, "Setting mode: WHOLE_RASTER");
         setMode(WHOLE_RASTER);
     }
     else {
+        G_debug(1, "Setting mode: SINGLE_POINT");
         setMode(SINGLE_POINT);
         if (sscanf(parm.coord->answer, "%lf,%lf", &xcoord, &ycoord) != 2) {
@@ -384 +396 @@
         horizon = parm.horizon->answer;
         if (parm.step->answer != NULL)
+            str_step = parm.step->answer;
             sscanf(parm.step->answer, "%lf", &step);
+        sscanf(parm.start->answer, "%lf", &start);
+        sscanf(parm.end->answer, "%lf", &end);
+        if (start < 0.0) {
+            G_fatal_error(
+                _("Negative values of start angle are not allowed. Aborting."));
+        }
+        if (end < 0.0 || end > 360.0) {
+            G_fatal_error(
+                _("End angle is not between 0 and 360. Aborting."));
+        }
+        if (start >= end) {
+            G_fatal_error(
+                _("You specify a start grater than the end angle. Aborting."));
+        }
+        G_debug(1, "Angle step: %g, start: %g, end: %g", step, start, end);
     }
     else {
@@ -393 +421 @@
         }
         sscanf(parm.step->answer, "%lf", &step);
-
-
     }
 
@@ -1014 +1040 @@
 {
     int i, j, l, k = 0;
-    int numDigits;
+    size_t numDigits = 3;
+    size_t decimals, add;
 
     int xindex, yindex;
@@ -1027 +1054 @@
     double delt_dist;
 
-    char formatString[10];
+    char *formatString;
     char msg_buff[256];
 
@@ -1040 +1067 @@
 
     int arrayNumInt;
-    double dfr_rad;
+    int start_indx;
+    double dfr_rad, start_rad, angle_deg;
 
     xindex = (int)((xcoord - xmin) / stepx);
@@ -1104 +1132 @@
         else {
             dfr_rad = step * deg2rad;
-            arrayNumInt = (int)(360. / fabs(step));
-        }
-
-        numDigits = (int)(log10(1. * arrayNumInt)) + 1;
-        sprintf(formatString, "%%s_%%0%dd", numDigits);
+            start_rad = start * deg2rad;
+            arrayNumInt = (int)((end - start) / fabs(step));
+            start_indx = (int)(start / step);
+        }
+
+        /* numDigits = (int)(log10(1. * arrayNumInt)) + 1;
+        sprintf(formatString, "%%s_%%0%dd", numDigits); */
+
+        decimals = G_get_num_decimals(str_step);
 
         for (k = 0; k < arrayNumInt; k++) {
            struct History history; 
 
-            if (step != 0.0)
-                sprintf(shad_filename, formatString, horizon, k);
-
-            angle = (single_direction * deg2rad) + (dfr_rad * k);
+            angle = (start + single_direction) * deg2rad + (dfr_rad * k);
+            angle_deg = angle * rad2deg + 0.0001;
+
+            if (step != 0.0)
+                 shad_filename = G_generate_basename(horizon, angle_deg, 3, decimals);
+
             /*              
                com_par(angle);
              */
             G_message(_("Calculating map %01d of %01d (angle %.2f, raster map <%s>)"),
-                     (k + 1), arrayNumInt, angle * rad2deg, shad_filename);
+                     (k + 1), arrayNumInt, angle_deg, shad_filename);
 
             for (j = hor_row_start; j < hor_row_end; j++) {
@@ -1265 +1299 @@
 
             Rast_write_history(shad_filename, &history);
-        }
-    }
-}
+            G_free(shad_filename);
+        }
+    }
+}