ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-29 10:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0020015: EDF 835 SMESH : Doc missing for concatenate.

Browse Source 
Convert Concatenate() command
This commit is contained in:
eap 2008-10-23 06:11:47 +00:00
parent 2a2884a992
commit 1e44e7cf5c
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -237,6 +237,13 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand
map< _pyID, Handle(_pyMeshEditor) >::iterator id_editor = myMeshEditors.find( objID ); map< _pyID, Handle(_pyMeshEditor) >::iterator id_editor = myMeshEditors.find( objID );
if ( id_editor != myMeshEditors.end() ) { if ( id_editor != myMeshEditors.end() ) {
id_editor->second->Process( aCommand ); id_editor->second->Process( aCommand );
TCollection_AsciiString processedCommand = aCommand->GetString();
// some commands of SMESH_MeshEditor create meshes
if ( aCommand->GetMethod().Search("MakeMesh") != -1 ) {
Handle(_pyMesh) mesh = new _pyMesh( aCommand, aCommand->GetResultValue() );
aCommand->GetString() = processedCommand; // discard changes made by _pyMesh
myMeshes.insert( make_pair( mesh->GetID(), mesh ));
}
return aCommand; return aCommand;
} }
// SMESH_Hypothesis method? // SMESH_Hypothesis method?
@ -289,17 +296,20 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand )
// CreateHypothesis( theHypType, theLibName ) // CreateHypothesis( theHypType, theLibName )
// Compute( mesh, geom ) // Compute( mesh, geom )
// mesh creation // mesh creation
if ( theCommand->GetMethod() == "CreateMesh" || TCollection_AsciiString method = theCommand->GetMethod();
theCommand->GetMethod() == "CreateEmptyMesh" || if ( method == "CreateMesh" || method == "CreateEmptyMesh")
theCommand->GetMethod() == "CreateMeshesFromUNV" ||
theCommand->GetMethod() == "CreateMeshesFromSTL")
{ {
Handle(_pyMesh) mesh = new _pyMesh( theCommand ); Handle(_pyMesh) mesh = new _pyMesh( theCommand );
myMeshes.insert( make_pair( mesh->GetID(), mesh )); myMeshes.insert( make_pair( mesh->GetID(), mesh ));
return; return;
} }
if ( method == "CreateMeshesFromUNV" || method == "CreateMeshesFromSTL")
if(theCommand->GetMethod() == "CreateMeshesFromMED") {
Handle(_pyMesh) mesh = new _pyMesh( theCommand, theCommand->GetResultValue() );
myMeshes.insert( make_pair( mesh->GetID(), mesh ));
return;
}
if( method == "CreateMeshesFromMED")
{ {
for(int ind = 0;ind<theCommand->GetNbResultValues();ind++) for(int ind = 0;ind<theCommand->GetNbResultValues();ind++)
{ {
@ -309,14 +319,14 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand )
} }
// CreateHypothesis() // CreateHypothesis()
if ( theCommand->GetMethod() == "CreateHypothesis" ) if ( method == "CreateHypothesis" )
{ {
myHypos.push_back( _pyHypothesis::NewHypothesis( theCommand )); myHypos.push_back( _pyHypothesis::NewHypothesis( theCommand ));
return; return;
} }
// smeshgen.Compute( mesh, geom ) --> mesh.Compute() // smeshgen.Compute( mesh, geom ) --> mesh.Compute()
if ( theCommand->GetMethod() == "Compute" ) if ( method == "Compute" )
{ {
const _pyID& meshID = theCommand->GetArg( 1 ); const _pyID& meshID = theCommand->GetArg( 1 );
map< _pyID, Handle(_pyMesh) >::iterator id_mesh = myMeshes.find( meshID ); map< _pyID, Handle(_pyMesh) >::iterator id_mesh = myMeshes.find( meshID );
@ -329,7 +339,7 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand )
} }
// leave only one smeshgen.GetPattern() in the script // leave only one smeshgen.GetPattern() in the script
if ( theCommand->GetMethod() == "GetPattern" ) { if ( method == "GetPattern" ) {
if ( myHasPattern ) { if ( myHasPattern ) {
theCommand->Clear(); theCommand->Clear();
return; return;
@ -338,9 +348,14 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand )
} }
// Concatenate( [mesh1, ...], ... ) // Concatenate( [mesh1, ...], ... )
if ( theCommand->GetMethod() == "Concatenate" || if ( method == "Concatenate" || method == "ConcatenateWithGroups")
theCommand->GetMethod() == "ConcatenateWithGroups")
{ {
if ( method == "ConcatenateWithGroups" ) {
theCommand->SetMethod( "Concatenate" );
theCommand->SetArg( theCommand->GetNbArgs() + 1, "True" );
}
Handle(_pyMesh) mesh = new _pyMesh( theCommand, theCommand->GetResultValue() );
myMeshes.insert( make_pair( mesh->GetID(), mesh ));
AddMeshAccessorMethod( theCommand ); AddMeshAccessorMethod( theCommand );
} }
@ -596,18 +611,17 @@ static bool sameGroupType( const _pyID& grpID,
*/ */
//================================================================================ //================================================================================
_pyMesh::_pyMesh(const Handle(_pyCommand) theCreationCmd): _pyMesh::_pyMesh(const Handle(_pyCommand) theCreationCmd)
_pyObject(theCreationCmd), myHasEditor(false) : _pyObject(theCreationCmd), myHasEditor(false)
{ {
// convert my creation command // convert my creation command
Handle(_pyCommand) creationCmd = GetCreationCmd(); Handle(_pyCommand) creationCmd = GetCreationCmd();
TCollection_AsciiString str = creationCmd->GetMethod(); //TCollection_AsciiString str = creationCmd->GetMethod();
// if(str != "CreateMeshesFromUNV" &&
// str != "CreateMeshesFromMED" &&
// str != "CreateMeshesFromSTL")
creationCmd->SetObject( SMESH_2smeshpy::SmeshpyName() ); creationCmd->SetObject( SMESH_2smeshpy::SmeshpyName() );
if(str != "CreateMeshesFromUNV" && creationCmd->SetMethod( "Mesh" );
str != "CreateMeshesFromMED" &&
str != "CreateMeshesFromSTL")
creationCmd->SetMethod( "Mesh" );
theGen->SetAccessorMethod( GetID(), "GetMesh()" ); theGen->SetAccessorMethod( GetID(), "GetMesh()" );
} }
@ -910,8 +924,8 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand)
// meshes made by *MakeMesh() methods are not wrapped by _pyMesh, // meshes made by *MakeMesh() methods are not wrapped by _pyMesh,
// so let _pyMesh care of it (TMP?) // so let _pyMesh care of it (TMP?)
if ( theCommand->GetMethod().Search("MakeMesh") != -1 ) // if ( theCommand->GetMethod().Search("MakeMesh") != -1 )
_pyMesh( new _pyCommand( theCommand->GetString(), 0 )); // for theGen->SetAccessorMethod() // _pyMesh( new _pyCommand( theCommand->GetString(), 0 )); // for theGen->SetAccessorMethod()
} }
else { else {
@ -926,7 +940,7 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand)
aMethod.Trunc(pos-1); aMethod.Trunc(pos-1);
theCommand->SetMethod(aMethod); theCommand->SetMethod(aMethod);
// 2. Set Mesh object instead SMESH_MeshEditor // 2. Set Mesh object instead of SMESH_MeshEditor
theCommand->SetObject( myMesh ); theCommand->SetObject( myMesh );
// 3. And add last "True" argument // 3. And add last "True" argument

4
src/SMESH_I/SMESH_2smeshpy.hxx
View File

@ -211,8 +211,8 @@ class _pyMesh: public _pyObject
std::list< Handle(_pyCommand) > mySubmeshes; std::list< Handle(_pyCommand) > mySubmeshes;
bool myHasEditor; bool myHasEditor;
public: public:
_pyMesh(const Handle(_pyCommand) theCreationCmd); _pyMesh(const Handle(_pyCommand) creationCmd);
_pyMesh(const Handle(_pyCommand) theCreationCmd, const TCollection_AsciiString &); _pyMesh(const Handle(_pyCommand) theCreationCmd, const TCollection_AsciiString & id);
const _pyID& GetGeom() { return GetCreationCmd()->GetArg(1); } const _pyID& GetGeom() { return GetCreationCmd()->GetArg(1); }
void Process( const Handle(_pyCommand)& theCommand); void Process( const Handle(_pyCommand)& theCommand);
void Flush(); void Flush();