// 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
//
//
//
#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 <sstream>
#include <set>
+using SMESH::TPythonDump;
+
//=======================================================================
//function : dumpErrorCode
//purpose :
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()";
}
//=============================================================================
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();
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 );
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;
// 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 << ", "
+ << theFace << ", " << theProject << " )";
addErrorCode( "LoadFromFace" );
- return myPattern.Load( aMesh, aFace, theProject );
+ return myPattern.Load( aMesh, TopoDS::Face( aFace ), theProject );
}
//=======================================================================
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 << ", " << theBlock << " )";
addErrorCode( "LoadFrom3DBlock" );
return myPattern.Load( aMesh, TopoDS::Shell( exp.Current() ));
}
// 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();
}
}
// 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();
}
}
// 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 << ", "
+ << theFacesIDs << ", "
+ << theNodeIndexOnKeyPoint1 << ", " << theReverse << " )";
return points._retn();
}
}
// 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 << ", "
+ << theVolumesIDs << ", "
+ << theNode000Index << ", " << theNode001Index << " )";
return points._retn();
}
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 << ", "
+ << CreatePolygons << ", " << CreatePolyedrs << " )";
addErrorCode( "MakeMesh" );
return myPattern.MakeMesh( aMesh, CreatePolygons, CreatePolyedrs );
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 );