[cgma-dev] r5328 - cgm/trunk/geom

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2012-01-20 14:41:45 -0600 (Fri, 20 Jan 2012)
New Revision: 5328

Modified:
   cgm/trunk/geom/CubitCompat.cpp
   cgm/trunk/geom/CubitCompat.hpp
   cgm/trunk/geom/GeometryQueryTool.hpp
Log:
Added unit parameter for import/export functions for iges files in OCC engine cgm. Passed cgm/test make check.

Modified: cgm/trunk/geom/CubitCompat.cpp
===================================================================
--- cgm/trunk/geom/CubitCompat.cpp	2012-01-20 20:38:34 UTC (rev 5327)
+++ cgm/trunk/geom/CubitCompat.cpp	2012-01-20 20:41:45 UTC (rev 5328)
@@ -49,6 +49,7 @@
 CubitCompat_import_solid_model( const char* file_name,
                                 const char* file_type,
                                 const char* logfile_name,
+                                const char* unit,
                                 CubitBoolean heal_step,
                                 CubitBoolean import_bodies,
                                 CubitBoolean import_surfaces,
@@ -70,9 +71,9 @@
                                         free_surfaces,
                                         merge_globally,
                                         no_assembly_level_features,
-                                        logfile_name ? logfile_name : "" };
+                                        logfile_name ? logfile_name : ""};
 #else 
-  #define CubitCompat_opts logfile_name, heal_step, \
+  #define CubitCompat_opts logfile_name, unit ? unit : "", heal_step, \
                            import_bodies, import_surfaces, \
                            import_curves, import_vertices, \
                            free_surfaces
@@ -91,7 +92,8 @@
                                 const char * filetype,
                                 int &num_ents_exported,
                                 const CubitString &cubit_version,
-                                const char* logfile_name )
+                                const char* logfile_name,
+                                const char* unit )
 {
   return GeometryQueryTool::instance()->export_solid_model(
            ref_entity_list,
@@ -99,5 +101,6 @@
            CubitCompat_file_type(filetype),
            num_ents_exported,
            cubit_version,
-           logfile_name );
+           logfile_name,
+           unit );
 }

Modified: cgm/trunk/geom/CubitCompat.hpp
===================================================================
--- cgm/trunk/geom/CubitCompat.hpp	2012-01-20 20:38:34 UTC (rev 5327)
+++ cgm/trunk/geom/CubitCompat.hpp	2012-01-20 20:41:45 UTC (rev 5328)
@@ -11,6 +11,7 @@
 CubitCompat_import_solid_model( const char* file_name,
                                 const char* file_type,
                                 const char* logfile_name = NULL,