Changeset 31079

Timestamp:

Apr 22, 2008, 4:00:37 PM (16 years ago)

Author:

neteler

Message:

Benjamin Ducke: patch for 3D support and better memory management. Added 3D centroids

Location:

grass/trunk/vector/v.voronoi

Files:

• dt_main.c (modified) (3 diffs)
• dt_write.c (modified) (4 diffs)
• sw_defs.h (modified) (3 diffs)
• sw_main.c (modified) (3 diffs)
• vo_main.c (modified) (1 diff)

grass/trunk/vector/v.voronoi/dt_main.c

@@ -75 +75 @@
       G_fatal_error(_("Vector map <%s> not found"), in_opt->answer);
   }
-
+  
   Vect_set_open_level (2);
   Vect_open_old (&In, in_opt->answer, mapset);
 
-  if (0 > Vect_open_new (&Out, out_opt->answer, 0)) {
-    G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer);
+  /* check if we have a 3D input points map */
+  mode3d = 0;
+  if ( Vect_is_3d ( &In ) ) {
+        mode3d = 1;
+  }
+
+
+  if ( mode3d ) {
+        if (0 > Vect_open_new (&Out, out_opt->answer, 1)) {
+                G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer);
+        }
+  } else {
+        if (0 > Vect_open_new (&Out, out_opt->answer, 0)) {
+                G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer);
+        }
+  
   }
 
@@ -111 +125 @@
   G_debug ( 3, "nareas = %d", nareas );
   for ( area = 1; area <= nareas; area++ ) {
-      double x, y;
+      double x, y, z, angle, slope;
       int ret;
 
@@ -118 +132 @@
       
       ret = Vect_get_point_in_area ( &Out, area, &x, &y );
-
       if ( ret < 0 ) {
           G_warning ( _("Cannot calculate area centroid") );
           continue;
       }
+
+      ret = Vect_tin_get_z (&Out, x, y, &z, &angle, &slope);
+      G_debug(3, "area centroid z: %f",z);
+      if ( ret < 0 ) {
+          G_warning ( _("Cannot calculate area centroid z coordinate") );
+          continue;
+      }
       
-      Vect_append_point ( Points, x, y, 0.0 );
+      Vect_append_point ( Points, x, y, z );
       Vect_cat_set ( Cats, 1, area );
       

grass/trunk/vector/v.voronoi/dt_write.c

@@ -47 +47 @@
                 int j, nlines;
                 int found = 0;
-                double x, y;
+                double x, y, z;
                 
                 nlines = Vect_get_node_n_lines ( &Out, node );
@@ -61 +61 @@
                         Vect_get_line_nodes ( &Out, abs(line), &node2, NULL );
                 
-                    Vect_get_node_coor ( &Out, node2, &x, &y, NULL );
+                    Vect_get_node_coor ( &Out, node2, &x, &y, &z );
                     
                     if ( x == sb->coord.x && y == sb->coord.y ) {
@@ -74 +74 @@
             /* Not found, write it */
             Vect_reset_line ( Points );
-            Vect_append_point ( Points, sa->coord.x, sa->coord.y, 0.0 );
-            Vect_append_point ( Points, sb->coord.x, sb->coord.y, 0.0 );
+            if ( mode3d ) {
+                G_debug(3, "sa->coord.z: %f", sa->coord.z );
+                Vect_append_point ( Points, sa->coord.x, sa->coord.y, sa->coord.z );
+                Vect_append_point ( Points, sb->coord.x, sb->coord.y, sb->coord.z );        
+            } else {
+                Vect_append_point ( Points, sa->coord.x, sa->coord.y, 0.0 );
+                Vect_append_point ( Points, sb->coord.x, sb->coord.y, 0.0 );
+            }
             Vect_write_line ( &Out, Type, Points, Cats );
         }
@@ -82 +88 @@
     return 0;
 }
+

grass/trunk/vector/v.voronoi/sw_defs.h

@@ -14 +14 @@
 
 struct Point    {
-    double x,y;
+    double x,y,z;
 };
 
@@ -42 +42 @@
 
 #ifdef MAIN
-int triangulate, sorted, plot, debug;
+int triangulate, sorted, plot, debug, mode3d;
 struct  Site    *sites;
 int             nsites;
@@ -62 +62 @@
 int PQmin;
 #else
-extern int triangulate, sorted, plot, debug;
+extern int triangulate, sorted, plot, debug, mode3d;
 extern struct   Site    *sites;
 extern int              nsites;

grass/trunk/vector/v.voronoi/sw_main.c

@@ -43 +43 @@
         foundDupe = 0;
         while(i < nsites)
-                if(sites[i].coord.x == sites[i-1].coord.x && sites[i].coord.y == sites[i-1].coord.y)
-                        i++;
-                else
-                {
-                        if(i != j) sites[j] = sites[i];
-                        i++; j++;;
+                if ( mode3d ) {
+                        if(sites[i].coord.x == sites[i-1].coord.x && sites[i].coord.y == sites[i-1].coord.y 
+                                                                  && sites[i].coord.z == sites[i-1].coord.z)
+                                i++;
+                        else
+                        {
+                                if(i != j) sites[j] = sites[i];
+                                i++; j++;;
+                        }               
+                } else {
+                        if(sites[i].coord.x == sites[i-1].coord.x && sites[i].coord.y == sites[i-1].coord.y)
+                                i++;
+                        else
+                        {
+                                if(i != j) sites[j] = sites[i];
+                                i++; j++;;
+                        }
                 }
 
@@ -68 +79 @@
     Points = Vect_new_line_struct ();
 
+    nlines = Vect_get_num_lines ( &In );
+
     nsites = 0;
-    sites = (struct Site *) myalloc(4000*sizeof(*sites));
-
-    nlines = Vect_get_num_lines ( &In );
+    sites = (struct Site *) myalloc(nlines * sizeof(*sites));
 
     for ( line = 1; line <= nlines; line++ ) {
@@ -85 +96 @@
         sites[nsites].coord.x = Points->x[0];
         sites[nsites].coord.y = Points->y[0];
+        if ( mode3d ) {
+                G_debug(3, "Points->z[0]: %f", Points->z[0]);
+                sites[nsites].coord.z = Points->z[0];
+        }
 
         sites[nsites].sitenbr = nsites;

grass/trunk/vector/v.voronoi/vo_main.c

@@ -322 +322 @@
                                       IFi->key, OFi->database, OFi->driver);
             }
-            G_done_msg("");
+            G_done_msg(" ");
         }
   }