Changeset 66596

Timestamp:

Oct 24, 2015, 8:55:49 PM (9 years ago)

Author:

wenzeslaus

Message:

r.in.lidar: separate class and return filters

Location:

grass/trunk/raster/r.in.lidar

Files:

• filters.c (added)
• filters.h (added)
• local_proto.h (modified) (1 diff)
• main.c (modified) (4 diffs)

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

@@ -42 +42 @@
 #define METHOD_TRIMMEAN   13
 
+#define LAS_ALL 0
+#define LAS_FIRST 1
+#define LAS_LAST 2
+#define LAS_MID 3
+
+
 /* info.c */
 void print_lasinfo(LASHeaderH, LASSRSH);

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

@@ -34 +34 @@
 #include "rast_segment.h"
 #include "point_binning.h"
-
-#define LAS_ALL 0
-#define LAS_FIRST 1
-#define LAS_LAST 2
-#define LAS_MID 3
+#include "filters.h"
+
 
 int main(int argc, char *argv[])
@@ -68 +65 @@
     int arr_row, arr_col;
     unsigned long count, count_total;
-    int skipme, i;
     int point_class;
 
@@ -299 +295 @@
             G_fatal_error(_("Unknown filter option <%s>"), filter_opt->answer);
     }
+    struct ReturnFilter return_filter_struct;
+    return_filter_struct.filter = return_filter;
+    struct ClassFilter class_filter;
+    class_filter_create_from_strings(&class_filter, class_opt->answers);
 
     /* Fetch input map projection in GRASS form. */
@@ -499 +499 @@
                 z = LASPoint_GetZ(LAS_point);
 
-        if (return_filter != LAS_ALL) {
-            int return_no = LASPoint_GetReturnNumber(LAS_point);
-            int n_returns = LASPoint_GetNumberOfReturns(LAS_point);
-            skipme = 1;
-
-            switch (return_filter) {
-            case LAS_FIRST:
-                if (return_no == 1)
-                    skipme = 0;
-                break;
-            case LAS_MID:
-                if (return_no > 1 && return_no < n_returns)
-                    skipme = 0;
-                break;
-            case LAS_LAST:
-                if (n_returns > 1 && return_no == n_returns)
-                    skipme = 0;
-                break;
-            }
-
-            if (skipme) {
-                n_filtered++;
-                continue;
-            }
-        }
-        if (class_opt->answer) {
-            point_class = (int) LASPoint_GetClassification(LAS_point);
-            i = 0;
-            skipme = TRUE;
-            while (class_opt->answers[i]) {
-                if (point_class == atoi(class_opt->answers[i])) {
-                    skipme = FALSE;
-                    break;
-                }
-                i++;
-            }
-            if (skipme) {
-                continue;
-            }
-        }
+        int return_n = LASPoint_GetReturnNumber(LAS_point);
+        int n_returns = LASPoint_GetNumberOfReturns(LAS_point);
+        if (return_filter_is_out(&return_filter_struct, return_n, n_returns)) {
+            n_filtered++;
+            continue;
+        }
+        point_class = (int) LASPoint_GetClassification(LAS_point);
+        if (class_filter_is_out(&class_filter, point_class))
+            continue;
 
             if (y <= pass_south || y > pass_north) {