[brlcad-commits] SF.net SVN: brlcad:[35011] brlcad/trunk/src/adrt/slave/load_g.c

[<eri...@us...>]

Revision: 35011
          http://brlcad.svn.sourceforge.net/brlcad/?rev=35011&view=rev
Author:   erikgreenwald
Date:     2009-07-08 19:51:28 +0000 (Wed, 08 Jul 2009)

Log Message:
-----------
eliminate verbose stuff. wire stuff together.

Modified Paths:
--------------
    brlcad/trunk/src/adrt/slave/load_g.c

Modified: brlcad/trunk/src/adrt/slave/load_g.c
===================================================================
--- brlcad/trunk/src/adrt/slave/load_g.c	2009-07-08 19:42:15 UTC (rev 35010)
+++ brlcad/trunk/src/adrt/slave/load_g.c	2009-07-08 19:51:28 UTC (rev 35011)
@@ -138,13 +138,13 @@
 	}
     }
 
+    printf("Region %s polys: %d\n", region_name, region_polys);
+
     bu_free(region_name, "region name");
 }
 
 int
-some_intermediate_function(argc, argv)
-    int argc;
-    char *argv[];
+some_intermediate_function(char *filename, char *region)
 {
     register int c;
     double percent;
@@ -177,56 +177,24 @@
     the_model = nmg_mm();
     BU_LIST_INIT(&rt_g.rtg_vlfree);	/* for vlist macros */
 
-    if ((dbip = db_open(argv[0], "r")) == DBI_NULL) {
-	perror(argv[0]);
-	bu_exit(1, "Unable to open geometry file (%s)\n", argv[0]);
+    if ((dbip = db_open(filename, "r")) == DBI_NULL) {
+	perror(filename);
+	bu_exit(1, "Unable to open geometry file (%s)\n", filename);
     }
-    if (db_dirbuild(dbip)) {
+    if (db_dirbuild(dbip))
 	bu_exit(1, "ERROR: db_dirbuild failed\n");
-    }
 
     BN_CK_TOL(tree_state.ts_tol);
     RT_CK_TESS_TOL(tree_state.ts_ttol);
 
-    if (verbose) {
-	bu_log("Model: %s\n", argv[0]);
-	bu_log("Objects:");
-	for (i=1; i<argc; i++)
-	    bu_log(" %s", argv[i]);
-	bu_log("\nTesselation tolerances:\n\tabs = %g mm\n\trel = %g\n\tnorm = %g\n",
-	       tree_state.ts_ttol->abs, tree_state.ts_ttol->rel, tree_state.ts_ttol->norm);
-	bu_log("Calculational tolerances:\n\tdist = %g mm perp = %g\n",
-	       tree_state.ts_tol->dist, tree_state.ts_tol->perp);
-    }
+    (void) db_walk_tree(dbip, 1, region,
+			1,			/* ncpu */
+			&tree_state,
+			0,			/* take all regions */
+			gcv_region_end,
+			nmg_booltree_leaf_tess,
+			(genptr_t)nmg_to_adrt_internal);
 
-    while (--argc) {
-	(void) db_walk_tree(dbip, 1, ++argv,
-			    1,			/* ncpu */
-			    &tree_state,
-			    0,			/* take all regions */
-			    gcv_region_end,
-			    nmg_booltree_leaf_tess,
-			    (genptr_t)nmg_to_adrt_internal);
-    }
-
-    percent = 0;
-    if (regions_tried>0) {
-	percent = ((double)regions_converted * 100) / regions_tried;
-	if (verbose)
-	    bu_log("Tried %d regions, %d converted to NMG's successfully.  %g%%\n",
-		   regions_tried, regions_converted, percent);
-    }
-    percent = 0;
-
-    if (regions_tried > 0) {
-	percent = ((double)regions_written * 100) / regions_tried;
-	if (verbose)
-	    bu_log("                  %d triangulated successfully. %g%%\n",
-		   regions_written, percent);
-    }
-
-    bu_log("%ld triangles written\n", tot_polygons);
-
     /* Release dynamic storage */
     nmg_km(the_model);
     rt_vlist_cleanup();
@@ -238,11 +206,7 @@
 int
 slave_load_g (tie_t *tie, char *data)
 {
-    char *filename, *region;
-    filename = data;
-    region = data + strlen(filename) + 1;
-    printf("Want to read %s from %s\n", region, filename);
-    return -1;
+    return some_intermediate_function(data, data+strlen(data)+1);
 }
 
 /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.