0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_ExtrusionAlongPathDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
index 640b22d385871f70651c749e67d39fb45c973c5e..4ec84dce95e8c3384d93871a4497acd0daa5bd3d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // SMESH SMESHGUI : GUI for SMESH component
 // File   : SMESHGUI_ExtrusionAlongPathDlg.cxx
@@ -533,55 +534,11 @@ bool SMESHGUI_ExtrusionAlongPathDlg::ClickOnApply()
 
   try {
     SUIT_OverrideCursor wc;
-    SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
-    //if ( LinearAnglesCheck->isChecked() ) {
-    //  anAngles = aMeshEditor->LinearAnglesVariation( myPathMesh, myPathShape, anAngles );
-    //}
 
+    SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
     SMESH::SMESH_MeshEditor::Extrusion_Error retVal;
-    /*
-    if ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() ) {
-      if( MeshCheck->isChecked() ) {
-        if( GetConstructorId() == 0 )
-          SMESH::ListOfGroups_var groups = 
-            aMeshEditor->ExtrusionAlongPathObject1DMakeGroups(myIDSource, myPathMesh,
-                                                              myPathShape, aNodeStart,
-                                                              AnglesGrp->isChecked(), anAngles,
-                                                              BasePointGrp->isChecked(), aBasePoint, retVal);
-        else
-          SMESH::ListOfGroups_var groups = 
-            aMeshEditor->ExtrusionAlongPathObject2DMakeGroups(myIDSource, myPathMesh,
-                                                              myPathShape, aNodeStart,
-                                                              AnglesGrp->isChecked(), anAngles,
-                                                              BasePointGrp->isChecked(), aBasePoint, retVal);
-      }
-      else
-        SMESH::ListOfGroups_var groups = 
-          aMeshEditor->ExtrusionAlongPathMakeGroups(anElementsId, myPathMesh,
-                                                    myPathShape, aNodeStart,
-                                                    AnglesGrp->isChecked(), anAngles,
-                                                    BasePointGrp->isChecked(), aBasePoint, retVal);
-    }
-    else {
-      if( MeshCheck->isChecked() ) {
-        if( GetConstructorId() == 0 )
-          retVal = aMeshEditor->ExtrusionAlongPathObject1D(myIDSource, myPathMesh,
-                                                           myPathShape, aNodeStart,
-                                                           AnglesGrp->isChecked(), anAngles,
-                                                           BasePointGrp->isChecked(), aBasePoint);
-        else
-          retVal = aMeshEditor->ExtrusionAlongPathObject2D(myIDSource, myPathMesh,
-                                                           myPathShape, aNodeStart,
-                                                           AnglesGrp->isChecked(), anAngles,
-                                                           BasePointGrp->isChecked(), aBasePoint);
-      }
-      else
-        retVal = aMeshEditor->ExtrusionAlongPath(anElementsId, myPathMesh,
-                                                 myPathShape, aNodeStart,
-                                                 AnglesGrp->isChecked(), anAngles,
-                                                 BasePointGrp->isChecked(), aBasePoint);
-    }
-    */
+
+    myMesh->SetParameters( aParameters.join(":").toLatin1().constData() );
 
     bool NeedGroups = ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() );
     SMESH::ElementType ElemType = SMESH::FACE;
@@ -603,10 +560,6 @@ bool SMESHGUI_ExtrusionAlongPathDlg::ClickOnApply()
     }
 
 
-    if( retVal == SMESH::SMESH_MeshEditor::EXTR_OK )
-      myMesh->SetParameters( aParameters.join(":").toLatin1().constData() );
-
-    //wc.stop();
     wc.suspend();
     switch (retVal) {
     case SMESH::SMESH_MeshEditor::EXTR_NO_ELEMENTS: