Join modifications from branch OCC_debug_for_3_2_0b1

[modules/smesh.git] / src / SMESH_I / SMESH_Pattern_i.cxx

diff --git a/src/SMESH_I/SMESH_Pattern_i.cxx b/src/SMESH_I/SMESH_Pattern_i.cxx
index d0b8bd2161188c900139d0b9ce6a5fee5d7a2963..24adf5a99aeea41a4c1552efefd5dca9a1eb7f2b 100644 (file)
--- a/src/SMESH_I/SMESH_Pattern_i.cxx
+++ b/src/SMESH_I/SMESH_Pattern_i.cxx
@@ -32,6 +32,7 @@
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Mesh_i.hxx"
+#include "SMESH_PythonDump.hxx"
 #include "SMDS_MeshFace.hxx"
 #include "SMDS_MeshVolume.hxx"
 
@@ -42,10 +43,21 @@
 #include <sstream>
 #include <set>
 
-// =============================================================================
+using SMESH::TPythonDump;
+
+//=======================================================================
+//function : dumpErrorCode
+//purpose  : 
+//=======================================================================
+
+static void addErrorCode(const char* thePyCommand)
+{
+  TPythonDump() << "if (isDone != 1):";
+  TPythonDump() << "\tprint '" << thePyCommand << " :', pattern.GetErrorCode()";
+}
+
 //=============================================================================
 /*!
-// =============================================================================
  *  SMESH_Gen_i::GetPattern
  *
  *  Create pattern mapper
@@ -54,6 +66,9 @@
 
 SMESH::SMESH_Pattern_ptr SMESH_Gen_i::GetPattern()
 {
+  // Update Python script
+  TPythonDump() << "pattern = " << this << ".GetPattern()";
+
   SMESH_Pattern_i* i = new SMESH_Pattern_i( this );
   SMESH::SMESH_Pattern_var anObj = i->_this();
   return anObj._retn();
@@ -91,6 +106,23 @@ SMESH_Pattern_i::SMESH_Pattern_i( SMESH_Gen_i* theGen_i ):
 
 CORBA::Boolean SMESH_Pattern_i::LoadFromFile(const char* theFileContents)
 {
+  // remove some gabage from the end
+  TCollection_AsciiString patternDescription = (char*) theFileContents;
+  int pos = patternDescription.Length();
+  while (! isdigit( patternDescription.Value( pos )))
+    pos--;
+  if ( pos != patternDescription.Length() ) {
+    patternDescription.Trunc( pos );
+  }
+
+  // Update Python script
+  TPythonDump() << "isDone = pattern.LoadFromFile("
+                << TPythonDump::LongStringStart("Pattern")
+                << patternDescription
+                << TPythonDump::LongStringEnd()
+                << ")";
+  addErrorCode( "LoadFromFile" );
+
   return myPattern.Load( theFileContents );
 }
 
@@ -110,11 +142,16 @@ CORBA::Boolean SMESH_Pattern_i::LoadFromFace(SMESH::SMESH_Mesh_ptr theMesh,
   if ( !aMesh )
     return false;
 
-  TopoDS_Face aFace = TopoDS::Face( myGen->GeomObjectToShape( theFace ));
-  if ( aFace.IsNull() )
+  TopoDS_Shape aFace = myGen->GeomObjectToShape( theFace );
+  if ( aFace.IsNull() || aFace.ShapeType() != TopAbs_FACE )
     return false;
 
-  return myPattern.Load( aMesh, aFace, theProject );
+  // Update Python script
+  TPythonDump() << "isDone = pattern.LoadFromFace( " << theMesh << ", "
+                << theFace << ", " << theProject << " )";
+  addErrorCode( "LoadFromFace" );
+
+  return myPattern.Load( aMesh, TopoDS::Face( aFace ), theProject );
 }
 
 //=======================================================================
@@ -140,6 +177,10 @@ CORBA::Boolean SMESH_Pattern_i::LoadFrom3DBlock(SMESH::SMESH_Mesh_ptr theMesh,
   if ( !exp.More() )
     return false;
 
+  // Update Python script
+  TPythonDump() << "isDone = pattern.LoadFrom3DBlock( " << theMesh << ", " << theBlock << " )";
+  addErrorCode( "LoadFrom3DBlock" );
+
   return myPattern.Load( aMesh, TopoDS::Shell( exp.Current() ));
 }
 
@@ -172,6 +213,10 @@ SMESH::point_array* SMESH_Pattern_i::ApplyToFace(GEOM::GEOM_Object_ptr theFace,
     }
   }
 
+  // Update Python script
+  TPythonDump() << "pattern.ApplyToFace( " << theFace << ", "
+                << theVertexOnKeyPoint1 << ", " << theReverse << " )";
+
   return points._retn();
 }
 
@@ -208,6 +253,10 @@ SMESH::point_array* SMESH_Pattern_i::ApplyTo3DBlock(GEOM::GEOM_Object_ptr theBlo
     }
   }
 
+  // Update Python script
+  TPythonDump() << "pattern.ApplyTo3DBlock( " << theBlock << ", "
+                << theVertex000 << ", " << theVertex001 << " )";
+
   return points._retn();
 }
 
@@ -248,6 +297,11 @@ SMESH::point_array*
     }
   }
 
+  // Update Python script
+  TPythonDump() << "pattern.ApplyToMeshFaces( " << theMesh << ", "
+                << theFacesIDs << ", "
+                << theNodeIndexOnKeyPoint1 << ", " << theReverse << " )";
+
   return points._retn();
 }
 
@@ -288,6 +342,11 @@ SMESH::point_array*
     }
   }
 
+  // Update Python script
+  TPythonDump() << "pattern.ApplyToHexahedrons( " << theMesh << ", "
+                << theVolumesIDs << ", "
+                << theNode000Index << ", " << theNode001Index << " )";
+
   return points._retn();
 }
 
@@ -296,13 +355,20 @@ SMESH::point_array*
 //purpose  : 
 //=======================================================================
 
-CORBA::Boolean SMESH_Pattern_i::MakeMesh(SMESH::SMESH_Mesh_ptr theMesh)
+CORBA::Boolean SMESH_Pattern_i::MakeMesh (SMESH::SMESH_Mesh_ptr theMesh,
+                                          const CORBA::Boolean  CreatePolygons,
+                                          const CORBA::Boolean  CreatePolyedrs)
 {
   ::SMESH_Mesh* aMesh = getMesh( theMesh );
   if ( !aMesh )
     return false;
 
-  return myPattern.MakeMesh( aMesh );
+  // Update Python script
+  TPythonDump() << "isDone = pattern.MakeMesh( " << theMesh << ", "
+                << CreatePolygons << ", " << CreatePolyedrs << " )";
+  addErrorCode( "MakeMesh" );
+
+  return myPattern.MakeMesh( aMesh, CreatePolygons, CreatePolyedrs );
 }
 
 //=======================================================================
@@ -417,6 +483,7 @@ SMESH::SMESH_Pattern::ErrorCode SMESH_Pattern_i::GetErrorCode()
     RETCASE( ERR_LOAD_EMPTY_SUBMESH );
     RETCASE( ERR_LOADF_NARROW_FACE );
     RETCASE( ERR_LOADF_CLOSED_FACE );
+    RETCASE( ERR_LOADF_CANT_PROJECT );
     RETCASE( ERR_LOADV_BAD_SHAPE );
     RETCASE( ERR_LOADV_COMPUTE_PARAMS );
     RETCASE( ERR_APPL_NOT_LOADED );