[cgma-dev] r5966 - in cgm/trunk/geom: . OCC facet virtual

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-02-01 12:07:49 -0600 (Fri, 01 Feb 2013)
New Revision: 5966

Modified:
   cgm/trunk/geom/GeometryQueryEngine.hpp
   cgm/trunk/geom/GeometryQueryTool.cpp
   cgm/trunk/geom/GeometryQueryTool.hpp
   cgm/trunk/geom/OCC/OCCQueryEngine.cpp
   cgm/trunk/geom/OCC/OCCQueryEngine.hpp
   cgm/trunk/geom/facet/FacetQueryEngine.hpp
   cgm/trunk/geom/virtual/VirtualQueryEngine.hpp
Log:
Update trunk with merge-cubit12.2 version of geom/parallel.

Modified: cgm/trunk/geom/GeometryQueryEngine.hpp
===================================================================
--- cgm/trunk/geom/GeometryQueryEngine.hpp	2013-01-31 23:25:28 UTC (rev 5965)
+++ cgm/trunk/geom/GeometryQueryEngine.hpp	2013-02-01 18:07:49 UTC (rev 5966)
@@ -176,6 +176,12 @@
                                    Model_File_Type file_type,
                                    const CubitString &cubit_version,
                                    ModelExportOptions &export_options ) = 0;
+
+      virtual CubitStatus export_solid_model(
+                                   DLIList<TopologyBridge*>& bridge_list,
+                                   char*& p_buffer,
+                                   int& n_buffer_size,
+                                   bool b_export_buffer) = 0;
     
      //! Saves out a temporary geometry file.  Entities in list must all be 
      //! of same modeling engine.
@@ -226,6 +232,15 @@
                                 DLIList<TopologyBridge*>& imported_entities,
                                 ModelImportOptions &import_options ) = 0;
 
+     virtual CubitStatus import_solid_model(DLIList<TopologyBridge*> &imported_entities,
+                                            const char* pBuffer,
+                                            const int n_buffer_size) = 0;
+
+     //O imported_entities
+     //O- List of top-level entities read from file
+     //I print_results
+     //I- If false, fail silently (don't write error messages to stdout or stderr)
+
       virtual CubitStatus get_underlying_curves(Curve * curve_ptr,
                                  DLIList<TopologyBridge*>& curve_list)  ;
       // -currently used only by VirtualGeometryEngine to get the underlying

Modified: cgm/trunk/geom/GeometryQueryTool.cpp
===================================================================
--- cgm/trunk/geom/GeometryQueryTool.cpp	2013-01-31 23:25:28 UTC (rev 5965)
+++ cgm/trunk/geom/GeometryQueryTool.cpp	2013-02-01 18:07:49 UTC (rev 5966)
@@ -486,6 +486,155 @@
   return result;
 }
 
+// export entities to buffer
+CubitStatus GeometryQueryTool::export_solid_model(DLIList<RefEntity*>& ref_entity_list,
+                                                  char*& p_buffer,
+                                                  int& n_buffer_size,
+                                                  bool b_export_buffer)
+{
+  if (0 == gqeList.size())
+  {
+    PRINT_WARNING("No active geometry engine.\n");