Changeset 68418

Timestamp:

May 10, 2016, 11:03:54 AM (8 years ago)

Author:

wenzeslaus

Message:

r.in.lidar: revert r67210 for main.c to hide grid-based decimation

The grid-based decimation outputs vector and
should not be part of a raster module.
Keeping code in place for further use
hopefully in a library.

Location:

grass/trunk/raster/r.in.lidar

Files:

• local_proto.h (modified) (1 diff)
• main.c (modified) (10 diffs)
• point_binning.h (modified) (1 diff)

grass/trunk/raster/r.in.lidar/local_proto.h

@@ -91 +91 @@
 void string_list_free(struct StringList *string_list);
 
-/* forward declarations */
-struct Map_info;
-struct line_pnts;
-struct line_cats;
-
-struct VectorWriter
-{
-    struct Map_info *info;
-    struct line_pnts *points;
-    struct line_cats *cats;
-#ifdef HAVE_LONG_LONG_INT
-    unsigned long long count;
-#else
-    unsigned long count;
-#endif
-};
-
 #endif /* __LOCAL_PROTO_H__ */

grass/trunk/raster/r.in.lidar/main.c

@@ -29 +29 @@
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
-#include <grass/vector.h>
 #include <liblas/capi/liblas.h>
 
@@ -80 +79 @@
     struct Option *trim_opt, *pth_opt, *res_opt;
     struct Option *file_list_opt;
-    struct Option *voutput_opt;
     struct Flag *print_flag, *scan_flag, *shell_style, *over_flag, *extents_flag, *intens_flag;
     struct Flag *set_region_flag;
     struct Flag *base_rast_res_flag;
-    struct Flag *notopo_flag;
 
     /* LAS */
@@ -114 +111 @@
 
     output_opt = G_define_standard_option(G_OPT_R_OUTPUT);
-    output_opt->required = NO;
+    output_opt->required = YES;
     output_opt->guisection = _("Output");
 
@@ -123 +120 @@
     file_list_opt->required = NO;
     file_list_opt->guisection = _("Input");
-
-    voutput_opt = G_define_standard_option(G_OPT_V_OUTPUT);
-    voutput_opt->key = "vector_output";
-    voutput_opt->required = NO;
-    voutput_opt->label = _("Grid-decimated point cloud");
-    voutput_opt->description = _("Grid-decimated point cloud with"
-        " XYZ coordinates which are mean for all points in a raster cell");
-    voutput_opt->guisection = _("Output");
 
     method_opt = G_define_option();
@@ -276 +265 @@
         _("Use base raster actual resolution instead of computational region");
 
-    notopo_flag = G_define_standard_flag(G_FLG_V_TOPO);
-
-    G_option_required(output_opt, voutput_opt, NULL);
-
     if (G_parser(argc, argv))
         exit(EXIT_FAILURE);
@@ -303 +288 @@
 
     /* parse input values */
-    if (output_opt->answer)
-        outmap = output_opt->answer;
-    else
-        outmap = NULL;
+    outmap = output_opt->answer;
 
     if (shell_style->answer && !scan_flag->answer) {
@@ -416 +398 @@
 
     point_binning_set(&point_binning, method_opt->answer, pth_opt->answer,
-                      trim_opt->answer, voutput_opt->answer ? TRUE : FALSE);
+                      trim_opt->answer, FALSE);
 
     base_array = NULL;
@@ -513 +495 @@
 
     /* open output map */
-    if (outmap)
-        out_fd = Rast_open_new(outmap, rtype);
-    else
-        out_fd = 0; /* TODO: is this correct? */
+    out_fd = Rast_open_new(outmap, rtype);
 
     /* allocate memory for a single row of output data */
     raster_row = Rast_allocate_output_buf(rtype);
-
-    struct Map_info voutput;
-    struct VectorWriter vector_writer;
-    if (voutput_opt->answer) {
-        if (Vect_open_new(&voutput, voutput_opt->answer, 1) < 0)
-            G_fatal_error(_("Unable to create vector map <%s>"), voutput_opt->answer);
-        vector_writer.info = &voutput;
-        vector_writer.points = Vect_new_line_struct();
-        vector_writer.cats = Vect_new_cats_struct();
-        vector_writer.count = 0;
-        Vect_hist_command(&voutput);
-    }
 
     G_message(_("Reading data ..."));
@@ -665 +632 @@
         /* potentially vector writing can be independent on the binning */
         write_values(&point_binning, &bin_index_nodes, raster_row, row,
-            cols, rtype, &vector_writer);
+            cols, rtype, NULL);
             /* write out line of raster data */
-        if (outmap)
-            Rast_put_row(out_fd, raster_row, rtype);
+        Rast_put_row(out_fd, raster_row, rtype);
         }
 
@@ -683 +649 @@
 
     /* close raster file & write history */
-    if (outmap)
-        Rast_close(out_fd);
-
-    if (outmap) {
-        sprintf(title, "Raw x,y,z data binned into a raster grid by cell %s",
-                method_opt->answer);
-        Rast_put_cell_title(outmap, title);
-
-        Rast_short_history(outmap, "raster", &history);
-        Rast_command_history(&history);
-        Rast_set_history(&history, HIST_DATSRC_1, infile);
-        Rast_write_history(outmap, &history);
-    }
-
-    /* close output vector map */
-    if (voutput_opt->answer) {
-        if (!notopo_flag->answer)
-            Vect_build(vector_writer.info);
-        Vect_close(vector_writer.info);
-        Vect_destroy_line_struct(vector_writer.points);
-        Vect_destroy_cats_struct(vector_writer.cats);
-    }
+    Rast_close(out_fd);
+
+    sprintf(title, "Raw x,y,z data binned into a raster grid by cell %s",
+            method_opt->answer);
+    Rast_put_cell_title(outmap, title);
+
+    Rast_short_history(outmap, "raster", &history);
+    Rast_command_history(&history);
+    Rast_set_history(&history, HIST_DATSRC_1, infile);
+    Rast_write_history(outmap, &history);
 
     /* set computation region to the new raster map */

grass/trunk/raster/r.in.lidar/point_binning.h

@@ -90 +90 @@
                     RASTER_MAP_TYPE rtype, double trim);
 
-/* forward declaration */
-struct VectorWriter;
+/* forward declarations */
+struct Map_info;
+struct line_pnts;
+struct line_cats;
+
+struct VectorWriter
+{
+    struct Map_info *info;
+    struct line_pnts *points;
+    struct line_cats *cats;
+#ifdef HAVE_LONG_LONG_INT
+    unsigned long long count;
+#else
+    unsigned long count;
+#endif
+};
 
 void write_values(struct PointBinning *point_binning,