Changeset 532

Timestamp:

03/16/08 17:08:53 (16 months ago)

Author:

hobu

Message:

mostly working txt2las

Files:

• trunk/apps/txt2las.c (modified) (13 diffs)

trunk/apps/txt2las.c

@@ -97 +97 @@
     const char* l = line;
 
-    point = LASPoint_Create();
+
     while (p[0])
     {
@@ -330 +330 @@
     LASHeaderH header = NULL;
     LASWriterH writer = NULL;
+    LASError err;
 
     int xyz_min_quant[3] = {0, 0, 0};
@@ -537 +538 @@
     while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in))
     {
-        if (parse(parse_less, line, xyz, &point, &gps_time))
+        point = LASPoint_Create();
+        if (parse(parse_less, line, xyz, point, &gps_time))
         {
             /* init the bounding box */
@@ -557 +559 @@
                     line, 
                     parse_less);
-        }
+
+        }
+        LASPoint_Destroy(point);
+        point = NULL;
     }
 
@@ -571 +576 @@
     while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in))
     {
-        if (parse(parse_less, line, xyz, &point, &gps_time))
+        point = LASPoint_Create();
+        if (parse(parse_less, line, xyz, point, &gps_time))
         {
             /* update bounding box */
@@ -587 +593 @@
             line, 
             parse_less);
-        }
+
+        }
+        LASPoint_Destroy(point);
+        point = NULL;
     }
 
@@ -672 +681 @@
     if (strstr(parse_string,"t"))
     {
+        fprintf(stderr, "Setting to LAS version 1.1!!!\n");
         LASHeader_SetDataFormatId(header, 1);
     }
@@ -726 +736 @@
     while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in))
     {
-        if (parse(parse_string, line, xyz, &point, &gps_time))
+        point = LASPoint_Create();
+        if (parse(parse_string, line, xyz, point, &gps_time))
         {
             /* init the bounding box */
@@ -739 +750 @@
             
             /* compute the quantized x, y, and z values */
-            LASPoint_SetX(point, 0.5 + (xyz[0] - xyz_offset[0]) / xyz_scale[0]);
-            LASPoint_SetY(point, 0.5 + (xyz[1] - xyz_offset[1]) / xyz_scale[1]);
-            LASPoint_SetX(point, 0.5 + (xyz[2] - xyz_offset[2]) / xyz_scale[2]);
+            LASPoint_SetX(point, xyz[0]);
+            LASPoint_SetY(point, xyz[1]);
+            LASPoint_SetZ(point, xyz[2]);
 
             /* write the first point */
-            LASWriter_WritePoint(writer, point);
-            printf("Writing point...");
+            err = LASWriter_WritePoint(writer, point);
+            if (err) {
+                LASError_Print("could not write point");
+                exit(1);
+            }
               
             /* we can stop this loop */
@@ -756 +770 @@
                     parse_string);
         }
+        LASPoint_Destroy(point);
+        point = NULL;
     }
 
@@ -769 +785 @@
     while (fgets(line, sizeof(char) * MAX_CHARACTERS_PER_LINE, file_in))
     {
+        point = LASPoint_Create();
         if (parse(parse_string, line, xyz, &point, &gps_time))
         {
@@ -781 +798 @@
 
             /* compute the quantized x, y, and z values */
-            LASPoint_SetX(point, 0.5 + (xyz[0] - xyz_offset[0]) / xyz_scale[0]);
-            LASPoint_SetY(point, 0.5 + (xyz[1] - xyz_offset[1]) / xyz_scale[1]);
-            LASPoint_SetX(point, 0.5 + (xyz[2] - xyz_offset[2]) / xyz_scale[2]);
+            LASPoint_SetX(point, xyz[0]);
+            LASPoint_SetY(point, xyz[1]);
+            LASPoint_SetZ(point, xyz[2]);
 
             /* write the first point */
-            LASWriter_WritePoint(writer, point);
+            err = LASWriter_WritePoint(writer, point);
+            if (err) {
+                LASError_Print("could not write point");
+                exit(1);
+            }
+
         }
         else
@@ -794 +816 @@
             parse_string);
         }
+        LASPoint_Destroy(point);
+        point = NULL;
     }