From: eap <eap@opencascade.com>
Date: Wed, 15 Sep 2010 12:46:19 +0000 (+0000)
Subject: 0020876: EDF 1246 SMESH: DoubleNodes fonctions available in the GUI
X-Git-Tag: V5_1_5a1~47
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ddff0c0a7efbda0a2bc6d93c46a00662a96bf2af;p=modules%2Fsmesh.git

0020876: EDF 1246 SMESH: DoubleNodes fonctions available in the GUI
  No need in new commands in smeshDC.py, so DoubleNodeXXXNew() is replaced by DoubleNodeXXX()
---

diff --git a/doc/salome/gui/SMESH/input/tui_transforming_meshes.doc b/doc/salome/gui/SMESH/input/tui_transforming_meshes.doc
index 25f5a7ec8..e47935311 100644
--- a/doc/salome/gui/SMESH/input/tui_transforming_meshes.doc
+++ b/doc/salome/gui/SMESH/input/tui_transforming_meshes.doc
@@ -380,7 +380,8 @@ print "Nodes      : ", mesh.NbNodes()
 print "Edges      : ", mesh.NbEdges()
 print "Triangles  : ", mesh.NbTriangles()
 
-createdNodes = mesh.DoubleNodeGroupNew(nodes1, faces1)
+groupOfCreatedNodes = mesh.DoubleNodeGroup(nodes1, faces1)
+print "New nodes:", groupOfCreatedNodes.GetIDs()
 
 print "\nMesh after the first nodes duplication:"
 print "Nodes      : ", mesh.NbNodes()
@@ -407,7 +408,8 @@ print "Nodes      : ", mesh.NbNodes()
 print "Edges      : ", mesh.NbEdges()
 print "Triangles  : ", mesh.NbTriangles()
 
-mesh_editor = mesh.DoubleNodeElemGroupNew( edges, nodes2, faces2 )
+groupOfNewEdges = mesh.DoubleNodeElemGroup( edges, nodes2, faces2 )
+print "New edges:", groupOfNewEdges.GetIDs()
 
 print "\nMesh after the second nodes duplication:"
 print "Nodes      : ", mesh.NbNodes()
diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx
index e6060297a..a5435f6c0 100644
--- a/src/SMESH_I/SMESH_2smeshpy.cxx
+++ b/src/SMESH_I/SMESH_2smeshpy.cxx
@@ -1157,6 +1157,12 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand)
     isPyMeshMethod=true;
     theCommand->SetMethod("FindCoincidentNodesOnPart");
   }
+  // DoubleNodeElemGroupNew() -> DoubleNodeElemGroup()
+  if ( !isPyMeshMethod && ( method == "DoubleNodeElemGroupNew" || method == "DoubleNodeGroupNew"))
+  {
+    isPyMeshMethod=true;
+    theCommand->SetMethod( method.SubString( 1, method.Length()-3));
+  }
 
   // meshes made by *MakeMesh() methods are not wrapped by _pyMesh,
   // so let _pyMesh care of it (TMP?)
diff --git a/src/SMESH_SWIG/smeshDC.py b/src/SMESH_SWIG/smeshDC.py
index 170c9664a..d72fd5cf8 100644
--- a/src/SMESH_SWIG/smeshDC.py
+++ b/src/SMESH_SWIG/smeshDC.py
@@ -3700,18 +3700,8 @@ class Mesh:
     #  @return TRUE if operation has been completed successfully, FALSE otherwise
     #  @ingroup l2_modif_edit
     def DoubleNodeGroup(self, theNodes, theModifiedElems):
-        return self.editor.DoubleNodeGroup(theNodes, theModifiedElems)
-
-    ## Creates a hole in a mesh by doubling the nodes of some particular elements
-    #  Works as DoubleNodeGroup() described above, but returns a new group with 
-    #  newly created nodes.
-    #  @param theNodes group of nodes to be doubled
-    #  @param theModifiedElems group of elements to be updated.
-    #  @return a new group with newly created nodes
-    #  @ingroup l2_modif_edit
-    def DoubleNodeGroupNew(self, theNodes, theModifiedElems):
         return self.editor.DoubleNodeGroupNew(theNodes, theModifiedElems)
-        
+
     ## Creates a hole in a mesh by doubling the nodes of some particular elements
     #  This method provided for convenience works as DoubleNodes() described above.
     #  @param theNodes list of groups of nodes to be doubled
@@ -3752,20 +3742,8 @@ class Mesh:
     #         should be associated to.
     #  @ingroup l2_modif_edit
     def DoubleNodeElemGroup(self, theElems, theNodesNot, theAffectedElems):
-        return self.editor.DoubleNodeElemGroup(theElems, theNodesNot, theAffectedElems)
-
-    ## Creates a hole in a mesh by doubling the nodes of some particular elements
-    #  Works as DoubleNodeElemGroup() described above, but returns a new group with 
-    #  newly created elements.
-    #  @param theElems - group of of elements (edges or faces) to be replicated
-    #  @param theNodesNot - group of nodes not to replicated
-    #  @param theAffectedElems - group of elements to which the replicated nodes
-    #         should be associated to.
-    #  @return a new group with newly created elements
-    #  @ingroup l2_modif_edit
-    def DoubleNodeElemGroupNew(self, theElems, theNodesNot, theAffectedElems):
         return self.editor.DoubleNodeElemGroupNew(theElems, theNodesNot, theAffectedElems)
-        
+
     ## Creates a hole in a mesh by doubling the nodes of some particular elements
     #  This method provided for convenience works as DoubleNodes() described above.
     #  @param theElems - group of of elements (edges or faces) to be replicated