X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Pattern_i.cxx;h=8a90fb7655de3e76a1fbba55d1536581a56729ec;hp=887dfe51f89dd105e7506f9cc7450abb91c71417;hb=079e65a9b152c9dec23fa91a346ac312b04eb145;hpb=a5e3cc49d703c008b20d1ba71858a4d5164210c5 diff --git a/src/SMESH_I/SMESH_Pattern_i.cxx b/src/SMESH_I/SMESH_Pattern_i.cxx index 887dfe51f..8a90fb765 100644 --- a/src/SMESH_I/SMESH_Pattern_i.cxx +++ b/src/SMESH_I/SMESH_Pattern_i.cxx @@ -1,37 +1,37 @@ -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses +// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// 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 +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // +// You should have received a copy of the GNU Lesser General Public +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // File : SMESH_Pattern_i.cxx // Created : Fri Aug 20 16:15:49 2004 // Author : Edward AGAPOV (eap) -// $Header: - +// #include "SMESH_Pattern_i.hxx" #include "GEOM_Client.hxx" #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" @@ -39,9 +39,15 @@ #include #include +#include +#include + #include #include +using SMESH::TPythonDump; +using SMESH::TVar; + //======================================================================= //function : dumpErrorCode //purpose : @@ -49,11 +55,8 @@ static void addErrorCode(const char* thePyCommand) { - SMESH_Gen_i::AddToCurrentPyScript("if (isDone != 1):"); - TCollection_AsciiString str ("\tprint \""); - str += (char*) thePyCommand; - str += ":\", pattern.GetErrorCode()"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "if (isDone != 1):"; + TPythonDump() << "\tprint '" << thePyCommand << " :', pattern.GetErrorCode()"; } //============================================================================= @@ -67,7 +70,7 @@ static void addErrorCode(const char* thePyCommand) SMESH::SMESH_Pattern_ptr SMESH_Gen_i::GetPattern() { // Update Python script - SMESH_Gen_i::AddToCurrentPyScript( "pattern = smesh.GetPattern()" ); + TPythonDump() << "pattern = " << this << ".GetPattern()"; SMESH_Pattern_i* i = new SMESH_Pattern_i( this ); SMESH::SMESH_Pattern_var anObj = i->_this(); @@ -106,10 +109,21 @@ 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 - TCollection_AsciiString str( "isDone = pattern.LoadFromFile(" ); - str += TCollection_AsciiString( (char*) theFileContents ) + ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = pattern.LoadFromFile(" + << TPythonDump::LongStringStart("Pattern") + << patternDescription + << TPythonDump::LongStringEnd() + << ")"; addErrorCode( "LoadFromFile" ); return myPattern.Load( theFileContents ); @@ -136,11 +150,8 @@ CORBA::Boolean SMESH_Pattern_i::LoadFromFace(SMESH::SMESH_Mesh_ptr theMesh, return false; // Update Python script - TCollection_AsciiString str( "isDone = pattern.LoadFromFace( " ); - SMESH_Gen_i::AddObject( str, theMesh ) += ", "; - SMESH_Gen_i::AddObject( str, theFace ) += ", "; - str += TCollection_AsciiString( theProject ) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = pattern.LoadFromFace( " << theMesh << ".GetMesh(), " + << theFace << ", " << theProject << " )"; addErrorCode( "LoadFromFace" ); return myPattern.Load( aMesh, TopoDS::Face( aFace ), theProject ); @@ -170,10 +181,7 @@ CORBA::Boolean SMESH_Pattern_i::LoadFrom3DBlock(SMESH::SMESH_Mesh_ptr theMesh, return false; // Update Python script - TCollection_AsciiString str( "isDone = pattern.LoadFrom3DBlock( " ); - SMESH_Gen_i::AddObject( str, theMesh ) += ", "; - SMESH_Gen_i::AddObject( str, theBlock ) += " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = pattern.LoadFrom3DBlock( " << theMesh << ".GetMesh(), " << theBlock << " )"; addErrorCode( "LoadFrom3DBlock" ); return myPattern.Load( aMesh, TopoDS::Shell( exp.Current() )); @@ -207,13 +215,9 @@ SMESH::point_array* SMESH_Pattern_i::ApplyToFace(GEOM::GEOM_Object_ptr theFace, (*xyzIt)->Coord( p.x, p.y, p.z ); } } - // Update Python script - TCollection_AsciiString str( "pattern.ApplyToFace( " ); - SMESH_Gen_i::AddObject( str, theFace ) += ", "; - SMESH_Gen_i::AddObject( str, theVertexOnKeyPoint1 ) += ", "; - str += TCollection_AsciiString( theReverse ) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "pattern.ApplyToFace( " << theFace << ", " + << theVertexOnKeyPoint1 << ", " << theReverse << " )"; return points._retn(); } @@ -252,11 +256,8 @@ SMESH::point_array* SMESH_Pattern_i::ApplyTo3DBlock(GEOM::GEOM_Object_ptr theBlo } // Update Python script - TCollection_AsciiString str( "pattern.ApplyTo3DBlock( " ); - SMESH_Gen_i::AddObject( str, theBlock ) += ", "; - SMESH_Gen_i::AddObject( str, theVertex000 ) += ", "; - SMESH_Gen_i::AddObject( str, theVertex001 ) += " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "pattern.ApplyTo3DBlock( " << theBlock << ", " + << theVertex000 << ", " << theVertex001 << " )"; return points._retn(); } @@ -287,8 +288,24 @@ SMESH::point_array* if ( elem && elem->GetType() == SMDSAbs_Face ) fset.insert( static_cast( elem )); } - if (myPattern.Apply( fset, theNodeIndexOnKeyPoint1, theReverse ) && - myPattern.GetMappedPoints( xyzList )) + 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(); @@ -299,12 +316,9 @@ SMESH::point_array* } // Update Python script - TCollection_AsciiString str( "pattern.ApplyToMeshFaces( " ); - SMESH_Gen_i::AddObject( str, theMesh ) += ", "; - SMESH_Gen_i::AddArray( str, theFacesIDs ) += ", "; - str += TCollection_AsciiString( (int)theNodeIndexOnKeyPoint1 ) + ", "; - str += TCollection_AsciiString( theReverse ) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "pattern.ApplyToMeshFaces( " << theMesh << ".GetMesh(), " + << theFacesIDs << ", " + << TVar( theNodeIndexOnKeyPoint1 ) << ", " << theReverse << " )"; return points._retn(); } @@ -347,12 +361,9 @@ SMESH::point_array* } // Update Python script - TCollection_AsciiString str( "pattern.ApplyToHexahedrons( " ); - SMESH_Gen_i::AddObject( str, theMesh ) += ", "; - SMESH_Gen_i::AddArray( str, theVolumesIDs ) += ", "; - str += TCollection_AsciiString( (int)theNode000Index ) + ", "; - str += TCollection_AsciiString( (int)theNode001Index ) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "pattern.ApplyToHexahedrons( " << theMesh << ".GetMesh(), " + << theVolumesIDs << ", " + << TVar(theNode000Index) << ", " << TVar(theNode001Index) << " )"; return points._retn(); } @@ -371,14 +382,20 @@ CORBA::Boolean SMESH_Pattern_i::MakeMesh (SMESH::SMESH_Mesh_ptr theMesh, return false; // Update Python script - TCollection_AsciiString str( "isDone = pattern.MakeMesh( " ); - SMESH_Gen_i::AddObject( str, theMesh ) += ", "; - str += TCollection_AsciiString( CreatePolygons ) + ", "; - str += TCollection_AsciiString( CreatePolyedrs ) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = pattern.MakeMesh( " << theMesh << ".GetMesh(), " + << CreatePolygons << ", " << CreatePolyedrs << " )"; addErrorCode( "MakeMesh" ); - return myPattern.MakeMesh( aMesh, CreatePolygons, CreatePolyedrs ); + int nb = aMesh->NbNodes() + aMesh->NbEdges() + aMesh->NbFaces() + aMesh->NbVolumes(); + + bool res = myPattern.MakeMesh( aMesh, CreatePolygons, CreatePolyedrs ); + + if ( nb > 0 && nb != aMesh->NbNodes() + aMesh->NbEdges() + aMesh->NbFaces() + aMesh->NbVolumes()) + { + aMesh->SetIsModified(true); + aMesh->GetMeshDS()->Modified(); + } + return res; } //======================================================================= @@ -493,6 +510,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 );