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

22635: EDF 8345 - Creation of group based on groups

Browse Source 
Fix for a dump script generated by 7.5.1
This commit is contained in:
eap 2015-08-06 17:13:42 +03:00
parent 7084b4f979
commit d5daad2f62
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -1872,7 +1872,7 @@ void _pyMesh::Process( const Handle(_pyCommand)& theCommand )
} }
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
else if ( method == "GetSubMesh" ) { // collect submeshes of the mesh else if ( method == "GetSubMesh" ) { // collect sub-meshes of the mesh
Handle(_pySubMesh) subMesh = theGen->FindSubMesh( theCommand->GetResultValue() ); Handle(_pySubMesh) subMesh = theGen->FindSubMesh( theCommand->GetResultValue() );
if ( !subMesh.IsNull() ) { if ( !subMesh.IsNull() ) {
subMesh->SetCreator( this ); subMesh->SetCreator( this );
@ -1894,7 +1894,8 @@ void _pyMesh::Process( const Handle(_pyCommand)& theCommand )
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
else if ( method == "CreateGroup" || else if ( method == "CreateGroup" ||
method == "CreateGroupFromGEOM" || method == "CreateGroupFromGEOM" ||
method == "CreateGroupFromFilter" ) method == "CreateGroupFromFilter" ||
method == "CreateDimGroup" )
{ {
Handle(_pyGroup) group = new _pyGroup( theCommand ); Handle(_pyGroup) group = new _pyGroup( theCommand );
myGroups.push_back( group ); myGroups.push_back( group );

26
src/SMESH_SWIG/smeshBuilder.py
View File

@ -4918,7 +4918,25 @@ class Mesh:
pass # end of Mesh class pass # end of Mesh class
## class used to add to SMESH_MeshEditor methods removed from its CORBA API
## class used to compensate change of CORBA API of SMESH_Mesh for backward compatibility
# with old dump scripts which call SMESH_Mesh directly and not via smeshBuilder.Mesh
#
class meshProxy(SMESH._objref_SMESH_Mesh):
def __init__(self):
SMESH._objref_SMESH_Mesh.__init__(self)
def __deepcopy__(self, memo=None):
new = self.__class__()
return new
def CreateDimGroup(self,*args): # 2 args added: nbCommonNodes, underlyingOnly
if len( args ) == 3:
args += SMESH.ALL_NODES, True
return SMESH._objref_SMESH_Mesh.CreateDimGroup( self, *args )
pass
omniORB.registerObjref(SMESH._objref_SMESH_Mesh._NP_RepositoryId, meshProxy)
## class used to compensate change of CORBA API of SMESH_MeshEditor for backward compatibility
# with old dump scripts which call SMESH_MeshEditor directly and not via smeshBuilder.Mesh
# #
class meshEditor(SMESH._objref_SMESH_MeshEditor): class meshEditor(SMESH._objref_SMESH_MeshEditor):
def __init__(self): def __init__(self):
@ -4937,12 +4955,10 @@ class meshEditor(SMESH._objref_SMESH_MeshEditor):
new = self.__class__() new = self.__class__()
return new return new
def FindCoincidentNodes(self,*args): # a 2nd arg added (SeparateCornerAndMediumNodes) def FindCoincidentNodes(self,*args): # a 2nd arg added (SeparateCornerAndMediumNodes)
if len( args ) == 1: if len( args ) == 1: args += False,
return SMESH._objref_SMESH_MeshEditor.FindCoincidentNodes( self, args[0], False )
return SMESH._objref_SMESH_MeshEditor.FindCoincidentNodes( self, *args ) return SMESH._objref_SMESH_MeshEditor.FindCoincidentNodes( self, *args )
def FindCoincidentNodesOnPart(self,*args): # a 3d arg added (SeparateCornerAndMediumNodes) def FindCoincidentNodesOnPart(self,*args): # a 3d arg added (SeparateCornerAndMediumNodes)
if len( args ) == 2: if len( args ) == 2: args += False,
args += False,
return SMESH._objref_SMESH_MeshEditor.FindCoincidentNodesOnPart( self, *args ) return SMESH._objref_SMESH_MeshEditor.FindCoincidentNodesOnPart( self, *args )
def MergeNodes(self,*args): # a 2nd arg added (NodesToKeep) def MergeNodes(self,*args): # a 2nd arg added (NodesToKeep)
if len( args ) == 1: if len( args ) == 1: