X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Pattern_i.cxx;h=4f730b3874abf276c3f99be4bab1cda2f4d6529a;hb=472ffc590834d098b2aaaa9596b34108d51eacbb;hp=206d497ba7a4c19b7c2d223bf230de877ef98e25;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_Pattern_i.cxx b/src/SMESH_I/SMESH_Pattern_i.cxx index 206d497ba..4f730b387 100644 --- a/src/SMESH_I/SMESH_Pattern_i.cxx +++ b/src/SMESH_I/SMESH_Pattern_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -32,12 +32,32 @@ #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" #include #include #include +#include +#include + #include +#include + +using SMESH::TPythonDump; + +//======================================================================= +//function : dumpErrorCode +//purpose : +//======================================================================= + +static void addErrorCode(const char* thePyCommand) +{ + TPythonDump() << "if (isDone != 1):"; + TPythonDump() << "\tprint '" << thePyCommand << " :', pattern.GetErrorCode()"; +} //============================================================================= /*! @@ -49,6 +69,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(); @@ -64,16 +87,6 @@ SMESH_Pattern_i::SMESH_Pattern_i( SMESH_Gen_i* theGen_i ): { } -//======================================================================= -//function : getShape -//purpose : -//======================================================================= - -TopoDS_Shape SMESH_Pattern_i::getShape( GEOM::GEOM_Object_ptr & theGeomObject ) -{ - return myGen->GetShapeReader()->GetShape( SMESH_Gen_i::GetGeomEngine(), theGeomObject ); -} - //======================================================================= //function : getMesh //purpose : @@ -96,6 +109,23 @@ TopoDS_Shape SMESH_Pattern_i::getShape( GEOM::GEOM_Object_ptr & theGeomObject ) 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 ); } @@ -115,11 +145,16 @@ CORBA::Boolean SMESH_Pattern_i::LoadFromFace(SMESH::SMESH_Mesh_ptr theMesh, if ( !aMesh ) return false; - TopoDS_Face aFace = TopoDS::Face( getShape( 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 ); } //======================================================================= @@ -137,7 +172,7 @@ CORBA::Boolean SMESH_Pattern_i::LoadFrom3DBlock(SMESH::SMESH_Mesh_ptr theMesh, if ( !aMesh ) return false; - TopoDS_Shape aShape = getShape( theBlock ); + TopoDS_Shape aShape = myGen->GeomObjectToShape( theBlock ); if ( aShape.IsNull()) return false; @@ -145,6 +180,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() )); } @@ -160,8 +199,8 @@ SMESH::point_array* SMESH_Pattern_i::ApplyToFace(GEOM::GEOM_Object_ptr theFace, SMESH::point_array_var points = new SMESH::point_array; list xyzList; - TopoDS_Shape F = getShape( theFace ); - TopoDS_Shape V = getShape( theVertexOnKeyPoint1 ); + TopoDS_Shape F = myGen->GeomObjectToShape( theFace ); + TopoDS_Shape V = myGen->GeomObjectToShape( theVertexOnKeyPoint1 ); if (!F.IsNull() && F.ShapeType() == TopAbs_FACE && !V.IsNull() && V.ShapeType() == TopAbs_VERTEX @@ -177,6 +216,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(); } @@ -192,9 +235,9 @@ SMESH::point_array* SMESH_Pattern_i::ApplyTo3DBlock(GEOM::GEOM_Object_ptr theBlo SMESH::point_array_var points = new SMESH::point_array; list xyzList; - TopExp_Explorer exp( getShape( theBlock ), TopAbs_SHELL ); - TopoDS_Shape V000 = getShape( theVertex000 ); - TopoDS_Shape V001 = getShape( theVertex001 ); + TopExp_Explorer exp( myGen->GeomObjectToShape( theBlock ), TopAbs_SHELL ); + TopoDS_Shape V000 = myGen->GeomObjectToShape( theVertex000 ); + TopoDS_Shape V001 = myGen->GeomObjectToShape( theVertex001 ); if (exp.More() && !V000.IsNull() && V000.ShapeType() == TopAbs_VERTEX && @@ -213,6 +256,116 @@ SMESH::point_array* SMESH_Pattern_i::ApplyTo3DBlock(GEOM::GEOM_Object_ptr theBlo } } + // Update Python script + TPythonDump() << "pattern.ApplyTo3DBlock( " << theBlock << ", " + << theVertex000 << ", " << theVertex001 << " )"; + + return points._retn(); +} + +//======================================================================= +//function : ApplyToMeshFaces +//purpose : +//======================================================================= + +SMESH::point_array* + SMESH_Pattern_i::ApplyToMeshFaces(SMESH::SMESH_Mesh_ptr theMesh, + const SMESH::long_array& theFacesIDs, + CORBA::Long theNodeIndexOnKeyPoint1, + CORBA::Boolean theReverse) +{ + SMESH::point_array_var points = new SMESH::point_array; + + ::SMESH_Mesh* aMesh = getMesh( theMesh ); + if ( !aMesh ) + return points._retn(); + + list xyzList; + set fset; + for (int i = 0; i < theFacesIDs.length(); i++) + { + CORBA::Long index = theFacesIDs[i]; + const SMDS_MeshElement * elem = aMesh->GetMeshDS()->FindElement(index); + if ( elem && elem->GetType() == SMDSAbs_Face ) + fset.insert( static_cast( elem )); + } + bool ok = false; + try { +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif + ok = myPattern.Apply( aMesh, fset, theNodeIndexOnKeyPoint1, theReverse ); + } + catch (Standard_Failure& exc) { + MESSAGE("OCCT Exception in SMESH_Pattern: " << exc.GetMessageString()); + } + catch ( std::exception& exc ) { + MESSAGE("STD Exception in SMESH_Pattern: << exc.what()"); + } + catch ( ... ) { + MESSAGE("Unknown Exception in SMESH_Pattern"); + } + + if ( ok && myPattern.GetMappedPoints( xyzList )) + { + points->length( xyzList.size() ); + list::iterator xyzIt = xyzList.begin(); + for ( int i = 0; xyzIt != xyzList.end(); xyzIt++ ) { + SMESH::PointStruct & p = points[ i++ ]; + (*xyzIt)->Coord( p.x, p.y, p.z ); + } + } + + // Update Python script + TPythonDump() << "pattern.ApplyToMeshFaces( " << theMesh << ", " + << theFacesIDs << ", " + << theNodeIndexOnKeyPoint1 << ", " << theReverse << " )"; + + return points._retn(); +} + +//======================================================================= +//function : ApplyToHexahedrons +//purpose : +//======================================================================= + +SMESH::point_array* + SMESH_Pattern_i::ApplyToHexahedrons(SMESH::SMESH_Mesh_ptr theMesh, + const SMESH::long_array& theVolumesIDs, + CORBA::Long theNode000Index, + CORBA::Long theNode001Index) +{ + SMESH::point_array_var points = new SMESH::point_array; + + ::SMESH_Mesh* aMesh = getMesh( theMesh ); + if ( !aMesh ) + return points._retn(); + + list xyzList; + set vset; + for (int i = 0; i < theVolumesIDs.length(); i++) + { + CORBA::Long index = theVolumesIDs[i]; + const SMDS_MeshElement * elem = aMesh->GetMeshDS()->FindElement(index); + if ( elem && elem->GetType() == SMDSAbs_Volume && elem->NbNodes() == 8 ) + vset.insert( static_cast( elem )); + } + if (myPattern.Apply( vset, theNode000Index, theNode001Index ) && + myPattern.GetMappedPoints( xyzList )) + { + points->length( xyzList.size() ); + list::iterator xyzIt = xyzList.begin(); + for ( int i = 0; xyzIt != xyzList.end(); xyzIt++ ) { + SMESH::PointStruct & p = points[ i++ ]; + (*xyzIt)->Coord( p.x, p.y, p.z ); + } + } + + // Update Python script + TPythonDump() << "pattern.ApplyToHexahedrons( " << theMesh << ", " + << theVolumesIDs << ", " + << theNode000Index << ", " << theNode001Index << " )"; + return points._retn(); } @@ -221,13 +374,20 @@ SMESH::point_array* SMESH_Pattern_i::ApplyTo3DBlock(GEOM::GEOM_Object_ptr theBlo //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 ); } //======================================================================= @@ -299,11 +459,11 @@ SMESH::long_array* SMESH_Pattern_i::GetKeyPoints() //purpose : //======================================================================= -SMESH::array_of_long_array* SMESH_Pattern_i::GetElementPoints() +SMESH::array_of_long_array* SMESH_Pattern_i::GetElementPoints(CORBA::Boolean applied) { SMESH::array_of_long_array_var arrayOfArray = new SMESH::array_of_long_array; - const list< list< int > >& listOfIdList = myPattern.GetElementPointIDs(); + const list< list< int > >& listOfIdList = myPattern.GetElementPointIDs(applied); arrayOfArray->length( listOfIdList.size() ); list< list< int > >::const_iterator llIt = listOfIdList.begin(); for ( int i = 0 ; llIt != listOfIdList.end(); llIt++, i++ ) @@ -342,6 +502,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 );