Salome HOME
The selections of elements corrected.
[modules/smesh.git] / src / SMESHGUI / SMESHGUI_SewingDlg.cxx
index 0cfe1f64399924850ba5c01a2ae18731409c2881..6bbc5c7b141412b71efaed2cd471d7f9c7a92aa2 100644 (file)
@@ -1,30 +1,30 @@
 //  SMESH SMESHGUI : GUI for SMESH component
 //
 //  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 //
 //
 //
 //  File   : SMESHGUI_SewingDlg.cxx
 //  Author : Michael ZORIN
 //  Module : SMESH
-//  $Header: 
+//  $Header:
 
 #include "SMESHGUI_SewingDlg.h"
 
 #include "SMESHGUI_Utils.h"
 #include "SMESHGUI_VTKUtils.h"
 #include "SMESHGUI_IdValidator.h"
+
 #include "SMESH_Actor.h"
 #include "SMDS_Mesh.hxx"
 
-#include "GEOMBase.h"
+#include "SUIT_ResourceMgr.h"
+#include "SUIT_Desktop.h"
+#include "SUIT_MessageBox.h"
+
+#include "SVTK_ViewModel.h"
+#include "SVTK_ViewWindow.h"
+#include "SVTK_Selector.h"
+#include "SVTK_Selection.h"
+#include "SALOME_ListIO.hxx"
 
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
-#include "QAD_MessageBox.h"
 #include "utilities.h"
 
+// OCCT Includes
+#include <TColStd_MapOfInteger.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+
 // QT Includes
 #include <qapplication.h>
 #include <qbuttongroup.h>
@@ -58,241 +68,257 @@ using namespace std;
 
 //=================================================================================
 // class    : SMESHGUI_SewingDlg()
-// purpose  : 
+// purpose  :
 //=================================================================================
-SMESHGUI_SewingDlg::SMESHGUI_SewingDlg( QWidget* parent, const char* name, SALOME_Selection* Sel,
-                                             bool modal, WFlags fl )
-  : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu |
-            Qt::WDestructiveClose)
+SMESHGUI_SewingDlg::SMESHGUI_SewingDlg( SMESHGUI* theModule, const char* name,
+                                        bool modal, WFlags fl)
+     : QDialog( SMESH::GetDesktop( theModule ), name, modal, WStyle_Customize | WStyle_NormalBorder |
+                WStyle_Title | WStyle_SysMenu | Qt::WDestructiveClose),
+      mySMESHGUI( theModule ),
+      mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
+      myViewWindow( SMESH::GetViewWindow( theModule ) ),
+      mySelector( myViewWindow->GetSelector() )
 {
-  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "SMESH",tr("ICON_SMESH_SEWING_FREEBORDERS")));
-  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "SMESH",tr("ICON_SMESH_SEWING_CONFORM_FREEBORDERS")));
-  QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "SMESH",tr("ICON_SMESH_SEWING_BORDERTOSIDE")));
-  QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "SMESH",tr("ICON_SMESH_SEWING_SIDEELEMENTS")));
-  QPixmap image4(QAD_Desktop::getResourceManager()->loadPixmap( "SMESH",tr("ICON_SELECT")));
-
-  if ( !name )
-    setName( "SMESHGUI_SewingDlg" );
-  resize( 303, 185 ); 
-  setCaption( tr( "SMESH_SEWING" ) );
-  setSizeGripEnabled( TRUE );
-  SMESHGUI_SewingDlgLayout = new QGridLayout( this ); 
-  SMESHGUI_SewingDlgLayout->setSpacing( 6 );
-  SMESHGUI_SewingDlgLayout->setMargin( 11 );
+  SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( mySMESHGUI );
+  QPixmap image0 (mgr->loadPixmap("SMESH", tr("ICON_SMESH_SEWING_FREEBORDERS")));
+  QPixmap image1 (mgr->loadPixmap("SMESH", tr("ICON_SMESH_SEWING_CONFORM_FREEBORDERS")));
+  QPixmap image2 (mgr->loadPixmap("SMESH", tr("ICON_SMESH_SEWING_BORDERTOSIDE")));
+  QPixmap image3 (mgr->loadPixmap("SMESH", tr("ICON_SMESH_SEWING_SIDEELEMENTS")));
+  QPixmap image4 (mgr->loadPixmap("SMESH", tr("ICON_SELECT")));
+
+  if (!name)
+    setName("SMESHGUI_SewingDlg");
+  resize(303, 185);
+  setCaption(tr("SMESH_SEWING"));
+  setSizeGripEnabled(TRUE);
+  SMESHGUI_SewingDlgLayout = new QGridLayout(this);
+  SMESHGUI_SewingDlgLayout->setSpacing(6);
+  SMESHGUI_SewingDlgLayout->setMargin(11);
 
   /***************************************************************/
-  GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
-  GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) );
-  GroupConstructors->setTitle( tr( "SMESH_SEWING"  ) );
-  GroupConstructors->setExclusive( TRUE );
-  GroupConstructors->setColumnLayout(0, Qt::Vertical );
-  GroupConstructors->layout()->setSpacing( 0 );
-  GroupConstructors->layout()->setMargin( 0 );
-  GroupConstructorsLayout = new QGridLayout( GroupConstructors->layout() );
-  GroupConstructorsLayout->setAlignment( Qt::AlignTop );
-  GroupConstructorsLayout->setSpacing( 6 );
-  GroupConstructorsLayout->setMargin( 11 );
-  QHBoxLayout* RBLayout = new QHBoxLayout( 0, 0, 6, "Layout2");
-  RadioButton1= new QRadioButton( GroupConstructors, "RadioButton1" );
-  RadioButton1->setText( tr( ""  ) );
-  RadioButton1->setPixmap( image0 );
-  RBLayout->addWidget( RadioButton1);
-  RadioButton2= new QRadioButton( GroupConstructors, "RadioButton2" );
-  RadioButton2->setText( tr( ""  ) );
-  RadioButton2->setPixmap( image1 );
-  RBLayout->addWidget( RadioButton2);
-  RadioButton3= new QRadioButton( GroupConstructors, "RadioButton3" );
-  RadioButton3->setText( tr( ""  ) );
-  RadioButton3->setPixmap( image2 );
-  RBLayout->addWidget( RadioButton3);
-  RadioButton4= new QRadioButton( GroupConstructors, "RadioButton4" );
-  RadioButton4->setText( tr( ""  ) );
-  RadioButton4->setPixmap( image3 );
-  RBLayout->addWidget( RadioButton4);
-  GroupConstructorsLayout->addLayout( RBLayout, 0, 0 );
-  SMESHGUI_SewingDlgLayout->addWidget( GroupConstructors, 0, 0 );
-  
+  GroupConstructors = new QButtonGroup(this, "GroupConstructors");
+  GroupConstructors->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)5,
+                                               (QSizePolicy::SizeType)0, 0, 0,
+                                               GroupConstructors->sizePolicy().hasHeightForWidth()));
+  GroupConstructors->setTitle(tr("SMESH_SEWING"));
+  GroupConstructors->setExclusive(TRUE);
+  GroupConstructors->setColumnLayout(0, Qt::Vertical);
+  GroupConstructors->layout()->setSpacing(0);
+  GroupConstructors->layout()->setMargin(0);
+  GroupConstructorsLayout = new QGridLayout(GroupConstructors->layout());
+  GroupConstructorsLayout->setAlignment(Qt::AlignTop);
+  GroupConstructorsLayout->setSpacing(6);
+  GroupConstructorsLayout->setMargin(11);
+  QHBoxLayout* RBLayout = new QHBoxLayout(0, 0, 6, "Layout2");
+  RadioButton1= new QRadioButton(GroupConstructors, "RadioButton1");
+  RadioButton1->setText(tr("" ));
+  RadioButton1->setPixmap(image0);
+  RBLayout->addWidget(RadioButton1);
+  RadioButton2= new QRadioButton(GroupConstructors, "RadioButton2");
+  RadioButton2->setText(tr("" ));
+  RadioButton2->setPixmap(image1);
+  RBLayout->addWidget(RadioButton2);
+  RadioButton3= new QRadioButton(GroupConstructors, "RadioButton3");
+  RadioButton3->setText(tr("" ));
+  RadioButton3->setPixmap(image2);
+  RBLayout->addWidget(RadioButton3);
+  RadioButton4= new QRadioButton(GroupConstructors, "RadioButton4");
+  RadioButton4->setText(tr("" ));
+  RadioButton4->setPixmap(image3);
+  RBLayout->addWidget(RadioButton4);
+  GroupConstructorsLayout->addLayout(RBLayout, 0, 0);
+  SMESHGUI_SewingDlgLayout->addWidget(GroupConstructors, 0, 0);
+
   /***************************************************************/
-  GroupButtons = new QGroupBox( this, "GroupButtons" );
-  GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
-  GroupButtons->setGeometry( QRect( 10, 10, 281, 48 ) ); 
-  GroupButtons->setTitle( tr( ""  ) );
-  GroupButtons->setColumnLayout(0, Qt::Vertical );
-  GroupButtons->layout()->setSpacing( 0 );
-  GroupButtons->layout()->setMargin( 0 );
-  GroupButtonsLayout = new QGridLayout( GroupButtons->layout() );
-  GroupButtonsLayout->setAlignment( Qt::AlignTop );
-  GroupButtonsLayout->setSpacing( 6 );
-  GroupButtonsLayout->setMargin( 11 );
-  buttonCancel = new QPushButton( GroupButtons, "buttonCancel" );
-  buttonCancel->setText( tr( "SMESH_BUT_CLOSE"  ) );
-  buttonCancel->setAutoDefault( TRUE );
-  GroupButtonsLayout->addWidget( buttonCancel, 0, 3 );
-  buttonApply = new QPushButton( GroupButtons, "buttonApply" );
-  buttonApply->setText( tr( "SMESH_BUT_APPLY"  ) );
-  buttonApply->setAutoDefault( TRUE );
-  GroupButtonsLayout->addWidget( buttonApply, 0, 1 );
-  QSpacerItem* spacer_9 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
-  GroupButtonsLayout->addItem( spacer_9, 0, 2 );
-  buttonOk = new QPushButton( GroupButtons, "buttonOk" );
-  buttonOk->setText( tr( "SMESH_BUT_OK"  ) );
-  buttonOk->setAutoDefault( TRUE );
-  buttonOk->setDefault( TRUE );
-  GroupButtonsLayout->addWidget( buttonOk, 0, 0 );
-  SMESHGUI_SewingDlgLayout->addWidget( GroupButtons, 2, 0 );
+  GroupButtons = new QGroupBox(this, "GroupButtons");
+  GroupButtons->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)7,
+                                          (QSizePolicy::SizeType)0, 0, 0,
+                                          GroupButtons->sizePolicy().hasHeightForWidth()));
+  GroupButtons->setGeometry(QRect(10, 10, 281, 48));
+  GroupButtons->setTitle(tr("" ));
+  GroupButtons->setColumnLayout(0, Qt::Vertical);
+  GroupButtons->layout()->setSpacing(0);
+  GroupButtons->layout()->setMargin(0);
+  GroupButtonsLayout = new QGridLayout(GroupButtons->layout());
+  GroupButtonsLayout->setAlignment(Qt::AlignTop);
+  GroupButtonsLayout->setSpacing(6);
+  GroupButtonsLayout->setMargin(11);
+  buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
+  buttonCancel->setText(tr("SMESH_BUT_CLOSE"));
+  buttonCancel->setAutoDefault(TRUE);
+  GroupButtonsLayout->addWidget(buttonCancel, 0, 3);
+  buttonApply = new QPushButton(GroupButtons, "buttonApply");
+  buttonApply->setText(tr("SMESH_BUT_APPLY"));
+  buttonApply->setAutoDefault(TRUE);
+  GroupButtonsLayout->addWidget(buttonApply, 0, 1);
+  QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+  GroupButtonsLayout->addItem(spacer_9, 0, 2);
+  buttonOk = new QPushButton(GroupButtons, "buttonOk");
+  buttonOk->setText(tr("SMESH_BUT_OK"));
+  buttonOk->setAutoDefault(TRUE);
+  buttonOk->setDefault(TRUE);
+  GroupButtonsLayout->addWidget(buttonOk, 0, 0);
+  SMESHGUI_SewingDlgLayout->addWidget(GroupButtons, 2, 0);
 
   /***************************************************************/
-  GroupArguments = new QGroupBox( this, "GroupArguments" );
-  GroupArguments->setColumnLayout(0, Qt::Vertical );
-  GroupArguments->layout()->setSpacing( 0 );
-  GroupArguments->layout()->setMargin( 0 );
-  GroupArgumentsLayout = new QGridLayout( GroupArguments->layout() );
-  GroupArgumentsLayout->setAlignment( Qt::AlignTop );
-  GroupArgumentsLayout->setSpacing( 6 );
-  GroupArgumentsLayout->setMargin( 11 );
+  GroupArguments = new QGroupBox(this, "GroupArguments");
+  GroupArguments->setColumnLayout(0, Qt::Vertical);
+  GroupArguments->layout()->setSpacing(0);
+  GroupArguments->layout()->setMargin(0);
+  GroupArgumentsLayout = new QGridLayout(GroupArguments->layout());
+  GroupArgumentsLayout->setAlignment(Qt::AlignTop);
+  GroupArgumentsLayout->setSpacing(6);
+  GroupArgumentsLayout->setMargin(11);
 
   // First subgroup
-  SubGroup1 = new QGroupBox( GroupArguments, "SubGroup1" );
-  SubGroup1->setColumnLayout(0, Qt::Vertical );
-  SubGroup1->layout()->setSpacing( 0 );
-  SubGroup1->layout()->setMargin( 0 );
-  QGridLayout* SubGroup1Layout = new QGridLayout( SubGroup1->layout() );
-  SubGroup1Layout->setAlignment( Qt::AlignTop );
-  SubGroup1Layout->setSpacing( 6 );
-  SubGroup1Layout->setMargin( 11 );
-  
+  SubGroup1 = new QGroupBox(GroupArguments, "SubGroup1");
+  SubGroup1->setColumnLayout(0, Qt::Vertical);
+  SubGroup1->layout()->setSpacing(0);
+  SubGroup1->layout()->setMargin(0);
+  QGridLayout* SubGroup1Layout = new QGridLayout(SubGroup1->layout());
+  SubGroup1Layout->setAlignment(Qt::AlignTop);
+  SubGroup1Layout->setSpacing(6);
+  SubGroup1Layout->setMargin(11);
+
   // Controls of the first subgroup
-  TextLabel1 = new QLabel( SubGroup1, "TextLabel1" );
+  TextLabel1 = new QLabel(SubGroup1, "TextLabel1");
   TextLabel1->setFixedWidth(104);
-  SubGroup1Layout->addWidget( TextLabel1, 0, 0 );
-  
-  SelectButton1  = new QPushButton( SubGroup1, "SelectButton1" );
-  SelectButton1->setPixmap( image4 );
-  SubGroup1Layout->addWidget( SelectButton1, 0, 1 );
-  
-  LineEdit1 = new QLineEdit( SubGroup1, "LineEdit1" );
-  SubGroup1Layout->addWidget( LineEdit1, 0, 2 );
-  
-  TextLabel2 = new QLabel( SubGroup1, "TextLabel2" );
-  SubGroup1Layout->addWidget( TextLabel2, 1, 0 );
-  
-  SelectButton2  = new QPushButton( SubGroup1, "SelectButton2" );
-  SelectButton2->setPixmap( image4 );
-  SubGroup1Layout->addWidget( SelectButton2, 1, 1 );
-  
-  LineEdit2 = new QLineEdit( SubGroup1, "LineEdit2" );
-  SubGroup1Layout->addWidget( LineEdit2, 1, 2 );
+  SubGroup1Layout->addWidget(TextLabel1, 0, 0);
 
-  TextLabel3 = new QLabel( SubGroup1, "TextLabel3" );
-  SubGroup1Layout->addWidget( TextLabel3, 2, 0 );
-  
-  SelectButton3  = new QPushButton( SubGroup1, "SelectButton3" );
-  SelectButton3->setPixmap( image4 );
-  SubGroup1Layout->addWidget( SelectButton3, 2, 1 );
-  
-  LineEdit3 = new QLineEdit( SubGroup1, "LineEdit3" );
-  SubGroup1Layout->addWidget( LineEdit3, 2, 2 );
+  SelectButton1  = new QPushButton(SubGroup1, "SelectButton1");
+  SelectButton1->setPixmap(image4);
+  SubGroup1Layout->addWidget(SelectButton1, 0, 1);
+
+  LineEdit1 = new QLineEdit(SubGroup1, "LineEdit1");
+  SubGroup1Layout->addWidget(LineEdit1, 0, 2);
+
+  TextLabel2 = new QLabel(SubGroup1, "TextLabel2");
+  SubGroup1Layout->addWidget(TextLabel2, 1, 0);
 
+  SelectButton2  = new QPushButton(SubGroup1, "SelectButton2");
+  SelectButton2->setPixmap(image4);
+  SubGroup1Layout->addWidget(SelectButton2, 1, 1);
+
+  LineEdit2 = new QLineEdit(SubGroup1, "LineEdit2");
+  SubGroup1Layout->addWidget(LineEdit2, 1, 2);
+
+  TextLabel3 = new QLabel(SubGroup1, "TextLabel3");
+  SubGroup1Layout->addWidget(TextLabel3, 2, 0);
+
+  SelectButton3  = new QPushButton(SubGroup1, "SelectButton3");
+  SelectButton3->setPixmap(image4);
+  SubGroup1Layout->addWidget(SelectButton3, 2, 1);
+
+  LineEdit3 = new QLineEdit(SubGroup1, "LineEdit3");
+  SubGroup1Layout->addWidget(LineEdit3, 2, 2);
 
   // Second subgroup
-  SubGroup2 = new QGroupBox( GroupArguments, "SubGroup2" );
-  SubGroup2->setColumnLayout(0, Qt::Vertical );
-  SubGroup2->layout()->setSpacing( 0 );
-  SubGroup2->layout()->setMargin( 0 );
-  QGridLayout* SubGroup2Layout = new QGridLayout( SubGroup2->layout() );
-  SubGroup2Layout->setAlignment( Qt::AlignTop );
-  SubGroup2Layout->setSpacing( 6 );
-  SubGroup2Layout->setMargin( 11 );
-  
+  SubGroup2 = new QGroupBox(GroupArguments, "SubGroup2");
+  SubGroup2->setColumnLayout(0, Qt::Vertical);
+  SubGroup2->layout()->setSpacing(0);
+  SubGroup2->layout()->setMargin(0);
+  QGridLayout* SubGroup2Layout = new QGridLayout(SubGroup2->layout());
+  SubGroup2Layout->setAlignment(Qt::AlignTop);
+  SubGroup2Layout->setSpacing(6);
+  SubGroup2Layout->setMargin(11);
+
   // Controls of the first subgroup
-  TextLabel4 = new QLabel( SubGroup2, "TextLabel4" );
-  SubGroup2Layout->addWidget( TextLabel4, 0, 0 );
-  
-  SelectButton4  = new QPushButton( SubGroup2, "SelectButton4" );
-  SelectButton4->setPixmap( image4 );
-  SubGroup2Layout->addWidget( SelectButton4, 0, 1 );
-  
-  LineEdit4 = new QLineEdit( SubGroup2, "LineEdit4" );
-  SubGroup2Layout->addWidget( LineEdit4, 0, 2 );
-  
-  TextLabel5 = new QLabel( SubGroup2, "TextLabel5" );
-  SubGroup2Layout->addWidget( TextLabel5, 1, 0 );
-  
-  SelectButton5  = new QPushButton( SubGroup2, "SelectButton5" );
-  SelectButton5->setPixmap( image4 );
-  SubGroup2Layout->addWidget( SelectButton5, 1, 1 );
-  
-  LineEdit5 = new QLineEdit( SubGroup2, "LineEdit5" );
-  SubGroup2Layout->addWidget( LineEdit5, 1, 2 );
+  TextLabel4 = new QLabel(SubGroup2, "TextLabel4");
+  SubGroup2Layout->addWidget(TextLabel4, 0, 0);
 
-  TextLabel6 = new QLabel( SubGroup2, "TextLabel6" );
-  SubGroup2Layout->addWidget( TextLabel6, 2, 0 );
-  
-  SelectButton6  = new QPushButton( SubGroup2, "SelectButton6" );
-  SelectButton6->setPixmap( image4 );
-  SubGroup2Layout->addWidget( SelectButton6, 2, 1 );
-  
-  LineEdit6 = new QLineEdit( SubGroup2, "LineEdit6" );
-  SubGroup2Layout->addWidget( LineEdit6, 2, 2 );
+  SelectButton4  = new QPushButton(SubGroup2, "SelectButton4");
+  SelectButton4->setPixmap(image4);
+  SubGroup2Layout->addWidget(SelectButton4, 0, 1);
+
+  LineEdit4 = new QLineEdit(SubGroup2, "LineEdit4");
+  SubGroup2Layout->addWidget(LineEdit4, 0, 2);
+
+  TextLabel5 = new QLabel(SubGroup2, "TextLabel5");
+  SubGroup2Layout->addWidget(TextLabel5, 1, 0);
+
+  SelectButton5  = new QPushButton(SubGroup2, "SelectButton5");
+  SelectButton5->setPixmap(image4);
+  SubGroup2Layout->addWidget(SelectButton5, 1, 1);
+
+  LineEdit5 = new QLineEdit(SubGroup2, "LineEdit5");
+  SubGroup2Layout->addWidget(LineEdit5, 1, 2);
+
+  TextLabel6 = new QLabel(SubGroup2, "TextLabel6");
+  SubGroup2Layout->addWidget(TextLabel6, 2, 0);
+
+  SelectButton6  = new QPushButton(SubGroup2, "SelectButton6");
+  SelectButton6->setPixmap(image4);
+  SubGroup2Layout->addWidget(SelectButton6, 2, 1);
+
+  LineEdit6 = new QLineEdit(SubGroup2, "LineEdit6");
+  SubGroup2Layout->addWidget(LineEdit6, 2, 2);
 
-  
   // Add subgroups to the group of arguments
-  GroupArgumentsLayout->addWidget( SubGroup1, 0, 0 );
-  GroupArgumentsLayout->addWidget( SubGroup2, 1, 0 );
+  GroupArgumentsLayout->addWidget(SubGroup1, 0, 0);
+  GroupArgumentsLayout->addWidget(SubGroup2, 1, 0);
 
   // Control for the merging equal elements
-  CheckBoxMerge = new QCheckBox( GroupArguments, "CheckBoxMerge" );
-  CheckBoxMerge->setText( tr( "MERGE_EQUAL_ELEMENTS"  ) );
-  GroupArgumentsLayout->addWidget( CheckBoxMerge, 2, 0 );
-  
+  CheckBoxMerge = new QCheckBox(GroupArguments, "CheckBoxMerge");
+  CheckBoxMerge->setText(tr("MERGE_EQUAL_ELEMENTS" ));
+  GroupArgumentsLayout->addWidget(CheckBoxMerge, 2, 0);
 
-  SMESHGUI_SewingDlgLayout->addWidget( GroupArguments, 1, 0 );
+// Control for the polygons creation instead of splitting
+  CheckBoxPolygons = new QCheckBox( GroupArguments, "CheckBoxPolygons" );
+  CheckBoxPolygons->setText( tr( "CREATE_POLYGONS_INSTEAD_SPLITTING"  ) );
+  GroupArgumentsLayout->addWidget( CheckBoxPolygons, 3, 0 );
   
+  // Control for the polyedres creation to obtain conform mesh
+  CheckBoxPolyedrs = new QCheckBox( GroupArguments, "CheckBoxPolyedrs" );
+  CheckBoxPolyedrs->setText( tr( "CREATE_POLYEDRS_NEAR_BOUNDARY"  ) );
+  GroupArgumentsLayout->addWidget( CheckBoxPolyedrs, 4, 0 );
+
+
+  SMESHGUI_SewingDlgLayout->addWidget(GroupArguments, 1, 0);
+
   /* Initialisations */
   GroupArguments->show();
-  RadioButton1->setChecked( TRUE );
-  mySelection = Sel;  
-  
-  LineEdit2->setValidator( new SMESHGUI_IdValidator( this, "validator", 1));
-  LineEdit3->setValidator( new SMESHGUI_IdValidator( this, "validator", 1));
-  LineEdit5->setValidator( new SMESHGUI_IdValidator( this, "validator", 1));
-  LineEdit6->setValidator( new SMESHGUI_IdValidator( this, "validator", 1));
-  
-  mySMESHGUI  = SMESHGUI::GetSMESHGUI() ;
-  mySMESHGUI->SetActiveDialogBox( (QDialog*)this ) ;
+  RadioButton1->setChecked(TRUE);
+
+  LineEdit2->setValidator(new SMESHGUI_IdValidator(this, "validator", 1));
+  LineEdit3->setValidator(new SMESHGUI_IdValidator(this, "validator", 1));
+  LineEdit5->setValidator(new SMESHGUI_IdValidator(this, "validator", 1));
+  LineEdit6->setValidator(new SMESHGUI_IdValidator(this, "validator", 1));
+
+  mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   Init();
+
   /* signals and slots connections */
-  connect( buttonOk, SIGNAL( clicked() ),     this, SLOT( ClickOnOk() ) );
-  connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) ) ;
-  connect( buttonApply, SIGNAL( clicked() ), this, SLOT(ClickOnApply() ) );
-  connect( GroupConstructors, SIGNAL(clicked(int) ), SLOT( ConstructorsClicked(int) ) );
-  
-  connect( SelectButton1, SIGNAL (clicked() ),   this, SLOT( SetEditCurrentArgument() ) ) ;
-  connect( SelectButton2, SIGNAL (clicked() ),   this, SLOT( SetEditCurrentArgument() ) ) ;
-  connect( SelectButton3, SIGNAL (clicked() ),   this, SLOT( SetEditCurrentArgument() ) ) ;
-  connect( SelectButton4, SIGNAL (clicked() ),   this, SLOT( SetEditCurrentArgument() ) ) ;
-  connect( SelectButton5, SIGNAL (clicked() ),   this, SLOT( SetEditCurrentArgument() ) ) ;
-  connect( SelectButton6, SIGNAL (clicked() ),   this, SLOT( SetEditCurrentArgument() ) ) ;
-
-  connect( mySMESHGUI, SIGNAL ( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) ) ;
-  connect( mySelection, SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+  connect(buttonOk, SIGNAL(clicked()),     this, SLOT(ClickOnOk()));
+  connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
+  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect(GroupConstructors, SIGNAL(clicked(int)), SLOT(ConstructorsClicked(int)));
+
+  connect(SelectButton1, SIGNAL (clicked()),   this, SLOT(SetEditCurrentArgument()));
+  connect(SelectButton2, SIGNAL (clicked()),   this, SLOT(SetEditCurrentArgument()));
+  connect(SelectButton3, SIGNAL (clicked()),   this, SLOT(SetEditCurrentArgument()));
+  connect(SelectButton4, SIGNAL (clicked()),   this, SLOT(SetEditCurrentArgument()));
+  connect(SelectButton5, SIGNAL (clicked()),   this, SLOT(SetEditCurrentArgument()));
+  connect(SelectButton6, SIGNAL (clicked()),   this, SLOT(SetEditCurrentArgument()));
+
+  connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
+  connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
   /* to close dialog if study change */
-  connect( mySMESHGUI, SIGNAL ( SignalCloseAllDialogs() ), this, SLOT( ClickOnCancel() ) ) ;
-
-  connect( LineEdit1, SIGNAL( textChanged( const QString& )), SLOT( onTextChange( const QString& )));
-  connect( LineEdit2, SIGNAL( textChanged( const QString& )), SLOT( onTextChange( const QString& )));
-  connect( LineEdit3, SIGNAL( textChanged( const QString& )), SLOT( onTextChange( const QString& )));
-  connect( LineEdit4, SIGNAL( textChanged( const QString& )), SLOT( onTextChange( const QString& )));
-  connect( LineEdit5, SIGNAL( textChanged( const QString& )), SLOT( onTextChange( const QString& )));
-  connect( LineEdit6, SIGNAL( textChanged( const QString& )), SLOT( onTextChange( const QString& )));
-  
+  connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
+
+  connect(LineEdit1, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
+  connect(LineEdit2, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
+  connect(LineEdit3, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
+  connect(LineEdit4, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
+  connect(LineEdit5, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
+  connect(LineEdit6, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
+
   /* Move widget on the botton right corner of main widget */
-  int x, y ;
-  mySMESHGUI->DefineDlgPosition( this, x, y ) ;
-  this->move( x, y ) ;
-  this->show() ; /* displays Dialog */
-  
+  int x, y;
+  mySMESHGUI->DefineDlgPosition(this, x, y);
+  this->move(x, y);
+  this->show(); /* displays Dialog */
+
   ConstructorsClicked(0);
   resize(0,0);
 }
@@ -306,7 +332,6 @@ SMESHGUI_SewingDlg::~SMESHGUI_SewingDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
@@ -317,21 +342,22 @@ void SMESHGUI_SewingDlg::Init()
 
   myEditCurrentArgument = LineEdit1;
   LineEdit1->setFocus();
-  myActor     = 0;
+  myActor = 0;
   myMesh = SMESH::SMESH_Mesh::_nil();
   CheckBoxMerge->setChecked(false);
+  CheckBoxPolygons->setChecked(false);
+  CheckBoxPolyedrs->setChecked(false);
   SelectionIntoArgument();
 }
 
-
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void SMESHGUI_SewingDlg::ConstructorsClicked(int constructorId)
+void SMESHGUI_SewingDlg::ConstructorsClicked (int constructorId)
 {
-  disconnect(mySelection, 0, this, 0);
-  mySelection->ClearIObjects();
+  disconnect(mySelectionMgr, 0, this, 0);
+  mySelectionMgr->clearSelected();
   LineEdit1->setText("");
   LineEdit2->setText("");
   LineEdit3->setText("");
@@ -341,99 +367,114 @@ void SMESHGUI_SewingDlg::ConstructorsClicked(int constructorId)
   myOk1 = myOk2 = myOk3 = myOk4 = myOk5 = myOk6 = false;
   myEditCurrentArgument = LineEdit1;
   myEditCurrentArgument->setFocus();
-  
-  if (!TextLabel5->isEnabled())
+
+  if (!TextLabel5->isEnabled()) {
+    TextLabel5->setEnabled(true);
+    SelectButton5->setEnabled(true);
+    LineEdit5->setEnabled(true);
+  } else if (!TextLabel6->isEnabled()) {
+    TextLabel6->setEnabled(true);
+    SelectButton6->setEnabled(true);
+    LineEdit6->setEnabled(true);
+  }
+
+  if (constructorId == 1 || constructorId == 3) {
+    if (CheckBoxPolygons->isVisible())
+      CheckBoxPolygons->hide();
+    if (CheckBoxPolyedrs->isVisible())
+      CheckBoxPolyedrs->hide();
+  }
+
+  switch (constructorId) {
+  case 0:
     {
-      TextLabel5->setEnabled(true);
-      SelectButton5->setEnabled(true);
-      LineEdit5->setEnabled(true);
+      GroupArguments->setTitle(tr("SEW_FREE_BORDERS"));
+      SubGroup1->setTitle(tr("BORDER_1"));
+      SubGroup2->setTitle(tr("BORDER_2"));
+
+        if (!CheckBoxPolygons->isVisible())
+          CheckBoxPolygons->show();
+        if (!CheckBoxPolyedrs->isVisible())
+          CheckBoxPolyedrs->show();
+
+
+      break;
     }
-  else if (!TextLabel6->isEnabled())
+  case 1:
     {
-      TextLabel6->setEnabled(true);
-      SelectButton6->setEnabled(true);
-      LineEdit6->setEnabled(true);
+      GroupArguments->setTitle(tr("SEW_CONFORM_FREE_BORDERS"));
+      SubGroup1->setTitle(tr("BORDER_1"));
+      SubGroup2->setTitle(tr("BORDER_2"));
+
+      TextLabel6->setEnabled(false);
+      SelectButton6->setEnabled(false);
+      LineEdit6->setEnabled(false);
+
+      myOk6 = true;
+
+      break;
     }
-  
-  switch(constructorId)
+  case 2:
     {
-    case 0 :
-      { 
-       GroupArguments->setTitle( tr( "SEW_FREE_BORDERS" ) );
-       SubGroup1->setTitle( tr( "BORDER_1" ) );
-       SubGroup2->setTitle( tr( "BORDER_2" ) );
-       
-       break;
-      }
-    case 1 :
-      {
-       GroupArguments->setTitle( tr( "SEW_CONFORM_FREE_BORDERS" ) );
-       SubGroup1->setTitle( tr( "BORDER_1" ) );
-       SubGroup2->setTitle( tr( "BORDER_2" ) );
-       
-       TextLabel6->setEnabled(false);
-       SelectButton6->setEnabled(false);
-       LineEdit6->setEnabled(false);
-       
-       myOk6 = true;
-         
-       break;
-      }
-    case 2 :
-      {
-       GroupArguments->setTitle( tr( "SEW_BORDER_TO_SIDE" ) );
-       SubGroup1->setTitle( tr( "BORDER" ) );
-       SubGroup2->setTitle( tr( "SIDE" ) );
-
-       TextLabel5->setEnabled(false);
-       SelectButton5->setEnabled(false);
-       LineEdit5->setEnabled(false);
-       
-       myOk5 = true;
+      GroupArguments->setTitle(tr("SEW_BORDER_TO_SIDE"));
+      SubGroup1->setTitle(tr("BORDER"));
+      SubGroup2->setTitle(tr("SIDE"));
+
+      TextLabel5->setEnabled(false);
+      SelectButton5->setEnabled(false);
+      LineEdit5->setEnabled(false);
+
+      if (!CheckBoxPolygons->isVisible())
+       CheckBoxPolygons->show();
+      if (!CheckBoxPolyedrs->isVisible())
+       CheckBoxPolyedrs->show();
+      
 
-       break;
-      }
-    case 3 :
-      {        
-       GroupArguments->setTitle( tr( "SEW_SIDE_ELEMENTS" ) );
-       SubGroup1->setTitle( tr( "SIDE_1" ) );
-       SubGroup2->setTitle( tr( "SIDE_2" ) );
-       
-       TextLabel1->setText( tr( "SMESH_ID_ELEMENTS" ) );
-       TextLabel2->setText( tr( "NODE1_TO_MERGE" ) );
-       TextLabel3->setText( tr( "NODE2_TO_MERGE" ) );
-       TextLabel4->setText( tr( "SMESH_ID_ELEMENTS" ) );
-       TextLabel5->setText( tr( "NODE1_TO_MERGE" ) );
-       TextLabel6->setText( tr( "NODE2_TO_MERGE" ) );
-
-       LineEdit1->setValidator( new SMESHGUI_IdValidator( this, "validator"));
-       LineEdit4->setValidator( new SMESHGUI_IdValidator( this, "validator"));
-
-       SMESH::SetPointRepresentation(false);
-       QAD_Application::getDesktop()->SetSelectionMode( CellSelection, true );
-       break;
-      }
+      myOk5 = true;
+
+      break;
     }
-  
-  if (constructorId != 3)
+  case 3:
     {
-      TextLabel1->setText( tr( "FIRST_NODE_ID" ) );
-      TextLabel2->setText( tr( "SECOND_NODE_ID" ) );
-      TextLabel3->setText( tr( "LAST_NODE_ID" ) );
-      TextLabel4->setText( tr( "FIRST_NODE_ID" ) );
-      TextLabel5->setText( tr( "SECOND_NODE_ID" ) );
-      TextLabel6->setText( tr( "LAST_NODE_ID" ) );
-      
-      LineEdit1->setValidator( new SMESHGUI_IdValidator( this, "validator", 1));
-      LineEdit4->setValidator( new SMESHGUI_IdValidator( this, "validator", 1));
+      GroupArguments->setTitle(tr("SEW_SIDE_ELEMENTS"));
+      SubGroup1->setTitle(tr("SIDE_1"));
+      SubGroup2->setTitle(tr("SIDE_2"));
 
-      SMESH::SetPointRepresentation(true);
-      QAD_Application::getDesktop()->SetSelectionMode( NodeSelection, true );
+      TextLabel1->setText(tr("SMESH_ID_ELEMENTS"));
+      TextLabel2->setText(tr("NODE1_TO_MERGE"));
+      TextLabel3->setText(tr("NODE2_TO_MERGE"));
+      TextLabel4->setText(tr("SMESH_ID_ELEMENTS"));
+      TextLabel5->setText(tr("NODE1_TO_MERGE"));
+      TextLabel6->setText(tr("NODE2_TO_MERGE"));
+
+      LineEdit1->setValidator(new SMESHGUI_IdValidator(this, "validator"));
+      LineEdit4->setValidator(new SMESHGUI_IdValidator(this, "validator"));
+
+      SMESH::SetPointRepresentation(false);
+
+      myViewWindow->SetSelectionMode(CellSelection);
+      break;
     }
-  
-  connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-}
+  }
+
+  if (constructorId != 3) {
+    TextLabel1->setText(tr("FIRST_NODE_ID"));
+    TextLabel2->setText(tr("SECOND_NODE_ID"));
+    TextLabel3->setText(tr("LAST_NODE_ID"));
+    TextLabel4->setText(tr("FIRST_NODE_ID"));
+    TextLabel5->setText(tr("SECOND_NODE_ID"));
+    TextLabel6->setText(tr("LAST_NODE_ID"));
 
+    LineEdit1->setValidator(new SMESHGUI_IdValidator(this, "validator", 1));
+    LineEdit4->setValidator(new SMESHGUI_IdValidator(this, "validator", 1));
+
+    SMESH::SetPointRepresentation(true);
+
+    myViewWindow->SetSelectionMode(NodeSelection);
+  }
+
+  connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+}
 
 //=================================================================================
 // function : ClickOnApply()
@@ -441,93 +482,96 @@ void SMESHGUI_SewingDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 bool SMESHGUI_SewingDlg::ClickOnApply()
 {
-  if (mySMESHGUI->ActiveStudyLocked())
+  if (mySMESHGUI->isActiveStudyLocked())
     return false;
-  
+
   bool aResult = false;
 
-  if ( IsValid() )
-    {
-      bool toMerge = CheckBoxMerge->isChecked();
-    
-      try
-       {
-         SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
-         QApplication::setOverrideCursor(Qt::waitCursor);
-       
-         int aConstructorId = GetConstructorId();
-          SMESH::SMESH_MeshEditor::Sew_Error anError;
-  
-         if (aConstructorId == 0)
-           anError = aMeshEditor->SewFreeBorders(LineEdit1->text().toLong(),
-                                                 LineEdit2->text().toLong(),
-                                                 LineEdit3->text().toLong(),
-                                                 LineEdit4->text().toLong(),
-                                                 LineEdit5->text().toLong(),
-                                                 LineEdit6->text().toLong());
-         else if (aConstructorId == 1)
-           anError = aMeshEditor->SewConformFreeBorders(LineEdit1->text().toLong(),
-                                                        LineEdit2->text().toLong(),
-                                                        LineEdit3->text().toLong(),
-                                                        LineEdit4->text().toLong(),
-                                                        LineEdit5->text().toLong());
-         else if (aConstructorId == 2)
-           anError = aMeshEditor->SewBorderToSide(LineEdit1->text().toLong(),
-                                                  LineEdit2->text().toLong(),
-                                                  LineEdit3->text().toLong(),
-                                                  LineEdit4->text().toLong(),
-                                                  LineEdit6->text().toLong());
-         else if (aConstructorId == 3)
-           {
-             QStringList aListElementsId1 = QStringList::split( " ", LineEdit1->text(), false);
-             QStringList aListElementsId2 = QStringList::split( " ", LineEdit4->text(), false);
-             
-             SMESH::long_array_var anElementsId1 = new SMESH::long_array;
-             SMESH::long_array_var anElementsId2 = new SMESH::long_array;
-      
-             anElementsId1->length( aListElementsId1.count() );
-             anElementsId2->length( aListElementsId2.count() );
-
-             for ( int i = 0; i < aListElementsId1.count(); i++ )
-               anElementsId1[i] = aListElementsId1[i].toInt();
-             for ( int i = 0; i < aListElementsId2.count(); i++ )
-               anElementsId2[i] = aListElementsId2[i].toInt();
-
-             anError = aMeshEditor->SewSideElements(anElementsId1.inout(),
-                                                    anElementsId2.inout(),
-                                                    LineEdit2->text().toLong(),
-                                                    LineEdit5->text().toLong(),
-                                                    LineEdit3->text().toLong(),
-                                                    LineEdit6->text().toLong());
-           }
-         aResult = ( anError == SMESH::SMESH_MeshEditor::SEW_OK );
-
-         if (toMerge && aResult)
-           aMeshEditor->MergeEqualElements();
-         
-         QApplication::restoreOverrideCursor();
-
-          if ( !aResult ) {
-            QString msg = tr(QString("ERROR_%1").arg(anError));
-            QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                                  tr("SMESH_WRN_WARNING"),msg,tr("SMESH_BUT_OK"));
-          }
-        }
-      catch( ... )
-       {
-       }
-      
-      if ( aResult )
-       {
-         Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
-         mySelection->ClearIObjects();
-         SMESH::UpdateView();
-         mySelection->AddIObject( anIO, false );
-         Init();
-         ConstructorsClicked(GetConstructorId());
-       }
+  if (IsValid()) {
+    bool toMerge = CheckBoxMerge->isChecked();
+    bool toCreatePolygons = CheckBoxPolygons->isChecked();
+    bool toCreatePolyedrs = CheckBoxPolyedrs->isChecked();
+
+    try {
+      SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
+      QApplication::setOverrideCursor(Qt::waitCursor);
+
+      int aConstructorId = GetConstructorId();
+      SMESH::SMESH_MeshEditor::Sew_Error anError;
+
+      if (aConstructorId == 0)
+        anError = aMeshEditor->SewFreeBorders(LineEdit1->text().toLong(),
+                                              LineEdit2->text().toLong(),
+                                              LineEdit3->text().toLong(),
+                                              LineEdit4->text().toLong(),
+                                              LineEdit5->text().toLong(),
+                                              LineEdit6->text().toLong(),
+                                             toCreatePolygons,
+                                             toCreatePolyedrs);
+      else if (aConstructorId == 1)
+        anError = aMeshEditor->SewConformFreeBorders(LineEdit1->text().toLong(),
+                                                     LineEdit2->text().toLong(),
+                                                     LineEdit3->text().toLong(),
+                                                     LineEdit4->text().toLong(),
+                                                     LineEdit5->text().toLong());
+      else if (aConstructorId == 2)
+        anError = aMeshEditor->SewBorderToSide(LineEdit1->text().toLong(),
+                                               LineEdit2->text().toLong(),
+                                               LineEdit3->text().toLong(),
+                                               LineEdit4->text().toLong(),
+                                               LineEdit6->text().toLong(),
+                                              toCreatePolygons,
+                                              toCreatePolyedrs);
+      else if (aConstructorId == 3) {
+        QStringList aListElementsId1 = QStringList::split(" ", LineEdit1->text(), false);
+        QStringList aListElementsId2 = QStringList::split(" ", LineEdit4->text(), false);
+
+        SMESH::long_array_var anElementsId1 = new SMESH::long_array;
+        SMESH::long_array_var anElementsId2 = new SMESH::long_array;
+
+        anElementsId1->length(aListElementsId1.count());
+        anElementsId2->length(aListElementsId2.count());
+
+        for (int i = 0; i < aListElementsId1.count(); i++)
+          anElementsId1[i] = aListElementsId1[i].toInt();
+        for (int i = 0; i < aListElementsId2.count(); i++)
+          anElementsId2[i] = aListElementsId2[i].toInt();
+
+        anError = aMeshEditor->SewSideElements(anElementsId1.inout(),
+                                               anElementsId2.inout(),
+                                               LineEdit2->text().toLong(),
+                                               LineEdit5->text().toLong(),
+                                               LineEdit3->text().toLong(),
+                                               LineEdit6->text().toLong());
+      }
+      aResult = (anError == SMESH::SMESH_MeshEditor::SEW_OK);
+
+      if (toMerge && aResult)
+        aMeshEditor->MergeEqualElements();
+
+      QApplication::restoreOverrideCursor();
+
+      if (!aResult) {
+        QString msg = tr(QString("ERROR_%1").arg(anError));
+        SUIT_MessageBox::warn1(SMESHGUI::desktop(), tr("SMESH_WRN_WARNING"),
+                               msg, tr("SMESH_BUT_OK"));
+      }
+    } catch (...) {
     }
 
+    if (aResult) {
+      Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
+
+      SALOME_ListIO aList;
+      aList.Append(anIO);
+      mySelectionMgr->setSelectedObjects(aList, false);
+      SMESH::UpdateView();
+
+      Init();
+      ConstructorsClicked(GetConstructorId());
+    }
+  }
+
   return aResult;
 }
 
@@ -537,40 +581,38 @@ bool SMESHGUI_SewingDlg::ClickOnApply()
 //=================================================================================
 void SMESHGUI_SewingDlg::ClickOnOk()
 {
-  ifClickOnApply())
-    ClickOnCancel() ;
+  if (ClickOnApply())
+    ClickOnCancel();
 }
 
-       
 //=================================================================================
 // function : ClickOnCancel()
 // purpose  :
 //=================================================================================
 void SMESHGUI_SewingDlg::ClickOnCancel()
 {
-  mySelection->ClearIObjects();
+  mySelectionMgr->clearSelected();
   SMESH::SetPointRepresentation(false);
-  QAD_Application::getDesktop()->SetSelectionMode( ActorSelection );
-  disconnect( mySelection, 0, this, 0 );
-  mySMESHGUI->ResetState() ;
-  reject() ;
+  myViewWindow->SetSelectionMode(ActorSelection);
+  disconnect(mySelectionMgr, 0, this, 0);
+  mySMESHGUI->ResetState();
+  reject();
 }
 
 //=======================================================================
 //function : onTextChange
-//purpose  : 
+//purpose  :
 //=======================================================================
-
-void SMESHGUI_SewingDlg::onTextChange(const QString& theNewText)
+void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText)
 {
   QLineEdit* send = (QLineEdit*)sender();
 
-  if ( myBusy ) return;
+  if (myBusy) return;
   myBusy = true;
 
   if (send)
     myEditCurrentArgument = send;
+
   if      (send == LineEdit1)
     myOk1 = false;
   else if (send == LineEdit2)
@@ -584,163 +626,161 @@ void SMESHGUI_SewingDlg::onTextChange(const QString& theNewText)
   else if (send == LineEdit6)
     myOk6 = false;
 
-  buttonOk->setEnabled( false );
-  buttonApply->setEnabled( false );
-  
+  buttonOk->setEnabled(false);
+  buttonApply->setEnabled(false);
+
   // hilight entered elements/nodes
   SMDS_Mesh* aMesh = 0;
-  
-  if ( myActor )
+
+  if (myActor)
     aMesh = myActor->GetObject()->GetMesh();
   else
     send->clear();
-  
-  if ( aMesh ) {
-    mySelection->ClearIObjects();
-    mySelection->AddIObject( myActor->getIO() );
-  
-    if (GetConstructorId() != 3 || (send != LineEdit1 && send != LineEdit4))
-      {
-       SMESH::SetPointRepresentation(true);
-       QAD_Application::getDesktop()->SetSelectionMode( NodeSelection, true );
+
+  if (aMesh) {
+    TColStd_MapOfInteger newIndices;
+    
+    if (GetConstructorId() != 3 || (send != LineEdit1 && send != LineEdit4)) {
+      SMESH::SetPointRepresentation(true);
+
+      myViewWindow->SetSelectionMode(NodeSelection);
+
+      const SMDS_MeshNode * n = aMesh->FindNode(theNewText.toInt());
+      if (n) {
+       newIndices.Add(n->GetID());
+       mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
+       myViewWindow->highlight( myActor->getIO(), true, true );
        
-       const SMDS_MeshNode * n = aMesh->FindNode( theNewText.toInt() );
-       if ( n ) {
-         if ( !mySelection->IsIndexSelected( myActor->getIO(), n->GetID() ))
-           mySelection->AddOrRemoveIndex (myActor->getIO(), n->GetID(), true);
-         
-         if      (send == LineEdit1)
-           myOk1 = true;
-         else if (send == LineEdit2)
-           myOk2 = true;
-         else if (send == LineEdit3)
-           myOk3 = true;
-         else if (send == LineEdit4)
-           myOk4 = true;
-         else if (send == LineEdit5)
-           myOk5 = true;
-         else if (send == LineEdit6)
-           myOk6 = true;
-       }
+        if      (send == LineEdit1)
+          myOk1 = true;
+        else if (send == LineEdit2)
+          myOk2 = true;
+        else if (send == LineEdit3)
+          myOk3 = true;
+        else if (send == LineEdit4)
+          myOk4 = true;
+        else if (send == LineEdit5)
+          myOk5 = true;
+        else if (send == LineEdit6)
+          myOk6 = true;
       }
-    else
-      {
-       SMESH::SetPointRepresentation(false);
-       QAD_Application::getDesktop()->SetSelectionMode( CellSelection, true );
-       
-       QStringList aListId = QStringList::split( " ", theNewText, false);
-       
-       bool isEvenOneExists = false;
-       
-       for ( int i = 0; i < aListId.count(); i++ ) {
-         const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() );
-         if ( e ) {
-           if ( !mySelection->IsIndexSelected( myActor->getIO(), e->GetID() ))
-             mySelection->AddOrRemoveIndex (myActor->getIO(), e->GetID(), true);
-           if (!isEvenOneExists) 
-             isEvenOneExists = true;
-         }
-       }
+    } else {
+      SMESH::SetPointRepresentation(false);
+
+      myViewWindow->SetSelectionMode(CellSelection);
+
+      QStringList aListId = QStringList::split(" ", theNewText, false);
+
+      bool isEvenOneExists = false;
+
+      for (int i = 0; i < aListId.count(); i++) {
+        const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
+        if (e) 
+         newIndices.Add(e->GetID());
        
-       if (isEvenOneExists)
-         {
-           if (send == LineEdit1)
-             myOk1 = true;
-           else if(send == LineEdit4)
-             myOk4 = true;
-         }
-       else
-         send->clear();
+          if (!isEvenOneExists)
+            isEvenOneExists = true;
       }
+      
+
+      mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
+      myViewWindow->highlight( myActor->getIO(), true, true );
+      
+      if (isEvenOneExists) {
+        if (send == LineEdit1)
+          myOk1 = true;
+        else if(send == LineEdit4)
+          myOk4 = true;
+      } else {
+        send->clear();
+      }
+    }
   }
-  
-  if ( IsValid() ) {
-    buttonOk->setEnabled( true );
-    buttonApply->setEnabled( true );
+
+  if (IsValid()) {
+    buttonOk->setEnabled(true);
+    buttonApply->setEnabled(true);
   }
-  
+
   myBusy = false;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed or other case
 //=================================================================================
-void SMESHGUI_SewingDlg::SelectionIntoArgument(bool isSelectionChanged)
+void SMESHGUI_SewingDlg::SelectionIntoArgument (bool isSelectionChanged)
 {
-  if ( myBusy ) return;
-  
+  if (myBusy) return;
+
   // clear
   if (isSelectionChanged)
     myActor = 0;
-  
+
   QString aString = "";
-  
+
   myBusy = true;
-  myEditCurrentArgument->setText( aString );
+  myEditCurrentArgument->setText(aString);
   myBusy = false;
-  
-  if ( !GroupButtons->isEnabled() ) // inactive
+
+  if (!GroupButtons->isEnabled()) // inactive
     return;
-  
-  buttonOk->setEnabled( false );
-  buttonApply->setEnabled( false );
-  
+
+  buttonOk->setEnabled(false);
+  buttonApply->setEnabled(false);
+
   // get selected mesh
-  int nbSel = mySelection->IObjectCount();
-  if(nbSel != 1)
+  SALOME_ListIO aList;
+  mySelectionMgr->selectedObjects(aList,SVTK_Viewer::Type());
+
+  int nbSel = aList.Extent();
+  if (nbSel != 1)
     return;
-  
-  Handle(SALOME_InteractiveObject) IO = mySelection->firstIObject();
-  myMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(IO) ;
-  myActor = SMESH::FindActorByEntry( mySelection->firstIObject()->getEntry() );
-  
+
+  Handle(SALOME_InteractiveObject) IO = aList.First();
+  myMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(IO);
+  myActor = SMESH::FindActorByEntry(aList.First()->getEntry());
+
   if (myMesh->_is_nil() || !myActor)
     return;
-  
+
   // get selected elements/nodes
-  
   int aNbUnits = 0;
-  
-  if (GetConstructorId() != 3 || (myEditCurrentArgument != LineEdit1 && myEditCurrentArgument != LineEdit4))
-    {
-      aNbUnits = SMESH::GetNameOfSelectedNodes(mySelection, aString);
-      if(aNbUnits != 1)
-       return;
-    }
-  else
-    {
-      aNbUnits = SMESH::GetNameOfSelectedElements(mySelection, aString);
-      if(aNbUnits < 1) 
-       return;
-    }
-  
+
+  if (GetConstructorId() != 3 ||
+      (myEditCurrentArgument != LineEdit1 && myEditCurrentArgument != LineEdit4)) {
+    aNbUnits = SMESH::GetNameOfSelectedNodes(mySelector, myActor->getIO(), aString);
+    if (aNbUnits != 1)
+      return;
+  } else {
+    aNbUnits = SMESH::GetNameOfSelectedElements(mySelector, myActor->getIO(), aString);
+    if (aNbUnits < 1)
+      return;
+  }
+
   myBusy = true;
-  myEditCurrentArgument->setText( aString );
+  myEditCurrentArgument->setText(aString);
   myBusy = false;
-  
+
   // OK
   if (myEditCurrentArgument == LineEdit1)
     myOk1 = true;
-  else if(myEditCurrentArgument == LineEdit2)
+  else if (myEditCurrentArgument == LineEdit2)
     myOk2 = true;
-  else if(myEditCurrentArgument == LineEdit3)
+  else if (myEditCurrentArgument == LineEdit3)
     myOk3 = true;
-  else if(myEditCurrentArgument == LineEdit4)
+  else if (myEditCurrentArgument == LineEdit4)
     myOk4 = true;
-  else if(myEditCurrentArgument == LineEdit5)
+  else if (myEditCurrentArgument == LineEdit5)
     myOk5 = true;
-  else if(myEditCurrentArgument == LineEdit6)
+  else if (myEditCurrentArgument == LineEdit6)
     myOk6 = true;
-  
-  if(IsValid())
-    {
-      buttonOk->setEnabled( true );
-      buttonApply->setEnabled( true );
-    }
-}
 
+  if (IsValid()) {
+    buttonOk->setEnabled(true);
+    buttonApply->setEnabled(true);
+  }
+}
 
 //=================================================================================
 // function : SetEditCurrentArgument()
@@ -749,11 +789,11 @@ void SMESHGUI_SewingDlg::SelectionIntoArgument(bool isSelectionChanged)
 void SMESHGUI_SewingDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  
-  disconnect( mySelection, 0, this, 0 );
-  mySelection->ClearIObjects();
-  
-  if(send == SelectButton1) {
+
+  disconnect(mySelectionMgr, 0, this, 0);
+  mySelectionMgr->clearSelected();
+
+  if (send == SelectButton1) {
     myEditCurrentArgument = LineEdit1;
     myOk1 = false;
   }
@@ -777,21 +817,20 @@ void SMESHGUI_SewingDlg::SetEditCurrentArgument()
     myEditCurrentArgument = LineEdit6;
     myOk6 = false;
   }
-  
-  if (GetConstructorId() != 3 || (send != SelectButton1 && send != SelectButton4))
-    {
-      SMESH::SetPointRepresentation(true);
-      QAD_Application::getDesktop()->SetSelectionMode( NodeSelection, true );
-    }
-  else
-    {
-      SMESH::SetPointRepresentation(false);
-      QAD_Application::getDesktop()->SetSelectionMode( CellSelection, true );
-    }
-  
+
+  if (GetConstructorId() != 3 || (send != SelectButton1 && send != SelectButton4)) {
+    SMESH::SetPointRepresentation(true);
+
+    myViewWindow->SetSelectionMode(NodeSelection);
+
+  } else {
+    SMESH::SetPointRepresentation(false);
+    myViewWindow->SetSelectionMode(CellSelection);
+  }
+
   myEditCurrentArgument->setFocus();
-  connect( mySelection, SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
-  SelectionIntoArgument(false) ;
+  connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  SelectionIntoArgument(false);
 }
 
 //=================================================================================
@@ -800,16 +839,15 @@ void SMESHGUI_SewingDlg::SetEditCurrentArgument()
 //=================================================================================
 void SMESHGUI_SewingDlg::DeactivateActiveDialog()
 {
-  if ( GroupConstructors->isEnabled() ) {
-    GroupConstructors->setEnabled(false) ;
-    GroupArguments->setEnabled(false) ;
-    GroupButtons->setEnabled(false) ;
-    mySMESHGUI->ResetState() ;    
-    mySMESHGUI->SetActiveDialogBox(0) ;
+  if (GroupConstructors->isEnabled()) {
+    GroupConstructors->setEnabled(false);
+    GroupArguments->setEnabled(false);
+    GroupButtons->setEnabled(false);
+    mySMESHGUI->ResetState();
+    mySMESHGUI->SetActiveDialogBox(0);
   }
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -817,68 +855,61 @@ void SMESHGUI_SewingDlg::DeactivateActiveDialog()
 void SMESHGUI_SewingDlg::ActivateThisDialog()
 {
   /* Emit a signal to deactivate the active dialog */
-  mySMESHGUI->EmitSignalDeactivateDialog() ;   
-  GroupConstructors->setEnabled(true) ;
-  GroupArguments->setEnabled(true) ;
-  GroupButtons->setEnabled(true) ;
-  
-  mySMESHGUI->SetActiveDialogBox( (QDialog*)this ) ;
-  
+  mySMESHGUI->EmitSignalDeactivateDialog();
+  GroupConstructors->setEnabled(true);
+  GroupArguments->setEnabled(true);
+  GroupButtons->setEnabled(true);
+
+  mySMESHGUI->SetActiveDialogBox((QDialog*)this);
+
   ConstructorsClicked(GetConstructorId());
   SelectionIntoArgument();
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void SMESHGUI_SewingDlg::enterEvent(QEvent* e)
+void SMESHGUI_SewingDlg::enterEvent (QEvent* e)
 {
-  if ( GroupConstructors->isEnabled() )
-    return ;  
-  ActivateThisDialog() ;
+  if (!GroupConstructors->isEnabled())
+    ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : closeEvent()
 // purpose  :
 //=================================================================================
-void SMESHGUI_SewingDlg::closeEvent( QCloseEvent* e )
+void SMESHGUI_SewingDlg::closeEvent (QCloseEvent*)
 {
   /* same than click on cancel button */
-  this->ClickOnCancel() ;
+  this->ClickOnCancel();
 }
 
-
 //=======================================================================
 //function : hideEvent
 //purpose  : caused by ESC key
 //=======================================================================
-
-void SMESHGUI_SewingDlg::hideEvent ( QHideEvent * e )
+void SMESHGUI_SewingDlg::hideEvent (QHideEvent*)
 {
-  if ( !isMinimized() )
+  if (!isMinimized())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : GetConstructorId()
-// purpose  : 
+// purpose  :
 //=================================================================================
 int SMESHGUI_SewingDlg::GetConstructorId()
-{ 
-  if ( GroupConstructors != NULL && GroupConstructors->selected() != NULL )
-    return GroupConstructors->id( GroupConstructors->selected() );
+{
+  if (GroupConstructors != NULL && GroupConstructors->selected() != NULL)
+    return GroupConstructors->id(GroupConstructors->selected());
   return -1;
 }
 
-
 //=================================================================================
 // function : GetConstructorId()
-// purpose  : 
+// purpose  :
 //=================================================================================
 bool SMESHGUI_SewingDlg::IsValid()
 {