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

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2012-01-20 14:46:09 -0600 (Fri, 20 Jan 2012)
New Revision: 5333

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

Modified: cgm/trunk/geom/GeometryQueryEngine.hpp
===================================================================
--- cgm/trunk/geom/GeometryQueryEngine.hpp	2012-01-20 20:44:00 UTC (rev 5332)
+++ cgm/trunk/geom/GeometryQueryEngine.hpp	2012-01-20 20:46:09 UTC (rev 5333)
@@ -74,6 +74,7 @@
                                    const char* file_name,
                                    const char* file_type,
                                    const CubitString &cubit_version,
+                                   const char* unit = NULL,
                                    const char* logfile_name = NULL ) = 0;
 
       virtual CubitStatus export_solid_model(
@@ -137,8 +138,8 @@
                                 bool import_surfaces = true,
                                 bool import_curves = true,
                                 bool import_vertices = true,
-                                bool free_surfaces = true
-					                      ) = 0;
+                                bool free_surfaces = true,
+			        const char* unit = NULL        ) = 0;
 
      virtual CubitStatus import_solid_model(DLIList<TopologyBridge*> &imported_entities,
 					    const char* pBuffer,

Modified: cgm/trunk/geom/GeometryQueryTool.cpp
===================================================================
--- cgm/trunk/geom/GeometryQueryTool.cpp	2012-01-20 20:44:00 UTC (rev 5332)
+++ cgm/trunk/geom/GeometryQueryTool.cpp	2012-01-20 20:46:09 UTC (rev 5333)
@@ -334,7 +334,8 @@
                                              char const* filetype,
                                              int &num_ents_exported,
                                              const CubitString &cubit_version,
-                                             const char* logfile_name )
+                                             const char* logfile_name,
+                                             const char* unit )
 {
   if (0 == gqeList.size())
   {
@@ -439,7 +440,7 @@
 
   int num_ents_before = bridge_list.size();
   temp_result = gqeList.get()->export_solid_model(bridge_list, filename, filetype,
-                                        cubit_version, logfile_name );
+                                        cubit_version, unit, logfile_name );
   if (temp_result == CUBIT_SUCCESS )
     result = temp_result;
 
@@ -960,6 +961,7 @@
 						  const char* file_name,
 						  const char* file_type,
 						  const char* logfile_name,