ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-04 17:58:26 +05:00
Code Issues Packages Projects Releases Wiki Activity

0020746: EDF 1274 SMESH : MergeAllNodesButNodesFromGroup feature

Browse Source 
+  // set "FindCoincidentNodesOnPart()" instead of "FindCoincidentNodesOnPartBut()"
+  if ( !isPyMeshMethod && method == "FindCoincidentNodesOnPartBut")
+  {
+    isPyMeshMethod=true;
+    theCommand->SetMethod("FindCoincidentNodesOnPart");
+  }
This commit is contained in:
eap 2010-09-15 11:50:13 +00:00
parent fed358c8ec
commit c375774866
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -1091,7 +1091,7 @@ _pyMeshEditor::_pyMeshEditor(const Handle(_pyCommand)& theCreationCmd):
void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand) void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand)
{ {
// names of SMESH_MeshEditor methods fully equal to methods of class Mesh, so // names of SMESH_MeshEditor methods fully equal to methods of python class Mesh, so
// commands calling this methods are converted to calls of methods of Mesh // commands calling this methods are converted to calls of methods of Mesh
static TStringSet sameMethods; static TStringSet sameMethods;
if ( sameMethods.empty() ) { if ( sameMethods.empty() ) {
@ -1105,7 +1105,7 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand)
"ExtrusionSweep","AdvancedExtrusion","ExtrusionSweepObject","ExtrusionSweepObject1D","ExtrusionSweepObject2D", "ExtrusionSweep","AdvancedExtrusion","ExtrusionSweepObject","ExtrusionSweepObject1D","ExtrusionSweepObject2D",
"ExtrusionAlongPath","ExtrusionAlongPathObject","ExtrusionAlongPathObject1D","ExtrusionAlongPathObject2D", "ExtrusionAlongPath","ExtrusionAlongPathObject","ExtrusionAlongPathObject1D","ExtrusionAlongPathObject2D",
"Mirror","MirrorObject","Translate","TranslateObject","Rotate","RotateObject", "Mirror","MirrorObject","Translate","TranslateObject","Rotate","RotateObject",
"FindCoincidentNodes","FindCoincidentNodesOnPart","MergeNodes","FindEqualElements", "FindCoincidentNodes",/*"FindCoincidentNodesOnPart",*/"MergeNodes","FindEqualElements",
"MergeElements","MergeEqualElements","SewFreeBorders","SewConformFreeBorders", "MergeElements","MergeEqualElements","SewFreeBorders","SewConformFreeBorders",
"SewBorderToSide","SewSideElements","ChangeElemNodes","GetLastCreatedNodes", "SewBorderToSide","SewSideElements","ChangeElemNodes","GetLastCreatedNodes",
"GetLastCreatedElems", "GetLastCreatedElems",
@ -1116,9 +1116,9 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand)
} }
// names of SMESH_MeshEditor methods which differ from methods of class Mesh // names of SMESH_MeshEditor methods which differ from methods of class Mesh
// only last two arguments // only by last two arguments
static TStringSet diffLastTwoArgsMethods; static TStringSet diffLastTwoArgsMethods;
if (diffLastTwoArgsMethods.empty() ){ if (diffLastTwoArgsMethods.empty() ) {
const char * names[] = { const char * names[] = {
"MirrorMakeGroups","MirrorObjectMakeGroups", "MirrorMakeGroups","MirrorObjectMakeGroups",
"TranslateMakeGroups","TranslateObjectMakeGroups", "TranslateMakeGroups","TranslateObjectMakeGroups",
@ -1127,41 +1127,52 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand)
diffLastTwoArgsMethods.Insert( names ); diffLastTwoArgsMethods.Insert( names );
} }
if ( sameMethods.Contains( theCommand->GetMethod() )) { const TCollection_AsciiString & method = theCommand->GetMethod();
theCommand->SetObject( myMesh ); bool isPyMeshMethod = sameMethods.Contains( method );
if ( !isPyMeshMethod )
// meshes made by *MakeMesh() methods are not wrapped by _pyMesh, {
// so let _pyMesh care of it (TMP?)
// if ( theCommand->GetMethod().Search("MakeMesh") != -1 )
// _pyMesh( new _pyCommand( theCommand->GetString(), 0 )); // for theGen->SetAccessorMethod()
}
else {
//Replace SMESH_MeshEditor "MakeGroups" functions on the Mesh //Replace SMESH_MeshEditor "MakeGroups" functions on the Mesh
//functions with the flag "theMakeGroups = True" like: //functions with the flag "theMakeGroups = True" like:
//SMESH_MeshEditor.CmdMakeGroups => Mesh.Cmd(...,True) //SMESH_MeshEditor.CmdMakeGroups => Mesh.Cmd(...,True)
int pos = theCommand->GetMethod().Search("MakeGroups"); int pos = method.Search("MakeGroups");
if( pos != -1) { if( pos != -1)
{
isPyMeshMethod = true;
// 1. Remove "MakeGroups" from the Command // 1. Remove "MakeGroups" from the Command
TCollection_AsciiString aMethod = theCommand->GetMethod(); TCollection_AsciiString aMethod = theCommand->GetMethod();
int nbArgsToAdd = diffLastTwoArgsMethods.Contains(aMethod) ? 2 : 1; int nbArgsToAdd = diffLastTwoArgsMethods.Contains(aMethod) ? 2 : 1;
aMethod.Trunc(pos-1); aMethod.Trunc(pos-1);
theCommand->SetMethod(aMethod); theCommand->SetMethod(aMethod);
// 2. Set Mesh object instead of SMESH_MeshEditor // 2. And add last "True" argument(s)
theCommand->SetObject( myMesh );
// 3. And add last "True" argument
while(nbArgsToAdd--) while(nbArgsToAdd--)
theCommand->SetArg(theCommand->GetNbArgs()+1,"True "); theCommand->SetArg(theCommand->GetNbArgs()+1,"True");
} }
else { }
// editor creation command is needed only if any editor function is called
theGen->AddMeshAccessorMethod( theCommand ); // for *Object() // set "FindCoincidentNodesOnPart()" instead of "FindCoincidentNodesOnPartBut()"
if ( !myCreationCmdStr.IsEmpty() ) { if ( !isPyMeshMethod && method == "FindCoincidentNodesOnPartBut")
GetCreationCmd()->GetString() = myCreationCmdStr; {
myCreationCmdStr.Clear(); isPyMeshMethod=true;
} theCommand->SetMethod("FindCoincidentNodesOnPart");
}
// meshes made by *MakeMesh() methods are not wrapped by _pyMesh,
// so let _pyMesh care of it (TMP?)
// if ( theCommand->GetMethod().Search("MakeMesh") != -1 )
// _pyMesh( new _pyCommand( theCommand->GetString(), 0 )); // for theGen->SetAccessorMethod()
if ( isPyMeshMethod )
{
theCommand->SetObject( myMesh );
}
else
{
// editor creation command is needed only if any editor function is called
theGen->AddMeshAccessorMethod( theCommand ); // for *Object()
if ( !myCreationCmdStr.IsEmpty() ) {
GetCreationCmd()->GetString() = myCreationCmdStr;
myCreationCmdStr.Clear();
} }
} }
} }