[cgma-dev] r5569 - in cgm/trunk/geom: . Cholla facet facetbool

[jvporter at wisc.edu]

Author: jvporter
Date: 2012-06-12 15:38:40 -0500 (Tue, 12 Jun 2012)
New Revision: 5569

Modified:
   cgm/trunk/geom/Cholla/Cholla.cpp
   cgm/trunk/geom/Cholla/FacetDataUtil.cpp
   cgm/trunk/geom/Cholla/FacetEvalTool.cpp
   cgm/trunk/geom/SurfaceOverlapTool.cpp
   cgm/trunk/geom/facet/FacetQueryEngine.cpp
   cgm/trunk/geom/facetbool/FBIntersect.cpp
Log:
Fix more printf warnings


Modified: cgm/trunk/geom/Cholla/Cholla.cpp
===================================================================
--- cgm/trunk/geom/Cholla/Cholla.cpp	2012-06-12 19:54:25 UTC (rev 5568)
+++ cgm/trunk/geom/Cholla/Cholla.cpp	2012-06-12 20:38:40 UTC (rev 5569)
@@ -1901,11 +1901,11 @@
     {
       int kk;
       for(kk=0; kk<3; kk++);
-      fprintf(fp, "(%d) %.6lf %.6lf %.6lf\n", edge_ptr->id(), P0.x(), P0.y(), P0.z()); 
-      fprintf(fp, "    %.6lf %.6lf %.6lf\n", Pi[0].x(), Pi[0].y(), Pi[0].z());
-      fprintf(fp, "    %.6lf %.6lf %.6lf\n", Pi[1].x(), Pi[1].y(), Pi[1].z());
-      fprintf(fp, "    %.6lf %.6lf %.6lf\n", Pi[2].x(), Pi[2].y(), Pi[2].z());
-      fprintf(fp, "    %.6lf %.6lf %.6lf\n", P1.x(), P1.y(), P1.z()); 
+      fprintf(fp, "(%d) %.6f %.6f %.6f\n", edge_ptr->id(), P0.x(), P0.y(), P0.z()); 
+      fprintf(fp, "    %.6f %.6f %.6f\n", Pi[0].x(), Pi[0].y(), Pi[0].z());
+      fprintf(fp, "    %.6f %.6f %.6f\n", Pi[1].x(), Pi[1].y(), Pi[1].z());
+      fprintf(fp, "    %.6f %.6f %.6f\n", Pi[2].x(), Pi[2].y(), Pi[2].z());
+      fprintf(fp, "    %.6f %.6f %.6f\n", P1.x(), P1.y(), P1.z()); 
     }
     edge_ptr->control_points( Pi, 4 );
   } 

Modified: cgm/trunk/geom/Cholla/FacetDataUtil.cpp
===================================================================
--- cgm/trunk/geom/Cholla/FacetDataUtil.cpp	2012-06-12 19:54:25 UTC (rev 5568)
+++ cgm/trunk/geom/Cholla/FacetDataUtil.cpp	2012-06-12 20:38:40 UTC (rev 5569)
@@ -1270,7 +1270,7 @@
   {
     pt = point_list.get_and_step();
     pt->set_id(ii);
-    fprintf(fp, "%d %lf %lf %lf\n", ii, pt->x(), pt->y(), pt->z() );
+    fprintf(fp, "%d %f %f %f\n", ii, pt->x(), pt->y(), pt->z() );
   }
 
   CubitFacet *facet;
@@ -1800,7 +1800,7 @@
           CubitVector loc_on_edge;
           CubitBoolean is_on_edge;
           double dist = edge->dist_to_edge(pt->coordinates(), loc_on_edge, is_on_edge);
-          PRINT_INFO("edge %d dist = %lf is_on_edge = %d\n", edge->id(), dist, is_on_edge);
+          PRINT_INFO("edge %d dist = %f is_on_edge = %d\n", edge->id(), dist, is_on_edge);
         }
         dview();
         pt = pt;

Modified: cgm/trunk/geom/Cholla/FacetEvalTool.cpp
===================================================================
--- cgm/trunk/geom/Cholla/FacetEvalTool.cpp	2012-06-12 19:54:25 UTC (rev 5568)
+++ cgm/trunk/geom/Cholla/FacetEvalTool.cpp	2012-06-12 20:38:40 UTC (rev 5569)
@@ -2308,7 +2308,7 @@
   if (normal_ptr) {