Salome HOME
0022100: EDF 2413 SMESH: Take into account TRIA7
[modules/smesh.git] / src / SMESHGUI / SMESHGUI.cxx
index 2ae9380aa89439f04ac48f8344a431589c6678c2..59420f87bee15cf122c3b7c9e7989a465d53d6df 100644 (file)
-//  SMESH SMESHGUI : GUI for SMESH component
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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 
+// Copyright (C) 2003-2007  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : SMESHGUI.cxx
-//  Author : Nicolas REJNERI
-//  Module : SMESH
-//  $Header$
+//  Author : Nicolas REJNERI, Open CASCADE S.A.S.
+
+#include <Standard_math.hxx>  // E.A. must be included before Python.h to fix compilation on windows
+#ifdef HAVE_FINITE
+#undef HAVE_FINITE            // VSR: avoid compilation warning on Linux : "HAVE_FINITE" redefined
+#endif
+#include "Python.h"
 
-using namespace std;
+//  SMESH includes
 #include "SMESHGUI.h"
-#include "SMESHGUI_AddHypothesisDlg.h"
-#include "SMESHGUI_AddAlgorithmDlg.h"
-#include "SMESHGUI_InitMeshDlg.h"
-#include "SMESHGUI_LocalLengthDlg.h"
-#include "SMESHGUI_NbSegmentsDlg.h"
-#include "SMESHGUI_AddSubMeshDlg.h"
+#include "SMESHGUI_Add0DElemsOnAllNodesDlg.h"
+#include "SMESHGUI_AddMeshElementDlg.h"
+#include "SMESHGUI_AddQuadraticElementDlg.h"
+#include "SMESHGUI_BuildCompoundDlg.h"
+#include "SMESHGUI_ClippingDlg.h"
+#include "SMESHGUI_ComputeDlg.h"
+#include "SMESHGUI_ConvToQuadOp.h"
+#include "SMESHGUI_CopyMeshDlg.h"
+#include "SMESHGUI_CreatePolyhedralVolumeDlg.h"
+#include "SMESHGUI_DeleteGroupDlg.h"
+#include "SMESHGUI_Displayer.h"
+#include "SMESHGUI_DuplicateNodesDlg.h"
+#include "SMESHGUI_ExtrusionAlongPathDlg.h"
+#include "SMESHGUI_ExtrusionDlg.h"
+#include "SMESHGUI_FileInfoDlg.h"
+#include "SMESHGUI_FileValidator.h"
+#include "SMESHGUI_FilterDlg.h"
+#include "SMESHGUI_FilterLibraryDlg.h"
+#include "SMESHGUI_FindElemByPointDlg.h"
+#include "SMESHGUI_GroupDlg.h"
+#include "SMESHGUI_GroupOnShapeDlg.h"
+#include "SMESHGUI_GroupOpDlg.h"
+#include "SMESHGUI_Hypotheses.h"
+#include "SMESHGUI_Make2DFrom3DOp.h"
+#include "SMESHGUI_MakeNodeAtPointDlg.h"
+#include "SMESHGUI_Measurements.h"
+#include "SMESHGUI_MergeDlg.h"
+#include "SMESHGUI_MeshInfo.h"
+#include "SMESHGUI_MeshOp.h"
+#include "SMESHGUI_MeshOrderOp.h"
+#include "SMESHGUI_MeshPatternDlg.h"
+#include "SMESHGUI_MultiEditDlg.h"
 #include "SMESHGUI_NodesDlg.h"
-#include "SMESHGUI_TransparencyDlg.h"
-#include "SMESHGUI_RemoveNodesDlg.h"
-#include "SMESHGUI_RemoveElementsDlg.h"
-#include "SMESHGUI_MeshInfosDlg.h"
-#include "SMESHGUI_Preferences_ColorDlg.h"
-#include "SMESHGUI_MaxElementAreaDlg.h"
-#include "SMESHGUI_MaxElementVolumeDlg.h"
 #include "SMESHGUI_Preferences_ScalarBarDlg.h"
-#include "SMESHGUI_EditScalarBarDlg.h"
-#include "SMESHGUI_aParameterDlg.h"
-#include "SMESHGUI_ComputeScalarValue.h"
-#include "SMESHGUI_MoveNodesDlg.h"
-#include "SMESHGUI_OrientationElementsDlg.h"
-#include "SMESHGUI_DiagonalInversionDlg.h"
-#include "SMESHGUI_EdgesConnectivityDlg.h"
-#include "SMESHGUI_AddFaceDlg.h"
-#include "SMESHGUI_AddEdgeDlg.h"
-#include "SMESHGUI_AddVolumeDlg.h"
-#include "SMESHGUI_EditHypothesesDlg.h"
-
-#include "SMESH_Grid.h"
-
-// SALOME Includes
-#include "Utils_ORB_INIT.hxx"
-#include "Utils_SINGLETON.hxx"
-
-#include "QAD.h"
-#include "QAD_Tools.h"
-#include "QAD_Config.h"
-#include "QAD_Settings.h"
-#include "QAD_RightFrame.h"
-#include "QAD_MessageBox.h"   
-#include "QAD_Resource.h"
-#include "QAD_FileDlg.h"
-#include "SALOMEGUI_Desktop.h"
-#include "SALOMEGUI_NameDlg.h"
-
-#include "OCCViewer_ViewPort.h"
-#include "OCCViewer_ViewPort3d.h"
-#include "OCCViewer_Viewer3d.h"
-
-#include "GEOM_Client.hxx"
-#include "GEOM_InteractiveObject.hxx"
-
-#include "SALOME_NamingService.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SALOME_InteractiveObject.hxx"
-
-#include "SALOMEGUI_ImportOperation.h"
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
-#include "utilities.h"
-
-#include "SMDS_Mesh.hxx"
-#include "SMESHDS_Document.hxx"
-#include "Document_Reader.h"
-#include "Document_Writer.h"
-#include "Mesh_Reader.h"
-#include "Mesh_Writer.h"
-
-#include "DriverDAT_R_SMESHDS_Document.h"
-#include "DriverMED_R_SMESHDS_Document.h"
-#include "DriverUNV_R_SMESHDS_Document.h"
-#include "DriverDAT_W_SMESHDS_Document.h"
-#include "DriverMED_W_SMESHDS_Document.h"
-#include "DriverUNV_W_SMESHDS_Document.h"
-#include "DriverDAT_R_SMESHDS_Mesh.h"
-#include "DriverMED_R_SMESHDS_Mesh.h"
-#include "DriverUNV_R_SMESHDS_Mesh.h"
-#include "DriverDAT_W_SMESHDS_Mesh.h"
-#include "DriverMED_W_SMESHDS_Mesh.h"
-#include "DriverUNV_W_SMESHDS_Mesh.h"
-
-// QT Includes
-#define         INCLUDE_MENUITEM_DEF
-#include <qapplication.h>
-#include <qlineedit.h>
-#include <qmenudata.h>
-#include <qmenubar.h>
-#include <qpopupmenu.h>
-#include <qfont.h>
-#include <qstring.h>
-#include <qcheckbox.h>
-#include <qcolordialog.h>
-#include <qmessagebox.h>
-#include <qspinbox.h>
-#include <qlist.h>
-#include <qwidget.h> 
-#include <qevent.h> 
-#include <qradiobutton.h> 
-
-// VTK Includes
-#include "VTKViewer_Common.h"
-#include "VTKViewer_ViewFrame.h"
-#include <vtkLegendBoxActor.h>
-#include <vtkFeatureEdges.h>
-#include <vtkDoubleArray.h>
-
-
-// Open CASCADE Includes
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
-
-static GEOM_Client      ShapeReader;
-static SMESHGUI*        smeshGUI = 0;
-static CORBA::ORB_var   _orb;
+#include "SMESHGUI_PropertiesDlg.h"
+#include "SMESHGUI_RemoveElementsDlg.h"
+#include "SMESHGUI_RemoveNodesDlg.h"
+#include "SMESHGUI_RenumberingDlg.h"
+#include "SMESHGUI_ReorientFacesDlg.h"
+#include "SMESHGUI_RevolutionDlg.h"
+#include "SMESHGUI_RotationDlg.h"
+#include "SMESHGUI_ScaleDlg.h"
+#include "SMESHGUI_Selection.h"
+#include "SMESHGUI_SewingDlg.h"
+#include "SMESHGUI_SingleEditDlg.h"
+#include "SMESHGUI_SmoothingDlg.h"
+#include "SMESHGUI_SymmetryDlg.h"
+#include "SMESHGUI_TranslationDlg.h"
+#include "SMESHGUI_TransparencyDlg.h"
 
+#include "SMESHGUI_FilterUtils.h"
+#include "SMESHGUI_GroupUtils.h"
+#include "SMESHGUI_HypothesesUtils.h"
+#include "SMESHGUI_MeshUtils.h"
+#include "SMESHGUI_PatternUtils.h"
+#include "SMESHGUI_Utils.h"
+#include "SMESHGUI_VTKUtils.h"
+
+#include <SMESH_version.h>
+
+#include "SMESH_ControlsDef.hxx"
+#include <SMESH_Actor.h>
+#include <SMESH_ActorUtils.h>
+#include <SMESH_Client.hxx>
+#include <SMESH_ScalarBarActor.h>
+#include <SMESH_TypeFilter.hxx>
+
+// SALOME GUI includes
+#include <SalomeApp_Application.h>
+#include <SalomeApp_CheckFileDlg.h>
+#include <SalomeApp_DataObject.h>
+#include <SalomeApp_Study.h>
+#include <SalomeApp_Tools.h>
+
+#include <LightApp_DataOwner.h>
+#include <LightApp_NameDlg.h>
+#include <LightApp_Preferences.h>
+#include <LightApp_SelectionMgr.h>
+#include <LightApp_UpdateFlags.h>
+
+#include <SVTK_ViewManager.h>
+#include <SVTK_ViewModel.h>
+#include <SVTK_ViewWindow.h>
+
+#include <VTKViewer_Algorithm.h>
+
+#include <SUIT_Desktop.h>
+#include <SUIT_FileDlg.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_OverrideCursor.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+
+#include <QtxPopupMgr.h>
+#include <QtxFontEdit.h>
+
+#include <SALOME_ListIO.hxx>
+#include <SALOME_ListIteratorOfListIO.hxx>
+
+#ifndef DISABLE_PLOT2DVIEWER
+#include <SPlot2d_ViewModel.h>
+#include <SPlot2d_Histogram.h>
+#endif
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-class CustomItem : public QCustomMenuItem
-{
-public:
-  CustomItem( const QString& s, const QFont& f )
-    : string( s ), font( f ){};
-  ~CustomItem(){}
-  
-  void paint( QPainter* p, const QColorGroup& /*cg*/, bool /*act*/, bool /*enabled*/, int x, int y, int w, int h )
-  {
-    p->setFont ( font );
-    p->drawText( x, y, w, h, AlignHCenter | AlignVCenter | ShowPrefix | DontClip, string );
-  }
-  
-  QSize sizeHint()
-  {
-    return QFontMetrics( font ).size( AlignHCenter | AlignVCenter | ShowPrefix | DontClip,  string );
-  }
-private:
-  QString string;
-  QFont font;
-};
+// IDL includes
+#include <SALOMEconfig.h>
+#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
+#include CORBA_CLIENT_HEADER(SMESH_MeshEditor)
+#include CORBA_CLIENT_HEADER(SMESH_Measurements)
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESHGUI::SMESHGUI() :
-  QObject()
-{
-}
+// Qt includes
+// #define       INCLUDE_MENUITEM_DEF // VSR commented ????????
+#include <QApplication>
+#include <QMenu>
+#include <QTextStream>
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESHGUI::~SMESHGUI()
-{
-}
+// BOOST includes
+#include <boost/shared_ptr.hpp>
 
+// VTK includes
+#include <vtkCallbackCommand.h>
+#include <vtkCamera.h>
+#include <vtkLookupTable.h>
+#include <vtkPlane.h>
+#include <vtkRenderer.h>
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESHGUI* SMESHGUI::GetSMESHGUI( )
-{
-  return smeshGUI;
-}
+// SALOME KERNEL includes
+#include <SALOMEDSClient_ClientFactory.hxx>
+#include <SALOMEDSClient_IParameters.hxx>
+#include <SALOMEDSClient_SComponent.hxx>
+#include <SALOMEDSClient_StudyBuilder.hxx>
+#include <SALOMEDS_Study.hxx>
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESHGUI* SMESHGUI::GetOrCreateSMESHGUI( QAD_Desktop* desktop )
-{
-  if( smeshGUI == 0 ) {
-    setOrb();
-    smeshGUI = new SMESHGUI;
-    smeshGUI->myActiveDialogBox = 0 ;
-    smeshGUI->myState = -1 ;
-    smeshGUI->myDesktop = desktop ; 
-    smeshGUI->myActiveStudy = desktop->getActiveStudy();
-
-    Engines::Component_var comp = desktop->getEngine("FactoryServer", "SMESH");
-    smeshGUI->myComponentMesh = SMESH::SMESH_Gen::_narrow(comp);
-    
-    Engines::Component_var comp1 = desktop->getEngine("FactoryServer", "GEOM");    
-    smeshGUI->myComponentGeom = GEOM::GEOM_Gen::_narrow(comp1);
-      
-    /* GetCurrentStudy */
-    smeshGUI->myStudyId = smeshGUI->myActiveStudy->getStudyId();
-    
-    smeshGUI->myComponentGeom->GetCurrentStudy( smeshGUI->myStudyId );
-    //    smeshGUI->myComponentGeom->NbLabels();
-    
-    smeshGUI->myStudy = smeshGUI->myActiveStudy->getStudyDocument();
-    
-    smeshGUI->myStudyAPI = SMESHGUI_StudyAPI(smeshGUI->myStudy, smeshGUI->myComponentMesh);
+// OCCT includes
+#include <Standard_ErrorHandler.hxx>
+#include <NCollection_DataMap.hxx>
 
-    smeshGUI->myDocument = new SMESHDS_Document(1);//NBU
+#include <Basics_Utils.hxx>
 
-    smeshGUI->mySimulationActors = vtkActorCollection::New();
-    smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
-  } else {
-    /* study may have changed */
-    smeshGUI->myActiveStudy = desktop->getActiveStudy();
-    smeshGUI->myStudyAPI.Update(smeshGUI->myComponentMesh);
-  }
-  
-  /* Automatic Update */
-  if ( desktop->menuBar()->isItemChecked(1001) )
-    smeshGUI->myAutomaticUpdate = true;
-  else 
-    smeshGUI->myAutomaticUpdate = false;
+//To disable automatic genericobj management, the following line should be commented.
+//Otherwise, it should be uncommented.
+//Refer to KERNEL_SRC/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx
+#define WITHGENERICOBJ
 
-  return smeshGUI;
-}
+//namespace{
+  // Declarations
+  //=============================================================
+  void ImportMeshesFromFile(SMESH::SMESH_Gen_ptr theComponentMesh,
+                            int theCommandID);
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::SetState(int aState )
-{  this->myState = aState ;  return ; }
+  void ExportMeshToFile(int theCommandID);
 
+  void SetDisplayMode(int theCommandID, SMESHGUI_StudyId2MarkerMap& theMarkerMap);
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::ResetState()
-{  this->myState = -1 ;  return ; }
+  void SetDisplayEntity(int theCommandID);
 
+  void Control( int theCommandID );
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::EmitSignalDeactivateDialog()
-{
-  emit this->SignalDeactivateActiveDialog() ;
-  return ;
-}
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::EmitSignalCloseAllDialogs()
-{
-  emit this->SignalCloseAllDialogs() ;
-  return ;
-}
+  // Definitions
+  //=============================================================
+  void ImportMeshesFromFile( SMESH::SMESH_Gen_ptr theComponentMesh,
+                             int theCommandID )
+  {
+    QStringList filter;
+    std::string myExtension;
 
+    if ( theCommandID == 113 ) {
+      filter.append( QObject::tr( "MED_FILES_FILTER" ) + " (*.*med)" );
+      filter.append( QObject::tr( "ALL_FILES_FILTER" ) + " (*)" );
+    }
+    else if ( theCommandID == 112 ) {
+      filter.append( QObject::tr( "IDEAS_FILES_FILTER" ) + " (*.unv)" );
+    }
+    else if ( theCommandID == 111 ) {
+      filter.append( QObject::tr( "DAT_FILES_FILTER" ) + " (*.dat)" );
+    }
+    else if ( theCommandID == 115 ) {
+      filter.append( QObject::tr( "STL_FILES_FILTER" ) + " (*.stl)" );
+    }
+    else if ( theCommandID == 116 ) {
+      filter.append( QObject::tr( "CGNS_FILES_FILTER" ) + " (*.cgns)" );
+    }
+    else if ( theCommandID == 117 ) {
+      filter.append( QObject::tr( "SAUV files (*.sauv*)" ) );
+      filter.append( QObject::tr( "All files (*)" ) );
+    }
+    else if ( theCommandID == 118 ) {
+      filter.append( QObject::tr( "GMF_ASCII_FILES_FILTER" ) + " (*.mesh)"  );
+      filter.append( QObject::tr( "GMF_BINARY_FILES_FILTER") + " (*.meshb)" );
+    }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-QDialog* SMESHGUI::GetActiveDialogBox()
-{
-  return this->myActiveDialogBox ;
-}
+    QString anInitialPath = "";
+    if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+      anInitialPath = QDir::currentPath();
+
+    QStringList filenames;
+    bool toCreateGroups = true;
+
+    // if ( theCommandID == 118 ) { // GMF
+    //   SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg
+    //     ( SMESHGUI::desktop(), true, QObject::tr("SMESH_REQUIRED_GROUPS"), true, true );
+    //   fd->setWindowTitle( QObject::tr( "SMESH_IMPORT_MESH" ) );
+    //   fd->setNameFilters( filter );
+    //   fd->SetChecked( true );
+    //   if ( fd->exec() )
+    //     filenames << fd->selectedFile();
+    //   toCreateGroups = fd->IsChecked();
+
+    //   delete fd;
+    // }
+    // else
+    {
+      filenames = SUIT_FileDlg::getOpenFileNames( SMESHGUI::desktop(),
+                                                  anInitialPath,
+                                                  filter,
+                                                  QObject::tr( "SMESH_IMPORT_MESH" ) );
+    }
+    if ( filenames.count() > 0 ) {
+      SUIT_OverrideCursor wc;
+      _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+
+      QStringList errors;
+      QStringList anEntryList;
+      bool isEmpty = false;
+      for ( QStringList::ConstIterator it = filenames.begin(); it != filenames.end(); ++it ) {
+        QString filename = *it;
+        SMESH::mesh_array_var aMeshes = new SMESH::mesh_array;
+        try {
+          switch ( theCommandID ) {
+          case 111:
+            {
+              // DAT format (currently unsupported)
+              errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
+                             arg( QObject::tr( "SMESH_ERR_NOT_SUPPORTED_FORMAT" ) ) );
+              break;
+            }
+          case 112:
+            {
+              // UNV format
+              aMeshes->length( 1 );
+              aMeshes[0] = theComponentMesh->CreateMeshesFromUNV( filename.toLatin1().constData() );
+              if ( aMeshes[0]->_is_nil() )
+                errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
+                               arg( QObject::tr( "SMESH_ERR_UNKNOWN_IMPORT_ERROR" ) ) );
+              break;
+            }
+          case 113:
+            {
+              // MED format
+              SMESH::DriverMED_ReadStatus res;
+              aMeshes = theComponentMesh->CreateMeshesFromMED( filename.toLatin1().constData(), res );
+              if ( res != SMESH::DRS_OK ) {
+                errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
+                               arg( QObject::tr( QString( "SMESH_DRS_%1" ).arg( res ).toLatin1().data() ) ) );
+              }
+              break;
+            }
+          case 115:
+            {
+              // STL format
+              aMeshes->length( 1 );
+              aMeshes[0] = theComponentMesh->CreateMeshesFromSTL( filename.toLatin1().constData() );
+              if ( aMeshes[0]->_is_nil() ) {
+                errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
+                               arg( QObject::tr( "SMESH_ERR_UNKNOWN_IMPORT_ERROR" ) ) );
+              }
+              break;
+            }
+          case 116:
+            {
+              // CGNS format
+              SMESH::DriverMED_ReadStatus res;
+              aMeshes = theComponentMesh->CreateMeshesFromCGNS( filename.toLatin1().constData(), res );
+              if ( res != SMESH::DRS_OK ) {
+                errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
+                               arg( QObject::tr( QString( "SMESH_DRS_%1" ).arg( res ).toLatin1().data() ) ) );
+              }
+              break;
+            }
+          case 117:
+            {
+              // SAUV format
+              SMESH::DriverMED_ReadStatus res;
+              aMeshes = theComponentMesh->CreateMeshesFromSAUV( filename.toLatin1().constData(), res );
+              if ( res != SMESH::DRS_OK ) {
+                errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
+                               arg( QObject::tr( QString( "SMESH_DRS_%1" ).arg( res ).toLatin1().data() ) ) );
+              }
+              break;
+            }
+          case 118:
+            {
+              // GMF format
+              SMESH::ComputeError_var res;
+              aMeshes->length( 1 );
+              aMeshes[0] = theComponentMesh->CreateMeshesFromGMF( filename.toLatin1().constData(),
+                                                                  toCreateGroups,
+                                                                  res.out() );
+              if ( res->code != SMESH::DRS_OK ) {
+                errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
+                               arg( QObject::tr( QString( "SMESH_DRS_%1" ).arg( res->code ).toLatin1().data() ) ) );
+                if ( strlen( res->comment.in() ) > 0 ) {
+                  errors.back() += ": ";
+                  errors.back() += res->comment.in();
+                }
+              }
+              break;
+            }
+          }
+        }
+        catch ( const SALOME::SALOME_Exception& S_ex ) {
+          errors.append( QString( "%1 :\n\t%2" ).arg( filename ).
+                         arg( QObject::tr( "SMESH_ERR_UNKNOWN_IMPORT_ERROR" ) ) );
+        }
+
+        for ( int i = 0, iEnd = aMeshes->length(); i < iEnd; i++ ) {
+          _PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshes[i] );
+          if ( aMeshSO ) {
+            _PTR(StudyBuilder) aBuilder = aStudy->NewBuilder();
+            _PTR(AttributePixMap) aPixmap = aBuilder->FindOrCreateAttribute( aMeshSO, "AttributePixMap" );
+            aPixmap->SetPixMap( "ICON_SMESH_TREE_MESH_IMPORTED" );
+            if ( theCommandID == 112 ) // mesh names aren't taken from the file for UNV import
+              SMESH::SetName( aMeshSO, QFileInfo(filename).fileName() );
+
+            anEntryList.append( aMeshSO->GetID().c_str() );
+
+            // obj has been published in study. Its refcount has been incremented.
+            // It is safe to decrement its refcount
+            // so that it will be destroyed when the entry in study will be removed
+            aMeshes[i]->UnRegister();
+          }
+          else {
+            isEmpty = true;
+          }
+        }
+      }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::SetActiveDialogBox(QDialog* aDlg)
-{
-  this->myActiveDialogBox = (QDialog*)aDlg ;
-  return ;
-}
+      // update Object browser
+      SMESHGUI::GetSMESHGUI()->updateObjBrowser();
 
+      // browse to the published meshes
+      if( LightApp_Application* anApp =
+          dynamic_cast<LightApp_Application*>( SUIT_Session::session()->activeApplication() ) )
+        anApp->browseObjects( anEntryList );
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-QAD_Study* SMESHGUI::GetActiveStudy()
-{
-  return this->myActiveStudy ;
-}
+      // show Error message box if there were errors
+      if ( errors.count() > 0 ) {
+        SUIT_MessageBox::critical( SMESHGUI::desktop(),
+                                   QObject::tr( "SMESH_ERROR" ),
+                                   QObject::tr( "SMESH_IMPORT_ERRORS" ) + "\n" + errors.join( "\n" ) );
+      }
 
+      // show warning message box, if some imported mesh is empty
+      if ( isEmpty ) {
+          SUIT_MessageBox::warning( SMESHGUI::desktop(),
+                                    QObject::tr( "SMESH_WRN_WARNING" ),
+                                    QObject::tr( "SMESH_DRS_SOME_EMPTY" ) );
+      }
+    }
+  }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SALOMEDS::Study_ptr SMESHGUI::GetStudy()
-{
-  return SALOMEDS::Study::_narrow( myStudy );
-}
+  //================================================================================
+  /*!
+   * \brief Export selected meshes or groups into a file
+   */
+  //================================================================================
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESHGUI_StudyAPI SMESHGUI::GetStudyAPI()
-{
-  return myStudyAPI;
-}
+  void ExportMeshToFile( int theCommandID )
+  {
+    LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+    SALOME_ListIO selected;
+    if( aSel )
+      aSel->selectedObjects( selected );
+
+    const bool isMED = ( theCommandID == 122 || theCommandID == 125 );
+    const bool isDAT = ( theCommandID == 121 || theCommandID == 124 );
+    const bool isUNV = ( theCommandID == 123 || theCommandID == 126 );
+    const bool isSTL = ( theCommandID == 140 || theCommandID == 141 );
+    const bool isCGNS= ( theCommandID == 142 || theCommandID == 143 );
+    const bool isSAUV= ( theCommandID == 144 || theCommandID == 145 );
+    const bool isGMF = ( theCommandID == 146 || theCommandID == 147 );
+
+    // actually, the following condition can't be met (added for insurance)
+    if( selected.Extent() == 0 ||
+        ( selected.Extent() > 1 && !isMED && !isSTL ))
+      return;
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-QAD_Desktop* SMESHGUI::GetDesktop()
-{
-  return this->myDesktop ;
-}
+    // get mesh object from selection and check duplication of their names
+    bool hasDuplicatedMeshNames = false;
+    QList< QPair< SMESH::SMESH_IDSource_var, QString > > aMeshList;
+    QList< QPair< SMESH::SMESH_IDSource_var, QString > >::iterator aMeshIter;
+    SALOME_ListIteratorOfListIO It( selected );
+    for( ; It.More(); It.Next() )
+    {
+      Handle(SALOME_InteractiveObject) anIObject = It.Value();
+      SMESH::SMESH_IDSource_var aMeshItem = SMESH::IObjectToInterface<SMESH::SMESH_IDSource>(anIObject);
+      if ( aMeshItem->_is_nil() ) {
+        SUIT_MessageBox::warning( SMESHGUI::desktop(),
+                                  QObject::tr( "SMESH_WRN_WARNING" ),
+                                  QObject::tr( "SMESH_BAD_MESH_SELECTION" ));
+        return;
+      }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-vtkScalarBarActor* SMESHGUI::GetScalarBar()
-{
-  vtkRenderer* aRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  vtkActor2DCollection* actor2DList = aRenderer->GetActors2D();
-  actor2DList->InitTraversal();
-  vtkActor2D* aActor2d =  actor2DList->GetNextActor2D();
-  while (aActor2d != NULL) {
-    if (aActor2d->IsA("vtkScalarBarActor"))
-      return vtkScalarBarActor::SafeDownCast(aActor2d);
-    actor2DList->GetNextActor2D();
-  }
-  return NULL;
-}
+      QString aMeshName = anIObject->getName();
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::activeStudyChanged( QAD_Desktop* parent )
-{
-  MESSAGE ("SMESHGUI::activeStudyChanged init.")
-  /* Create or retrieve an object SMESHGUI */
-  SMESHGUI::GetOrCreateSMESHGUI(parent); 
-  if(smeshGUI != 0) {  
-    smeshGUI->EmitSignalCloseAllDialogs() ;
-    MESSAGE( "Active study changed : SMESHGUI nullified" << endl ) ;
-    smeshGUI = 0 ;
-  }
+      // check for name duplications
+      if ( !hasDuplicatedMeshNames )
+        for( aMeshIter = aMeshList.begin(); aMeshIter != aMeshList.end(); aMeshIter++ ) {
+          if( aMeshName == (*aMeshIter).second ) {
+            hasDuplicatedMeshNames = true;
+            break;
+          }
+        }
 
-  //smeshGUI->SetSettings( parent ); //DCQ : Pb. Multi-Etudes
-  MESSAGE ("SMESHGUI::activeStudyChanged done.")
-  return ;
-}
+      aMeshList.append( QPair< SMESH::SMESH_IDSource_var, QString >( aMeshItem, aMeshName ) );
+    }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::DefineDlgPosition(QWidget* aDlg, int& x, int& y)
-{
-  /* Here the position is on the bottom right corner - 10 */
-       aDlg->resize(QSize().expandedTo(aDlg->minimumSizeHint()));
-  QAD_Desktop* PP = QAD_Application::getDesktop() ;
-  x = abs ( PP->x() + PP->size().width()  - aDlg->size().width()  - 10 ) ;
-  y = abs ( PP->y() + PP->size().height() - aDlg->size().height() - 10 ) ;
-  return true ;  
-}
+    if( hasDuplicatedMeshNames && isMED ) {
+      int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                          QObject::tr("SMESH_WRN_WARNING"),
+                                          QObject::tr("SMESH_EXPORT_MED_DUPLICATED_MESH_NAMES"),
+                                          QObject::tr("SMESH_BUT_YES"),
+                                          QObject::tr("SMESH_BUT_NO"), 0, 1);
+      if (aRet != 0)
+        return;
+    }
 
+    aMeshIter = aMeshList.begin();
+    SMESH::SMESH_IDSource_var aMeshOrGroup = (*aMeshIter).first;
+    SMESH::SMESH_Mesh_var            aMesh = aMeshOrGroup->GetMesh();
+    QString                      aMeshName = (*aMeshIter).second;
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::EraseSimulationActors()
-{
-  if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) {  //VTK
-    vtkRenderer* theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-    vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
+    if ( isMED || isCGNS || isSAUV ) // formats where group names must be unique
+    {
+      // check for equal group names within each mesh
+      for( aMeshIter = aMeshList.begin(); aMeshIter != aMeshList.end(); aMeshIter++ ) {
+        SMESH::SMESH_Mesh_var aMeshItem = SMESH::SMESH_Mesh::_narrow( (*aMeshIter).first );
+        if ( !aMeshItem->_is_nil() && aMeshItem->HasDuplicatedGroupNamesMED()) {
+          int aRet = SUIT_MessageBox::warning
+            (SMESHGUI::desktop(),
+             QObject::tr("SMESH_WRN_WARNING"),
+             QObject::tr("SMESH_EXPORT_MED_DUPLICATED_GRP").arg((*aMeshIter).second),
+             QObject::tr("SMESH_BUT_YES"),
+             QObject::tr("SMESH_BUT_NO"), 0, 1);
+          if (aRet != 0)
+            return;
+        }
+      }
+    }
+    
+    // Warn the user about presence of not supported elements
+    QString format;
+    std::vector< SMESH::EntityType > notSupportedElemTypes, presentNotSupported;
+    if ( isDAT )
+    {
+      format = "DAT";
+      notSupportedElemTypes.push_back( SMESH::Entity_0D );
+      notSupportedElemTypes.push_back( SMESH::Entity_Ball );
+    }
+    else if ( isUNV )
+    {
+      format = "UNV";
+      notSupportedElemTypes.push_back( SMESH::Entity_Polygon );
+      notSupportedElemTypes.push_back( SMESH::Entity_Quad_Polygon );
+      notSupportedElemTypes.push_back( SMESH::Entity_Polyhedra );
+      notSupportedElemTypes.push_back( SMESH::Entity_Quad_Polyhedra );
+      notSupportedElemTypes.push_back( SMESH::Entity_Pyramid );
+      notSupportedElemTypes.push_back( SMESH::Entity_Hexagonal_Prism );
+      notSupportedElemTypes.push_back( SMESH::Entity_0D );
+      notSupportedElemTypes.push_back( SMESH::Entity_Ball );
+    }
+    else if ( isSTL )
+    {
+      format = "STL";
+      notSupportedElemTypes.push_back( SMESH::Entity_Edge );
+      notSupportedElemTypes.push_back( SMESH::Entity_Quad_Edge );
+      notSupportedElemTypes.push_back( SMESH::Entity_0D );
+      notSupportedElemTypes.push_back( SMESH::Entity_Ball );
+    }
+    else if ( isCGNS )
+    {
+      format = "CGNS";
+      notSupportedElemTypes.push_back( SMESH::Entity_Ball );
+      notSupportedElemTypes.push_back( SMESH::Entity_BiQuad_Triangle );
+    }
+    else if ( isSAUV )
+    {
+      format = "SAUV";
+      notSupportedElemTypes.push_back( SMESH::Entity_Ball );
+      notSupportedElemTypes.push_back( SMESH::Entity_BiQuad_Triangle );
+      notSupportedElemTypes.push_back( SMESH::Entity_BiQuad_Quadrangle );
+      notSupportedElemTypes.push_back( SMESH::Entity_TriQuad_Hexa );
+      notSupportedElemTypes.push_back( SMESH::Entity_Hexagonal_Prism );
+      notSupportedElemTypes.push_back( SMESH::Entity_Polygon );
+      notSupportedElemTypes.push_back( SMESH::Entity_Polyhedra );
+    }
+    else if ( isGMF )
+    {
+      format = "GMF";
+      notSupportedElemTypes.push_back( SMESH::Entity_0D );
+      notSupportedElemTypes.push_back( SMESH::Entity_Polygon );
+      notSupportedElemTypes.push_back( SMESH::Entity_Quad_Polygon );
+      notSupportedElemTypes.push_back( SMESH::Entity_Quad_Pyramid );
+      notSupportedElemTypes.push_back( SMESH::Entity_Quad_Penta );
+      notSupportedElemTypes.push_back( SMESH::Entity_Hexagonal_Prism );
+      notSupportedElemTypes.push_back( SMESH::Entity_Polyhedra );
+      notSupportedElemTypes.push_back( SMESH::Entity_Quad_Polyhedra );
+      notSupportedElemTypes.push_back( SMESH::Entity_Ball );
+    }
+    if ( ! notSupportedElemTypes.empty() )
+    {
+      SMESH::long_array_var nbElems = aMeshOrGroup->GetMeshInfo();
+      for ( size_t iType = 0; iType < notSupportedElemTypes.size(); ++iType )
+        if ( nbElems[ notSupportedElemTypes[ iType ]] > 0 )
+          presentNotSupported.push_back( notSupportedElemTypes[ iType ]);
+    }
+    if ( !presentNotSupported.empty() )
+    {
+      QString typeNames;
+      const char* typeMsg[SMESH::Entity_Last] = {
+        "SMESH_NODES", "SMESH_ELEMS0D","SMESH_EDGES","SMESH_QUADRATIC_EDGES",
+        "SMESH_TRIANGLES", "SMESH_QUADRATIC_TRIANGLES", "SMESH_BIQUADRATIC_TRIANGLES",
+        "SMESH_QUADRANGLES","SMESH_QUADRATIC_QUADRANGLES", "SMESH_BIQUADRATIC_QUADRANGLES",
+        "SMESH_POLYGONS","SMESH_QUADRATIC_POLYGONS",
+        "SMESH_TETRAHEDRA","SMESH_QUADRATIC_TETRAHEDRONS","SMESH_PYRAMIDS",
+        "SMESH_QUADRATIC_PYRAMIDS","SMESH_HEXAHEDRA","SMESH_QUADRATIC_HEXAHEDRONS",
+        "SMESH_TRIQUADRATIC_HEXAHEDRONS","SMESH_PENTAHEDRA","SMESH_QUADRATIC_PENTAHEDRONS",
+        "SMESH_OCTAHEDRA","SMESH_POLYEDRONS","SMESH_QUADRATIC_POLYEDRONS","SMESH_BALLS"
+      };
+      QString andStr = " " + QObject::tr("SMESH_AND") + " ", comma(", ");
+      for ( size_t iType = 0; iType < presentNotSupported.size(); ++iType ) {
+        typeNames += QObject::tr( typeMsg[ presentNotSupported[ iType ]]);
+        if ( iType != presentNotSupported.size() - 1 )
+          typeNames += ( iType == presentNotSupported.size() - 2 ) ? andStr : comma;
+      }
+      int aRet = SUIT_MessageBox::warning
+        (SMESHGUI::desktop(),
+         QObject::tr("SMESH_WRN_WARNING"),
+         QObject::tr("EXPORT_NOT_SUPPORTED").arg(aMeshName).arg(format).arg(typeNames),
+         QObject::tr("SMESH_BUT_YES"),
+         QObject::tr("SMESH_BUT_NO"), 0, 1);
+      if (aRet != 0)
+        return;
+    }
 
-    if ( mySimulationActors != NULL ) {
+    // Get parameters of export operation
+
+    QString            aFilename;
+    SMESH::MED_VERSION aFormat;
+    // Init the parameters with the default values
+    bool aIsASCII_STL   = true;
+    bool toCreateGroups = false;
+    SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+    if ( resMgr )
+      toCreateGroups = resMgr->booleanValue( "SMESH", "auto_groups", false );
+    bool toOverwrite = true;
+
+    QString aFilter, aTitle = QObject::tr("SMESH_EXPORT_MESH");
+    QString anInitialPath = "";
+    if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+      anInitialPath = QDir::currentPath();
+
+    // Get a file name to write in and additional otions
+    if ( isUNV || isDAT || isGMF ) // Export w/o options
+    {
+      if ( isUNV )
+        aFilter = QObject::tr( "IDEAS_FILES_FILTER" ) + " (*.unv)";
+      else if ( isDAT )
+        aFilter = QObject::tr( "DAT_FILES_FILTER" ) + " (*.dat)";
+      else if ( isGMF )
+        aFilter = QObject::tr( "GMF_ASCII_FILES_FILTER" ) + " (*.mesh)" +
+          ";;" +  QObject::tr( "GMF_BINARY_FILES_FILTER" )  + " (*.meshb)";
+     if ( anInitialPath.isEmpty() ) anInitialPath = SUIT_FileDlg::getLastVisitedPath();
+      aFilename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(),
+                                            anInitialPath + QString("/") + aMeshName,
+                                            aFilter, aTitle, false);
+    }
+    // else if ( isGMF )// Export to GMF
+    // {
+      // SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg
+      //   ( SMESHGUI::desktop(), false, QObject::tr("SMESH_REQUIRED_GROUPS"), true, true );
+      // QStringList filters;
+      // filters << QObject::tr( "GMF_ASCII_FILES_FILTER" ) + " (*.mesh)"
+      //         << QObject::tr( "GMF_BINARY_FILES_FILTER" )  + " (*.meshb)";
+      // fd->setWindowTitle( aTitle );
+      // fd->setNameFilters( filters );
+
+      // if ( !aMeshOrGroup->_is_equivalent( aMesh ))
+      //   toCreateGroups = false;
+      // else
+      //   toCreateGroups = ( aMesh->NbGroups() > 0 );
+
+      // fd->SetChecked( true );
+      // if ( !anInitialPath.isEmpty() )
+      //   fd->setDirectory( anInitialPath );
+      // fd->selectFile(aMeshName);
+
+      // if ( fd->exec() )
+      //   aFilename = fd->selectedFile();
+      // toCreateGroups = fd->IsChecked();
+
+      // delete fd;
+    // }
+    else if ( isCGNS )// Export to CGNS
+    {
+      SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
+      fd->setWindowTitle( aTitle );
+      fd->setNameFilter( QObject::tr( "CGNS_FILES_FILTER" ) + " (*.cgns)" );
+      if ( !anInitialPath.isEmpty() )
+        fd->setDirectory( anInitialPath );
+      fd->selectFile(aMeshName);
+      SMESHGUI_FileValidator* fv = new SMESHGUI_FileValidator( fd );
+      fd->setValidator( fv );
+
+      if ( fd->exec() )
+        aFilename = fd->selectedFile();
+      toOverwrite = fv->isOverwrite();
+
+      delete fd;
+    }
+    else if ( isSTL ) // Export to STL
+    {
+      QMap<QString, int> aFilterMap;
+      aFilterMap.insert( QObject::tr( "STL_ASCII_FILES_FILTER" ) + " (*.stl)", 1 );
+      aFilterMap.insert( QObject::tr( "STL_BIN_FILES_FILTER" )   + " (*.stl)", 0 );
+
+      QStringList filters;
+      QMap<QString, int>::const_iterator it = aFilterMap.begin();
+      for ( ; it != aFilterMap.end(); ++it )
+        filters.push_back( it.key() );
+
+      SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
+      fd->setWindowTitle( aTitle );
+      fd->setNameFilters( filters );
+      fd->selectNameFilter( QObject::tr( "STL_ASCII_FILES_FILTER" ) + " (*.stl)" );
+      if ( !anInitialPath.isEmpty() )
+        fd->setDirectory( anInitialPath );
+      fd->selectFile(aMeshName);
+      bool is_ok = false;
+      while (!is_ok) {
+        if ( fd->exec() )
+          aFilename = fd->selectedFile();
+        aIsASCII_STL = (aFilterMap[fd->selectedNameFilter()]) == 1 ? true: false;
+        is_ok = true;
+      }
+      delete fd;
+    }
+    else if ( isMED || isSAUV ) // Export to MED or SAUV
+    {
+      QMap<QString, SMESH::MED_VERSION> aFilterMap;
+      //QString v21 (aMesh->GetVersionString(SMESH::MED_V2_1, 2));
+      if ( isMED ) {
+        QString v22 (aMesh->GetVersionString(SMESH::MED_V2_2, 2));
+        //aFilterMap.insert( QObject::tr( "MED_VX_FILES_FILTER" ).arg( v21 ) + " (*.med)", SMESH::MED_V2_1 );
+        aFilterMap.insert( QObject::tr( "MED_VX_FILES_FILTER" ).arg( v22 ) + " (*.med)", SMESH::MED_V2_2 );
+      }
+      else { // isSAUV
+        aFilterMap.insert("All files (*)", SMESH::MED_V2_1 );
+        aFilterMap.insert("SAUV files (*.sauv)", SMESH::MED_V2_2 );
+        aFilterMap.insert("SAUV files (*.sauve)", SMESH::MED_V2_1 );
+      }
 
-      mySimulationActors->InitTraversal();
-      vtkActor *ac = mySimulationActors->GetNextActor();
-      while(!(ac==NULL)) {
-       theRenderer->RemoveActor(ac);
-       ac = mySimulationActors->GetNextActor();
+      QStringList filters;
+      QString aDefaultFilter;
+      QMap<QString, SMESH::MED_VERSION>::const_iterator it = aFilterMap.begin();
+      for ( ; it != aFilterMap.end(); ++it ) {
+        filters.push_back( it.key() );
+        if (it.value() == SMESH::MED_V2_2)
+          aDefaultFilter = it.key();
       }
-      mySimulationActors->RemoveAllItems();
-    }
-    if ( mySimulationActors2D != NULL ) {
-      mySimulationActors2D->InitTraversal();
-      vtkActor2D *ac = mySimulationActors2D->GetNextActor2D();
-      while(!(ac==NULL)) {
-       theRenderer->RemoveActor2D(ac);
-       ac = mySimulationActors2D->GetNextActor2D();
+
+      SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg
+        ( SMESHGUI::desktop(), false, QObject::tr("SMESH_AUTO_GROUPS"), true, true );
+      fd->setWindowTitle( aTitle );
+      fd->setNameFilters( filters );
+      fd->selectNameFilter(aDefaultFilter);
+      fd->SetChecked(toCreateGroups);
+      if ( !anInitialPath.isEmpty() )
+        fd->setDirectory( anInitialPath );
+      fd->selectFile(aMeshName);
+
+      SMESHGUI_FileValidator* fv = new SMESHGUI_FileValidator( fd );
+      fd->setValidator( fv );
+
+      bool is_ok = false;
+      while (!is_ok) {
+        if ( fd->exec() )
+          aFilename = fd->selectedFile();
+        else {
+          aFilename = QString::null;
+          break;
+        }
+        aFormat = aFilterMap[fd->selectedNameFilter()];
+        toOverwrite = fv->isOverwrite();
+        is_ok = true;
+        if ( !aFilename.isEmpty() ) {
+          // med-2.1 does not support poly elements
+          if ( aFormat==SMESH::MED_V2_1 )
+            for( aMeshIter = aMeshList.begin(); aMeshIter != aMeshList.end(); aMeshIter++ ) {
+              SMESH::SMESH_IDSource_var aMeshItem = (*aMeshIter).first;
+              SMESH::long_array_var nbElems = aMeshItem->GetMeshInfo();
+              if ( nbElems[ SMESH::Entity_Polygon   ] + nbElems[ SMESH::Entity_Quad_Polygon   ] +
+                   nbElems[ SMESH::Entity_Polyhedra ] + nbElems[ SMESH::Entity_Quad_Polyhedra ])
+              {
+                int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                                    QObject::tr("SMESH_WRN_WARNING"),
+                                                    QObject::tr("SMESH_EXPORT_MED_V2_1").arg((*aMeshIter).second),
+                                                    QObject::tr("SMESH_BUT_YES"),
+                                                    QObject::tr("SMESH_BUT_NO"), 0, 1);
+                if (aRet != 0) {
+                  is_ok = false;
+                  break;
+                }
+              }
+            }
+          if( !toOverwrite ) {
+            // can't append to an existing using other format
+            SMESH::MED_VERSION aVersion = SMESH::MED_V2_1;
+            bool isVersionOk = SMESHGUI::GetSMESHGen()->GetMEDVersion( aFilename.toLatin1().constData(), aVersion );
+            if( !isVersionOk || aVersion != aFormat ) {
+              int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                                  QObject::tr("SMESH_WRN_WARNING"),
+                                                  QObject::tr("SMESH_EXPORT_MED_VERSION_COLLISION").arg(aFilename),
+                                                  QObject::tr("SMESH_BUT_YES"),
+                                                  QObject::tr("SMESH_BUT_NO"), 0, 1);
+              if (aRet == 0)
+                toOverwrite = true;
+              else
+                is_ok = false;
+            }
+
+            QStringList aMeshNamesCollisionList;
+            SMESH::string_array_var aMeshNames = SMESHGUI::GetSMESHGen()->GetMeshNames( aFilename.toLatin1().constData() );
+            for( int i = 0, n = aMeshNames->length(); i < n; i++ ) {
+              QString anExistingMeshName( aMeshNames[ i ] );
+              for( aMeshIter = aMeshList.begin(); aMeshIter != aMeshList.end(); aMeshIter++ ) {
+                QString anExportMeshName = (*aMeshIter).second;
+                if( anExportMeshName == anExistingMeshName ) {
+                  aMeshNamesCollisionList.append( anExportMeshName );
+                  break;
+                }
+              }
+            }
+            if( !aMeshNamesCollisionList.isEmpty() ) {
+              QString aMeshNamesCollisionString = aMeshNamesCollisionList.join( ", " );
+              int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                                  QObject::tr("SMESH_WRN_WARNING"),
+                                                  QObject::tr("SMESH_EXPORT_MED_MESH_NAMES_COLLISION").arg(aMeshNamesCollisionString),
+                                                  QObject::tr("SMESH_BUT_YES"),
+                                                  QObject::tr("SMESH_BUT_NO"),
+                                                  QObject::tr("SMESH_BUT_CANCEL"), 0, 2);
+              if (aRet == 0)
+                toOverwrite = true;
+              else if (aRet == 2)
+                is_ok = false;
+            }
+          }
+        }
       }
-      mySimulationActors2D->RemoveAllItems();
+      toCreateGroups = fd->IsChecked();
+      delete fd;
+    }
+    else
+    {
+      return;
     }
-    renWin->Render();
-  }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH::SMESH_Mesh_ptr SMESHGUI::InitMesh( GEOM::GEOM_Shape_ptr aShape, QString NameMesh )
-{
-  try {
-    if ( !myComponentMesh->_is_nil() && !aShape->_is_nil() ) {
-      SMESH::SMESH_Mesh_var aMesh = myComponentMesh->Init( myComponentGeom, myStudyId, aShape);
 
-      if ( !aMesh->_is_nil() ) {
-       SALOMEDS::SObject_var SM = myStudyAPI.AddNewMesh ( aMesh );
-       myStudyAPI.SetName( SM, NameMesh );
-         
-       // GEOM::GEOM_Shape has non-empty StudyShapeId only after AddInStudy operation,
-       // not after loading from file, so let's use more reliable way to retrieve SObject
-       Standard_CString ShapeIOR = _orb->object_to_string(aShape);
-       SALOMEDS::SObject_var SObject = myStudy->FindObjectIOR(ShapeIOR);
-       if ( !SObject->_is_nil() && !SM->_is_nil() ) {
-         myStudyAPI.SetShape( SM, SObject );
-       }
-       return SMESH::SMESH_Mesh::_narrow(aMesh);
+    // Perform export
+
+    if ( !aFilename.isEmpty() ) {
+      // Check whether the file already exists and delete it if yes
+      QFile aFile( aFilename );
+      if ( aFile.exists() && toOverwrite )
+        aFile.remove();
+      SUIT_OverrideCursor wc;
+
+      try {
+        // Renumbering is not needed since SMDS redesign in V6.2.0 (Nov 2010)
+//         bool Renumber = false;
+//         // PAL 14172  : Check of we have to renumber or not from the preferences before export
+//         if (resMgr)
+//           Renumber= resMgr->booleanValue("renumbering");
+//         if (Renumber){
+//           SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
+//           aMeshEditor->RenumberNodes();
+//           aMeshEditor->RenumberElements();
+//           if ( SMESHGUI::automaticUpdate() )
+//             SMESH::UpdateView();
+//         }
+        if ( isMED )
+        {
+          aMeshIter = aMeshList.begin();
+          for( int aMeshIndex = 0; aMeshIter != aMeshList.end(); aMeshIter++, aMeshIndex++ )
+          {
+            SMESH::SMESH_IDSource_var aMeshOrGroup = (*aMeshIter).first;
+            SMESH::SMESH_Mesh_var        aMeshItem = aMeshOrGroup->GetMesh();
+            if ( aMeshOrGroup->_is_equivalent( aMeshItem ))
+              aMeshItem->ExportToMEDX( aFilename.toLatin1().data(), toCreateGroups,
+                                       aFormat, toOverwrite && aMeshIndex == 0 );
+            else
+              aMeshItem->ExportPartToMED( aMeshOrGroup, aFilename.toLatin1().data(), toCreateGroups,
+                                          aFormat, toOverwrite && aMeshIndex == 0 );
+          }
+        }
+        else if ( isSAUV )
+        {
+          for( aMeshIter = aMeshList.begin(); aMeshIter != aMeshList.end(); aMeshIter++ )
+          {
+            SMESH::SMESH_Mesh_var aMeshItem = SMESH::SMESH_Mesh::_narrow( (*aMeshIter).first );
+            if( !aMeshItem->_is_nil() )
+              aMeshItem->ExportSAUV( aFilename.toLatin1().data(), toCreateGroups );
+          }
+        }
+        else if ( isDAT )
+        {
+          if ( aMeshOrGroup->_is_equivalent( aMesh ))
+            aMesh->ExportDAT( aFilename.toLatin1().data() );
+          else
+            aMesh->ExportPartToDAT( aMeshOrGroup, aFilename.toLatin1().data() );
+        }
+        else if ( isUNV )
+        {
+          if ( aMeshOrGroup->_is_equivalent( aMesh ))
+            aMesh->ExportUNV( aFilename.toLatin1().data() );
+          else
+            aMesh->ExportPartToUNV( aMeshOrGroup, aFilename.toLatin1().data() );
+        }
+        else if ( isSTL )
+        {
+          if ( aMeshOrGroup->_is_equivalent( aMesh ))
+            aMesh->ExportSTL( aFilename.toLatin1().data(), aIsASCII_STL );
+          else
+            aMesh->ExportPartToSTL( aMeshOrGroup, aFilename.toLatin1().data(), aIsASCII_STL );
+        }
+        else if ( isCGNS )
+        {
+          aMeshIter = aMeshList.begin();
+          for( int aMeshIndex = 0; aMeshIter != aMeshList.end(); aMeshIter++, aMeshIndex++ )
+          {
+            SMESH::SMESH_IDSource_var aMeshOrGroup = (*aMeshIter).first;
+            SMESH::SMESH_Mesh_var        aMeshItem = aMeshOrGroup->GetMesh();
+            aMeshItem->ExportCGNS( aMeshOrGroup,
+                                   aFilename.toLatin1().data(),
+                                   toOverwrite && aMeshIndex == 0 );
+          }
+        }
+        else if ( isGMF )
+        {
+          toCreateGroups = true;
+          aMesh->ExportGMF( aMeshOrGroup, aFilename.toLatin1().data(), toCreateGroups );
+        }
+      }
+      catch (const SALOME::SALOME_Exception& S_ex){
+        wc.suspend();
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 QObject::tr("SMESH_WRN_WARNING"),
+                                 QObject::tr("SMESH_EXPORT_FAILED"));
+        wc.resume();
       }
     }
   }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
+
+  inline void InverseEntityMode(unsigned int& theOutputMode,
+                                unsigned int theMode)
+  {
+    bool anIsNotPresent = ~theOutputMode & theMode;
+    if(anIsNotPresent)
+      theOutputMode |= theMode;
+    else
+      theOutputMode &= ~theMode;
   }
-  myActiveStudy->updateObjBrowser(true);
-  return SMESH::SMESH_Mesh::_nil();
-}
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH::SMESH_subMesh_ptr SMESHGUI::AddSubMesh( SMESH::SMESH_Mesh_ptr aMesh, GEOM::GEOM_Shape_ptr aShape, QString NameMesh )
-{
-  try {
-    SMESH::SMESH_subMesh_var aSubMesh = aMesh->GetElementsOnShape(aShape);
-    SALOMEDS::SObject_var SO_Mesh = myStudyAPI.FindMesh(aMesh);
-    Standard_CString ShapeIOR = _orb->object_to_string(aShape);
-    SALOMEDS::SObject_var SO_GeomShape = myStudy->FindObjectIOR(ShapeIOR);
-    
-    if ( !SO_GeomShape->_is_nil() && !SO_Mesh->_is_nil() && !aSubMesh->_is_nil() && !aMesh->_is_nil() ) {
-      SALOMEDS::SObject_var SO = myStudyAPI.AddSubMeshOnShape(SO_Mesh, SO_GeomShape, aSubMesh, aShape->ShapeType() );
-      myStudyAPI.SetName(SO, NameMesh);
-    
-      SMESH_Actor* amesh = SMESH_Actor::New();
-      Handle(SALOME_InteractiveObject) IO = new SALOME_InteractiveObject(SO->GetID(),
-                                                                        "MESH",
-                                                                        strdup(NameMesh));
-      amesh->setIO( IO );
-      amesh->setName( strdup(NameMesh) );
-      DisplayActor(amesh, false);
-      return SMESH::SMESH_subMesh::_narrow( aSubMesh );
+  void SetDisplayEntity(int theCommandID){
+    LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+    SALOME_ListIO selected;
+    if( aSel )
+      aSel->selectedObjects( selected );
+
+    if(selected.Extent() >= 1){
+      SALOME_ListIteratorOfListIO It( selected );
+      for( ; It.More(); It.Next()){
+        Handle(SALOME_InteractiveObject) IObject = It.Value();
+        if(IObject->hasEntry()){
+          if(SMESH_Actor *anActor = SMESH::FindActorByEntry(IObject->getEntry())){
+            unsigned int aMode = anActor->GetEntityMode();
+            switch(theCommandID){
+            case 222:
+              InverseEntityMode(aMode,SMESH_Actor::eBallElem);
+              break;
+            case 216:
+              InverseEntityMode(aMode,SMESH_Actor::e0DElements);
+              break;
+            case 217:
+              InverseEntityMode(aMode,SMESH_Actor::eEdges);
+              break;
+            case 218:
+              InverseEntityMode(aMode,SMESH_Actor::eFaces);
+              break;
+            case 219:
+              InverseEntityMode(aMode,SMESH_Actor::eVolumes);
+              break;
+            case 220:
+              aMode = SMESH_Actor::eAllEntity;
+              break;
+            }
+            if(aMode)
+              anActor->SetEntityMode(aMode);
+          }
+        }
+      }
     }
   }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  }
-  myActiveStudy->updateObjBrowser(true);
-  return SMESH::SMESH_subMesh::_nil();
-}
 
+  void AutoColor(){
+    SALOME_ListIO selected;
+    SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+    if( !app )
+      return;
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH::SMESH_Hypothesis_ptr SMESHGUI::CreateHypothesis( QString TypeHypothesis, 
-                                                       QString NameHypothesis )
-{
-  SMESH::SMESH_Hypothesis_var Hyp;
-  try {
-    Hyp = myComponentMesh->CreateHypothesis( TypeHypothesis, myStudyId );
-    if ( !Hyp->_is_nil() ) {
-      SALOMEDS::SObject_var SHyp = myStudyAPI.AddNewHypothesis( Hyp );
-      myStudyAPI.SetName( SHyp, NameHypothesis);
-    }
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  }
+    LightApp_SelectionMgr* aSel = app->selectionMgr();
+    SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
+    if( !aSel || !appStudy )
+      return;
 
-  return SMESH::SMESH_Hypothesis::_narrow( Hyp );
-}
+    aSel->selectedObjects( selected );
+    if( selected.IsEmpty() )
+      return;
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddHypothesisOnMesh( SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hypothesis_ptr aHyp )
-{
-  if ( !aMesh->_is_nil() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    SALOMEDS::SObject_var SM = myStudyAPI.FindMesh( aMesh );
-    GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SM );
-    try {
-      bool res = aMesh->AddHypothesis( aShape, aHyp );
-      if (res) {
-       SALOMEDS::SObject_var SH = myStudyAPI.FindHypothesisOrAlgorithms( aHyp );
-       if ( !SM->_is_nil() && !SH->_is_nil() ) {
-         myStudyAPI.SetHypothesis( SM, SH );
-         myStudyAPI.ModifiedMesh( SM, false );
-       }
-       QApplication::restoreOverrideCursor();
-      } else {
-       QApplication::restoreOverrideCursor();
-       QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                               tr ("SMESH_WRN_HYPOTHESIS_ALREADYEXIST"), tr ("SMESH_BUT_YES") );
+    Handle(SALOME_InteractiveObject) anIObject = selected.First();
+
+    _PTR(Study) aStudy = appStudy->studyDS();
+    _PTR(SObject) aMainSObject( aStudy->FindObjectID( anIObject->getEntry() ) );
+    SMESH::SMESH_Mesh_var aMainObject = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIObject);
+    if( aMainObject->_is_nil() )
+      return;
+
+    aMainObject->SetAutoColor( true ); // mesh groups are re-colored here
+
+    SMESH::ListOfGroups aListOfGroups = *aMainObject->GetGroups();
+    for( int i = 0, n = aListOfGroups.length(); i < n; i++ )
+    {
+      SMESH::SMESH_GroupBase_var aGroupObject = aListOfGroups[i];
+      SALOMEDS::Color aColor = aGroupObject->GetColor();
+      _PTR(SObject) aGroupSObject = SMESH::FindSObject(aGroupObject);
+      if (aGroupSObject) {
+        QColor c;
+        int delta;
+        if(SMESH_Actor *anActor = SMESH::FindActorByEntry(aGroupSObject->GetID().c_str())) {
+          switch ( aGroupObject->GetType ()) {
+          case SMESH::NODE:
+            anActor->SetNodeColor( aColor.R, aColor.G, aColor.B ); break;
+          case SMESH::EDGE:
+            anActor->SetEdgeColor( aColor.R, aColor.G, aColor.B ); break;
+          case SMESH::ELEM0D:
+            anActor->Set0DColor( aColor.R, aColor.G, aColor.B ); break;
+          case SMESH::BALL:
+            anActor->SetBallColor( aColor.R, aColor.G, aColor.B ); break;
+          case SMESH::VOLUME:
+            SMESH::GetColor("SMESH", "volume_color", c, delta, "255,0,170|-100");
+            anActor->SetVolumeColor( aColor.R, aColor.G, aColor.B, delta ); break;
+          case SMESH::FACE:
+          default:
+            SMESH::GetColor("SMESH", "fill_color", c, delta, "0,170,255|-100");
+            anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B, delta );
+          }
+        }
       }
     }
-    catch  (const SALOME::SALOME_Exception& S_ex) {
-      QtCatchCorbaException(S_ex);
+
+    SMESH::RepaintCurrentView();
+  }
+
+  QString functorToString( SMESH::Controls::FunctorPtr f )
+  {
+    QString type = QObject::tr( "UNKNOWN_CONTROL" );
+    if ( dynamic_cast< SMESH::Controls::Volume* >( f.get() ) )
+      type = QObject::tr( "VOLUME_3D_ELEMENTS" );
+    else if ( dynamic_cast< SMESH::Controls::MaxElementLength2D* >( f.get() ) )
+      type = QObject::tr( "MAX_ELEMENT_LENGTH_2D" );
+    else if ( dynamic_cast< SMESH::Controls::MaxElementLength3D* >( f.get() ) )
+      type = QObject::tr( "MAX_ELEMENT_LENGTH_3D" );
+    else if ( dynamic_cast< SMESH::Controls::MinimumAngle* >( f.get() ) )
+      type = QObject::tr( "MINIMUMANGLE_ELEMENTS" );
+    else if ( dynamic_cast< SMESH::Controls::AspectRatio* >( f.get() ) )
+      type = QObject::tr( "ASPECTRATIO_ELEMENTS" );
+    else if ( dynamic_cast< SMESH::Controls::AspectRatio3D* >( f.get() ) )
+      type = QObject::tr( "ASPECTRATIO_3D_ELEMENTS" );
+    else if ( dynamic_cast< SMESH::Controls::Warping* >( f.get() ) )
+      type = QObject::tr( "WARP_ELEMENTS" );
+    else if ( dynamic_cast< SMESH::Controls::Taper* >( f.get() ) )
+      type = QObject::tr( "TAPER_ELEMENTS" );
+    else if ( dynamic_cast< SMESH::Controls::Skew* >( f.get() ) )
+      type = QObject::tr( "SKEW_ELEMENTS" );
+    else if ( dynamic_cast< SMESH::Controls::Area* >( f.get() ) )
+      type = QObject::tr( "AREA_ELEMENTS" );
+    else if ( dynamic_cast< SMESH::Controls::Length* >( f.get() ) )
+      type = QObject::tr( "LENGTH_EDGES" );
+    else if ( dynamic_cast< SMESH::Controls::Length2D* >( f.get() ) )
+      type = QObject::tr( "LENGTH2D_EDGES" );
+    else if ( dynamic_cast< SMESH::Controls::MultiConnection* >( f.get() ) )
+      type = QObject::tr( "MULTI_BORDERS" );
+    else if ( dynamic_cast< SMESH::Controls::MultiConnection2D* >( f.get() ) )
+      type = QObject::tr( "MULTI2D_BORDERS" );
+    else if ( dynamic_cast< SMESH::Controls::FreeNodes* >( f.get() ) )
+      type = QObject::tr( "FREE_NODES" );
+    else if ( dynamic_cast< SMESH::Controls::FreeEdges* >( f.get() ) )
+      type = QObject::tr( "FREE_EDGES" );
+    else if ( dynamic_cast< SMESH::Controls::FreeBorders* >( f.get() ) )
+      type = QObject::tr( "FREE_BORDERS" );
+    else if ( dynamic_cast< SMESH::Controls::FreeFaces* >( f.get() ) )
+      type = QObject::tr( "FREE_FACES" );
+    else if ( dynamic_cast< SMESH::Controls::BareBorderVolume* >( f.get() ) )
+      type = QObject::tr( "BARE_BORDER_VOLUME" );
+    else if ( dynamic_cast< SMESH::Controls::BareBorderFace* >( f.get() ) )
+      type = QObject::tr( "BARE_BORDER_FACE" );
+    else if ( dynamic_cast< SMESH::Controls::OverConstrainedVolume* >( f.get() ) )
+      type = QObject::tr( "OVER_CONSTRAINED_VOLUME" );
+    else if ( dynamic_cast< SMESH::Controls::OverConstrainedFace* >( f.get() ) )
+      type = QObject::tr( "OVER_CONSTRAINED_FACE" );
+    else if ( dynamic_cast< SMESH::Controls::CoincidentNodes* >( f.get() ) )
+      type = QObject::tr( "EQUAL_NODE" );
+    else if ( dynamic_cast< SMESH::Controls::CoincidentElements1D* >( f.get() ) )
+      type = QObject::tr( "EQUAL_EDGE" );
+    else if ( dynamic_cast< SMESH::Controls::CoincidentElements2D* >( f.get() ) )
+      type = QObject::tr( "EQUAL_FACE" );
+    else if ( dynamic_cast< SMESH::Controls::CoincidentElements3D* >( f.get() ) )
+      type = QObject::tr( "EQUAL_VOLUME" );
+    return type;
+  }
+
+  void SaveDistribution()
+  {
+    LightApp_SelectionMgr* aSel = SMESHGUI::selectionMgr();
+    SALOME_ListIO selected;
+    if ( aSel )
+      aSel->selectedObjects( selected );
+
+    if ( selected.Extent() == 1 ) {
+      Handle(SALOME_InteractiveObject) anIO = selected.First();
+      if ( anIO->hasEntry() ) {
+        SMESH_Actor* anActor = SMESH::FindActorByEntry( anIO->getEntry() );
+        if ( anActor && anActor->GetScalarBarActor() && anActor->GetControlMode() != SMESH_Actor::eNone ) {
+          SMESH_ScalarBarActor* aScalarBarActor = anActor->GetScalarBarActor();
+          SMESH::Controls::FunctorPtr aFunctor = anActor->GetFunctor();
+          if ( aScalarBarActor && aFunctor ) {
+            SMESH::Controls::NumericalFunctor* aNumFun = dynamic_cast<SMESH::Controls::NumericalFunctor*>( aFunctor.get() );
+            if ( aNumFun ) {
+              std::vector<int> elements;
+              SMESH::SMESH_Mesh_var mesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIO);
+              if ( mesh->_is_nil() ) {
+                SMESH::SMESH_IDSource_var idSource =
+                  SMESH::IObjectToInterface<SMESH::SMESH_IDSource>(anIO);
+                if ( !idSource->_is_nil() )
+                {
+                  SMESH::long_array_var ids = idSource->GetIDs();
+                  elements.resize( ids->length() );
+                  for ( unsigned i = 0; i < elements.size(); ++i )
+                    elements[i] = ids[i];
+                }
+              }
+              int nbIntervals = aScalarBarActor->GetMaximumNumberOfColors();
+              vtkLookupTable* lookupTable =
+                static_cast<vtkLookupTable*>(aScalarBarActor->GetLookupTable());
+              double * minmax = lookupTable->GetRange();
+              bool isLogarithmic = lookupTable->GetScale() == VTK_SCALE_LOG10;
+              std::vector<int>    nbEvents;
+              std::vector<double> funValues;
+              aNumFun->GetHistogram( nbIntervals, nbEvents, funValues, elements, minmax, isLogarithmic );
+              QString anInitialPath = "";
+              if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+                anInitialPath = QDir::currentPath();
+              QString aMeshName = anIO->getName();
+              QStringList filter;
+              filter.append( QObject::tr( "TEXT_FILES_FILTER" ) + " (*.txt)" );
+              filter.append( QObject::tr( "ALL_FILES_FILTER" ) + " (*)" );
+              QString aFilename = anInitialPath + "/" + aMeshName + "_" + 
+                functorToString( aFunctor ).toLower().simplified().replace( QRegExp( " |-" ), "_" ) + ".txt";
+              aFilename = SUIT_FileDlg::getFileName( SMESHGUI::desktop(),
+                                                     aFilename,
+                                                     filter,
+                                                     QObject::tr( "SMESH_SAVE_DISTRIBUTION" ),
+                                                     false );
+              if ( !aFilename.isEmpty() ) {
+                QFile f( aFilename );
+                if ( f.open( QFile::WriteOnly | QFile::Truncate ) ) {
+                  QTextStream out( &f );
+                  out << "# Mesh: " << aMeshName << endl;
+                  out << "# Control: " << functorToString( aFunctor ) << endl;
+                  out << "#" << endl;
+                  out.setFieldWidth( 10 );
+                  for ( int i = 0; i < qMin( nbEvents.size(), funValues.size()-1 ); i++ )
+                    out << funValues[i] << "\t" << funValues[i+1] << "\t" << nbEvents[i] << endl;
+                  f.close();
+                }
+              }
+            }
+          }
+        }
+      }
     }
   }
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
-}
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh( const Handle(SALOME_InteractiveObject)& IObject )
-{
-  if ( IObject->hasReference() ) {
-    SMESH::SMESH_Hypothesis_var anHyp;
-    SALOMEDS::SObject_var SO_Hypothesis = smeshGUI->myStudy->FindObjectID(IObject->getEntry() );
-    SALOMEDS::GenericAttribute_var anAttr;
-    SALOMEDS::AttributeIOR_var     anIOR;
-
-    if ( !SO_Hypothesis->_is_nil() ) {
-      QApplication::setOverrideCursor( Qt::waitCursor );
-      if (SO_Hypothesis->FindAttribute(anAttr, "AttributeIOR")) {
-        anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-       anHyp = SMESH::SMESH_Hypothesis::_narrow( _orb->string_to_object(anIOR->Value()) );
+  void ShowDistribution() {
+    LightApp_SelectionMgr* aSel = SMESHGUI::selectionMgr();
+    SALOME_ListIO selected;
+    if ( aSel )
+      aSel->selectedObjects( selected );
+    
+    if ( selected.Extent() == 1 ) {
+      Handle(SALOME_InteractiveObject) anIO = selected.First();
+      if ( anIO->hasEntry() ) {
+        SMESH_Actor* anActor = SMESH::FindActorByEntry( anIO->getEntry() );
+        if ( anActor && anActor->GetScalarBarActor() && anActor->GetControlMode() != SMESH_Actor::eNone ) {
+          SMESH_ScalarBarActor *aScalarBarActor = anActor->GetScalarBarActor();
+          aScalarBarActor->SetDistributionVisibility(!aScalarBarActor->GetDistributionVisibility());
+        }
       }
+    }
+  }
 
-      SALOMEDS::SObject_var SO_Applied_Hypothesis = smeshGUI->myStudy->FindObjectID(IObject->getReference());
-      if ( !SO_Applied_Hypothesis->_is_nil() ) {
-       SALOMEDS::SObject_var MorSM = smeshGUI->myStudyAPI.GetMeshOrSubmesh( SO_Applied_Hypothesis );
-       if ( !MorSM->_is_nil() ) {
-         smeshGUI->myStudyAPI.ModifiedMesh( MorSM, false );
-
-         GEOM::GEOM_Shape_var aShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh( MorSM );
-         if ( !aShape->_is_nil() ) {
-           if (MorSM->FindAttribute(anAttr, "AttributeIOR")) {
-              anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-             SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-             SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-             if ( !aMesh->_is_nil() ) {
-               bool res = aMesh->RemoveHypothesis( aShape, anHyp );
-               if ( !res ) {
-                 QApplication::restoreOverrideCursor();
-                 QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                         tr ("SMESH_WRN_HYPOTHESIS_NOTEXIST"), tr ("SMESH_BUT_YES") );
-               }
-             } else if ( !aSubMesh->_is_nil() ) {
-               aMesh = aSubMesh->GetFather();
-               if ( !aMesh->_is_nil() ) {
-                 bool res = aMesh->RemoveHypothesis( aShape, anHyp );
-                 if ( !res ) {
-                   QApplication::restoreOverrideCursor();
-                   QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                           tr ("SMESH_WRN_HYPOTHESIS_NOTEXIST"), tr ("SMESH_BUT_YES") );
-                 }
-               }
-             }
-             if ( myAutomaticUpdate ) {
-               SMESH_Actor* Mesh = smeshGUI->ReadScript(aMesh);
-               if ( Mesh != NULL ) {
-#ifdef TRACE
-                 Dump( Mesh );
-#endif
-                 DisplayActor( Mesh );
-                 DisplayEdges( Mesh ); 
-                 smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-               }
-             }
-           }
-         }
-       }
-       smeshGUI->myStudyAPI.UnSetHypothesis( SO_Applied_Hypothesis );
+#ifndef DISABLE_PLOT2DVIEWER
+ void PlotDistribution() {
+   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+   if( !app )
+     return;
+
+   LightApp_SelectionMgr* aSel = SMESHGUI::selectionMgr();
+   SALOME_ListIO selected;
+   if ( aSel )
+     aSel->selectedObjects( selected );
+    
+   if ( selected.Extent() == 1 ) {
+     Handle(SALOME_InteractiveObject) anIO = selected.First();
+     if ( anIO->hasEntry() ) {
+       //Find Actor by entry before getting Plot2d viewer,
+       //because after call getViewManager( Plot2d_Viewer::Type(), true ) active window is Plot2d Viewer
+       SMESH_Actor* anActor = SMESH::FindActorByEntry( anIO->getEntry() );
+
+       SUIT_ViewManager* aViewManager = app->getViewManager( Plot2d_Viewer::Type(), true ); // create if necessary
+
+       if( !aViewManager )
+         return;
+       
+       SPlot2d_Viewer* aView = dynamic_cast<SPlot2d_Viewer*>(aViewManager->getViewModel());
+       if ( !aView )
+         return;
+
+       Plot2d_ViewFrame* aPlot = aView->getActiveViewFrame();
+       if ( !aPlot )
+         return;
+
+       if ( anActor && anActor->GetControlMode() != SMESH_Actor::eNone ) {
+         SPlot2d_Histogram* aHistogram = anActor->UpdatePlot2Histogram();
+         QString functorName = functorToString( anActor->GetFunctor());
+         QString aHistogramName("%1 : %2");
+         aHistogramName = aHistogramName.arg(anIO->getName()).arg(functorName);
+         aHistogram->setName(aHistogramName);
+         aHistogram->setHorTitle(functorName);
+         aHistogram->setVerTitle(QObject::tr("DISTRIBUTION_NB_ENT"));
+         aPlot->displayObject(aHistogram, true);
+       }
+     }
+   }
+ }
+#endif //DISABLE_PLOT2DVIEWER
+
+  void DisableAutoColor(){
+    LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+    SALOME_ListIO selected;
+    if( aSel )
+      aSel->selectedObjects( selected );
+
+    if(selected.Extent()){
+      Handle(SALOME_InteractiveObject) anIObject = selected.First();
+      SMESH::SMESH_Mesh_var aMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIObject);
+      if ( !aMesh->_is_nil() ) {
+        aMesh->SetAutoColor( false );
       }
-    }    
-  } else if ( IObject->hasEntry() ) {
-    MESSAGE ( "IObject entry " << IObject->getEntry() )    
+    }
   }
-  QApplication::restoreOverrideCursor();
-}
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh( SALOMEDS::SObject_ptr MorSM, SMESH::SMESH_Hypothesis_ptr anHyp )
-{
-  SALOMEDS::SObject_var             AHR, aRef;
-  SALOMEDS::GenericAttribute_var    anAttr;
-  SALOMEDS::AttributeIOR_var        anIOR;
-
-  if ( !MorSM->_is_nil() ) {
-    GEOM::GEOM_Shape_var aShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh( MorSM );
-    if ( !aShape->_is_nil() ) {
-      if (MorSM->FindAttribute(anAttr, "AttributeIOR")) {
-       anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-       SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-       SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-       if ( !aMesh->_is_nil() ) {
-         bool res = aMesh->RemoveHypothesis( aShape, anHyp );
-         if ( !res ) {
-           QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                   tr ("SMESH_WRN_HYPOTHESIS_NOTEXIST"), tr ("SMESH_BUT_YES") );
-         }
-       } else if ( !aSubMesh->_is_nil() ) {
-         aMesh = aSubMesh->GetFather();
-         if ( !aMesh->_is_nil() ) {
-           bool res = aMesh->RemoveHypothesis( aShape, anHyp );
-           if ( !res ) {
-             QApplication::restoreOverrideCursor();
-             QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                     tr ("SMESH_WRN_HYPOTHESIS_NOTEXIST"), tr ("SMESH_BUT_YES") );
-           }
-         }
-       }
-       if ( myAutomaticUpdate ) {
-         SMESH_Actor* Mesh = smeshGUI->ReadScript(aMesh);
-         if ( Mesh != NULL ) {
-#ifdef TRACE
-           Dump( Mesh );
-#endif
-           DisplayActor( Mesh );
-           DisplayEdges( Mesh ); 
-           // smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-         }
-       }
+  void SetDisplayMode(int theCommandID, SMESHGUI_StudyId2MarkerMap& theMarkerMap)
+  {
+    SALOME_ListIO selected;
+    SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+    if( !app )
+      return;
+
+    LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+    SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
+    if( !aSel || !appStudy )
+      return;
+
+    if( theCommandID == 1134 ) { // Clipping dialog can be activated without selection
+      if( SMESHGUI* aModule = SMESHGUI::GetSMESHGUI() ) {
+        aModule->EmitSignalDeactivateDialog();
+        if( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( aModule ) )
+          (new SMESHGUI_ClippingDlg( aModule, aViewWindow ))->show();
       }
+      return;
     }
 
-    if ( MorSM->FindSubObject (2, AHR)) {
-      SALOMEDS::ChildIterator_var it = myStudy->NewChildIterator(AHR);
-      for (; it->More();it->Next()) {
-       SALOMEDS::SObject_var Obj = it->Value();
-       if ( Obj->ReferencedObject(aRef) ) {
-         if (aRef->FindAttribute(anAttr, "AttributeIOR")) {
-           anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-           if ( strcmp( anIOR->Value(), _orb->object_to_string(anHyp) ) == 0 ) {
-             smeshGUI->myStudyAPI.UnSetHypothesis( Obj );
-             break;
-           }
-         }
-       }
+    _PTR(Study) aStudy = appStudy->studyDS();
+
+    aSel->selectedObjects( selected );
+
+    if(selected.Extent() >= 1){
+      switch(theCommandID){
+      case 1133:{
+        SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog();
+        (new SMESHGUI_TransparencyDlg( SMESHGUI::GetSMESHGUI() ))->show();
+        return;
       }
+      case 1132: {
+        double color[3];
+        QColor faceColor, edgeColor, nodeColor, elem0dColor, ballColor;
+        QColor orientationColor, outlineColor, volumeColor;
+        int deltaF = 0, deltaV = 0;
+        int elem0dSize   = 1;
+        int ballSize     = 1;
+        int edgeWidth    = 1;
+        int outlineWidth = 1;
+        double shrinkCoef = 0.0;
+        double orientationScale = 0.0;
+        bool orientation3d = false;
+        VTK::MarkerType markerType = VTK::MT_NONE;
+        VTK::MarkerScale markerScale = VTK::MS_NONE;
+        int markerId = 0;
+        bool hasNodes = false;
+        int presentEntities = 0;
+        bool firstTime  = true;
+
+        SALOME_ListIteratorOfListIO It( selected );
+        for ( ; It.More(); It.Next() ) {
+          Handle(SALOME_InteractiveObject) IObject = It.Value();
+          if ( !IObject->hasEntry() ) continue;
+          SMESH_Actor* anActor = SMESH::FindActorByEntry( IObject->getEntry() );
+          if ( !anActor || !anActor->GetObject() ) continue;
+
+          if ( firstTime ) {
+            // nodes: color, marker
+            anActor->GetNodeColor( color[0], color[1], color[2] );
+            nodeColor.setRgbF( color[0], color[1], color[2] );
+            markerType  = anActor->GetMarkerType();
+            markerScale = anActor->GetMarkerScale();
+            markerId    = anActor->GetMarkerTexture();
+            // edges: color, width
+            anActor->GetEdgeColor( color[0], color[1], color[2] );
+            edgeColor.setRgbF( color[0], color[1], color[2] );
+            edgeWidth = qMax( (int)anActor->GetLineWidth(), 1 ); // minimum allowed width is 1
+            // faces: front color, back color (delta)
+            anActor->GetSufaceColor( color[0], color[1], color[2], deltaF );
+            faceColor.setRgbF( color[0], color[1], color[2] );
+            // faces: front color, back color (delta)
+            anActor->GetVolumeColor( color[0], color[1], color[2], deltaV );
+            volumeColor.setRgbF( color[0], color[1], color[2] );
+            // 0d elements: color, size
+            anActor->Get0DColor( color[0], color[1], color[2] );
+            elem0dColor.setRgbF( color[0], color[1], color[2] );
+            elem0dSize = qMax( (int)anActor->Get0DSize(), 1 ); // minimum allowed size is 1
+            // balls: color, size
+            anActor->GetBallColor( color[0], color[1], color[2] );
+            ballColor.setRgbF( color[0], color[1], color[2] );
+            ballSize = qMax( (int)anActor->GetBallSize(), 1 ); // minimum allowed size is 1
+            // outlines: color
+            anActor->GetOutlineColor( color[0], color[1], color[2] );
+            outlineColor.setRgbF( color[0], color[1], color[2] );
+            outlineWidth = qMax( (int)anActor->GetOutlineWidth(), 1 ); // minimum allowed width is 1
+            // orientation vectors: color, scale, 3d flag
+            anActor->GetFacesOrientationColor( color[0], color[1], color[2] );
+            orientationColor.setRgbF( color[0], color[1], color[2] );
+            orientationScale = anActor->GetFacesOrientationScale();
+            orientation3d = anActor->GetFacesOrientation3DVectors();
+            // shrink factor
+            shrinkCoef = anActor->GetShrinkFactor();
+          }
+
+          firstTime = false; // we only take properties from first object (for performance reasons)
+
+          if ( !hasNodes )
+            hasNodes = anActor->GetObject()->GetNbEntities( SMDSAbs_Node );
+          if ( !(presentEntities & SMESH_Actor::eEdges) && anActor->GetObject()->GetNbEntities( SMDSAbs_Edge ) )
+            presentEntities = presentEntities | SMESH_Actor::eEdges;
+          if ( !(presentEntities & SMESH_Actor::eFaces) && anActor->GetObject()->GetNbEntities( SMDSAbs_Face ) )
+            presentEntities = presentEntities | SMESH_Actor::eFaces;
+          if ( !(presentEntities & SMESH_Actor::eVolumes) && anActor->GetObject()->GetNbEntities( SMDSAbs_Volume ) )
+            presentEntities = presentEntities | SMESH_Actor::eVolumes;
+          if ( !(presentEntities & SMESH_Actor::e0DElements) && anActor->GetObject()->GetNbEntities( SMDSAbs_0DElement ) )
+            presentEntities = presentEntities | SMESH_Actor::e0DElements;
+          if ( !(presentEntities & SMESH_Actor::eBallElem) && anActor->GetObject()->GetNbEntities( SMDSAbs_Ball ) )
+            presentEntities = presentEntities | SMESH_Actor::eBallElem;
+          
+          // as we know that all types of elements are present, we can exit the loop
+          if ( presentEntities == SMESH_Actor::eAllEntity )
+            break;
+        }
+
+        SMESHGUI_PropertiesDlg dlg( theMarkerMap[ aStudy->StudyId() ], SMESHGUI::desktop() );
+        // nodes: color, marker
+        dlg.setNodeColor( nodeColor );
+        if( markerType != VTK::MT_USER )
+          dlg.setNodeMarker( markerType, markerScale );
+        else
+          dlg.setNodeCustomMarker( markerId );
+        // edges: color, line width
+        dlg.setEdgeColor( edgeColor );
+        dlg.setEdgeWidth( edgeWidth );
+        // faces: front color, back color
+        dlg.setFaceColor( faceColor, deltaF );
+        // volumes: normal color, reversed color
+        dlg.setVolumeColor( volumeColor, deltaV );
+        // outlines: color, line width
+        dlg.setOutlineColor( outlineColor );
+        dlg.setOutlineWidth( outlineWidth );
+        // 0d elements: color, size
+        dlg.setElem0dColor( elem0dColor );
+        dlg.setElem0dSize( elem0dSize );
+        // balls: color, size
+        dlg.setBallColor( ballColor );
+        dlg.setBallSize( ballSize );
+        // orientation: color, scale, 3d flag
+        dlg.setOrientationColor( orientationColor );
+        dlg.setOrientationSize( int( orientationScale * 100. ) );
+        dlg.setOrientation3d( orientation3d );
+        // shrink: scale factor
+        dlg.setShrinkCoef( int( shrinkCoef * 100. ) );
+        // hide unused controls
+        dlg.showControls( presentEntities, hasNodes );
+        
+        if ( dlg.exec() ) {
+          nodeColor        = dlg.nodeColor();
+          markerType       = dlg.nodeMarkerType();
+          markerScale      = dlg.nodeMarkerScale();
+          markerId         = dlg.nodeMarkerId();
+          edgeColor        = dlg.edgeColor();
+          edgeWidth        = dlg.edgeWidth();
+          faceColor        = dlg.faceColor();
+          deltaF           = dlg.faceColorDelta();
+          volumeColor      = dlg.volumeColor();
+          deltaV           = dlg.volumeColorDelta();
+          outlineColor     = dlg.outlineColor();
+          outlineWidth     = dlg.outlineWidth();
+          elem0dColor      = dlg.elem0dColor();
+          elem0dSize       = dlg.elem0dSize();
+          ballColor        = dlg.ballColor();
+          ballSize         = dlg.ballSize();
+          orientationColor = dlg.orientationColor();
+          orientationScale = dlg.orientationSize() / 100.;
+          orientation3d    = dlg.orientation3d();
+          shrinkCoef       = dlg.shrinkCoef() / 100.;
+
+          // store point markers map that might be changed by the user
+          theMarkerMap[ aStudy->StudyId() ] = dlg.customMarkers();
+
+          // set properties from dialog box to the presentations
+          SALOME_ListIteratorOfListIO It( selected );
+          for ( ; It.More(); It.Next() ) {
+            Handle(SALOME_InteractiveObject) IObject = It.Value();
+            if ( !IObject->hasEntry() ) continue;
+            SMESH_Actor* anActor = SMESH::FindActorByEntry( IObject->getEntry() );
+            if ( !anActor ) continue;
+            
+            // nodes: color, marker
+            anActor->SetNodeColor( nodeColor.redF(), nodeColor.greenF(), nodeColor.blueF() );
+            if ( markerType != VTK::MT_USER ) {
+              anActor->SetMarkerStd( markerType, markerScale );
+            }
+            else {
+              const VTK::MarkerMap& markerMap = theMarkerMap[ aStudy->StudyId() ];
+              VTK::MarkerMap::const_iterator iter = markerMap.find( markerId );
+              if ( iter != markerMap.end() )
+                anActor->SetMarkerTexture( markerId, iter->second.second );
+            }
+            // volumes: normal color, reversed color (delta)
+            anActor->SetVolumeColor( volumeColor.redF(), volumeColor.greenF(), volumeColor.blueF(), deltaV );
+            // faces: front color, back color (delta)
+            anActor->SetSufaceColor( faceColor.redF(), faceColor.greenF(), faceColor.blueF(), deltaF );
+            // edges: color, width
+            anActor->SetEdgeColor( edgeColor.redF(), edgeColor.greenF(), edgeColor.blueF() );
+            anActor->SetLineWidth( edgeWidth );
+            // outlines: color
+            anActor->SetOutlineColor( outlineColor.redF(), outlineColor.greenF(), outlineColor.blueF() );
+            anActor->SetOutlineWidth( outlineWidth );
+            // 0D elements: color, size
+            anActor->Set0DColor( elem0dColor.redF(), elem0dColor.greenF(), elem0dColor.blueF() );
+            anActor->Set0DSize( elem0dSize );
+            // balls: color, size
+            anActor->SetBallColor( ballColor.redF(), ballColor.greenF(), ballColor.blueF() );
+            anActor->SetBallSize( ballSize );
+            // orientation: color, scale, 3d flag
+            anActor->SetFacesOrientationColor( orientationColor.redF(), orientationColor.greenF(), orientationColor.blueF() );
+            anActor->SetFacesOrientationScale( orientationScale );
+            anActor->SetFacesOrientation3DVectors( orientation3d );
+            // shrink factor
+            anActor->SetShrinkFactor( shrinkCoef );
+
+            // for groups, set also proper color
+            SMESH::SMESH_GroupBase_var aGroupObject = SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(IObject);
+            if ( !aGroupObject->_is_nil() ) {
+              SMESH::ElementType anElementType = aGroupObject->GetType();
+              QColor aColor;
+              switch( anElementType ) {
+              case SMESH::NODE:
+                aColor = nodeColor; break;
+              case SMESH::EDGE:
+                aColor = edgeColor; break;
+              case SMESH::FACE: 
+                aColor = faceColor; break;
+              case SMESH::VOLUME:
+                aColor = volumeColor; break;
+              case SMESH::ELEM0D: 
+                aColor = elem0dColor; break;
+              case SMESH::BALL: 
+                aColor = ballColor; break;
+              default: break;
+              }
+              
+              if ( aColor.isValid() ) {
+                SALOMEDS::Color aGroupColor;
+                aGroupColor.R = aColor.redF();
+                aGroupColor.G = aColor.greenF();
+                aGroupColor.B = aColor.blueF();
+                aGroupObject->SetColor( aGroupColor );
+              }
+            } // if ( !aGroupObject->_is_nil() )
+          } // for ( ; It.More(); It.Next() )
+          SMESH::RepaintCurrentView();
+        } // if ( dlg.exec() )
+        return;
+      } // case 1132:
+      } // switch(theCommandID)
+      SALOME_ListIteratorOfListIO It( selected );
+      for( ; It.More(); It.Next()){
+        Handle(SALOME_InteractiveObject) IObject = It.Value();
+        if(IObject->hasEntry()){
+          if(SMESH_Actor *anActor = SMESH::FindActorByEntry(IObject->getEntry())){
+            switch(theCommandID){
+            case 211:
+              anActor->SetRepresentation(SMESH_Actor::eEdge);
+              break;
+            case 212:
+              anActor->SetRepresentation(SMESH_Actor::eSurface);
+              break;
+            case 213:
+              if(anActor->IsShrunk())
+                anActor->UnShrink();
+              else
+                anActor->SetShrink();
+              break;
+            case 215:
+              anActor->SetRepresentation(SMESH_Actor::ePoint);
+              break;
+            case 231:
+              if(anActor->GetQuadratic2DRepresentation() != SMESH_Actor::eLines)
+                anActor->SetQuadratic2DRepresentation(SMESH_Actor::eLines);
+              break;
+            case 232:
+              if(anActor->GetQuadratic2DRepresentation() != SMESH_Actor::eArcs)
+                anActor->SetQuadratic2DRepresentation(SMESH_Actor::eArcs);
+              break;
+            }
+          }
+        }
+      }
+      SMESH::RepaintCurrentView();
     }
-    if ( MorSM->FindSubObject (3, AHR)) {
-      SALOMEDS::ChildIterator_var it = myStudy->NewChildIterator(AHR);
-      for (; it->More();it->Next()) {
-       SALOMEDS::SObject_var Obj = it->Value();
-       if ( Obj->ReferencedObject(aRef) ) {
-         if (aRef->FindAttribute(anAttr, "AttributeIOR")) {
-           anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-           if ( strcmp( anIOR->Value(), _orb->object_to_string(anHyp) ) == 0 ) {
-             smeshGUI->myStudyAPI.UnSetAlgorithm( Obj );
-             break;
-           }
-         }
-       }
+  }
+
+  void Control( int theCommandID )
+  {
+    LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+    SALOME_ListIO selected;
+    if( aSel )
+      aSel->selectedObjects( selected );
+
+    if( !selected.IsEmpty() ){
+      Handle(SALOME_InteractiveObject) anIO = selected.First();
+      if(!anIO.IsNull()){
+        SMESH_Actor::eControl aControl = SMESH_Actor::eNone;
+        if(SMESH_Actor *anActor = SMESH::FindActorByEntry(anIO->getEntry())) {
+          switch ( theCommandID ){
+          case 6001:
+            aControl = SMESH_Actor::eLength;
+            break;
+          case 6018:
+            aControl = SMESH_Actor::eLength2D;
+            break;
+          case 6002:
+            aControl = SMESH_Actor::eFreeEdges;
+            break;
+          case 6003:
+            aControl = SMESH_Actor::eFreeBorders;
+            break;
+          case 6004:
+            aControl = SMESH_Actor::eMultiConnection;
+            break;
+          case 6005:
+            aControl = SMESH_Actor::eFreeNodes;
+            break;
+          case 6019:
+            aControl = SMESH_Actor::eMultiConnection2D;
+            break;
+          case 6011:
+            aControl = SMESH_Actor::eArea;
+            break;
+          case 6012:
+            aControl = SMESH_Actor::eTaper;
+            break;
+          case 6013:
+            aControl = SMESH_Actor::eAspectRatio;
+            break;
+          case 6017:
+            aControl = SMESH_Actor::eAspectRatio3D;
+            break;
+          case 6014:
+            aControl = SMESH_Actor::eMinimumAngle;
+            break;
+          case 6015:
+            aControl = SMESH_Actor::eWarping;
+            break;
+          case 6016:
+            aControl = SMESH_Actor::eSkew;
+            break;
+          case 6009:
+            aControl = SMESH_Actor::eVolume3D;
+            break;
+          case 6021:
+            aControl = SMESH_Actor::eFreeFaces;
+            break;
+          case 6022:
+            aControl = SMESH_Actor::eMaxElementLength2D;
+            break;
+          case 6023:
+            aControl = SMESH_Actor::eMaxElementLength3D;
+            break;
+          case 6024:
+            aControl = SMESH_Actor::eBareBorderVolume;
+            break;
+          case 6025:
+            aControl = SMESH_Actor::eBareBorderFace;
+            break;
+          case 6026:
+            aControl = SMESH_Actor::eOverConstrainedVolume;
+            break;
+          case 6027:
+            aControl = SMESH_Actor::eOverConstrainedFace;
+            break;
+          case 6028:
+            aControl = SMESH_Actor::eCoincidentNodes;
+            break;
+          case 6029:
+            aControl = SMESH_Actor::eCoincidentElems1D;
+            break;
+          case 6030:
+            aControl = SMESH_Actor:: eCoincidentElems2D;
+            break;
+          case 6031:
+            aControl = SMESH_Actor::eCoincidentElems3D;
+            break;
+          }
+
+          anActor->SetControlMode(aControl);
+          anActor->GetScalarBarActor()->SetTitle( functorToString( anActor->GetFunctor() ).toLatin1().constData() );
+          SMESH::RepaintCurrentView();
+#ifndef DISABLE_PLOT2DVIEWER
+          if(anActor->GetPlot2Histogram()) {
+            SPlot2d_Histogram* aHistogram = anActor->UpdatePlot2Histogram();
+            QString functorName = functorToString( anActor->GetFunctor());
+            QString aHistogramName("%1 : %2");
+            aHistogramName = aHistogramName.arg(anIO->getName()).arg(functorName);
+            aHistogram->setName(aHistogramName);
+            aHistogram->setHorTitle(functorName);
+            SMESH::ProcessIn2DViewers(anActor);
+          }
+#endif
+        }
       }
-    }    
-   smeshGUI->myStudyAPI.ModifiedMesh( MorSM, false );
-  } 
-  QApplication::restoreOverrideCursor();
-}
+    }
+  }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddAlgorithmOnMesh( SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hypothesis_ptr aHyp )
-{
-  if ( !aMesh->_is_nil() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    SALOMEDS::SObject_var SM = myStudyAPI.FindMesh( aMesh );
-    GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SM );
-    try {
-      bool res = aMesh->AddHypothesis( aShape, aHyp );
-      if (res) {
-       SALOMEDS::SObject_var SH = myStudyAPI.FindHypothesisOrAlgorithms( aHyp );
-       if ( !SM->_is_nil() && !SH->_is_nil() ) { 
-         myStudyAPI.SetAlgorithms( SM, SH );    
-         myStudyAPI.ModifiedMesh( SM, false );
-       }
-      } else {
-       QApplication::restoreOverrideCursor();
-       QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                               tr ("SMESH_WRN_ALGORITHM_ALREADYEXIST"), tr ("SMESH_BUT_YES") );
+
+  bool CheckOIType(const Handle(SALOME_InteractiveObject) & theIO,
+                   SMESH::MeshObjectType                           theType,
+                   const QString                            theInTypeName,
+                   QString &                                theOutTypeName)
+  {
+    SMESH_TypeFilter aTypeFilter( theType );
+    QString entry;
+    if( !theIO.IsNull() )
+    {
+      entry = theIO->getEntry();
+      LightApp_DataOwner owner( entry );
+      if ( aTypeFilter.isOk( &owner )) {
+        theOutTypeName = theInTypeName;
+        return true;
       }
     }
-    catch  (const SALOME::SALOME_Exception& S_ex) {
-      QtCatchCorbaException(S_ex);
+    return false;
+  }
+
+
+  QString CheckTypeObject(const Handle(SALOME_InteractiveObject) & theIO)
+  {
+    _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+    _PTR(SObject) aSObj = aStudy->FindObjectID(theIO->getEntry());
+    if (aSObj) {
+      _PTR(SComponent) aSComp = aSObj->GetFatherComponent();
+      CORBA::String_var anID = aSComp->GetID().c_str();
+      if (!strcmp(anID.in(),theIO->getEntry()))
+        return "Component";
     }
+
+    QString aTypeName;
+    if (
+        CheckOIType ( theIO, SMESH::HYPOTHESIS,    "Hypothesis", aTypeName ) ||
+        CheckOIType ( theIO, SMESH::ALGORITHM,     "Algorithm",  aTypeName ) ||
+        CheckOIType ( theIO, SMESH::MESH,          "Mesh",       aTypeName ) ||
+        CheckOIType ( theIO, SMESH::SUBMESH,       "SubMesh",    aTypeName ) ||
+        CheckOIType ( theIO, SMESH::GROUP,         "Group",      aTypeName )
+        )
+      return aTypeName;
+
+    return "NoType";
   }
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
-}
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddHypothesisOnSubMesh( SMESH::SMESH_subMesh_ptr aSubMesh, SMESH::SMESH_Hypothesis_ptr aHyp )
-{
-  if ( !aSubMesh->_is_nil() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    try {
-      SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
-      SALOMEDS::SObject_var SsubM = myStudyAPI.FindSubMesh( aSubMesh );
-      GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SsubM );
-      if ( !aMesh->_is_nil() ) {
-       bool res = aMesh->AddHypothesis( aShape, aHyp );
-       if (res) {      
-         SALOMEDS::SObject_var SH = myStudyAPI.FindHypothesisOrAlgorithms( aHyp );
-         if ( !SsubM->_is_nil() && !SH->_is_nil() ) {
-           myStudyAPI.SetHypothesis( SsubM, SH );
-           myStudyAPI.ModifiedMesh( SsubM, false );
-         }
-       } else {
-         QApplication::restoreOverrideCursor();
-         QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                 tr ("SMESH_WRN_HYPOTHESIS_ALREADYEXIST"), tr ("SMESH_BUT_YES") );
-       }
+
+  QString CheckHomogeneousSelection()
+  {
+    //SUIT_Study* aStudy = SMESH::GetActiveStudy();
+    LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+    SALOME_ListIO selected;
+    if( aSel )
+      aSel->selectedObjects( selected );
+
+    QString RefType = CheckTypeObject(selected.First());
+    SALOME_ListIteratorOfListIO It(selected);
+    for ( ; It.More(); It.Next())
+      {
+        Handle(SALOME_InteractiveObject) IObject = It.Value();
+        QString Type = CheckTypeObject(IObject);
+        if (Type.compare(RefType) != 0)
+          return "Heterogeneous Selection";
+      }
+
+    return RefType;
+  }
+
+
+  void SMESHGUI::OnEditDelete()
+  {
+    // VSR 17/11/04: check if all objects selected belong to SMESH component --> start
+    LightApp_SelectionMgr* aSel = SMESHGUI::selectionMgr();
+    SALOME_ListIO selected; aSel->selectedObjects( selected, QString::null, false );
+
+    _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+    _PTR(StudyBuilder) aStudyBuilder = aStudy->NewBuilder();
+    _PTR(GenericAttribute) anAttr;
+    _PTR(AttributeIOR) anIOR;
+
+    int objectCount = 0;
+    QString aNameList;
+    QString aParentComponent = QString::null;
+    Handle(SALOME_InteractiveObject) anIO;
+    for( SALOME_ListIteratorOfListIO anIt( selected ); anIt.More(); anIt.Next() )
+    {
+      anIO = anIt.Value();
+      QString cur = anIO->getComponentDataType();
+      _PTR(SObject) aSO = aStudy->FindObjectID(anIO->getEntry());
+      if (aSO) {
+        // check if object is reference
+        _PTR(SObject) aRefSObj;
+        aNameList.append("\n    - ");
+        if ( aSO->ReferencedObject( aRefSObj ) ) {
+          QString aRefName = QString::fromStdString ( aRefSObj->GetName() );
+          aNameList.append( aRefName );
+          cur = QString::fromStdString ( aRefSObj->GetFatherComponent()->ComponentDataType() );
+        }
+        else
+          aNameList.append(anIO->getName());
+        objectCount++;
       }
+
+      if( aParentComponent.isNull() )
+        aParentComponent = cur;
+      else if( !aParentComponent.isEmpty() && aParentComponent!=cur )
+        aParentComponent = "";
     }
-    catch  (const SALOME::SALOME_Exception& S_ex) {
-      QtCatchCorbaException(S_ex);
+
+    if ( objectCount == 0 )
+      return; // No Valid Objects Selected
+
+    if ( aParentComponent != SMESHGUI::GetSMESHGUI()->name() )  {
+      SUIT_MessageBox::warning( SMESHGUI::desktop(),
+                                QObject::tr("ERR_ERROR"),
+                                QObject::tr("NON_SMESH_OBJECTS_SELECTED").arg( SMESHGUI::GetSMESHGUI()->moduleName() ) );
+      return;
     }
-  }
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
-}
+    // VSR 17/11/04: check if all objects selected belong to SMESH component <-- finish
+    if (SUIT_MessageBox::warning
+        (SMESHGUI::desktop(),
+         QObject::tr("SMESH_WRN_WARNING"),
+         QObject::tr("SMESH_REALLY_DELETE").arg( objectCount ).arg( aNameList ),
+         SUIT_MessageBox::Yes | SUIT_MessageBox::No,
+         SUIT_MessageBox::Yes) != SUIT_MessageBox::Yes)
+      return;
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddAlgorithmOnSubMesh( SMESH::SMESH_subMesh_ptr aSubMesh, SMESH::SMESH_Hypothesis_ptr aHyp )
-{
-  if ( !aSubMesh->_is_nil() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    try {
-      SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
-      SALOMEDS::SObject_var SsubM = myStudyAPI.FindSubMesh( aSubMesh );
-      GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SsubM );
-      if ( !aMesh->_is_nil() ) {
-       bool res = aMesh->AddHypothesis( aShape, aHyp );
-       if (res) {
-         SALOMEDS::SObject_var SH = myStudyAPI.FindHypothesisOrAlgorithms( aHyp );
-         if ( !SsubM->_is_nil() && !SH->_is_nil() ) {
-           myStudyAPI.SetAlgorithms( SsubM, SH ); 
-           myStudyAPI.ModifiedMesh( SsubM, false );
-         }
-       } else {
-         QApplication::restoreOverrideCursor();
-         QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                 tr ("SMESH_WRN_ALGORITHM_ALREADYEXIST"), tr ("SMESH_BUT_YES") );
-       }
+    SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+
+    // Put the whole hierarchy of sub-objects of the selected SO's into a list and
+    // then treat them all starting from the deepest objects (at list back)
+    std::list< _PTR(SObject) > listSO;
+    SALOME_ListIteratorOfListIO It(selected);
+    for( ; It.More(); It.Next()) // loop on selected IO's
+    {
+      Handle(SALOME_InteractiveObject) IObject = It.Value();
+      if(IObject->hasEntry()) {
+        _PTR(SObject) aSO = aStudy->FindObjectID(IObject->getEntry());
+
+        // disable removal of "SMESH" component object
+        if(aSO->FindAttribute(anAttr, "AttributeIOR")){
+          anIOR = anAttr;
+          if ( engineIOR() == anIOR->Value().c_str() )
+            continue;
+        }
+        //Check the referenced object
+        _PTR(SObject) aRefSObject;
+        if ( aSO && aSO->ReferencedObject( aRefSObject ) )
+          aSO = aRefSObject; // Delete main Object instead of reference
+
+        listSO.push_back( aSO );
+        std::list< _PTR(SObject) >::iterator itSO = listSO.begin();
+        for ( ; itSO != listSO.end(); ++itSO ) {
+          _PTR(ChildIterator) it = aStudy->NewChildIterator( *itSO );
+          for (it->InitEx(false); it->More(); it->Next())
+            listSO.push_back( it->Value() );
+        }
       }
     }
-    catch  (const SALOME::SALOME_Exception& S_ex) {
-      QtCatchCorbaException(S_ex);
+    // Check if none of objects to delete is referred from outside
+    std::list< _PTR(SObject) >::reverse_iterator ritSO;
+    for ( ritSO = listSO.rbegin(); ritSO != listSO.rend(); ++ritSO )
+    {
+      _PTR(SObject) SO = *ritSO;
+      if ( !SO ) continue;
+      std::vector<_PTR(SObject)> aReferences = aStudy->FindDependances( *ritSO  );
+      for (size_t i = 0; i < aReferences.size(); i++) {
+        _PTR(SComponent) aComponent = aReferences[i]->GetFatherComponent();
+        std::string type = aComponent->ComponentDataType();
+        if ( type != "SMESH" )
+        {
+          SUIT_MessageBox::warning( anApp->desktop(),
+                                    QObject::tr("WRN_WARNING"),
+                                    QObject::tr("DEP_OBJECT") );
+          return; // outside SMESH, there is an object depending on a SMESH object 
+        }
+      }
     }
-  }
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
-}
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::CreateAlgorithm( QString TypeAlgo, QString NameAlgo )
-{
-  SMESH::SMESH_Hypothesis_var Hyp;
-  try {
-    if ( TypeAlgo.compare("Regular_1D") == 0 )
-      Hyp = myComponentMesh->CreateHypothesis( TypeAlgo, myStudyId );
-    else if ( TypeAlgo.compare("MEFISTO_2D") == 0 )
-      Hyp = myComponentMesh->CreateHypothesis( TypeAlgo, myStudyId );
-    else if ( TypeAlgo.compare("Quadrangle_2D") == 0 )
-      Hyp = myComponentMesh->CreateHypothesis( TypeAlgo, myStudyId );
-    else if ( TypeAlgo.compare("Hexa_3D") == 0 )
-      Hyp = myComponentMesh->CreateHypothesis( TypeAlgo, myStudyId );
-    
-    if ( !Hyp->_is_nil() ) {
-      SALOMEDS::SObject_var SHyp = myStudyAPI.AddNewAlgorithms( Hyp );
-      myStudyAPI.SetName( SHyp, NameAlgo);
+    // Call mesh->Clear() to prevent loading mesh from file caused by hypotheses removal
+    for( It.Initialize( selected ); It.More(); It.Next()) // loop on selected IO's
+    {
+      Handle(SALOME_InteractiveObject) IObject = It.Value();
+      SMESH::SMESH_Mesh_var mesh = SMESH::IObjectToInterface< SMESH::SMESH_Mesh >( IObject );
+      if ( !mesh->_is_nil() )
+        mesh->Clear();
     }
+
+    // Treat SO's in the list starting from the back
+    aStudyBuilder->NewCommand();  // There is a transaction
+    for ( ritSO = listSO.rbegin(); ritSO != listSO.rend(); ++ritSO )
+    {
+      _PTR(SObject) SO = *ritSO;
+      if ( !SO ) continue;
+      std::string anEntry = SO->GetID();
+
+      /** Erase graphical object **/
+      if(SO->FindAttribute(anAttr, "AttributeIOR")) {
+        SMESH::RemoveVisualObjectWithActors( anEntry.c_str(), true);
+        // ViewManagerList aViewMenegers = anApp->viewManagers();
+        // ViewManagerList::const_iterator it = aViewMenegers.begin();
+        // for( ; it != aViewMenegers.end(); it++) {         
+        //   SUIT_ViewManager* vm = *it;
+        //   int nbSf = vm ? vm->getViewsCount() : 0;
+        //   if(vm) {
+        //     QVector<SUIT_ViewWindow*> aViews = vm->getViews();
+        //     for(int i = 0; i < nbSf; i++){
+        //       SUIT_ViewWindow *sf = aViews[i];
+        //       if(SMESH_Actor* anActor = SMESH::FindActorByEntry(sf,anEntry.c_str())){
+        //         SMESH::RemoveActor(sf,anActor);
+        //       }
+        //     }
+        //   }
+        // }
+      }
+      /** Remove an object from data structures **/
+      SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( SMESH::SObjectToObject( SO ));
+      SMESH::SMESH_subMesh_var   aSubMesh = SMESH::SMESH_subMesh::_narrow( SMESH::SObjectToObject( SO ));
+      if ( !aGroup->_is_nil() ) {                          // DELETE GROUP
+        SMESH::SMESH_Mesh_var aMesh = aGroup->GetMesh();
+        aMesh->RemoveGroup( aGroup );
+      }
+      else if ( !aSubMesh->_is_nil() ) {                   // DELETE SUBMESH
+        SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
+        aMesh->RemoveSubMesh( aSubMesh );
+
+        _PTR(SObject) aMeshSO = SMESH::FindSObject(aMesh);
+        if (aMeshSO)
+          SMESH::ModifiedMesh(aMeshSO, false, aMesh->NbNodes()==0);
+      }
+      else {
+        Handle(SALOME_InteractiveObject) IObject = new SALOME_InteractiveObject
+          ( anEntry.c_str(), engineIOR().toLatin1().data(), SO->GetName().c_str() );
+        QString objType = CheckTypeObject(IObject);
+        if ( objType == "Hypothesis" || objType == "Algorithm" ) {// DELETE HYPOTHESIS
+          SMESH::RemoveHypothesisOrAlgorithmOnMesh(IObject);
+          aStudyBuilder->RemoveObjectWithChildren( SO );
+        }
+        else {// default action: remove SObject from the study
+              // san - it's no use opening a transaction here until UNDO/REDO is provided in SMESH
+              //SUIT_Operation *op = new SALOMEGUI_ImportOperation(myActiveStudy);
+              //op->start();
+          aStudyBuilder->RemoveObjectWithChildren( SO );
+          //op->finish();
+        }
+      }
+    } /* listSO back loop */
+
+    aStudyBuilder->CommitCommand();
+
+    /* Clear any previous selection */
+    SALOME_ListIO l1;
+    aSel->setSelectedObjects( l1 );
+
+    SMESHGUI::GetSMESHGUI()->updateObjBrowser();
+  }
+//} namespace
+
+extern "C" {
+  SMESHGUI_EXPORT CAM_Module* createModule()
+  {
+    return new SMESHGUI();
   }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
+
+  SMESHGUI_EXPORT  char* getModuleVersion() {
+    return (char*)SMESH_VERSION_STR;
   }
-  myActiveStudy->updateObjBrowser(true);
 }
 
+SMESH::SMESH_Gen_var SMESHGUI::myComponentSMESH = SMESH::SMESH_Gen::_nil();
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::CreateLocalLength( QString TypeHypothesis, QString NameHypothesis, double Length )
+SMESHGUI::SMESHGUI() :
+SalomeApp_Module( "SMESH" )
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  try {
-    SMESH::SMESH_Hypothesis_var Hyp = SMESH::SMESH_Hypothesis::_narrow( CreateHypothesis( TypeHypothesis, NameHypothesis ) );
-    SMESH::SMESH_LocalLength_var LL = SMESH::SMESH_LocalLength::_narrow( Hyp );
-    if ( !LL->_is_nil() )
-      LL->SetLength( Length );
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
+  if ( CORBA::is_nil( myComponentSMESH ) )
+  {
+    CORBA::Boolean anIsEmbeddedMode;
+    myComponentSMESH = SMESH_Client::GetSMESHGen(getApp()->orb(),anIsEmbeddedMode);
+    MESSAGE("-------------------------------> anIsEmbeddedMode=" << anIsEmbeddedMode);
+
+    //  0019923: EDF 765 SMESH : default values of hypothesis
+    SUIT_ResourceMgr* aResourceMgr = SMESH::GetResourceMgr(this);
+    int nbSeg = aResourceMgr->integerValue( "SMESH", "segmentation", 10 );
+    myComponentSMESH->SetBoundaryBoxSegmentation( nbSeg );
+    nbSeg = aResourceMgr->integerValue( "SMESH", "nb_segments_per_edge", 15 );
+    myComponentSMESH->SetDefaultNbSegments( nbSeg );
+
+    const char* options[] = { "historical_python_dump", "forget_mesh_on_hyp_modif" };
+    for ( size_t i = 0; i < sizeof(options)/sizeof(char*); ++i )
+      if ( aResourceMgr->hasValue( "SMESH", options[i] ))
+      {
+        QString val = aResourceMgr->stringValue( "SMESH", options[i] );
+        myComponentSMESH->SetOption( options[i], val.toLatin1().constData() );
+      }
   }
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
+
+  myActiveDialogBox = 0;
+  myFilterLibraryDlg = 0;
+  myState = -1;
+  myDisplayer = 0;
+
+  myEventCallbackCommand = vtkCallbackCommand::New();
+  myEventCallbackCommand->Delete();
+  myEventCallbackCommand->SetClientData( this );
+  myEventCallbackCommand->SetCallback( SMESHGUI::ProcessEvents );
+  myPriority = 0.0;
+
+  /* load resources for all available meshers */
+  SMESH::InitAvailableHypotheses();
 }
 
 //=============================================================================
@@ -887,21 +1931,8 @@ void SMESHGUI::CreateLocalLength( QString TypeHypothesis, QString NameHypothesis
  *
  */
 //=============================================================================
-void SMESHGUI::CreateMaxElementArea( QString TypeHypothesis, QString NameHypothesis, double MaxArea )
+SMESHGUI::~SMESHGUI()
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  try {
-    SMESH::SMESH_Hypothesis_var Hyp = SMESH::SMESH_Hypothesis::_narrow( CreateHypothesis( TypeHypothesis, NameHypothesis  ) );
-    SMESH::SMESH_MaxElementArea_var MaxElArea = SMESH::SMESH_MaxElementArea::_narrow( Hyp );
-    if ( !MaxElArea->_is_nil() )
-      MaxElArea->SetMaxElementArea( MaxArea );
-  }
-  catch  (SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  } 
-
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -909,20 +1940,13 @@ void SMESHGUI::CreateMaxElementArea( QString TypeHypothesis, QString NameHypothe
  *
  */
 //=============================================================================
-void SMESHGUI::CreateMaxElementVolume( QString TypeHypothesis, QString NameHypothesis, double MaxVolume )
+LightApp_SelectionMgr* SMESHGUI::selectionMgr()
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  try {
-    SMESH::SMESH_Hypothesis_var Hyp = SMESH::SMESH_Hypothesis::_narrow( CreateHypothesis( TypeHypothesis, NameHypothesis  ) );
-    SMESH::SMESH_MaxElementVolume_var MaxElVolume = SMESH::SMESH_MaxElementVolume::_narrow( Hyp );
-    if ( !MaxElVolume->_is_nil() )
-      MaxElVolume->SetMaxElementVolume( MaxVolume );
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  } 
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
+  SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+  if( anApp )
+    return dynamic_cast<LightApp_SelectionMgr*>( anApp->selectionMgr() );
+  else
+    return 0;
 }
 
 //=============================================================================
@@ -930,20 +1954,17 @@ void SMESHGUI::CreateMaxElementVolume( QString TypeHypothesis, QString NameHypot
  *
  */
 //=============================================================================
-void SMESHGUI::CreateNbSegments( QString TypeHypothesis, QString NameHypothesis, double nbSegments )
+bool SMESHGUI::automaticUpdate(unsigned int requestedSize, bool* limitExceeded)
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  try {
-    SMESH::SMESH_Hypothesis_var Hyp = SMESH::SMESH_Hypothesis::_narrow( CreateHypothesis( TypeHypothesis, NameHypothesis  ) );
-    SMESH::SMESH_NumberOfSegments_var NbS = SMESH::SMESH_NumberOfSegments::_narrow( Hyp );
-    if ( !NbS->_is_nil() )
-      NbS->SetNumberOfSegments( nbSegments );
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  } 
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  if ( !resMgr )
+    return false;
+
+  bool autoUpdate  = resMgr->booleanValue( "SMESH", "auto_update",  false );
+  long updateLimit = resMgr->integerValue( "SMESH", "update_limit", 500000 );
+  bool exceeded = updateLimit > 0 && requestedSize > updateLimit;
+  if ( limitExceeded ) *limitExceeded = autoUpdate && exceeded;
+  return autoUpdate && !exceeded;
 }
 
 //=============================================================================
@@ -951,16 +1972,9 @@ void SMESHGUI::CreateNbSegments( QString TypeHypothesis, QString NameHypothesis,
  *
  */
 //=============================================================================
-int SMESHGUI::GetNameOfSelectedIObjects( SALOME_Selection* Sel, QString& aName )
+SUIT_ResourceMgr* SMESHGUI::resourceMgr()
 {
-  int nbSel = Sel->IObjectCount() ;
-  if ( nbSel == 1 ) {
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    aName = IObject->getName();
-  } else {
-    aName = tr( "SMESH_OBJECTS_SELECTED" ).arg( nbSel );
-  }
-  return nbSel;
+  return dynamic_cast<SUIT_ResourceMgr*>( SUIT_Session::session()->resourceMgr() );
 }
 
 //=============================================================================
@@ -968,148 +1982,56 @@ int SMESHGUI::GetNameOfSelectedIObjects( SALOME_Selection* Sel, QString& aName )
  *
  */
 //=============================================================================
-int SMESHGUI::GetNameOfSelectedNodes( SALOME_Selection* Sel, QString& aName )
+SMESHGUI* SMESHGUI::GetSMESHGUI()
 {
-  int nbNodes = 0;
-  int nbSel = Sel->IObjectCount() ;
-  if ( nbSel == 1 ) {
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    if ( !IObject->hasEntry() )
-      return -1;
-
-    Standard_Boolean res;
-    SMESH_Actor* ac = FindActorByEntry( IObject->getEntry(), res, true );
-    if ( !res )
-      return -1;
-
-    TColStd_MapOfInteger MapIndex;
-    Sel->GetIndex( IObject, MapIndex );
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    aName = " ";
-    nbNodes = MapIndex.Extent();
-    for ( ; ite.More(); ite.Next() ) {
-      aName = aName + QString("%1").arg(ac->GetIdSMESHDSNode(ite.Key())) + " ";
-    }
-  } else {
-    aName = "";
+  SMESHGUI* smeshMod = 0;
+  SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>(SUIT_Session::session()->activeApplication());
+  if ( app )
+  {
+    CAM_Module* module = app->module( "Mesh" );
+    smeshMod = dynamic_cast<SMESHGUI*>( module );
+  }
+
+  if ( smeshMod && smeshMod->application() && smeshMod->application()->activeStudy() )
+  {
+    SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>( smeshMod->application()->activeStudy() );
+    if ( study )
+    {
+      _PTR(Study) aStudy = study->studyDS();
+      if ( aStudy )
+        GetSMESHGen()->SetCurrentStudy( _CAST(Study,aStudy)->GetStudy() );
+    }
   }
-  return nbNodes;
+
+  return smeshMod;
 }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-int SMESHGUI::GetNameOfSelectedElements( SALOME_Selection* Sel, QString& aName )
+extern "C"
 {
-  int nbElements = 0;
-  int nbSel = Sel->IObjectCount() ;
-  if ( nbSel == 1 ) {
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    if ( !IObject->hasEntry() )
-      return -1;
-
-    Standard_Boolean res;
-    SMESH_Actor* ac = FindActorByEntry( IObject->getEntry(), res, true );
-    if ( !res )
-      return -1;
-
-    TColStd_MapOfInteger MapIndex;
-    Sel->GetIndex( IObject, MapIndex );
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    aName = " ";
-    nbElements = MapIndex.Extent();
-    MESSAGE("GetNameOfSelectedElements(): number = " << nbElements);
-    for ( ; ite.More(); ite.Next() ) {
-      int idVTK = ite.Key();
-      MESSAGE("GetNameOfSelectedElements(): VTK Id = " << idVTK);
-      aName = aName + QString("%1").arg(ac->GetIdSMESHDSElement(idVTK)) + " ";
-    }
-  } else {
-    aName = "";
+  Standard_EXPORT SMESHGUI* GetComponentGUI()
+  {
+    return SMESHGUI::GetSMESHGUI();
   }
-  return nbElements;
 }
 
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-int SMESHGUI::GetNameOfSelectedEdges( SALOME_Selection* Sel, QString& aName )
+void SMESHGUI::SetState(int aState)
 {
-  int nbElements = 0;
-  int nbSel = Sel->IObjectCount() ;
-  if ( nbSel == 1 ) {
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    if ( !IObject->hasEntry() )
-      return -1;
-
-    Standard_Boolean res;
-    SMESH_Actor* ac = FindActorByEntry( IObject->getEntry(), res, true );
-    if ( !res )
-      return -1;
-
-    TColStd_MapOfInteger MapIndex;
-    Sel->GetIndex( IObject, MapIndex );
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    aName = " ";
-    nbElements = MapIndex.Extent();
-    for ( ; ite.More(); ite.Next() ) {
-      aName = aName + QString("%1").arg(ite.Key()) + " ";
-    }
-  } else {
-    aName = "";
-  }
-  return nbElements;
+  myState = aState;
 }
 
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-SMESH_Actor* SMESHGUI::FindActorByEntry(QString entry, 
-                                       Standard_Boolean& testResult,
-                                       bool onlyInActiveView)
+void SMESHGUI::ResetState()
 {
-  int nbSf = myActiveStudy->getStudyFramesCount();
-  for ( int i = 0; i < nbSf; i++ ) {
-    QAD_StudyFrame* sf = myActiveStudy->getStudyFrame(i);
-    if ( sf->getTypeView() == VIEW_VTK ) {
-      vtkRenderer* Renderer = ((VTKViewer_ViewFrame*)sf->getRightFrame()->getViewFrame())->getRenderer();
-      vtkActorCollection* theActors = Renderer->GetActors();
-      theActors->InitTraversal();
-      vtkActor *ac = theActors->GetNextActor();
-      while(!(ac==NULL)) {
-       if ( ac->IsA("SMESH_Actor") ) {
-         SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( ac );
-         if ( anActor->hasIO() ) {
-           Handle(SALOME_InteractiveObject) IO = anActor->getIO();
-           if ( strcmp( IO->getEntry(), entry ) == 0 ) {
-             if ( onlyInActiveView ) {
-               if ( sf == myActiveStudy->getActiveStudyFrame() ) {
-                 testResult = true;
-                 return anActor;
-               }
-             } else {
-               testResult = true;
-               return anActor;
-             }
-           }
-         }
-       }
-       ac = theActors->GetNextActor();
-      }
-    }
-  }
-
-  MESSAGE ( " Actor Not Found " )
-  testResult = false;
-  return SMESH_Actor::New();
+  myState = -1;
 }
 
 //=============================================================================
@@ -1117,19 +2039,9 @@ SMESH_Actor* SMESHGUI::FindActorByEntry(QString entry,
  *
  */
 //=============================================================================
-SMESH_Actor* SMESHGUI::FindActor(SMESH::SMESH_Mesh_ptr aMesh, 
-                                Standard_Boolean& testResult,
-                                bool onlyInActiveView)
+void SMESHGUI::EmitSignalDeactivateDialog()
 {
-  SALOMEDS::SObject_var SM = myStudyAPI.FindMesh( aMesh );
-  if ( SM->_is_nil() ) {
-    MESSAGE ( " Actor Not Found " )
-    
-    testResult = false;
-    return SMESH_Actor::New();
-  }
-
-  return FindActorByEntry( SM->GetID(), testResult, onlyInActiveView);
+  emit SignalDeactivateActiveDialog();
 }
 
 //=============================================================================
@@ -1137,29 +2049,9 @@ SMESH_Actor* SMESHGUI::FindActor(SMESH::SMESH_Mesh_ptr aMesh,
  *
  */
 //=============================================================================
-SMESH::SMESH_Mesh_ptr SMESHGUI::ConvertIOinMesh(const Handle(SALOME_InteractiveObject)& IO, 
-                                               Standard_Boolean& testResult)
+void SMESHGUI::EmitSignalStudyFrameChanged()
 {
-  SMESH::SMESH_Mesh_var aMesh;
-  testResult = false ;
-
-  /* case SObject */
-  if ( IO->hasEntry() ) {
-    SALOMEDS::SObject_var obj = myStudy->FindObjectID( IO->getEntry() );
-    SALOMEDS::GenericAttribute_var anAttr;
-    SALOMEDS::AttributeIOR_var     anIOR;
-    if ( !obj->_is_nil() ) {
-       if (obj->FindAttribute(anAttr, "AttributeIOR")) {
-         anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-        aMesh = SMESH::SMESH_Mesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-        if ( !aMesh->_is_nil() ) {
-          testResult = true ;
-          return SMESH::SMESH_Mesh::_duplicate( aMesh );
-        }
-       }
-    }
-  } 
-  return SMESH::SMESH_Mesh::_nil();
+  emit SignalStudyFrameChanged();
 }
 
 //=============================================================================
@@ -1167,29 +2059,9 @@ SMESH::SMESH_Mesh_ptr SMESHGUI::ConvertIOinMesh(const Handle(SALOME_InteractiveO
  *
  */
 //=============================================================================
-SMESH::SMESH_subMesh_ptr SMESHGUI::ConvertIOinSubMesh(const Handle(SALOME_InteractiveObject)& IO, 
-                                                     Standard_Boolean& testResult)
+void SMESHGUI::EmitSignalCloseAllDialogs()
 {
-  SMESH::SMESH_subMesh_var aSubMesh;
-  testResult = false ;
-
-  /* case SObject */
-  if ( IO->hasEntry() ) {
-    SALOMEDS::SObject_var obj = myStudy->FindObjectID( IO->getEntry() );
-    SALOMEDS::GenericAttribute_var anAttr;
-    SALOMEDS::AttributeIOR_var     anIOR;
-    if ( !obj->_is_nil() ) {
-       if (obj->FindAttribute(anAttr, "AttributeIOR")) {
-         anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-        aSubMesh = SMESH::SMESH_subMesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-        if ( !aSubMesh->_is_nil() ) {
-          testResult = true ;
-          return SMESH::SMESH_subMesh::_duplicate( aSubMesh );
-        }
-       }
-    }
-  } 
-  return SMESH::SMESH_subMesh::_nil();
+  emit SignalCloseAllDialogs();
 }
 
 //=============================================================================
@@ -1197,106 +2069,30 @@ SMESH::SMESH_subMesh_ptr SMESHGUI::ConvertIOinSubMesh(const Handle(SALOME_Intera
  *
  */
 //=============================================================================
-SMESH::SMESH_Hypothesis_ptr SMESHGUI::ConvertIOinSMESHHypothesis( const Handle(SALOME_InteractiveObject)& IO, 
-                                                                 Standard_Boolean& testResult )
+void SMESHGUI::EmitSignalVisibilityChanged()
 {
-  SMESH::SMESH_Hypothesis_var aHyp ;
-  testResult = false ;
-
-  /* case SObject */
-  if ( IO->hasEntry() ) {
-    SALOMEDS::SObject_var obj = myStudy->FindObjectID( IO->getEntry() );
-    SALOMEDS::GenericAttribute_var anAttr;
-    SALOMEDS::AttributeIOR_var     anIOR;
-    if ( !obj->_is_nil() ) {
-       if (obj->FindAttribute(anAttr, "AttributeIOR")) {
-         anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-        aHyp = SMESH::SMESH_Hypothesis::_narrow( _orb->string_to_object(anIOR->Value()));
-        if ( !aHyp->_is_nil() ) {
-          testResult = true ;
-          return SMESH::SMESH_Hypothesis::_duplicate( aHyp );
-        }
-       }
-    }
-  } 
-  return SMESH::SMESH_Hypothesis::_nil();
+  emit SignalVisibilityChanged();
 }
 
-
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-GEOM::GEOM_Shape_ptr SMESHGUI::ConvertIOinGEOMShape( const Handle(SALOME_InteractiveObject)& IO, 
-                                              Standard_Boolean& testResult )
+QDialog *SMESHGUI::GetActiveDialogBox()
 {
-  GEOM::GEOM_Shape_var aShape ;
-  testResult = false ;
-
-  /* case SObject */
-  if ( IO->hasEntry() ) {
-    SALOMEDS::SObject_var obj = myStudy->FindObjectID( IO->getEntry() );
-    SALOMEDS::GenericAttribute_var anAttr;
-    SALOMEDS::AttributeIOR_var     anIOR;
-    if ( !obj->_is_nil() ) {
-       if (obj->FindAttribute(anAttr, "AttributeIOR")) {
-         anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-        aShape = myComponentGeom->GetIORFromString(anIOR->Value()) ;
-        if ( !aShape->_is_nil() ) {
-          testResult = true ;
-          return GEOM::GEOM_Shape::_duplicate( aShape );
-        }
-       }
-    }
-  }
-  return GEOM::GEOM_Shape::_nil();
+  return myActiveDialogBox;
 }
 
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::SetViewMode(int commandId)
+void SMESHGUI::SetActiveDialogBox(QDialog * aDlg)
 {
-  SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
-  int nbSel = Sel->IObjectCount();
-  if ( nbSel >= 1 ) {
-    SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-    for ( ; It.More(); It.Next() ) {
-      Handle(SALOME_InteractiveObject) IObject = It.Value();
-      if ( IObject->hasEntry() ) {
-       Standard_Boolean res;
-       SMESH_Actor* ac = FindActorByEntry( IObject->getEntry(), res, true );
-       if ( res ) {
-         switch (commandId) {
-         case 211: {
-           ChangeRepresentation( ac, 0 );
-           break;
-         }
-         case 212: {
-           ChangeRepresentation( ac, 1 );
-           break;
-         }
-         case 213: {
-           ChangeRepresentation( ac, 2 );
-           break;
-         }
-         case 1132: {
-           ChangeRepresentation( ac, 3 );
-           break;
-         }
-         }
-       }
-      }
-    }
-    if ( commandId == 1133 ) {
-      ChangeRepresentation( SMESH_Actor::New(), 4 );
-    }
-  }
+  myActiveDialogBox = (QDialog *) aDlg;
+  return;
 }
 
 //=============================================================================
@@ -1304,164 +2100,13 @@ void SMESHGUI::SetViewMode(int commandId)
  *
  */
 //=============================================================================
-void SMESHGUI::ChangeRepresentation( SMESH_Actor* ac, int type )
+SUIT_Desktop* SMESHGUI::desktop()
 {
-  if (ac->DataSource == NULL && type != 4 )
-    return;
-
-  if ( type != 4 ) {
-    if ( ac->getMapper() == NULL ) {
-      return;
-    }
-  }
-  switch (type) {
-  case 0 : {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    if (ac->getDisplayMode()==2) {
-      bool isColored = ac->getMapper()->GetScalarVisibility(); //SAL3899
-      vtkDataSetMapper* meshMapper = (vtkDataSetMapper*) (ac->getMapper());
-      meshMapper->SetInput(ac->DataSource);
-      meshMapper->SetScalarVisibility(isColored); //SAL3899
-    }
-    ac->setDisplayMode(0);
-    ac->GetProperty()->SetRepresentationToWireframe();
-    //    ac->SetActorProperty( ac->GetProperty() );
-    QApplication::restoreOverrideCursor();
-    break;
-  }
-  case 1 : {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    if (ac->getDisplayMode()==2) {
-      bool isColored = ac->getMapper()->GetScalarVisibility(); //SAL3899
-      vtkDataSetMapper* meshMapper = (vtkDataSetMapper*) (ac->getMapper());
-      meshMapper->SetInput(ac->DataSource);
-      meshMapper->SetScalarVisibility(isColored); //SAL3899
-    }
-    ac->setDisplayMode(1);
-    ac->GetProperty()->SetRepresentationToSurface();
-    QApplication::restoreOverrideCursor();
-    //    ac->SetActorProperty( ac->GetProperty() );
-    break;
-  }
-  case 2 : {
-    //    if (!(ac->getDisplayMode()==2)) {
-    //    ChangeRepresentation(ac, 1);
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    ac->setDisplayMode(2);
-    bool isColored = ac->getMapper()->GetScalarVisibility(); //SAL3899
-    vtkDataSetMapper* meshMapper = (vtkDataSetMapper*) (ac->getMapper());
-    vtkShrinkFilter *shrink = vtkShrinkFilter::New();
-    shrink->SetInput(ac->DataSource);
-    shrink->SetShrinkFactor(ac->GetShrinkFactor());
-    
-    meshMapper->SetInput( shrink->GetOutput() );
-    meshMapper->SetScalarVisibility(isColored); //SAL3899
-    ac->SetMapper( meshMapper );
-    QApplication::restoreOverrideCursor();
-    //    }
-    break;
-  }
-  case 3:
-    {
-      float color[3];
-      float edgecolor[3];
-      float backfacecolor[3];
-      float nodecolor[3];
-      ac->GetColor(color[0],color[1],color[2]);
-      QColor c(color[0]*255,color[1]*255,color[2]*255);
-      ac->GetEdgeColor(edgecolor[0],edgecolor[1],edgecolor[2]);
-      QColor e(edgecolor[0]*255,edgecolor[1]*255,edgecolor[2]*255);
-      ac->GetBackfaceProperty()->GetColor(backfacecolor);
-      QColor b(backfacecolor[0]*255,backfacecolor[1]*255,backfacecolor[2]*255);
-      ac->GetNodeColor(nodecolor[0], nodecolor[1], nodecolor[2] ) ;
-      QColor n(nodecolor[0]*255, nodecolor[1]*255, nodecolor[2]*255 ) ;
-
-      int Edgewidth = (int)ac->EdgeDevice->GetProperty()->GetLineWidth();
-      if ( Edgewidth == 0 )
-       Edgewidth = 1;
-      int intValue = ac->GetNodeSize() ;
-      float Shrink = ac->GetShrinkFactor();
-      SMESHGUI_Preferences_ColorDlg *aDlg = new SMESHGUI_Preferences_ColorDlg( QAD_Application::getDesktop(), "" ) ;
-      aDlg->SetColor(1,c);
-      aDlg->SetColor(2,e);
-      aDlg->SetColor(3,n);
-      aDlg->SetColor(4,b);
-      aDlg->SetIntValue(1,Edgewidth);
-      aDlg->SetIntValue(2,intValue);
-      aDlg->SetIntValue(3,int(Shrink*100.));
-
-      if ( aDlg->exec() ) {
-       QApplication::setOverrideCursor( Qt::waitCursor );
-       QColor color = aDlg->GetColor(1);
-       QColor edgecolor = aDlg->GetColor(2);
-       QColor nodecolor = aDlg->GetColor(3);
-       QColor backfacecolor = aDlg->GetColor(4);
-       /* actor color and backface color */
-       ac->GetProperty()->SetColor(float(color.red())/255.,float(color.green())/255.,float(color.blue())/255.);
-       ac->SetColor(float(color.red())/255.,float(color.green())/255.,float(color.blue())/255.);
-       ac->GetBackfaceProperty()->SetColor(float(backfacecolor.red())/255.,float(backfacecolor.green())/255.,float(backfacecolor.blue())/255.);
-
-       /* edge color */
-       ac->EdgeDevice->GetProperty()->SetColor(float(edgecolor.red())/255.,
-                                               float(edgecolor.green())/255.,
-                                               float(edgecolor.blue())/255.);
-       ac->EdgeShrinkDevice->GetProperty()->SetColor(float(edgecolor.red())/255.,
-                                                     float(edgecolor.green())/255.,
-                                                     float(edgecolor.blue())/255.);
-       ac->SetEdgeColor(float(edgecolor.red())/255.,
-                        float(edgecolor.green())/255.,
-                        float(edgecolor.blue())/255.);
-
-       /* Shrink factor and size edges */
-       ac->SetShrinkFactor( aDlg->GetIntValue(3)/100. );
-       ac->EdgeDevice->GetProperty()->SetLineWidth( aDlg->GetIntValue(1) );    
-       ac->EdgeShrinkDevice->GetProperty()->SetLineWidth( aDlg->GetIntValue(1) );
-
-       /* Nodes color and size */
-       ac->SetNodeColor(float(nodecolor.red())/255.,
-                        float(nodecolor.green())/255.,
-                        float(nodecolor.blue())/255.);
-       ac->SetNodeSize(aDlg->GetIntValue(2)) ;
-       
-       if (ac->getDisplayMode()==2) {
-         bool isColored = ac->getMapper()->GetScalarVisibility(); //SAL3899
-         vtkDataSetMapper* meshMapper = (vtkDataSetMapper*) (ac->getMapper());
-         meshMapper->SetInput(ac->DataSource);
-         vtkShrinkFilter *shrink = vtkShrinkFilter::New();
-         shrink->SetInput(meshMapper->GetInput());
-         shrink->SetShrinkFactor(ac->GetShrinkFactor());
-         
-         meshMapper->SetInput( shrink->GetOutput() );
-         meshMapper->SetScalarVisibility(isColored); //SAL3899
-         ac->SetMapper( meshMapper );
-       }
-      }
-      delete aDlg;
-      QApplication::restoreOverrideCursor();
-      break;
-    }
-  case 4:
-    {
-      EmitSignalDeactivateDialog() ;
-      SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
-      SMESHGUI_TransparencyDlg *aDlg = new SMESHGUI_TransparencyDlg( QAD_Application::getDesktop(), "", Sel) ;
-      break;
-    }
-  case 5: {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    ac->GetProperty()->SetRepresentationToPoints();
-    QApplication::restoreOverrideCursor();
-    break;
-  }
-  }
-
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-    vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-    theRenderer->Render();
-  }
-  QApplication::restoreOverrideCursor();
+  SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+  if( app )
+    return app->desktop();
+  else
+    return 0;
 }
 
 //=============================================================================
@@ -1469,13 +2114,13 @@ void SMESHGUI::ChangeRepresentation( SMESH_Actor* ac, int type )
  *
  */
 //=============================================================================
-void SMESHGUI::UpdateView()
+SalomeApp_Study* SMESHGUI::activeStudy()
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
-
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  theRenderer->Render();
+  SUIT_Application* app = SUIT_Session::session()->activeApplication();
+  if( app )
+    return dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
+  else
+    return NULL;
 }
 
 //=============================================================================
@@ -1483,69 +2128,15 @@ void SMESHGUI::UpdateView()
  *
  */
 //=============================================================================
-void SMESHGUI::DisplayActor(SMESH_Actor* ac, bool visibility)
+void SMESHGUI::Modified( bool theIsUpdateActions )
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
-
-  MESSAGE("DisplayActor(): DataSource = " << ac->DataSource);
-
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  vtkActorCollection* theActors = theRenderer->GetActors();
-  theActors->InitTraversal();
-  if ( theActors->IsItemPresent(ac) == 0 ) {
-    vtkProperty* prop = vtkProperty::New();
-    prop->SetColor( QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed").toFloat()/255., 
-                   QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen").toFloat()/255.,
-                   QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue").toFloat()/255. ) ;
-
-    prop->SetPointSize( QAD_CONFIG->getSetting("SMESH:SettingsNodesSize").toInt());
-    prop->SetLineWidth( QAD_CONFIG->getSetting("SMESH:SettingsWidth").toInt() );
-    ac->SetProperty( prop );
-    ac->SetColor( QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed").toFloat()/255., 
-                 QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen").toFloat()/255.,
-                 QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue").toFloat()/255. );
-
-    //    prop->BackfaceCullingOn();
-    vtkProperty* backprop = vtkProperty::New();
-    backprop->SetColor( QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorRed").toFloat()/255., 
-                       QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorGreen").toFloat()/255.,
-                       QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorBlue").toFloat()/255. ) ;
-    ac->SetBackfaceProperty(backprop);
-
-    int intValue = QAD_CONFIG->getSetting("SMESH:SettingsShrinkCoeff").toInt();
-    if (intValue == 0 )
-      intValue = 80;       
-    ac->SetShrinkFactor( intValue/100. );
-
-    ac->GetMapper()->SetResolveCoincidentTopologyToShiftZBuffer();
-    ac->GetMapper()->SetResolveCoincidentTopologyZShift(0.02);
-
-    QString DisplayMode = QAD_CONFIG->getSetting("SMESH:DisplayMode");
-    if ( DisplayMode.compare("Wireframe") == 0 ){
-      ac->setDisplayMode(0);
-      ChangeRepresentation( ac, 0 );
-    } else if ( DisplayMode.compare("Shading") == 0 ){
-      ac->setDisplayMode(1);
-      ChangeRepresentation( ac, 1 );
-    } else if ( DisplayMode.compare("Shrink") == 0 ) {
-      ac->setDisplayMode(2);
-      ChangeRepresentation( ac, 2 );
-    }
-    theRenderer->AddActor(ac);
-  } else {
-    if (ac->GetMapper())
-      ac->GetMapper()->Update();
+  if( SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() ) ) {
+    if( SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() ) ) {
+      appStudy->Modified();
+      if( theIsUpdateActions )
+        app->updateActions();
+    }
   }
-//  if ( visibility )
-  ac->SetVisibility(visibility);
-//    ac->VisibilityOn();
-//  else
-//    ac->VisibilityOff();
-
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
 }
 
 //=============================================================================
@@ -1553,20 +2144,15 @@ void SMESHGUI::DisplayActor(SMESH_Actor* ac, bool visibility)
  *
  */
 //=============================================================================
-void SMESHGUI::EraseActor(SMESH_Actor* ac)
+bool SMESHGUI::DefineDlgPosition(QWidget * aDlg, int &x, int &y)
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
-
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-
-  //NRI- : 02/12/2002 : Fixed bugId 882
-  //  ac->EdgeDevice->VisibilityOff();
-  //  ac->EdgeShrinkDevice->VisibilityOff();
-  //  ac->VisibilityOff();
-  ac->SetVisibility( false );
-
-  theRenderer->Render();
+  /* Here the position is on the bottom right corner - 10 */
+  // aDlg->resize(QSize().expandedTo(aDlg->minimumSizeHint()));
+  aDlg->adjustSize();
+  SUIT_Desktop *PP = desktop();
+  x = abs(PP->x() + PP->size().width() - aDlg->size().width() - 10);
+  y = abs(PP->y() + PP->size().height() - aDlg->size().height() - 10);
+  return true;
 }
 
 //=============================================================================
@@ -1574,50 +2160,29 @@ void SMESHGUI::EraseActor(SMESH_Actor* ac)
  *
  */
 //=============================================================================
-bool SMESHGUI::AddActorInSelection(SMESH_Actor* ac)
-{
-  SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
-  Sel->ClearIObjects();
-  if ( ac->hasIO() )
-    return Sel->AddIObject( ac->getIO() );
-  else
-    return -1;
+static int isStudyLocked(_PTR(Study) theStudy){
+  return theStudy->GetProperties()->IsLocked();
 }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-QString SMESHGUI::CheckHomogeneousSelection()
-{
-  SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-  /* copy the list */
-  SALOME_ListIO List;
-  SALOME_ListIteratorOfListIO Itinit( Sel->StoredIObjects() );
-  for (; Itinit.More(); Itinit.Next()) {
-    List.Append(Itinit.Value());
+static bool checkLock(_PTR(Study) theStudy) {
+  if (isStudyLocked(theStudy)) {
+    SUIT_MessageBox::warning( SMESHGUI::desktop(),
+                              QObject::tr("WRN_WARNING"),
+                              QObject::tr("WRN_STUDY_LOCKED") );
+    return true;
   }
+  return false;
+}
 
-  QString RefType = CheckTypeObject( Sel->firstIObject() );
-  SALOME_ListIteratorOfListIO It( List );
-  for (; It.More(); It.Next()) {
-    Handle(SALOME_InteractiveObject) IObject = It.Value();
-    QString Type = CheckTypeObject( IObject );
-    if ( Type.compare( RefType ) != 0 )
-      return "Heterogeneous Selection";
-  }
+//=======================================================================
+//function : CheckActiveStudyLocked
+//purpose  :
+//=======================================================================
 
-  Sel->ClearIObjects();
-  SALOME_ListIteratorOfListIO It1( List );
-  for(;It1.More();It1.Next()) {
-    int res = Sel->AddIObject( It1.Value() );
-    if ( res == -1 )
-      myActiveStudy->highlight( It1.Value(), false );
-    if ( res == 0 )
-      myActiveStudy->highlight( It1.Value(), true );
-  }
-  return RefType;
+bool SMESHGUI::isActiveStudyLocked()
+{
+  _PTR(Study) aStudy = activeStudy()->studyDS();
+  return checkLock( aStudy );
 }
 
 //=============================================================================
@@ -1625,2550 +2190,1271 @@ QString SMESHGUI::CheckHomogeneousSelection()
  *
  */
 //=============================================================================
-QString SMESHGUI::CheckTypeObject(const Handle(SALOME_InteractiveObject)& IO)
+bool SMESHGUI::OnGUIEvent( int theCommandID )
 {
-  SALOMEDS::SObject_var sobj = smeshGUI->myActiveStudy->getStudyDocument()->FindObjectID(IO->getEntry());
-  if (!sobj->_is_nil()) {
-    SALOMEDS::SComponent_var scomp = sobj->GetFatherComponent();
-    if (strcmp(scomp->GetID(), IO->getEntry()) == 0) { // component is selected
-      return "Component";
-    }
-  }
+  SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( application() );
+  if( !anApp )
+    return false;
 
-  SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-  Sel->ClearIObjects();
-
-  Handle(SMESH_TypeFilter) aHypFilter = new SMESH_TypeFilter( HYPOTHESIS );
-  Handle(SMESH_TypeFilter) anAlgoFilter = new SMESH_TypeFilter( ALGORITHM );
-  Handle(SMESH_TypeFilter) aMeshFilter = new SMESH_TypeFilter( MESH );
-  Handle(SMESH_TypeFilter) aSubMeshFilter = new SMESH_TypeFilter( SUBMESH );
-  Handle(SMESH_TypeFilter) aMeshOrSubMeshFilter = new SMESH_TypeFilter( MESHorSUBMESH );
-  Handle(SMESH_TypeFilter) aSubMeshVextexFilter = new SMESH_TypeFilter( SUBMESH_VERTEX );
-  Handle(SMESH_TypeFilter) aSubMeshEdgeFilter = new SMESH_TypeFilter( SUBMESH_EDGE );
-  Handle(SMESH_TypeFilter) aSubMeshFaceFilter = new SMESH_TypeFilter( SUBMESH_FACE );
-  Handle(SMESH_TypeFilter) aSubMeshSolidFilter = new SMESH_TypeFilter( SUBMESH_SOLID );
-  Handle(SMESH_TypeFilter) aSubMeshCompoundFilter = new SMESH_TypeFilter( SUBMESH_COMPOUND );
-  
-  Sel->AddFilter(aHypFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "Hypothesis";
-  } 
-
-  Sel->ClearFilters();
-  Sel->AddFilter(anAlgoFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "Algorithm";
-  } 
-
-  Sel->ClearFilters();
-  Sel->AddFilter(aMeshFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "Mesh";
-  } 
-
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "SubMesh";
-  } 
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshVextexFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "SubMeshVertex";
-  } 
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshEdgeFilter);
-  if ( Sel->AddIObject( IO ) != -1 ){
-    Sel->ClearFilters();
-    return "SubMeshEdge";
-  } 
-  
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshFaceFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "SubMeshFace";
-  } 
-  
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshSolidFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "SubMeshSolid";
-  } 
-  
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshCompoundFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "SubMeshCompound";
-  } 
-  
-  Sel->ClearFilters();
-  Sel->AddIObject( IO );
-  return "NoType";
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::OnGUIEvent(int theCommandID,    QAD_Desktop* parent)
-{
-  /* Create or retrieve an object SMESHGUI */
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-  // NRI : Temporary added
-  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
+  _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); //Document OCAF de l'etude active
+  SUIT_ResourceMgr* mgr = resourceMgr();
+  if( !mgr )
     return false;
-  }
-  //NRI
 
-  //  QAD_Viewer3d* v3d;
-  OCCViewer_Viewer3d* v3d;
-  
-  Handle(AIS_InteractiveContext) ic;
-  vtkRenderer* Renderer;
-  vtkRenderWindow* RenWin;
-
-  if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC ) {
-    v3d =((OCCViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); 
-    ic = v3d->getAISContext();
-  } else if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) {
-    Renderer = ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-    RenWin = Renderer->GetRenderWindow();
+  if (CORBA::is_nil(GetSMESHGen()->GetCurrentStudy())) {
+    GetSMESHGen()->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy());
   }
 
-  switch (theCommandID)
+  SUIT_ViewWindow* view = application()->desktop()->activeWindow();
+  SVTK_ViewWindow* vtkwnd = dynamic_cast<SVTK_ViewWindow*>( view );
+
+  //QAction* act = action( theCommandID );
+
+  switch (theCommandID) {
+  case 33:                                      // DELETE
+    if(checkLock(aStudy)) break;
+    OnEditDelete();
+    break;
+
+  case 116:
+  case 115:
+  case 117:
+  case 118:
+  case 113:
+  case 112:
+  case 111:                                     // IMPORT
     {
-    case 33: // DELETE
-      smeshGUI->OnEditDelete();
+      if(checkLock(aStudy)) break;
+      ::ImportMeshesFromFile(GetSMESHGen(),theCommandID);
       break;
+    }
 
-    case 113: // IMPORT
-    case 112:
-    case 111: 
+  case 150:    //MED FILE INFORMATION
+    {
+      SALOME_ListIO selected;
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      if( aSel )
+        aSel->selectedObjects( selected );
+      if( selected.Extent() )
       {
-       Import_Document(parent,theCommandID);//NBU
-       //Import_Mesh(parent,theCommandID);
-       break;
+        Handle(SALOME_InteractiveObject) anIObject = selected.First();
+        SMESH::SMESH_Mesh_var aMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIObject);
+        if ( !aMesh->_is_nil() )
+        {
+          SMESHGUI_FileInfoDlg dlg( desktop(), aMesh->GetMEDFileInfo() );
+          dlg.exec();
+        }
       }
+      break;
+    }
 
-    case 122: // EXPORT MED
-    case 121:
-    case 123:
-      {
-       Export_Mesh(parent, theCommandID);
-       break;
-      }
+  case 122:                                     // EXPORT MED
+  case 121:
+  case 123:
+  case 124:
+  case 125:
+  case 126:
+  case 140:
+  case 141:
+  case 142:
+  case 143:
+  case 144:
+  case 145:
+  case 146:
+  case 147:
+    {
+      ::ExportMeshToFile(theCommandID);
+      break;
+    }
 
-    case 200: // SCALAR BAR
-      {
-       smeshGUI->DisplayScalarBar(false);
-       break;
-      }
-    case 201:
-      {
-       SMESHGUI_EditScalarBarDlg *aDlg = new SMESHGUI_EditScalarBarDlg( parent, "", false ) ;
-       aDlg->show();
-       break;
+  case 200:                                     // SCALAR BAR
+    {
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      if( selected.Extent() ) {
+        Handle(SALOME_InteractiveObject) anIO = selected.First();
+        if( anIO->hasEntry() ) {
+          if( SMESH_Actor* anActor = SMESH::FindActorByEntry( anIO->getEntry() ) ) {
+            anActor->SetControlMode( SMESH_Actor::eNone );
+#ifndef DISABLE_PLOT2DVIEWER
+            SMESH::ProcessIn2DViewers(anActor,SMESH::RemoveFrom2dViewer);
+#endif
+          }
+        }
       }
-    case 202:
-      {
-       smeshGUI->DisplayScalarBar( true );
-       break;
-      }      
-
-    case 1133: // DISPLAY MODE : WireFrame, Surface, Shrink
-    case 1132:
-    case 213:
-    case 212:
-    case 211:
-      {
-       smeshGUI->SetViewMode(theCommandID);
-       break;
+      break;
+    }
+  case 201:
+    {
+      SMESHGUI_Preferences_ScalarBarDlg::ScalarBarProperties( this );
+      break;
+    }
+  case 2021:
+    {
+      // dump control distribution data to the text file
+      ::SaveDistribution();
+      break;
+    }
+
+  case 2022:
+    {
+      // show/ distribution
+      ::ShowDistribution();
+      break;
+    }
+
+#ifndef DISABLE_PLOT2DVIEWER
+  case 2023:
+    {
+      // plot distribution
+      ::PlotDistribution();
+      break;
+    }
+#endif
+
+    // Auto-color
+  case 1136:
+    ::AutoColor();
+  break;
+
+  case 1137:
+    ::DisableAutoColor();
+  break;
+
+  case 1134: // Clipping
+  case 1133: // Tranparency
+  case 1132: // Display preferences (colors, shrink size, line width, ...)
+
+    // Display Mode
+  case 215: // Nodes
+  case 213: // Nodes
+  case 212: // Nodes
+  case 211: // Nodes
+    ::SetDisplayMode(theCommandID, myMarkerMap);
+  break;
+
+  //2D quadratic representation
+  case 231:
+  case 232:
+    ::SetDisplayMode(theCommandID, myMarkerMap);
+  break;
+
+  // Display Entity
+  case 216: // 0D elements
+  case 217: // Edges
+  case 218: // Faces
+  case 219: // Volumes
+  case 220: // All Entity
+  case 222: // Balls
+    ::SetDisplayEntity(theCommandID);
+  break;
+
+  case 221: // Orientation of faces
+    {
+      LightApp_SelectionMgr* mgr = selectionMgr();
+      SALOME_ListIO selected; mgr->selectedObjects( selected );
+
+      SALOME_ListIteratorOfListIO it(selected);
+      for( ; it.More(); it.Next()) {
+        Handle(SALOME_InteractiveObject) anIObject = it.Value();
+        if(anIObject->hasEntry()) {
+          if(SMESH_Actor *anActor = SMESH::FindActorByEntry(anIObject->getEntry())){
+            anActor->SetFacesOriented( !anActor->GetFacesOriented() );
+          }
+        }
       }
-      
-    case 214 : // UPDATE
-      {
-       smeshGUI->Update();
-       break;
+      break;
+    }
+
+  case 214:                                     // UPDATE
+    {
+      if(checkLock(aStudy)) break;
+      try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+        OCC_CATCH_SIGNALS;
+#endif
+        SMESH::UpdateView();
       }
-    case 300 : // ERASE
-      {
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-         // VTK
-         SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-         for(;It.More();It.Next()) {
-           Handle(SALOME_InteractiveObject) IOS = It.Value();
-           if ( IOS->hasEntry() ) {
-             Standard_Boolean res;
-             SMESH_Actor *ac = smeshGUI->FindActorByEntry(IOS->getEntry(), res, true );
-             if ( res ) smeshGUI->EraseActor( ac );
-           }
-         }
-       }
-       Sel->ClearIObjects();
-       smeshGUI->myActiveStudy->updateObjBrowser( true );
+      catch (std::bad_alloc) { // PAL16774 (Crash after display of many groups)
+        SMESH::OnVisuException();
       }
-     
-    case 301 : // DISPLAY
-      {
-       if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-         // VTK
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         SALOMEDS::SObject_var fatherSF = 
-           smeshGUI->myStudy->FindObjectID(smeshGUI->myActiveStudy->getActiveStudyFrame()->entry());
-
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-         
-         for(;It.More();It.Next()) {
-           Handle(SALOME_InteractiveObject) IObject = It.Value();
-           if ( IObject->hasEntry() ) {
-             Standard_Boolean res;
-             SMESH_Actor *ac = smeshGUI->FindActorByEntry(IObject->getEntry(), res, true );
-             if ( res ) {
-               smeshGUI->DisplayActor( ac, true );
-               smeshGUI->DisplayEdges( ac ); 
-               smeshGUI->ChangeRepresentation( ac, ac->getDisplayMode() );
-             }
-           }
-         }
-         QApplication::restoreOverrideCursor();
-       }
-       break;
+      catch (...) { // PAL16774 (Crash after display of many groups)
+        SMESH::OnVisuException();
       }
 
-    case 302 : // DISPLAY ONLY
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         vtkActorCollection* theActors = Renderer->GetActors();
-         theActors->InitTraversal();
-         vtkActor *ac = theActors->GetNextActor();
-         while(!(ac==NULL)) {
-           if ( ac->IsA("SMESH_Actor") ) {
-             SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( ac );
-             if(!anActor->isHighlighted()) {
-               //anActor->VisibilityOff();
-               //NRI- : 02/12/2002 : Fixed bugId 882
-               //              anActor->EdgeDevice->VisibilityOff();
-               //              anActor->EdgeShrinkDevice->VisibilityOff();
-               anActor->SetVisibility( false );
-             }
-           }
-           ac = theActors->GetNextActor();
-         }
-
-         // Display selection
-         SALOMEDS::SObject_var fatherSF = smeshGUI->myStudy->FindObjectID(smeshGUI->myActiveStudy->getActiveStudyFrame()->entry());
-         
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-         
-         for(;It.More();It.Next()) {
-           Handle(SALOME_InteractiveObject) IObject = It.Value();
-           SALOMEDS::SObject_var obj = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-           
-           VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
-           //      vtkQGLRenderWindowInteractor* myRenderInter= smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getVTKView()->getRWInteractor();
-           
-           if(myRenderInter->isInViewer(IObject)) {
-             if ( IObject->hasEntry() ) {
-               Standard_Boolean res;
-               SMESH_Actor *ac = smeshGUI->FindActorByEntry(IObject->getEntry(), res, true );
-               if ( res ) {
-                 smeshGUI->DisplayActor( ac, true );
-                 smeshGUI->DisplayEdges( ac ); 
-                 smeshGUI->ChangeRepresentation( ac, ac->getDisplayMode() );
-               }
-             }
-           }
-         }
-         smeshGUI->myActiveStudy->updateObjBrowser( true );
-         QApplication::restoreOverrideCursor();
-       }
-       break;
-      }
+      SALOME_ListIO l;
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      aSel->selectedObjects( l );
+      aSel->setSelectedObjects( l );
+      break;
+    }
 
-    case 400: // NODES
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_NodesDlg *aDlg = new SMESHGUI_NodesDlg( parent, "", Sel ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
+  case 300:                                     // ERASE
+  case 301:                                     // DISPLAY
+  case 302:                                     // DISPLAY ONLY
+    {
+      SMESH::EDisplaing anAction;
+      switch (theCommandID) {
+      case 300: anAction = SMESH::eErase; break;
+      case 301: anAction = SMESH::eDisplay; break;
+      case 302: anAction = SMESH::eDisplayOnly; break;
       }
 
-    case 405: // MOVE NODE
-      {
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         SMESHGUI_MoveNodesDlg *aDlg = new SMESHGUI_MoveNodesDlg( parent, "", Sel ) ;
-         break;
-      }
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO sel_objects, to_process;
+      if (aSel)
+        aSel->selectedObjects( sel_objects );
 
-    case 701: // COMPUTE MESH 
+      if( theCommandID==302 )
       {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         int nbSel = Sel->IObjectCount();
-         if ( nbSel != 1 ) {
-           QApplication::restoreOverrideCursor();
-           break;
-         }
-
-         SMESH::SMESH_Mesh_var aM;
-         SMESH::SMESH_subMesh_var aSubM;
-         Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-         if ( IObject->hasEntry() ) {
-           SALOMEDS::SObject_var aMorSM = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-            SALOMEDS::GenericAttribute_var anAttr;
-            SALOMEDS::AttributeIOR_var     anIOR;
-           if ( !aMorSM->_is_nil() ) {
-             if (aMorSM->FindAttribute(anAttr, "AttributeIOR") ) {
-                anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-               MESSAGE( "SMESHGUI::OnGUIEvent - Compute mesh : IOR = " << anIOR->Value() )
-               CORBA::Object_var cobj;
-               try {
-                 cobj = _orb->string_to_object(anIOR->Value());
-                 if ( CORBA::is_nil(cobj) ) {
-                   MESSAGE( "SMESHGUI::OnGUIEvent - Compute mesh : nil object" )
-                 }
-               }
-               catch(CORBA::COMM_FAILURE& ex) {
-                 MESSAGE( "SMESHGUI::OnGUIEvent - Compute mesh : exception (1)" )
-               }
-               aM = SMESH::SMESH_Mesh::_narrow(cobj);
-               //aM = SMESH::SMESH_Mesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-               aSubM = SMESH::SMESH_subMesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-               if ( !aM->_is_nil() ) {
-                 GEOM::GEOM_Shape_var refShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(aMorSM);
-                 if ( !refShape->_is_nil() ) {
-                   bool compute = smeshGUI->myComponentMesh->IsReadyToCompute(aM, refShape);
-                   if ( !compute ) {
-                     QApplication::restoreOverrideCursor();
-                     QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                             tr ("SMESH_WRN_MISSING_PARAMETERS"), tr ("SMESH_BUT_YES") );
-                     break;
-                   }
-                   try {
-                     smeshGUI->myComponentMesh->Compute( aM, refShape);
-                     smeshGUI->myStudyAPI.ModifiedMesh( aMorSM, true );
-                     // TO Do : change icon of all submeshes
-                   }
-                   catch  (const SALOME::SALOME_Exception& S_ex) {
-                     QtCatchCorbaException(S_ex);
-                   }
-                 }
-               } else if ( !aSubM->_is_nil() ) {
-                 aM = aSubM->GetFather();
-                 GEOM::GEOM_Shape_var refShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(aMorSM);
-                 if ( !refShape->_is_nil() ) {
-                   bool compute = smeshGUI->myComponentMesh->IsReadyToCompute(aM, refShape);
-                   if ( !compute ) {
-                     QApplication::restoreOverrideCursor();
-                     QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                             tr ("SMESH_WRN_MISSING_PARAMETERS"), tr ("SMESH_BUT_YES") );
-                     break;
-                   }
-                   try {
-                     smeshGUI->myComponentMesh->Compute( aM, refShape);
-                     smeshGUI->myStudyAPI.ModifiedMesh( aMorSM, true );
-                     // TO Do : change icon of all submeshes
-                   }
-                   catch  (const SALOME::SALOME_Exception& S_ex) {
-                     QtCatchCorbaException(S_ex);
-                   }
-                 }
-               }
-             }
-           }
-         }
-
-         // Check whether the actor for the mesh exists at least in one view
-         Standard_Boolean res;
-         SMESH_Actor* ac = smeshGUI->FindActorByEntry(IObject->getEntry(), res, false);
-         if (!res)
-           smeshGUI->InitActor( aM );
-         else {
-           // Check whether the actor belongs to the active view
-           VTKViewer_RenderWindowInteractor* rwInter = 
-             ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
-
-           // The actor belongs to inactive view -> create a copy and add it in the active view
-           if (!rwInter->isInViewer(IObject)) {
-             SMESH_Actor* acCopy = SMESH_Actor::New();
-             acCopy->ShallowCopy(ac);
-
-             smeshGUI->DisplayActor( acCopy, false );
-           }
-         }
-
-         if ( smeshGUI->myAutomaticUpdate ) {
-           SMESH_Actor* Mesh = smeshGUI->ReadScript(aM);
-           if ( Mesh != NULL ) {
-#ifdef TRACE
-             Dump( Mesh );
-#endif
-             smeshGUI->DisplayActor( Mesh, true );
-             smeshGUI->DisplayEdges( Mesh, true );    
-             smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-           }
-         }
-       } else {
-         QApplication::restoreOverrideCursor();
-         QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                 tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       QApplication::restoreOverrideCursor();
-       break;
+        MESSAGE("anAction = SMESH::eDisplayOnly");
+        startOperation( myEraseAll );
       }
 
-    case 702: // ADD SUB MESH 
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         SMESHGUI_AddSubMeshDlg *aDlg = new SMESHGUI_AddSubMeshDlg( parent, "", Sel ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-         QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
+      extractContainers( sel_objects, to_process );
+
+      try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+        OCC_CATCH_SIGNALS;
+#endif
+        if (vtkwnd) {
+          SALOME_ListIteratorOfListIO It( to_process );
+          for ( ; It.More(); It.Next()) {
+                MESSAGE("---");
+            Handle(SALOME_InteractiveObject) IOS = It.Value();
+            if (IOS->hasEntry()) {
+                MESSAGE("---");
+              if (!SMESH::UpdateView(anAction, IOS->getEntry())) {
+                SMESHGUI::GetSMESHGUI()->EmitSignalVisibilityChanged();
+                break; // PAL16774 (Crash after display of many groups)
+              }
+              if (anAction == SMESH::eDisplayOnly)
+              {
+                MESSAGE("anAction = SMESH::eDisplayOnly");
+                anAction = SMESH::eDisplay;
+              }
+            }
+          }
+        }
+
+        // PAL13338 + PAL15161 -->
+        if ( ( theCommandID==301 || theCommandID==302 ) && !checkLock(aStudy)) {
+                MESSAGE("anAction = SMESH::eDisplayOnly");
+          SMESH::UpdateView();
+          SMESHGUI::GetSMESHGUI()->EmitSignalVisibilityChanged();
+        }
+        // PAL13338 + PAL15161 <--
       }
-    
-    case 703: // INIT MESH 
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_InitMeshDlg *aDlg = new SMESHGUI_InitMeshDlg( parent, "", Sel ) ;
-       break;
+      catch (...) { // PAL16774 (Crash after display of many groups)
+        SMESH::OnVisuException();
       }
 
-    case 704: // EDIT Hypothesis 
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg( parent, "", Sel ) ;
-       break;
+      if (anAction == SMESH::eErase) {
+        MESSAGE("anAction == SMESH::eErase");
+        SALOME_ListIO l1;
+        aSel->setSelectedObjects( l1 );
       }
+      else
+        aSel->setSelectedObjects( to_process );
 
-    case 705: //  EDIT Global Hypothesis
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg( parent, "", Sel ) ;
-       break;
-      }
+      break;
+    }
 
-    case 706: //  EDIT Local Hypothesis
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg( parent, "", Sel ) ;
-       break;
-      }
+  case 4000:                                    // NODES
+    {
+      if(checkLock(aStudy)) break;
 
-    case 806: // ORIENTATION ELEMENTS
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       smeshGUI->myDesktop->SetSelectionMode(3, true);
-       SMESHGUI_OrientationElementsDlg *aDlg = new SMESHGUI_OrientationElementsDlg( parent, "", Sel ) ;
-       break;
-      }
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
 
-    case 807: // DIAGONAL INVERSION
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       Sel->ClearIObjects();
-       smeshGUI->myDesktop->SetSelectionMode(2, true);
-       SMESHGUI_DiagonalInversionDlg *aDlg = new SMESHGUI_DiagonalInversionDlg( parent, "", Sel ) ;
-       break;
+        ( new SMESHGUI_NodesDlg( this ) )->show();
       }
-     
-    case 900: // MESH INFOS
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_MeshInfosDlg *aDlg = new SMESHGUI_MeshInfosDlg( parent, "", Sel ) ;
-       break;
+      else {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"),
+                                 tr("SMESH_WRN_VIEWER_VTK"));
       }
-      
-    case 1001: // AUTOMATIC UPDATE PREFERENCES
+      break;
+    }
+
+  case 2151:  // FILTER
+  {
+    if ( vtkwnd )
+    {
+      EmitSignalDeactivateDialog();
+      ( new SMESHGUI_FilterDlg( this, SMESH::EDGE ) )->show();
+    }
+    break;
+  }
+
+  case 701: // COMPUTE MESH
+  case 711: // PRECOMPUTE MESH
+  case 712: // EVALUATE MESH
+  case 713: // MESH ORDER
+  case 702: // Create mesh
+  case 703: // Create sub-mesh
+  case 704: // Edit mesh/sub-mesh
+    startOperation( theCommandID );
+    break;
+  case 705: // copy mesh
+    {
+      if (checkLock(aStudy)) break;
+      EmitSignalDeactivateDialog();
+      ( new SMESHGUI_CopyMeshDlg( this ) )->show();
+    }
+    break;
+  case 710: // Build compound mesh
+    {
+      if (checkLock(aStudy)) break;
+      EmitSignalDeactivateDialog();
+      ( new SMESHGUI_BuildCompoundDlg( this ) )->show();
+    }
+    break;
+
+  case 407: // DIAGONAL INVERSION
+  case 408: // Delete diagonal
+    {
+      if ( !vtkwnd )
       {
-       parent->menuBar()->setItemChecked(1001, !parent->menuBar()->isItemChecked(1001) );
-       if ( parent->menuBar()->isItemChecked(1001) ) {
-         QAD_CONFIG->addSetting("SMESH:AutomaticUpdate","true");
-         smeshGUI->myAutomaticUpdate = true;     
-       } else {
-         QAD_CONFIG->addSetting("SMESH:AutomaticUpdate","false");
-         smeshGUI->myAutomaticUpdate = false;
-       }
-       break;
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
       }
-       
-    case 1003: // MESH PREFERENCES
+
+      if ( checkLock( aStudy ) )
+        break;
+
+      /*Standard_Boolean aRes;
+      SMESH::SMESH_Mesh_var aMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(IObject);
+      if ( aMesh->_is_nil() )
       {
-       smeshGUI->SetDisplaySettings();
-       break;
+        SUIT_MessageBox::warning(GetDesktop(), tr( "SMESH_WRN_WARNING" ),
+          tr( "SMESH_BAD_SELECTION" ) );
+        break;
       }
-      
-    case 1005:
+      */
+      EmitSignalDeactivateDialog();
+      if ( theCommandID == 407 )
+        ( new SMESHGUI_TrianglesInversionDlg( this ) )->show();
+      else
+        ( new SMESHGUI_UnionOfTwoTrianglesDlg( this ) )->show();
+      break;
+    }
+  case 409: // Change orientation
+  case 410: // Union of triangles
+  case 411: // Cutting of quadrangles
+  case 419: // Splitting volumes into tetrahedra
+    {
+      if ( !vtkwnd )
       {
-       QString Bold = QAD_CONFIG->getSetting("ScalarBar:Bold");
-       QString Italic = QAD_CONFIG->getSetting("ScalarBar:Italic");
-       QString Shadow = QAD_CONFIG->getSetting("ScalarBar:Shadow");    
-       QString FontFamily = QAD_CONFIG->getSetting("ScalarBar:FontFamily");
-       QString Orientation = QAD_CONFIG->getSetting("ScalarBar:Orientation");
-       float Width = QAD_CONFIG->getSetting("ScalarBar:Width").toFloat();  
-       float Height = QAD_CONFIG->getSetting("ScalarBar:Height").toFloat();
-       int NumberOfLabels = QAD_CONFIG->getSetting("ScalarBar:NumberOfLabels").toInt();
-       int NumberOfColors = QAD_CONFIG->getSetting("ScalarBar:NumberOfColors").toInt();
-
-       if ( Width == 0 ) Width = 0.17;
-       if ( Height == 0 ) Height = 0.8;
-       if ( NumberOfLabels == 0 ) NumberOfLabels = 5;
-       if ( NumberOfColors == 0) NumberOfColors = 64;
-
-       SMESHGUI_Preferences_ScalarBarDlg *aDlg = new SMESHGUI_Preferences_ScalarBarDlg( parent, "", true) ;
-
-       if ( Bold.compare("true") == 0 ) 
-         aDlg->Bold->setChecked(true); else aDlg->Bold->setChecked(false);
-       if ( Italic.compare("true") == 0 ) 
-         aDlg->Italic->setChecked(true); else aDlg->Italic->setChecked(false);
-       if ( Shadow.compare("true") == 0 ) 
-         aDlg->Shadow->setChecked(true); else aDlg->Shadow->setChecked(false);
-
-       if ( Orientation.compare("Horizontal") == 0 ) 
-         aDlg->RadioHoriz->setChecked(true); else aDlg->RadioVert->setChecked(true);
-
-       int NbItems = aDlg->ComboBox1->count();
-       int i = 0;
-       aDlg->ComboBox1->setCurrentItem( i );
-       while ( i < NbItems ) {
-         if ( FontFamily.compare( aDlg->ComboBox1->text( i ) ) == 0 )
-           aDlg->ComboBox1->setCurrentItem( i );
-         i++;
-       }
-       
-       aDlg->LineEditWidth->setText( QString("%1").arg(Width) );
-       aDlg->LineEditHeight->setText( QString("%1").arg(Height) );
-
-       aDlg->SpinBoxLabels->setValue( NumberOfLabels );
-       aDlg->SpinBoxColors->setValue( NumberOfColors );
-       
-       aDlg->show();
-       if ( aDlg->result() ) {
-         if ( aDlg->RadioHoriz->isChecked() )
-           Orientation = "Horizontal"; else Orientation = "Vertical";
-         if ( aDlg->Bold->isChecked() )
-           Bold = "true"; else Bold = "false";
-         if ( aDlg->Italic->isChecked() )
-           Italic = "true"; else Italic = "false";
-         if ( aDlg->Shadow->isChecked() )
-           Shadow = "true"; else Shadow = "false";
-                       
-         FontFamily = aDlg->ComboBox1->currentText();
-         Width = aDlg->LineEditWidth->text().toFloat();
-         Height = aDlg->LineEditHeight->text().toFloat();
-         NumberOfColors = aDlg->SpinBoxColors->text().toInt();
-         NumberOfLabels = aDlg->SpinBoxLabels->text().toInt();
-
-         
-         vtkScalarBarActor* aScalarBar = smeshGUI->GetScalarBar();
-         if ( aScalarBar != NULL ) {
-           smeshGUI->SetSettingsScalarBar(aScalarBar, Bold, Italic, Shadow, 
-                                          FontFamily, Orientation,
-                                          Width, Height, NumberOfColors, NumberOfLabels);
-         }
-         
-         QAD_CONFIG->addSetting("ScalarBar:Bold", Bold);
-         QAD_CONFIG->addSetting("ScalarBar:Italic", Italic);
-         QAD_CONFIG->addSetting("ScalarBar:Shadow", Shadow);    
-         QAD_CONFIG->addSetting("ScalarBar:FontFamily", FontFamily);
-         QAD_CONFIG->addSetting("ScalarBar:Orientation", Orientation);
-         QAD_CONFIG->addSetting("ScalarBar:Width", Width);
-         QAD_CONFIG->addSetting("ScalarBar:Height", Height);
-         QAD_CONFIG->addSetting("ScalarBar:NumberOfLabels", NumberOfLabels);
-         QAD_CONFIG->addSetting("ScalarBar:NumberOfColors", NumberOfColors);
-       }
-       break;
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
       }
-      
-    case 1100: // EDIT HYPOTHESIS
-      {
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       int nbSel = Sel->IObjectCount() ;
-
-       if ( nbSel == 1 ) {
-         Standard_Boolean res;
-         SMESH::SMESH_Hypothesis_var Hyp = smeshGUI->ConvertIOinSMESHHypothesis( Sel->firstIObject(), res );
-
-         /* Look for all mesh objects that have this hupothesis affected in order to flag as ModifiedMesh */
-         /* At end below '...->updateObjBrowser(true)' will change icon of mesh objects                   */
-         /* Warning : however by internal mechanism all subMeshes icons are changed !                     */
-         SALOMEDS::Study::ListOfSObject_var listSOmesh = smeshGUI->GetMeshesUsingAlgoOrHypothesis( Hyp) ;
-
-         if ( res ) {
-           QString Name = Hyp->GetName();
-           
-           if ( Name.compare("LocalLength") == 0 ) {
-             SMESH::SMESH_LocalLength_var LL = SMESH::SMESH_LocalLength::_narrow( Hyp );
-             double beforeLength = LL->GetLength() ;
-             double Length = smeshGUI->Parameter( res, 
-                                                  beforeLength,
-                                                  tr("SMESH_LOCAL_LENGTH_HYPOTHESIS"), 
-                                                  tr("SMESH_VALUE"), 
-                                                  1.0E-5, 1E6, 6 ) ;
-             if ( res && Length != beforeLength ) {
-               LL->SetLength( Length );
-               for( int i=0; i<listSOmesh->length(); i++ ) {
-                 smeshGUI->GetStudyAPI().ModifiedMesh( listSOmesh[i], false ) ;
-               }
-               break;
-             }
-             
-           } else if ( Name.compare("NumberOfSegments") == 0 ) {
-             SMESH::SMESH_NumberOfSegments_var NOS = SMESH::SMESH_NumberOfSegments::_narrow( Hyp );
-             int beforeNbSeg = NOS->GetNumberOfSegments() ;
-             int NbSeg = smeshGUI->Parameter( res,
-                                              beforeNbSeg, 
-                                              tr("SMESH_NB_SEGMENTS_HYPOTHESIS"), 
-                                              tr("SMESH_VALUE"), 
-                                              1, 1000000 ) ;
-
-             if ( res && NbSeg != beforeNbSeg ) {
-               NOS->SetNumberOfSegments( NbSeg );
-               for( int i=0; i<listSOmesh->length(); i++ ) {             
-                 SALOMEDS::SObject_var SO = listSOmesh[i] ;
-                 smeshGUI->GetStudyAPI().ModifiedMesh( listSOmesh[i], false ) ;
-               }
-               break;
-             }
-             
-           } else if ( Name.compare("MaxElementArea") == 0 ) {
-             SMESH::SMESH_MaxElementArea_var MEA = SMESH::SMESH_MaxElementArea::_narrow( Hyp );
-             double beforeMaxArea = MEA->GetMaxElementArea() ;
-             double MaxArea = smeshGUI->Parameter( res,
-                                                   beforeMaxArea,
-                                                   tr("SMESH_MAX_ELEMENT_AREA_HYPOTHESIS"), 
-                                                   tr("SMESH_VALUE"), 
-                                                   1.0E-5, 1E6, 6 ) ;
-             if ( res && MaxArea != beforeMaxArea ) {
-               MEA->SetMaxElementArea( MaxArea );
-               for( int i=0; i<listSOmesh->length(); i++ ) {
-                 smeshGUI->GetStudyAPI().ModifiedMesh( listSOmesh[i], false ) ;
-               }
-               break;
-             }
-             
-           }  else if ( Name.compare("MaxElementVolume") == 0 ) {
-             SMESH::SMESH_MaxElementVolume_var MEV = SMESH::SMESH_MaxElementVolume::_narrow( Hyp );
-             double beforeMaxVolume = MEV->GetMaxElementVolume() ;
-             double MaxVolume = smeshGUI->Parameter( res, 
-                                                     beforeMaxVolume,
-                                                     tr("SMESH_MAX_ELEMENT_AREA_HYPOTHESIS"), 
-                                                     tr("SMESH_VALUE"), 
-                                                     1.0E-5, 1E6, 6 ) ;
-             if ( res && MaxVolume != beforeMaxVolume ) {
-               MEV->SetMaxElementVolume( MaxVolume );
-               for( int i=0; i<listSOmesh->length(); i++ ) {
-                 smeshGUI->GetStudyAPI().ModifiedMesh( listSOmesh[i], false ) ;
-               }
-               break;
-             }
-             
-           } else if ( Name.compare("Regular_1D") == 0 ) {
-           } else if ( Name.compare("MEFISTO_2D") == 0 ) {
-           } else {
-           }
-           
-         }
-       }
-       break;
+
+      if ( checkLock( aStudy ) )
+        break;
+
+      EmitSignalDeactivateDialog();
+      SMESHGUI_MultiEditDlg* aDlg = NULL;
+      if ( theCommandID == 409 )
+        aDlg = new SMESHGUI_ChangeOrientationDlg(this);
+      else if ( theCommandID == 410 )
+        aDlg = new SMESHGUI_UnionOfTrianglesDlg(this);
+      else if ( theCommandID == 419 )
+        aDlg = new SMESHGUI_CuttingIntoTetraDlg(this);
+      else
+        aDlg = new SMESHGUI_CuttingOfQuadsDlg(this);
+
+      aDlg->show();
+      break;
+    }
+  case 412: // Smoothing
+    {
+      if(checkLock(aStudy)) break;
+      if( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_SmoothingDlg( this ) )->show();
       }
-      
-    case 1101: // RENAME
-      {
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-       for ( ; It.More(); It.Next() ) {
-         Handle(SALOME_InteractiveObject) IObject = It.Value();
-
-         SALOMEDS::SObject_var obj = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-          SALOMEDS::GenericAttribute_var anAttr;
-          SALOMEDS::AttributeName_var    aName;
-         if ( !obj->_is_nil() ) {
-           if (obj->FindAttribute(anAttr, "AttributeName")) {
-              aName = SALOMEDS::AttributeName::_narrow(anAttr);
-             QString newName = QString( aName->Value() );
-             newName = SALOMEGUI_NameDlg::getName( QAD_Application::getDesktop(), newName);
-             if ( !newName.isEmpty() ) {
-               QApplication::setOverrideCursor( Qt::waitCursor );
-               smeshGUI->myActiveStudy->renameIObject( IObject, newName );
-             }
-             QApplication::restoreOverrideCursor();
-           }
-         }
-       }
-       break;
-      }  
-
-    case 1102: // REMOVE HYPOTHESIS / ALGORITHMS
-      {
-       QApplication::setOverrideCursor( Qt::waitCursor );
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-       for ( int i=0; It.More(); It.Next(), i++ ) {
-         Handle(SALOME_InteractiveObject) IObject = It.Value();
-         smeshGUI->RemoveHypothesisOrAlgorithmOnMesh( IObject );
-       }
-       Sel->ClearIObjects();
-       smeshGUI->myActiveStudy->updateObjBrowser( true );
-       QApplication::restoreOverrideCursor();
-       break;
+      else {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
       }
-    case 401: // GEOM::EDGE
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_AddEdgeDlg *aDlg = new SMESHGUI_AddEdgeDlg( parent, "", Sel ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
+      break;
+    }
+  case 413: // Extrusion
+    {
+      if (checkLock(aStudy)) break;
+      if (vtkwnd) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_ExtrusionDlg ( this ) )->show();
+      } else {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
       }
-    case 4021: // TRIANGLE
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_AddFaceDlg *aDlg = new SMESHGUI_AddFaceDlg( parent, "", Sel, 3 ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
+      break;
+    }
+  case 414: // Revolution
+    {
+      if(checkLock(aStudy)) break;
+      if( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_RevolutionDlg( this ) )->show();
       }
-    case 4022: // QUAD
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_AddFaceDlg *aDlg = new SMESHGUI_AddFaceDlg( parent, "", Sel, 4 ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
+      else {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
       }
-    case 4031: // TETRA
+      break;
+    }
+  case 415: // Pattern mapping
+    {
+      if ( checkLock( aStudy ) )
+        break;
+      if ( vtkwnd )
       {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_AddVolumeDlg *aDlg = new SMESHGUI_AddVolumeDlg( parent, "", Sel, 4 ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_MeshPatternDlg( this ) )->show();
       }
-    case 4032: // HEXA
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_AddVolumeDlg *aDlg = new SMESHGUI_AddVolumeDlg( parent, "", Sel, 8 ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
+      else {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
       }
-
-    case 4041: // REMOVES NODES
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_RemoveNodesDlg *aDlg = new SMESHGUI_RemoveNodesDlg( parent, "", Sel ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
+      break;
+    }
+  case 416: // Extrusion along a path
+    {
+      if (checkLock(aStudy)) break;
+      if (vtkwnd) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_ExtrusionAlongPathDlg( this ) )->show();
+      } else {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
       }
-    case 4042: // REMOVES ELEMENTS
+      break;
+    }
+  case 417: // Convert mesh to quadratic
+  case 418: // create 2D mesh from 3D
+  case 420: // Reorient faces
+  case 806: // CREATE GEO GROUP
+    {
+      startOperation( theCommandID );
+      break;
+    }
+  case 801:                                     // CREATE GROUP
+    {
+      if ( !vtkwnd )
       {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(3, true);
-         SMESHGUI_RemoveElementsDlg *aDlg = new SMESHGUI_RemoveElementsDlg( parent, "", Sel ) ;        
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
       }
 
-    case 5000: // HYPOTHESIS - ALGO
-      {
-       smeshGUI->CreateAlgorithm("Regular_1D","Wire Discretisation");  
-       break;
-      }
-    case 5010: 
-      {
-       smeshGUI->CreateAlgorithm("MEFISTO_2D","Triangle (Mefisto)");
-       break;
-      }
-    case 5011: 
-      {
-       smeshGUI->CreateAlgorithm("Quadrangle_2D","Quadrangle (Mapping)");      
-       break;
+      if(checkLock(aStudy)) break;
+      EmitSignalDeactivateDialog();
+      SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_nil();
+
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      int nbSel = selected.Extent();
+      if (nbSel == 1) {
+        // check if mesh is selected
+        aMesh = SMESH::GetMeshByIO( selected.First() );
       }
-    case 5020: 
+      SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg( this, aMesh);
+      aDlg->show();
+      break;
+    }
+
+  case 802:                                     // CONSTRUCT GROUP
+    {
+      if ( !vtkwnd )
       {
-       smeshGUI->CreateAlgorithm("Hexa_3D","Hexaedral (i,j,k)");       
-       break;
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
       }
 
-    case 5030: // HYPOTHESIS - LOCAL LENGTH
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_LocalLengthDlg *aDlg = new SMESHGUI_LocalLengthDlg( parent, "" ) ;
-       break;
+      if(checkLock(aStudy)) break;
+      EmitSignalDeactivateDialog();
+
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      int nbSel = selected.Extent();
+      if (nbSel == 1) {
+        // check if submesh is selected
+        Handle(SALOME_InteractiveObject) IObject = selected.First();
+        if (IObject->hasEntry()) {
+          _PTR(SObject) aSObj = aStudy->FindObjectID(IObject->getEntry());
+          if( aSObj ) {
+            SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( SMESH::SObjectToObject( aSObj ) );
+            if (!aSubMesh->_is_nil()) {
+              try {
+                SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
+                // get submesh elements list by types
+                SMESH::long_array_var aNodes = aSubMesh->GetElementsByType(SMESH::NODE);
+                SMESH::long_array_var aEdges = aSubMesh->GetElementsByType(SMESH::EDGE);
+                SMESH::long_array_var aFaces = aSubMesh->GetElementsByType(SMESH::FACE);
+                SMESH::long_array_var aVolumes = aSubMesh->GetElementsByType(SMESH::VOLUME);
+                // create group for each type o elements
+                QString aName = IObject->getName();
+                QStringList anEntryList;
+                if (aNodes->length() > 0) {
+                  SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::NODE, aName + "_Nodes");
+                  aGroup->Add(aNodes.inout());
+                  if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( aGroup ) )
+                    anEntryList.append( aSObject->GetID().c_str() );
+                }
+                if (aEdges->length() > 0) {
+                  SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::EDGE, aName + "_Edges");
+                  aGroup->Add(aEdges.inout());
+                  if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( aGroup ) )
+                    anEntryList.append( aSObject->GetID().c_str() );
+                }
+                if (aFaces->length() > 0) {
+                  SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::FACE, aName + "_Faces");
+                  aGroup->Add(aFaces.inout());
+                  if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( aGroup ) )
+                    anEntryList.append( aSObject->GetID().c_str() );
+                }
+                if (aVolumes->length() > 0) {
+                  SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::VOLUME, aName + "_Volumes");
+                  aGroup->Add(aVolumes.inout());
+                  if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( aGroup ) )
+                    anEntryList.append( aSObject->GetID().c_str() );
+                }
+                updateObjBrowser();
+                anApp->browseObjects( anEntryList );
+              }
+              catch(const SALOME::SALOME_Exception & S_ex){
+                SalomeApp_Tools::QtCatchCorbaException(S_ex);
+              }
+            }
+          }
+        }
       }
-    case 5031: // HYPOTHESIS - NB SEGMENTS
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_NbSegmentsDlg *aDlg = new SMESHGUI_NbSegmentsDlg( parent, "" ) ;
-       break;
+      else if(nbSel==0) {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"),
+                                 tr("SMESH_WRN_NO_AVAILABLE_DATA"));
       }
+      break;
+    }
 
-    case 5032: // HYPOTHESIS - MAX ELEMENT AREA
+  case 803:                                     // EDIT GROUP
+    {
+      if ( !vtkwnd )
       {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_MaxElementAreaDlg *aDlg = new SMESHGUI_MaxElementAreaDlg( parent, "" ) ;
-       break;
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
       }
 
-    case 5033: // HYPOTHESIS - MAX ELEMENT VOLUME
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_MaxElementVolumeDlg *aDlg = new SMESHGUI_MaxElementVolumeDlg( parent, "" ) ;
-       break;
-      }
+      if(checkLock(aStudy)) break;
+      EmitSignalDeactivateDialog();
 
-    case 6016: // CONTROLS 
-    case 6015:
-    case 6014:
-    case 6013:
-    case 6012:
-    case 6011:
-    case 6001:
-      {
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       int nbSel = Sel->IObjectCount();
-       if ( nbSel != 1 )
-         break;
-       smeshGUI->Control(theCommandID);
-       break;
-      }
-      
-    case 6002:
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      SALOME_ListIteratorOfListIO It (selected);
+      int nbSelectedGroups = 0;
+      for ( ; It.More(); It.Next() )
       {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         SMESHGUI_EdgesConnectivityDlg *Dlg = new SMESHGUI_EdgesConnectivityDlg( parent, "", Sel ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-         QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-               break;
+        SMESH::SMESH_GroupBase_var aGroup =
+          SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(It.Value());
+        if (!aGroup->_is_nil()) {
+          nbSelectedGroups++;
+          SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg( this, aGroup);
+          aDlg->show();
+        }
       }
+      if (nbSelectedGroups == 0)
+        {
+          SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg( this, SMESH::SMESH_GroupBase::_nil());
+          aDlg->show();
+        }
+      break;
+    }
 
-    case 9010:
-      {
-       if ( !parent->menuBar()->isItemChecked(9010) ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         parent->menuBar()->setItemChecked(9011, false );
-         
-         smeshGUI->EraseSimulationActors();
-         smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
-
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         int nbSel = Sel->IObjectCount() ;
-         if ( nbSel == 1 ) {
-           Standard_Boolean res;
-           SMESH_Actor* MeshActor = smeshGUI->FindActorByEntry(Sel->firstIObject()->getEntry(), res, true);
-           if ( res ) {
-             parent->menuBar()->setItemChecked(9010, !parent->menuBar()->isItemChecked(9010) );
-
-             // It's necessary to display SMDS IDs instead of VTK ones, so 
-             // vtkIdFilter is unacceptable here. We have to do it manually :(
-             vtkUnstructuredGrid* ptGrid = vtkUnstructuredGrid::New();
-             ptGrid->CopyStructure(MeshActor->DataSource);
-
-             int numPts = MeshActor->DataSource->GetNumberOfPoints();
-
-             // Loop over points and generate ids
-             vtkIntArray *ptIds = vtkIntArray::New();
-             ptIds->SetNumberOfValues(numPts);
-
-             for (int id=0; id < numPts; id++) {
-               int idSMDS = MeshActor->GetIdSMESHDSNode(id);
-               ptIds->SetValue(id, idSMDS);
-             }
-
-// mpv porting vtk4.2.2
-             //              vtkScalars* newScalars = vtkScalars::New();
-             //              newScalars->SetData(ptIds);
-             //              ptGrid->GetPointData()->SetScalars(newScalars);
-             ptGrid->GetPointData()->SetScalars(ptIds);
-             //              newScalars->Delete();
-// mpv
-             ptIds->Delete();
-             
-             vtkMaskPoints* mask = vtkMaskPoints::New();
-             mask->SetInput(ptGrid);
-             mask->SetOnRatio( 1 );
-             //            mask->SetMaximumNumberOfPoints( 50 );
-             //            mask->RandomModeOn();
-             
-             vtkSelectVisiblePoints* visPts = vtkSelectVisiblePoints::New();
-             visPts->SetInput(mask->GetOutput());
-             visPts->SetRenderer(((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer());
-             //visPts->SetSelectInvisible(1);
-             visPts->SelectInvisibleOff();
-             visPts->SetTolerance(0.1);
-           
-             vtkLabeledDataMapper* ldm = vtkLabeledDataMapper::New();
-             ldm->SetInput(visPts->GetOutput());
-             ldm->SetLabelFormat("%g");
-             ldm->SetLabelModeToLabelScalars();
-             //ldm->SetLabelModeToLabelFieldData();
-             
-             ldm->SetFontFamilyToTimes();
-             ldm->SetFontSize(6 * parent->font().pointSize() / 5);
-             ldm->SetBold(1);
-             ldm->SetItalic(0);
-             ldm->SetShadow(0);
-             
-             vtkActor2D* pointLabels = vtkActor2D::New();
-             pointLabels->SetMapper(ldm);
-             pointLabels->GetProperty()->SetColor(0,1,0);
-             
-             visPts->Delete();
-             ldm->Delete();
-             smeshGUI->mySimulationActors2D->AddItem( pointLabels );
-             ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer()->AddActor2D( pointLabels );
-           }
-         } 
-       } else {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         parent->menuBar()->setItemChecked(9010, !parent->menuBar()->isItemChecked(9010) );
-         smeshGUI->EraseSimulationActors();
-         smeshGUI->ScalarVisibilityOff();
-       }
-       QApplication::restoreOverrideCursor();
-       break;
+  case 804:                                     // Add elements to group
+    {
+      if(checkLock(aStudy)) break;
+      if (myState == 800) {
+        SMESHGUI_GroupDlg *aDlg = (SMESHGUI_GroupDlg*) myActiveDialogBox;
+        if (aDlg) aDlg->onAdd();
       }
-    case 9011:
-      { 
-       if ( !parent->menuBar()->isItemChecked(9011) ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         parent->menuBar()->setItemChecked(9010, false );
-
-         smeshGUI->EraseSimulationActors();
-         smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
-
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         int nbSel = Sel->IObjectCount() ;
-         if ( nbSel == 1 ) {
-           Standard_Boolean res;
-           SMESH_Actor* MeshActor = smeshGUI->FindActorByEntry(Sel->firstIObject()->getEntry(), res, true);
-           if ( res ) {
-             parent->menuBar()->setItemChecked(9011, !parent->menuBar()->isItemChecked(9011) );
-
-             // It's necessary to display SMDS IDs instead of VTK ones, so 
-             // vtkIdFilter is unacceptable here. We have to do it manually :(
-             vtkUnstructuredGrid* elGrid = vtkUnstructuredGrid::New();
-             elGrid->CopyStructure(MeshActor->DataSource);
-
-             int numCells = MeshActor->DataSource->GetNumberOfCells();
-
-             // Loop over points and generate ids
-             vtkIntArray *cellIds = vtkIntArray::New();
-             cellIds->SetNumberOfValues(numCells);
-
-             for (int id=0; id < numCells; id++) {
-               int idSMDS = MeshActor->GetIdSMESHDSElement(id);
-               cellIds->SetValue(id, idSMDS);
-             }
-
-// mpv porting vk4.2.2
-             //              vtkScalars* newScalars = vtkScalars::New();
-             //              newScalars->SetData(cellIds);
-             elGrid->GetCellData()->SetScalars(cellIds);
-             //              elGrid->GetCellData()->SetScalars(newScalars);
-             //              newScalars->Delete();
-//mpv
-
-             cellIds->Delete();
-           
-             vtkCellCenters* cc = vtkCellCenters::New();
-             cc->SetInput(elGrid);
-
-             vtkSelectVisiblePoints* visCells = vtkSelectVisiblePoints::New();
-             visCells->SetInput(cc->GetOutput());
-             visCells->SetRenderer(((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer());
-             visCells->SelectInvisibleOff();
-             visCells->SetTolerance(0.1);
-             //            visCells->SetSelectInvisible(1);
-           
-             vtkLabeledDataMapper* ldm = vtkLabeledDataMapper::New();
-             ldm->SetInput(visCells->GetOutput());
-             ldm->SetLabelFormat("%g");
-             ldm->SetLabelModeToLabelScalars();
-           
-             ldm->SetFontFamilyToTimes();
-             ldm->SetFontSize(6 * parent->font().pointSize() / 5);
-             ldm->SetBold(1);
-             ldm->SetItalic(0);
-             ldm->SetShadow(0);
-           
-             vtkActor2D* cellLabels = vtkActor2D::New();
-             cellLabels->SetMapper(ldm);
-             cellLabels->GetProperty()->SetColor(1,0,0);
-           
-             cc->Delete();
-             visCells->Delete();
-             ldm->Delete();
-             smeshGUI->mySimulationActors2D->AddItem( cellLabels );
-             ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer()->AddActor2D( cellLabels );
-           }
-         } 
-       } else {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         parent->menuBar()->setItemChecked(9011, !parent->menuBar()->isItemChecked(9011) );
-         smeshGUI->EraseSimulationActors();
-         smeshGUI->ScalarVisibilityOff();
-       }
-       QApplication::restoreOverrideCursor();
-       break;
+      break;
+    }
+
+  case 805:                                     // Remove elements from group
+    {
+      if(checkLock(aStudy)) break;
+      if (myState == 800) {
+        SMESHGUI_GroupDlg *aDlg = (SMESHGUI_GroupDlg*) myActiveDialogBox;
+        if (aDlg) aDlg->onRemove();
       }
+      break;
+    }
 
-    case 10001: // DISPLAY MODE PREFERENCE
+  case 815:                                     // Edit GEOM GROUP as standalone
+    {
+      if ( !vtkwnd )
       {
-       parent->menuBar()->setItemChecked(10001, !parent->menuBar()->isItemChecked(10001) );
-       parent->menuBar()->setItemChecked(10002, false );
-       parent->menuBar()->setItemChecked(10003, false );
-       QAD_CONFIG->addSetting("SMESH:DisplayMode", "Wireframe");
-       break;
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
       }
-    case 10002:
+
+      if(checkLock(aStudy)) break;
+      EmitSignalDeactivateDialog();
+
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      SALOME_ListIteratorOfListIO It (selected);
+      for ( ; It.More(); It.Next() )
       {
-       parent->menuBar()->setItemChecked(10002, !parent->menuBar()->isItemChecked(10002) );
-       parent->menuBar()->setItemChecked(10001, false );
-       parent->menuBar()->setItemChecked(10003, false );
-       QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading");
-       break;
+        SMESH::SMESH_GroupOnGeom_var aGroup =
+          SMESH::IObjectToInterface<SMESH::SMESH_GroupOnGeom>(It.Value());
+        if (!aGroup->_is_nil()) {
+          SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg( this, aGroup, true );
+          aDlg->show();
+        }
+        else
+        {
+          SMESH::SMESH_GroupOnFilter_var aGroup =
+            SMESH::IObjectToInterface<SMESH::SMESH_GroupOnFilter>(It.Value());
+          if (!aGroup->_is_nil()) {
+            SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg( this, aGroup, true );
+            aDlg->show();
+          }
+        }
       }
-    case 10003:
+      break;
+    }
+
+    case 810: // Union Groups
+    case 811: // Intersect groups
+    case 812: // Cut groups
+    {
+      if ( !vtkwnd )
       {
-       parent->menuBar()->setItemChecked(10003, !parent->menuBar()->isItemChecked(10003) );
-       parent->menuBar()->setItemChecked(10002, false );
-       parent->menuBar()->setItemChecked(10001, false );
-       QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shrink");
-       break;
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
       }
 
+      if ( checkLock( aStudy ) )
+        break;
+
+      EmitSignalDeactivateDialog();
+
+      SMESHGUI_GroupOpDlg* aDlg = 0;
+      if ( theCommandID == 810 )
+        aDlg = new SMESHGUI_UnionGroupsDlg( this );
+      else if ( theCommandID == 811 )
+        aDlg = new SMESHGUI_IntersectGroupsDlg( this );
+      else
+        aDlg = new SMESHGUI_CutGroupsDlg( this );
+
+      aDlg->show();
+
+      break;
     }
-  
-  smeshGUI->myActiveStudy->updateObjBrowser(true);
-  return true ;
-}
 
+    case 814: // Create groups of entities from existing groups of superior dimensions
+    {
+      if ( checkLock( aStudy ) )
+        break;
 
-//=============================================================================
-/*! function : GetMeshesUsingAlgoOrHypothesis()
- *  purpose  : return a list of Study objects (mesh kind) that have 'AlgoOrHyp' affected.
- *           : However is supposed here that father of father of an hypothesis is a Mesh Object.
- */
-//=============================================================================      
-SALOMEDS::Study::ListOfSObject* SMESHGUI::GetMeshesUsingAlgoOrHypothesis( SMESH::SMESH_Hypothesis_ptr AlgoOrHyp ) 
-{
-  SALOMEDS::Study::ListOfSObject_var listSOmesh = new SALOMEDS::Study::ListOfSObject ;
-  listSOmesh->length(0) ;
-  unsigned int index = 0 ;
-  if( !AlgoOrHyp->_is_nil() ) {
-    SALOMEDS::SObject_var SO_Hypothesis = smeshGUI->GetStudyAPI().FindHypothesisOrAlgorithms( AlgoOrHyp );
-    if( !SO_Hypothesis->_is_nil() ) {
-      SALOMEDS::Study::ListOfSObject_var listSO = smeshGUI->myStudy->FindDependances(SO_Hypothesis) ;
-      for( unsigned int i=0; i<listSO->length(); i++ ) {
-       SALOMEDS::SObject_var SO = listSO[i] ;
-       if( !SO->_is_nil() ) {
-         SALOMEDS::SObject_var SOfatherFather = SO->GetFather()->GetFather() ;
-         if( !SOfatherFather->_is_nil() ) {
-           index++ ;
-           listSOmesh->length(index) ;
-           listSOmesh[index-1] = SOfatherFather ;
-         }
-       }
-      }
+      EmitSignalDeactivateDialog();
+      SMESHGUI_GroupOpDlg* aDlg = new SMESHGUI_DimGroupDlg( this );
+      aDlg->show();
+
+      break;
     }
-  }
-  return listSOmesh._retn() ;
-}
 
+    case 813: // Delete groups with their contents
+    {
+      if ( !vtkwnd )
+      {
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
+      }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Import_Mesh(QAD_Desktop* parent, int theCommandID)
-{
-  QString filter;
-  string myExtension;
-  Mesh_Reader* myReader;
-  
-  if (theCommandID==113) {
-    filter = tr("MED files (*.med)");
-    myExtension = string("MED");
-    myReader = new DriverMED_R_SMESHDS_Mesh;
-  }
-  else if (theCommandID==112) {
-    filter = tr("IDEAS files (*.unv)");
-    myExtension = string("UNV");
-  }
-  else if (theCommandID==111) {
-    filter = tr("DAT files (*.dat)");
-    myExtension = string("MED");
-    myReader = new DriverDAT_R_SMESHDS_Mesh;
-  }
+      if ( checkLock( aStudy ) )
+        break;
 
-  QString filename = QAD_FileDlg::getFileName(parent,
-                                             "",
-                                             filter,
-                                             tr("Import mesh"),
-                                             true);
-  if ( !filename.isEmpty() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    string myClass = string("SMESHDS_Mesh");
-//    Mesh_Reader* myReader = SMESHDriver::GetMeshReader(myExtension, myClass);
-    
-    int myMeshId = (smeshGUI->myDocument)->NewMesh();
-    SMDS_Mesh* myMesh = (smeshGUI->myDocument)->GetMesh(myMeshId);
+      EmitSignalDeactivateDialog();
 
-    myReader->SetFile(string(filename.latin1()));
-    myReader->SetMesh(myMesh);
-    myReader->SetMeshId(myMeshId);
-    myReader->Read();
+      ( new SMESHGUI_DeleteGroupDlg( this ) )->show();
+      break;
+    }
 
-    QApplication::restoreOverrideCursor();
-  }
-}
-  
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Export_Mesh(QAD_Desktop* parent, int theCommandID)
-{
-  SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-  int nbSel = Sel->IObjectCount() ;
-  if ( nbSel == 1 ) {
-    Standard_Boolean res;
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    SMESH::SMESH_Mesh_var aMesh = smeshGUI->ConvertIOinMesh( IObject, res );
-    if ( res ) {
-      if (theCommandID==122) { // EXPORT MED
-       QString filename = QAD_FileDlg::getFileName(parent,
-                                                   "",
-                                                   tr("MED files (*.med)"),
-                                                   tr("Export mesh"),
-                                                   false);
-       if ( !filename.isEmpty() ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         aMesh->ExportMED( filename.latin1() );
-         QApplication::restoreOverrideCursor();
-       }
-      }
-      else if (theCommandID==121) { // EXPORT DAT
-       QString filename = QAD_FileDlg::getFileName(parent,
-                                                   "",
-                                                   tr("DAT files (*.dat)"),
-                                                   tr("Export mesh"),
-                                                   false);
-       if ( !filename.isEmpty() ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         aMesh->ExportDAT( filename.latin1() );
-         QApplication::restoreOverrideCursor();
-       }
+  case 900:                                     // MESH INFOS
+  case 903:                                     // WHAT IS
+    {
+      int page = theCommandID == 900 ? SMESHGUI_MeshInfoDlg::BaseInfo : SMESHGUI_MeshInfoDlg::ElemInfo;
+      EmitSignalDeactivateDialog();
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      if ( selected.Extent() > 1 ) { // a dlg for each IO
+        SALOME_ListIteratorOfListIO It( selected );
+        for ( ; It.More(); It.Next() ) {
+          SMESHGUI_MeshInfoDlg* dlg = new SMESHGUI_MeshInfoDlg( SMESHGUI::desktop(), page );
+          dlg->showInfo( It.Value() ); 
+          dlg->show();
+        }
       }
-      else if (theCommandID==123) { // EXPORT UNV
-       QString filename = QAD_FileDlg::getFileName(parent,
-                                                   "",
-                                                   tr("IDEAS files (*.unv)"),
-                                                   tr("Export mesh"),
-                                                   false);
-       if ( !filename.isEmpty() ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         aMesh->ExportUNV( filename.latin1() );
-         QApplication::restoreOverrideCursor();
-       }
-        else 
-         aMesh->ExportDAT( filename.latin1() );
-
-       QApplication::restoreOverrideCursor();
-
-       if ( IObject->hasEntry() )
-         {
-       MESSAGE("---");
-           SALOMEDS::SObject_var SO = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-           SALOMEDS::GenericAttribute_var anAttr;
-           SALOMEDS::AttributeComment_var    aFileName;
-           SALOMEDS::StudyBuilder_var aStudyBuilder = smeshGUI->myStudy->NewBuilder();
-           anAttr = aStudyBuilder->FindOrCreateAttribute(SO, "AttributeComment");
-           aFileName = SALOMEDS::AttributeComment::_narrow(anAttr);
-           aFileName->SetValue(filename.latin1());
-         }
+      else {
+        SMESHGUI_MeshInfoDlg* dlg = new SMESHGUI_MeshInfoDlg( SMESHGUI::desktop(), page );
+        dlg->show();
       }
+      break;
     }
-  }
-}
-  
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Import_Document(QAD_Desktop* parent, int theCommandID)
-{
-  QString filter;
-  string myExtension;
-  Document_Reader* myReader;
-
-  if (theCommandID==113) {
-    filter = tr("MED files (*.med)");
-    myExtension = string("MED");
-    myReader = new DriverMED_R_SMESHDS_Document;
-  }
-  else if (theCommandID==112) {
-    filter = tr("IDEAS files (*.unv)");
-    myExtension = string("UNV");
-    myReader = new DriverUNV_R_SMESHDS_Document;
-  }
-  else if (theCommandID==111) {
-    filter = tr("DAT files (*.dat)");
-    myExtension = string("DAT");
-    myReader = new DriverDAT_R_SMESHDS_Document;
-  }
 
-  QString filename = QAD_FileDlg::getFileName(parent,
-                                             "",
-                                             filter,
-                                             tr("Import document"),
-                                             true);
-  if ( !filename.isEmpty() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    string myClass = string("SMESHDS_Document");
-//    Document_Reader* myReader = SMESHDriver::GetDocumentReader(myExtension, myClass);
-       SMESHDS_Document* newDocument = new SMESHDS_Document(1);
-
-    myReader->SetFile(string(filename.latin1()));
-    myReader->SetDocument(smeshGUI->myDocument);
-    myReader->Read();
-    QApplication::restoreOverrideCursor();
-  }
-}
-  
-void SMESHGUI::Export_Document(QAD_Desktop* parent, int theCommandID)
-{
-  QString filter;
-  Document_Writer* myWriter;
-  string myExtension;
-
-  if (theCommandID==122) {
-    filter = tr("MED files (*.med)");
-    myExtension = string("MED");
-    myWriter = new DriverMED_W_SMESHDS_Document;
-  }
-  else if (theCommandID==121) {
-    filter = tr("DAT files (*.dat)");
-    myExtension = string("DAT");
-    myWriter = new DriverDAT_W_SMESHDS_Document;
-  } else if (theCommandID==123) {
-    filter = tr("IDEAS files (*.unv)");
-    myExtension = string("UNV");
-    myWriter = new DriverUNV_W_SMESHDS_Document;
-  }
+  case 904:                                     // FIND ELEM
+    {
+      startOperation( theCommandID );
+      break;
+    }
 
-  QString filename = QAD_FileDlg::getFileName(parent,
-                                             "",
-                                             filter,
-                                             tr("Export document"),
-                                             false);
-  if ( !filename.isEmpty() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    string myClass = string("SMESHDS_Document");
-    //Document_Writer* myWriter = SMESHDriver::GetDocumentWriter(myExtension, myClass);
-
-    myWriter->SetFile(string(filename.latin1()));
-    myWriter->SetDocument(smeshGUI->myDocument);
-
-    //StudyContextStruct* myStudyContext = _impl.GetStudyContext(myStudyId);
-    //Handle(SMESHDS_Document) myDocument = myStudyContext->myDocument;
-    //myWriter->SetDocument(myDocument);
-
-    myWriter->Write();
-    QApplication::restoreOverrideCursor();
-  }
-}
-  
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::OnMousePress(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
-{
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-  return false ;
-}
-
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::OnMouseMove (QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
-{
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-  return true;
-}
-
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::OnKeyPress (QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
-{
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-  return true ;
-}
-
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::SetSettings( QAD_Desktop* parent )
-{
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-  /* Display mode */
-  QString DisplayMode = QAD_CONFIG->getSetting("SMESH:DisplayMode");
-  if ( DisplayMode.compare("") == 0 ) {
-    DisplayMode = "Shading";
-    QAD_CONFIG->addSetting("SMESH:DisplayMode","Shading");
-  }
-
-  if ( DisplayMode.compare("Wireframe") == 0 ){
-    parent->menuBar()->setItemChecked(10003, false );
-    parent->menuBar()->setItemChecked(10002, false );
-    parent->menuBar()->setItemChecked(10001, true );
-  } else if ( DisplayMode.compare("Shading") == 0 ){
-    parent->menuBar()->setItemChecked(10003, false );
-    parent->menuBar()->setItemChecked(10002, true );
-    parent->menuBar()->setItemChecked(10001, false );
-  } else if ( DisplayMode.compare("Shrink") == 0 ) {
-    parent->menuBar()->setItemChecked(10003, true );
-    parent->menuBar()->setItemChecked(10002, false );
-    parent->menuBar()->setItemChecked(10001, false );
-  }
-
-  /* Automatic Update */
-  QString AutoUpdate = QAD_CONFIG->getSetting("SMESH:AutomaticUpdate");
-  if ( AutoUpdate.compare("true") == 0 ) {
-    parent->menuBar()->setItemChecked(1001, true );
-    smeshGUI->myAutomaticUpdate = true;
-  } else {
-    parent->menuBar()->setItemChecked(1001, false );
-    smeshGUI->myAutomaticUpdate = false;
-  }
-
-  /* menus disable */
-  parent->menuBar()->setItemEnabled( 11, false); // IMPORT
-   
-  return true;
-}
-
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DefinePopup( QString & theContext, QString & theParent, QString & theObject )
-{
-  /* Create or retrieve an object SMESHGUI */
-  SMESHGUI::GetOrCreateSMESHGUI(QAD_Application::getDesktop());
-
-  // NRI : Temporary added
-  //  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
-  //    theObject = "NothingSelected";
-  //    theContext = "NothingSelected";
-  //  }
-  // NRI
-
-  SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-  int nbSel = Sel->IObjectCount();
-  if (nbSel == 0) {
-    if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-      vtkScalarBarActor* aScalarBar = smeshGUI->GetScalarBar();
-      if ((aScalarBar != NULL) && (aScalarBar->GetVisibility() == 1) ) {
-       theObject = "ScalarBar";
-       theContext = "";
-      } else {
-       theObject = "NothingSelected";
-       theContext = "NothingSelected";
-      }
-    } else {
-      theObject = "NothingSelected";
-      theContext = "NothingSelected";
-    }
-  } else if (nbSel == 1 ) {
-    theObject = smeshGUI->CheckTypeObject( Sel->firstIObject() ); 
-    theContext = "";
-  } else {
-    theObject = smeshGUI->CheckHomogeneousSelection();
-    theContext = "";
-  }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::CustomPopup( QAD_Desktop* parent,
-                          QPopupMenu* popup,
-                          const QString& theContext,
-                          const QString& theParent,
-                          const QString& theObject )
-{
-  // Popup should be customized for any viewer since some meaningless commands may be present in the popup
-  //if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) //Test du type de viewer true=OCC false=VTK
-  //  return false;
-  /* Create or retrieve an object SMESHGUI */
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-  // NRI : Temporary added
-  //  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
-  //    return false;
-  //  }
-  // NRI
-
-  SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-  QAD_StudyFrame* studyFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
-  int nbSel = Sel->IObjectCount();
-  
-  if (nbSel == 0) { 
-    if (studyFrame->getTypeView() != VIEW_VTK)
-      popup->clear();
-    return false;
-  } else if (nbSel == 1 ) {
-    QString parentComp = ((SALOMEGUI_Desktop*)parent)->getComponentFromSelection();
-    // First check type of active viewer (VTK required)
-    if (/*studyFrame->getTypeView() != VIEW_VTK ||*/ parentComp != parent->getActiveComponent())
-      {
-      //MESSAGE("CustomPopup(): VTK viewer required, removing all SMESH-specific popup menu items")
-      while (1) {
-       int id = popup->idAt(0);
-       if (id <= QAD_TopLabel_Popup_ID)
-         popup->removeItemAt(0);
-       else
-         break;
-      }
-      if (theObject.compare("Component") == 0) {
-       popup->removeItem(QAD_DisplayOnly_Popup_ID);
+  case 1100:                                    // EDIT HYPOTHESIS
+    {
+      if(checkLock(aStudy)) break;
+
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      int nbSel = selected.Extent();
+
+      if (nbSel == 1) {
+        Handle(SALOME_InteractiveObject) anIObject = selected.First();
+        SMESH::SMESH_Hypothesis_var aHypothesis = SMESH::IObjectToInterface<SMESH::SMESH_Hypothesis>(anIObject);
+
+        /* Look for all mesh objects that have this hypothesis affected in order to flag as ModifiedMesh */
+        /* At end below '...->updateObjBrowser(true)' will change icon of mesh objects                   */
+        /* Warning : however by internal mechanism all subMeshes icons are changed !                     */
+        if ( !aHypothesis->_is_nil() )
+        {
+          // BUG 0020378
+          //SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator(aHypothesis->GetName());
+          SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator(aHypothesis->GetName());
+          if (aCreator) {
+            aCreator->edit( aHypothesis.in(), anIObject->getName(), desktop(), this, SLOT( onHypothesisEdit( int ) ) );
+          }
+          else
+          {
+            // report error
+          }
+        }
       }
-      return false;
-    }
-
-    // Remove common popup items for Submesh, Hypothesis and Algorithm
-    if (theObject.compare("SubMesh") == 0 ||
-       theObject.compare("Hypothesis") == 0 ||
-       theObject.compare("Algorithm") == 0 ) {
-      popup->removeItem(QAD_Display_Popup_ID);
-      popup->removeItem(QAD_DisplayOnly_Popup_ID);
-      popup->removeItem(QAD_Erase_Popup_ID);
-      int id = popup->idAt(popup->count()-1); // last item
-      if (id < 0 && id != -1) popup->removeItem(id); // separator
+      break;
     }
-
-    if (theObject.compare("Component") == 0) {
-      popup->removeItem(QAD_DisplayOnly_Popup_ID);
-      return true;
+  case 1102:                                    // REMOVE HYPOTHESIS / ALGORITHMS
+    {
+      if(checkLock(aStudy)) break;
+      SUIT_OverrideCursor wc;
+
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected, QString::null, false );
+
+      SALOME_ListIteratorOfListIO It(selected);
+      for (int i = 0; It.More(); It.Next(), i++) {
+        Handle(SALOME_InteractiveObject) IObject = It.Value();
+        SMESH::RemoveHypothesisOrAlgorithmOnMesh(IObject);
+      }
+      SALOME_ListIO l1;
+      aSel->setSelectedObjects( l1 );
+      updateObjBrowser();
+      break;
     }
 
-    int id = QAD_TopLabel_Popup_ID;//popup->idAt(0);
-    QFont f = QApplication::font();
-    f.setBold( TRUE );
-       
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    
-    if ( theParent.compare("Viewer")==0 ) {
-      if (popup->idAt(0) == id) {
-       popup->removeItem(id);
-       popup->insertItem( new CustomItem ( QString(IObject->getName()), f ), id, 0 );
+  case 4008:                                    // BALL
+  case 4009:                                    // ELEM0D
+  case 4010:                                    // EDGE
+  case 4021:                                    // TRIANGLE
+  case 4022:                                    // QUAD
+  case 4023:                                    // POLYGON
+  case 4031:                                    // TETRA
+  case 4032:                                    // HEXA
+  case 4133:                                    // PENTA
+  case 4134:                                    // PYRAMID
+  case 4135:                                    // OCTA12
+    {
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        SMDSAbs_EntityType type = SMDSEntity_Edge;
+        switch (theCommandID) {
+        case 4008: type = SMDSEntity_Ball;            break;
+        case 4009: type = SMDSEntity_0D;              break;
+        case 4021: type = SMDSEntity_Triangle;        break;
+        case 4022: type = SMDSEntity_Quadrangle;      break;
+        case 4031: type = SMDSEntity_Tetra;           break;
+        case 4023: type = SMDSEntity_Polygon;         break;
+        case 4032: type = SMDSEntity_Hexa;            break;
+        case 4133: type = SMDSEntity_Penta;           break;
+        case 4134: type = SMDSEntity_Pyramid;         break;
+        case 4135: type = SMDSEntity_Hexagonal_Prism; break;
+        default:;
+        }
+        ( new SMESHGUI_AddMeshElementDlg( this, type ) )->show();
       }
-      
-      Standard_Boolean res;
-      SMESH_Actor* ac = smeshGUI->FindActorByEntry( IObject->getEntry(), res, false );
-      if ( res && studyFrame->getTypeView() == VIEW_VTK) {
-       VTKViewer_RenderWindowInteractor* myRenderInter= 
-         ((VTKViewer_ViewFrame*)studyFrame->getRightFrame()->getViewFrame())->getRWInteractor();
-       if ( myRenderInter->isVisible( IObject ) ) {
-         popup->removeItem(QAD_Display_Popup_ID);
-       } else {
-         popup->removeItem(QAD_Erase_Popup_ID);
-       }
-      } else {
-       popup->removeItem(QAD_Erase_Popup_ID);
-       if (!res) {// mesh not computed -> can't display it
-         popup->removeItem(QAD_Display_Popup_ID);
-         popup->removeItem(QAD_DisplayOnly_Popup_ID);
-         popup->removeItemAt(popup->count() - 1);//separator
-       }
+      else {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
       }
-    } else if ( theParent.compare("ObjectBrowser")==0 ) {
-      if (theObject.compare("Mesh") == 0 ||
-         theObject.compare("SubMesh") == 0 ||
-         theObject.compare("Hypothesis") == 0 ||
-         theObject.compare("Algorithm") == 0 ) {
-       popup->removeItemAt(0); 
-      } else {
-       if (popup->idAt(0) == id) {
-         popup->removeItem(id);
-         popup->removeItemAt(0);//separator
-       }
+      break;
+    }
+  case 4033:                                    // POLYHEDRON
+    {
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_CreatePolyhedralVolumeDlg( this ) )->show();
       }
-
-      Standard_Boolean res;
-      SMESH_Actor* ac = smeshGUI->FindActorByEntry( IObject->getEntry(), res, false );
-      if ( res && studyFrame->getTypeView() == VIEW_VTK ) {
-       VTKViewer_RenderWindowInteractor* myRenderInter= 
-         ((VTKViewer_ViewFrame*)studyFrame->getRightFrame()->getViewFrame())->getRWInteractor();
-       if ( myRenderInter->isVisible( IObject ) ) {
-         popup->removeItem(QAD_Display_Popup_ID);
-       } else {
-         popup->removeItem(QAD_Erase_Popup_ID);
-       }
-      } else {
-       if (theObject.compare("Mesh") == 0 ||
-           theObject.compare("SubMesh") == 0 ||
-           theObject.compare("Hypothesis") == 0 ||
-           theObject.compare("Algorithm") == 0 ) {
-       } else {
-         popup->removeItem(QAD_Erase_Popup_ID);
-         if (!res) {// mesh not computed -> can't display it
-           popup->removeItem(QAD_Display_Popup_ID);
-           popup->removeItem(QAD_DisplayOnly_Popup_ID);
-           popup->removeItemAt(popup->count() - 1);//separator
-         }
-       }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
       }
+      break;
     }
-  } else {
-    QString parentComp = ((SALOMEGUI_Desktop*)parent)->getComponentFromSelection();
-    QAD_StudyFrame* studyFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
-    if (/*studyFrame->getTypeView() != VIEW_VTK ||*/ parentComp != parent->getActiveComponent())
+  case 4034:     // QUADRATIC EDGE
+  case 4035:     // QUADRATIC TRIANGLE
+  case 4036:     // QUADRATIC QUADRANGLE
+  case 4136:     // BIQUADRATIC QUADRANGLE
+  case 4137:     // BIQUADRATIC TRIANGLE
+  case 4037:     // QUADRATIC TETRAHEDRON
+  case 4038:     // QUADRATIC PYRAMID
+  case 4039:     // QUADRATIC PENTAHEDRON
+  case 4040:     // QUADRATIC HEXAHEDRON
+  case 4140:     // TRIQUADRATIC HEXAHEDRON
     {
-      //MESSAGE("CustomPopup(): VTK viewer required, removing all SMESH-specific popup menu items")
-      while (1) {
-       int id = popup->idAt(0);
-       if (id <= QAD_TopLabel_Popup_ID && id != -1)
-         popup->removeItemAt(0);
-       else
-         break;
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        SMDSAbs_EntityType type = SMDSEntity_Last;
+
+        switch (theCommandID) {
+        case 4034:
+          type = SMDSEntity_Quad_Edge; break;
+        case 4035:
+          type = SMDSEntity_Quad_Triangle; break;
+        case 4036:
+          type = SMDSEntity_Quad_Quadrangle; break;
+        case 4136:
+          type = SMDSEntity_BiQuad_Quadrangle; break;
+        case 4137:
+          type = SMDSEntity_BiQuad_Triangle; break;
+        case 4037:
+          type = SMDSEntity_Quad_Tetra; break;
+        case 4038:
+          type = SMDSEntity_Quad_Pyramid; break;
+        case 4039:
+          type = SMDSEntity_Quad_Penta; break;
+        case 4040:
+          type = SMDSEntity_Quad_Hexa; break;
+        case 4140:
+          type = SMDSEntity_TriQuad_Hexa; break;
+        default: break;
+        }
+        if ( type != SMDSEntity_Last )
+          ( new SMESHGUI_AddQuadraticElementDlg( this, type ) )->show();
       }
-      if (parentComp.isNull()) { // objects from several components are selected
-       popup->removeItem(QAD_DisplayOnly_Popup_ID);    
-       popup->removeItem(QAD_Display_Popup_ID);
-       popup->removeItem(QAD_Erase_Popup_ID);
-       int id = popup->idAt(popup->count()-1); // last item
-       if (id < 0 && id != -1) popup->removeItem(id); // separator
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
       }
-      return false;
+      break;
     }
-
-    QString type =  smeshGUI->CheckHomogeneousSelection();
-    if ( type.compare("Heterogeneous Selection") != 0 ) {
-      int id = QAD_TopLabel_Popup_ID;//popup->idAt(0);
-      QFont f = QApplication::font();
-      f.setBold( TRUE );
-      popup->removeItem(id);
-      popup->insertItem( new CustomItem ( QString("%1 ").arg(nbSel) + type + " (s) ", f), id, 0  );
+  case 4041:                                    // REMOVES NODES
+    {
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_RemoveNodesDlg( this ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }
+      break;
     }
-  }
-  return false;
-}
-
-//=============================================================================
-/*! Method:  BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
- *  Purpose: ensures that the actor for the given <theIO> exists in the active VTK view
- */
-//=============================================================================
-void SMESHGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
-{
-  /* Create or retrieve an object SMESHGUI */
-  SMESHGUI::GetOrCreateSMESHGUI(QAD_Application::getDesktop());
-  
-  QAD_StudyFrame* activeFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
-  if (activeFrame->getTypeView() == VIEW_VTK) {
-    // VTK
-    SALOMEDS::SObject_var fatherSF = 
-      smeshGUI->myStudy->FindObjectID(activeFrame->entry());
-    
-    SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-    SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-    
-//    for(;It.More();It.Next()) {
-//      Handle(SALOME_InteractiveObject) IObject = It.Value();
-      Handle(SALOME_InteractiveObject) IObject = theIO;
-      if ( IObject->hasEntry() ) {
-       // Look for the actor in all views
-       Standard_Boolean res;
-       SMESH_Actor *ac = smeshGUI->FindActorByEntry(IObject->getEntry(), res, false);
-
-       // Actor not found at all -> mesh is not computed -> do nothing!!!
-       if ( !res ) {
-         /*SMESH::SMESH_Mesh_var aM;
-         SALOMEDS::SObject_var aMorSM = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-         SALOMEDS::SObject_var father = aMorSM->GetFather();
-         SALOMEDS::SObject_var fatherComp = aMorSM->GetFatherComponent();
-         
-         // Non-displayable objects (Hypo, Algo) have tags < 3 or have a father different from component
-         if (aMorSM->Tag() < 3 || strcmp(father->GetID(), fatherComp->GetID()) != 0)
-           continue;
-
-         SALOMEDS::GenericAttribute_var anAttr;
-         SALOMEDS::AttributeIOR_var     anIOR;
-         if ( !aMorSM->_is_nil() ) {
-           if (aMorSM->FindAttribute(anAttr, "AttributeIOR") ) {
-             anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-             aM = SMESH::SMESH_Mesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-           }
-         }
-
-         if (!aM->_is_nil()) {
-           smeshGUI->InitActor(aM);
-           ac = smeshGUI->ReadScript(aM);
-         }
-
-         if (ac) {
-           smeshGUI->DisplayActor( ac, true );
-           smeshGUI->DisplayEdges( ac ); 
-           smeshGUI->ChangeRepresentation( ac, ac->getDisplayMode() );
-         }*/
-//       continue;
-       } else { // The actor exists in some view
-         // Check whether the actor belongs to the active view
-         VTKViewer_RenderWindowInteractor* rwInter = 
-           ((VTKViewer_ViewFrame*)activeFrame->getRightFrame()->getViewFrame())->getRWInteractor();
-
-         // The actor belongs to inactive view -> create a copy and display it in the active view
-         if (!rwInter->isInViewer(IObject)) {
-           SMESH_Actor* acCopy = SMESH_Actor::New();
-           acCopy->ShallowCopy(ac);
-           ac = acCopy;
-         }
-         smeshGUI->DisplayActor( ac, false );
-         smeshGUI->DisplayEdges( ac ); 
-         smeshGUI->ChangeRepresentation( ac, ac->getDisplayMode() );
-       }
+  case 4042:                                    // REMOVES ELEMENTS
+    {
+      if(checkLock(aStudy)) break;
+      if( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_RemoveElementsDlg( this ) )->show();
       }
-//    }
-  } else {
-    MESSAGE("BuildPresentation() must not be called while non-VTK view is active")
-  }
-}
+      else
+        {
+          SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                   tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+        }
+      break;
+    }
+  case 4043: {                                // CLEAR_MESH
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::setOrb()
-{
-  try {
-    ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance();
-    ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
-    _orb = init( 0 , 0 );
-  } catch (...) {
-    INFOS("internal error : orb not found");
-    _orb = 0;
-  }
-  ASSERT(! CORBA::is_nil(_orb));
-}
+    if(checkLock(aStudy)) break;
 
+    SALOME_ListIO selected;
+    if( LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr() )
+      aSel->selectedObjects( selected );
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH_Actor* SMESHGUI::ReadScript(SMESH::SMESH_Mesh_ptr aMesh)
-{
-  SMESH_Actor* MeshActor;
-  if ( !aMesh->_is_nil() ) {
-    Standard_Boolean result;
-    MeshActor = FindActor(aMesh, result, true);
-    if ( result ) {
-      SMESH::log_array_var aSeq = aMesh->GetLog(true);
-      
-      if (aSeq->length() == 0) {
-       MESSAGE("ReadScript(): log is empty")
-       return MeshActor;
+    SUIT_OverrideCursor wc;
+    SALOME_ListIteratorOfListIO It (selected);
+    for ( ; It.More(); It.Next() )
+    {
+      Handle(SALOME_InteractiveObject) IOS = It.Value();
+      SMESH::SMESH_Mesh_var aMesh =
+        SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(IOS);
+      if ( aMesh->_is_nil()) continue;
+      try {
+        SMESH::RemoveVisualObjectWithActors(IOS->getEntry(), true);
+        aMesh->Clear();
+        _PTR(SObject) aMeshSObj = SMESH::FindSObject(aMesh);
+        SMESH::ModifiedMesh( aMeshSObj, false, true);
+        // hide groups and submeshes
+        _PTR(ChildIterator) anIter =
+          SMESH::GetActiveStudyDocument()->NewChildIterator( aMeshSObj );
+        for ( anIter->InitEx(true); anIter->More(); anIter->Next() )
+        {
+          _PTR(SObject) so = anIter->Value();
+          SMESH::RemoveVisualObjectWithActors(so->GetID().c_str(), true);
+        }
       }
-
-      for (unsigned int ind = 0; ind < aSeq->length();ind++) {
-       switch ( aSeq[ind].commandType )
-         {
-         case SMESH::ADD_NODE :
-           {
-             AddNodes( MeshActor, aSeq[ind].number, aSeq[ind].coords, aSeq[ind].indexes );
-             break;
-           }
-         case SMESH::ADD_EDGE :
-           {
-             //              AddEdges( MeshActor, aSeq[ind].number, aSeq[ind].coords, aSeq[ind].indexes );
-             break;
-           }
-         case SMESH::ADD_TRIANGLE :
-           {
-             AddTriangles( MeshActor, aSeq[ind].number, aSeq[ind].coords, aSeq[ind].indexes );
-             break;
-           }
-         case SMESH::ADD_QUADRANGLE :
-           {
-             AddQuadrangles( MeshActor, aSeq[ind].number, aSeq[ind].coords, aSeq[ind].indexes );
-             break;
-           }
-         case SMESH::ADD_TETRAHEDRON :
-           {
-             AddTetras( MeshActor, aSeq[ind].number, aSeq[ind].coords, aSeq[ind].indexes );
-             break;
-           }
-         case SMESH::ADD_PYRAMID :
-           {
-             break;
-           }
-         case SMESH::ADD_PRISM :
-           {
-             break;
-           }
-         case SMESH::ADD_HEXAHEDRON :
-           {
-             AddHexaedres( MeshActor, aSeq[ind].number, aSeq[ind].coords, aSeq[ind].indexes );
-             break;
-           }
-         case SMESH::REMOVE_NODE :
-           {
-             RemoveNodes( MeshActor, aSeq[ind].number, aSeq[ind].coords, aSeq[ind].indexes );
-             break;
-           }
-         case SMESH::REMOVE_ELEMENT :
-           {
-             RemoveElements( MeshActor, aSeq[ind].number, aSeq[ind].coords, aSeq[ind].indexes );
-             break;
-           }
-         }
+      catch (const SALOME::SALOME_Exception& S_ex){
+        wc.suspend();
+        SalomeApp_Tools::QtCatchCorbaException(S_ex);
+        wc.resume();
       }
-      return MeshActor;
     }
+    SMESH::UpdateView();
+    updateObjBrowser();
+    break;
   }
-  return NULL;
-}
-
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Dump(SMESH_Actor* Mactor)
-{
-  vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  vtkPoints *Pts = ugrid->GetPoints();
-  int nbPts = Pts->GetNumberOfPoints();
-  int nbCells = ugrid->GetNumberOfCells();
-
-  FILE *In;
-  int i,j;
-  In = fopen("/tmp/dumpMesh","w+");
-  fprintf(In,"%d %d\n",nbPts,nbCells);
-  for ( int i = 0; i < nbPts; i++ ) {
-    float *p = ugrid->GetPoint(i);
-    fprintf(In,"%d %e %e %e\n",i, p[0], p[1], p[2] );
-  }
-
-  for ( int i = 0; i < nbCells; i++ ) {
-    fprintf(In,"%d %d",i,ugrid->GetCell(i)->GetCellType());
-    vtkIdList *Id = ugrid->GetCell(i)->GetPointIds();
-    for (j=0; j<Id->GetNumberOfIds(); j++) {
-      fprintf(In," %d",Id->GetId(j));
+  case 4044:                                     // REMOVE ORPHAN NODES
+    {
+      if(checkLock(aStudy)) break;
+      SALOME_ListIO selected;
+      if( LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr() )
+        aSel->selectedObjects( selected );
+      if ( selected.Extent() == 1 ) {
+        Handle(SALOME_InteractiveObject) anIO = selected.First();
+        SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO(anIO);
+        if ( !aMesh->_is_nil() ) {
+          bool confirm = SUIT_MessageBox::question( SMESHGUI::desktop(),
+                                                    tr( "SMESH_WARNING" ),
+                                                    tr( "REMOVE_ORPHAN_NODES_QUESTION"),
+                                                    SUIT_MessageBox::Yes |
+                                                    SUIT_MessageBox::No,
+                                                    SUIT_MessageBox::No ) == SUIT_MessageBox::Yes;
+          if( confirm ) {
+            try {
+              SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
+              int removed = aMeshEditor->RemoveOrphanNodes();
+              SUIT_MessageBox::information(SMESHGUI::desktop(),
+                                           tr("SMESH_INFORMATION"),
+                                           tr("NB_NODES_REMOVED").arg(removed));
+              if ( removed > 0 ) {
+                SMESH::UpdateView();
+                SMESHGUI::Modified();
+              }
+            }
+            catch (const SALOME::SALOME_Exception& S_ex) {
+              SalomeApp_Tools::QtCatchCorbaException(S_ex);
+            }
+            catch (...) {
+            }
+          }
+        }
+      }
+      break;
     }
-    fprintf(In,"\n");
-  }
-  fclose(In);
-}
-
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddNodes( SMESH_Actor* Mactor, int number, 
-                        const SMESH::double_array& coords,
-                        const SMESH::long_array& indexes)
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  if ( Mactor->GetMapper() == NULL ) {
-    vtkPoints    *Pts = vtkPoints::New();
-    SMESH_Grid *ugrid = SMESH_Grid::New();
-    ugrid->Allocate();
-
-    int i = 1;
-    int j = 1;
-    while ( i <= number ) {
-      int idVTK = Pts->InsertNextPoint( coords[j-1], coords[j], coords[j+1] );
-      //Mactor->AddNode( indexes[i-1], idVTK );
-      ugrid->AddNode( indexes[i-1], idVTK );
-      i++;
-      j = j + 3;
-    }
-    //vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::New();
-    ugrid->SetPoints(Pts);
-    vtkDataSetMapper * PtsMapper = vtkDataSetMapper::New();
-    PtsMapper->SetInput( ugrid );
-    Mactor->DataSource = PtsMapper->GetInput();
-    Mactor->SetMapper(PtsMapper);
-  } else {
-    //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-    SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-    int i = 1;
-    int j = 1;
-    while ( i <= number ) {
-      int idVTK = ugrid->GetPoints()->InsertNextPoint( coords[j-1], coords[j], coords[j+1] );
-      ugrid->AddNode( indexes[i-1], idVTK );
-      i++;
-      j = j + 3;
-    }
-    vtkDataSetMapper *PtsMapper = vtkDataSetMapper::New();
-    PtsMapper->SetInput( ugrid );
-    Mactor->DataSource = PtsMapper->GetInput();
-    Mactor->SetMapper(PtsMapper);
-  }
-  QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddNode(SMESH_Actor* Mactor, int idnode, float x, float y, float z)
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  MESSAGE ( "SMESHGUI::AddNode " << idnode << " : " << x << ";" << y << ";" << z )
-  if ( Mactor->GetMapper() == NULL ) {
-    vtkPoints *Pts = vtkPoints::New();
-    int idVTK = Pts->InsertNextPoint( x, y, z );
-    //Mactor->AddNode( idnode, idVTK );
-    //vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::New();
-    SMESH_Grid *ugrid = SMESH_Grid::New();
-    ugrid->Allocate();
-    ugrid->AddNode( idnode, idVTK );
-    ugrid->SetPoints(Pts);
-    vtkDataSetMapper * PtsMapper = vtkDataSetMapper::New();
-    PtsMapper->SetInput( ugrid );
-    Mactor->DataSource = PtsMapper->GetInput();
-    Mactor->SetMapper(PtsMapper);
-  } else {
-    //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-    SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-    int idVTK = ugrid->GetPoints()->InsertNextPoint( x, y, z );
-    //Mactor->AddNode( idnode, idVTK );
-    ugrid->AddNode( idnode, idVTK );
-    vtkDataSetMapper *PtsMapper = vtkDataSetMapper::New();
-    PtsMapper->SetInput( ugrid );
-    Mactor->DataSource = PtsMapper->GetInput();
-    Mactor->SetMapper(PtsMapper);
-  }
-  QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveNode(SMESH_Actor* Mactor, int idnode)
-{
-  MESSAGE ( " OLD RemoveNode method " )
-//   int id = Mactor->GetIdVTKNode( idnode );
-//    MESSAGE ( " RemoveNode id VTK " << id )
-//    if ( Mactor->GetMapper() != NULL ) {
-//      vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-//      vtkUnstructuredGrid* newUgrid = vtkUnstructuredGrid::New();
-//      vtkPoints *Pts = ugrid->GetPoints();
-//      vtkPoints *newPts = vtkPoints::New();
-//      int nbPts = Pts->GetNumberOfPoints();
-//      bool findPt = false;
-//      for ( int i = 0; i < nbPts; i++ ) {
-//        if ( id != i ) {
-//     if ( !findPt)
-//       newPts->InsertPoint(i, Pts->GetPoint(i) );
-//     else
-//       newPts->InsertPoint(i-1, Pts->GetPoint(i) );
-//        } else {
-//     findPt = true;
-//     Mactor->RemoveNode( idnode );
-//        }
-//      }
-
-//      newUgrid->SetPoints(newPts);
-//      int nbCells = ugrid->GetNumberOfCells();
-//      for ( int i = 0; i < nbCells; i++ ) {
-//        vtkIdList *Ids = ugrid->GetCell(i)->GetPointIds();
-//        vtkIdList *newIds = vtkIdList::New();
-//        int nbIds = Ids->GetNumberOfIds();
-//        newIds->SetNumberOfIds(nbIds);
-//        for ( int j = 0; j < nbIds; j++ ) {
-//     int theid = Ids->GetId(j);
-//     if ( theid > id ) {
-//       newIds->SetId( j, theid-1 );
-//     } else
-//       newIds->SetId( j, theid );
-//        }
-//        int idSMDSel = Mactor->GetIdSMESHDSElement( i );
-//        Mactor->RemoveElement( idSMDSel, false );
-//        int idVTKel = newUgrid->InsertNextCell( ugrid->GetCell(i)->GetCellType(), newIds );
-//        Mactor->AddElement( idSMDSel, idVTKel );
-//      }
-
-
-//      vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-//      Mapper->SetInput( newUgrid );
-//      Mactor->DataSource = Mapper->GetInput();
-//      Mactor->SetMapper(Mapper);
-
-//      UpdateView();
-//    }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveNodes(SMESH_Actor* Mactor, int number, 
-                          const SMESH::double_array& coords, const SMESH::long_array& indexes)
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  int i = 1;
-  while ( i <= number ) {
-    Mactor->RemoveNode( indexes[i-1] );
-    i++;
-  }
-
-  TColStd_DataMapOfIntegerInteger newMapVTKNodes;
-  TColStd_DataMapOfIntegerInteger newMapSMESHDSNodes;
-  TColStd_DataMapOfIntegerInteger MapOldNodesToNewNodes;
-
-  if ( Mactor->GetMapper() != NULL ) {
-    SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-    SMESH_Grid *newUgrid = SMESH_Grid::New();
-    newUgrid->CopyMaps(ugrid);
-
-    vtkPoints *Pts = ugrid->GetPoints();
-    vtkPoints *newPts = vtkPoints::New();
-    int nbPts = Pts->GetNumberOfPoints();
-    int j = 0;
-    for ( int i = 0; i < nbPts; i++ ) {
-      int idSMESHDSNode = Mactor->GetIdSMESHDSNode(i);
-      if ( idSMESHDSNode != -1 ) {
-       newPts->InsertPoint(j, Pts->GetPoint(i) );
-
-       newMapVTKNodes.Bind(j, idSMESHDSNode);
-       newMapSMESHDSNodes.Bind(idSMESHDSNode, j);
-
-       MapOldNodesToNewNodes.Bind(i,j);
-       j++;
+  case 4051:                                    // RENUMBERING NODES
+    {
+      if(checkLock(aStudy)) break;
+      if( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_RenumberingDlg( this, 0 ) )->show();
       }
+      else
+        {
+          SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                   tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+        }
+      break;
     }
-
-    newUgrid->SetIdsVTKNode(newMapVTKNodes); 
-    newUgrid->SetIdsSMESHDSNode(newMapSMESHDSNodes); 
-    newUgrid->SetPoints(newPts);
-
-    TColStd_DataMapOfIntegerInteger newMapElementSMDStoVTK;
-    TColStd_DataMapOfIntegerInteger newMapElementVTKtoSMDS;
-
-    int nbCells = ugrid->GetNumberOfCells();
-    for ( int i = 0; i < nbCells; i++ ) {
-      vtkIdList *Ids = ugrid->GetCell(i)->GetPointIds();
-      vtkIdList *newIds = vtkIdList::New();
-      int nbIds = Ids->GetNumberOfIds();
-      newIds->SetNumberOfIds(nbIds);
-      bool isGood = true;
-      for ( int j = 0; j < nbIds; j++ ) {
-       int theid = Ids->GetId(j);
-       if ( MapOldNodesToNewNodes.IsBound( theid ) ) {
-         newIds->SetId( j, MapOldNodesToNewNodes.Find( theid ) );
-       } else {
-         isGood = false;
-         break;
-       }
+  case 4052:                                    // RENUMBERING ELEMENTS
+    {
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_RenumberingDlg( this, 1 ) )->show();
       }
-
-      // Filtering out cells based on non-existing nodes
-      if (isGood) {
-       int idSMDSel = Mactor->GetIdSMESHDSElement( i );
-       int idVTKel = newUgrid->InsertNextCell( ugrid->GetCell(i)->GetCellType(), newIds );
-
-       newMapElementSMDStoVTK.Bind(idSMDSel, idVTKel);
-       newMapElementVTKtoSMDS.Bind(idVTKel, idSMDSel);
+      else
+        {
+          SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                   tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+        }
+      break;
+    }
+  case 4061:                                   // TRANSLATION
+    {
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_TranslationDlg( this ) )->show();
       }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }
+      break;
     }
-
-    newUgrid->SetIdsVTKElement(newMapElementVTKtoSMDS);
-    newUgrid->SetIdsSMESHDSElement(newMapElementSMDStoVTK);
-    
-    // Copy new data to the old DatSource: keep the single DataSource for all actors
-    ugrid->DeepCopy(newUgrid);
-
-    vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-    Mapper->SetInput( ugrid );
-    Mactor->SetMapper(Mapper);
-    
-    // Commented to avoid multiple viewer updates when called by ReadScript()
-    //UpdateView();
-
-  }
-  QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveNodes(SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex)
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    SMESH::long_array_var anArrayOfIdeces = new  SMESH::long_array;
-    anArrayOfIdeces->length(MapIndex.Extent());
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    int i = 0;
-    for ( ; ite.More(); ite.Next() ) {
-      //      MESSAGE ( " RemoveNode : id " << ac->GetIdSMESHDSNode(ite.Key()) )
-      anArrayOfIdeces[i] = ac->GetIdSMESHDSNode(ite.Key());
-      i++;
-    }
-    SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-    aMeshEditor->RemoveNodes(anArrayOfIdeces);
-
-  }
-  if ( myAutomaticUpdate ) {
-    SMESH_Actor* Mesh = smeshGUI->ReadScript(aMesh);
-    if ( Mesh != NULL ) {
-      smeshGUI->DisplayActor( Mesh );
-      smeshGUI->DisplayEdges( Mesh );
-      smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-      AddActorInSelection( Mesh );
+  case 4062:                                   // ROTATION
+    {
+      if(checkLock(aStudy)) break;
+      if( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_RotationDlg( this ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }
+      break;
     }
-  }
-  QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveElement(SMESH_Actor* Mactor, int idelement)
-{
-  MESSAGE ( " OLD RemoveElement method " )
-//    int id = Mactor->GetIdVTKElement( idelement );
-//    MESSAGE ( " RemoveElement id VTK : " << id )
-//    if ( Mactor->GetMapper() != NULL ) {
-//      vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-//      vtkUnstructuredGrid* newUgrid = vtkUnstructuredGrid::New();
-    
-//      int nbCells = ugrid->GetNumberOfCells();
-//      for ( int i = 0; i < nbCells; i++ ) {
-//        if ( id != i ) {
-//     newUgrid->InsertNextCell( ugrid->GetCell(i)->GetCellType(), 
-//                               ugrid->GetCell(i)->GetPointIds() );
-//        } else
-//     Mactor->RemoveElement( idelement );
-//      }
-//      newUgrid->SetPoints(ugrid->GetPoints());
-    
-//      vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-//      Mapper->SetInput( newUgrid );
-//      Mactor->DataSource = Mapper->GetInput();
-//      Mactor->SetMapper(Mapper);
-    
-//      UpdateView();
-//    }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveElements(SMESH_Actor* Mactor, int number, 
-                             const SMESH::double_array& coords, const SMESH::long_array& indexes)
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  int i = 1;
-  while ( i <= number ) {
-    Mactor->RemoveElement( indexes[i-1] );
-    i++;
-  }
-  TColStd_DataMapOfIntegerInteger newMapElementSMDStoVTK;
-  TColStd_DataMapOfIntegerInteger newMapElementVTKtoSMDS;
-
-  if ( Mactor->GetMapper() != NULL ) {
-    SMESH_Grid*    ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-    SMESH_Grid* newUgrid = SMESH_Grid::New();
-    newUgrid->CopyMaps(ugrid);
-
-    int nbCells = ugrid->GetNumberOfCells();
-    for ( int i = 0; i < nbCells; i++ ) {
-      int idSMESHDSElement = Mactor->GetIdSMESHDSElement(i);
-      if ( idSMESHDSElement != -1 ) {
-       int newId = newUgrid->InsertNextCell( ugrid->GetCell(i)->GetCellType(), 
-                                             ugrid->GetCell(i)->GetPointIds() );
-       newMapElementSMDStoVTK.Bind(idSMESHDSElement, newId);
-       newMapElementVTKtoSMDS.Bind(newId, idSMESHDSElement);
+  case 4063:                                   // SYMMETRY
+    {
+      if(checkLock(aStudy)) break;
+      if(vtkwnd) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_SymmetryDlg( this ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
       }
+      break;
     }
-
-    newUgrid->SetIdsVTKElement(newMapElementVTKtoSMDS);
-    newUgrid->SetIdsSMESHDSElement(newMapElementSMDStoVTK);
-
-    newUgrid->SetPoints(ugrid->GetPoints());
-
-    // Copy new data to the old DatSource: keep the single DataSource for all actors
-    ugrid->DeepCopy(newUgrid);
-    
-    vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-    Mapper->SetInput( ugrid );
-    Mactor->SetMapper(Mapper);
-
-    // Commented to avoid multiple viewer updates when called by ReadScript()
-    //UpdateView();
-  }
-  QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveElements(SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex)
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    SMESH::long_array_var anArrayOfIdeces = new  SMESH::long_array;
-    anArrayOfIdeces->length(MapIndex.Extent());
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    int i = 0;
-    for ( ; ite.More(); ite.Next() ) {
-      //      MESSAGE ( " RemoveElement : id " << ite.Key() << "," << ac->GetIdSMESHDSElement(ite.Key()) )
-      anArrayOfIdeces[i] = ac->GetIdSMESHDSElement(ite.Key());
-      i++;
-    }
-
-    SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-    aMeshEditor->RemoveElements(anArrayOfIdeces);
-  }
-    
-  if ( myAutomaticUpdate ) {
-    SMESH_Actor* Mesh = smeshGUI->ReadScript(aMesh);
-    if ( Mesh != NULL ) {
-      smeshGUI->DisplayActor( Mesh );
-      smeshGUI->DisplayEdges( Mesh );
-      smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-      AddActorInSelection( Mesh );
-#ifdef TRACE
-      Dump( Mesh );
-#endif
+  case 4064:                                   // SEWING
+    {
+      if(checkLock(aStudy)) break;
+      if(vtkwnd) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_SewingDlg( this ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }
+      break;
     }
-  }
-  QApplication::restoreOverrideCursor();
-}
-
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::OrientationElements(SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex)
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
-
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    //vtkUnstructuredGrid* UGrid = vtkUnstructuredGrid::New();
-    SMESH_Grid*   UGrid = SMESH_Grid::New();
-    SMESH_Grid* oldGrid = SMESH_Grid::SafeDownCast(ac->DataSource);
-    UGrid->CopyMaps(oldGrid);
-
-    vtkGeometryFilter *gf = vtkGeometryFilter::New();
-    gf->SetInput( ac->DataSource );
-
-    vtkPolyDataMapper *Mapper = vtkPolyDataMapper::New();
-    Mapper->SetInput( gf->GetOutput() );
-    Mapper->Update();
-
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    for ( ; ite.More(); ite.Next() ) {
-       Mapper->GetInput()->ReverseCell( ite.Key() );
+  case 4065:                                   // MERGE NODES
+    {
+      if(checkLock(aStudy)) break;
+      if(vtkwnd) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_MergeDlg( this, 0 ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }
+      break;
     }
-
-    UGrid->SetPoints( Mapper->GetInput()->GetPoints() );
-    int nbCells = Mapper->GetInput()->GetNumberOfCells();
-    for ( int i = 0; i < nbCells; i++ ) {
-      UGrid->InsertNextCell( Mapper->GetInput()->GetCellType(i), Mapper->GetInput()->GetCell(i)->GetPointIds() );
+  case 4066:                                   // MERGE EQUAL ELEMENTS
+    {
+      if (checkLock(aStudy)) break;
+      if (vtkwnd) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_MergeDlg( this, 1 ) )->show();
+      } else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }
+      break;
     }
 
-    // Copy new data to the old DatSource: keep the single DataSource for all actors
-    oldGrid->DeepCopy(UGrid);
-
-    vtkDataSetMapper *NewMapper = vtkDataSetMapper::New();
-    //NewMapper->SetInput( UGrid );
-    NewMapper->SetInput( oldGrid );
-    NewMapper->Update();
-
-    //ac->DataSource = NewMapper->GetInput();
-    ac->SetMapper( NewMapper );
-  }
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
-  QApplication::restoreOverrideCursor();
-}
-
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DiagonalInversion(SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex)
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  case 4067: // MAKE MESH PASS THROUGH POINT
+    startOperation( 4067 );
+    break;
 
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();  
-  Standard_Boolean result;
+  case 4068: // SCALE
+    {
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_ScaleDlg( this ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }
+      break;
+    }
 
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    //vtkUnstructuredGrid* UGrid = vtkUnstructuredGrid::New();
-    SMESH_Grid* UGrid = SMESH_Grid::New();
-    vtkGeometryFilter *gf = vtkGeometryFilter::New();
-    gf->SetInput( ac->DataSource );
-    
-    vtkExtractEdges *edges = vtkExtractEdges::New();
-    edges->SetInput( ac->DataSource );
-
-    vtkPolyDataMapper *Mapper = vtkPolyDataMapper::New();
-    Mapper->SetInput( edges->GetOutput() );
-    Mapper->Update();
-
-    int nb = Mapper->GetInput()->GetNumberOfCells();
-    //MESSAGE ( "nb : " << nb )
-
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    for ( ; ite.More(); ite.Next() ) {
-      vtkCell* StartEdge = Mapper->GetInput()->GetCell(ite.Key());
-      //MESSAGE( "DCQ : Edge Id = " << ite.Key())
-      int CellType = StartEdge->GetCellType();
-      //MESSAGE( "DCQ : Cell Type = " << CellType)
-      int nbPoints = StartEdge->GetNumberOfPoints();
-
-      //MESSAGE( "DCQ : Nb Point = " << nbPoints)
-      if ( nbPoints == 2 ) {
-       vtkUnstructuredGrid* StartUGrid = vtkUnstructuredGrid::SafeDownCast( ac->DataSource );
-       
-       vtkIdList *IdCells =  vtkIdList::New();
-       vtkIdList *IdPoints = StartEdge->GetPointIds();
-       float p1[3];
-       float p2[3];
-       
-       Mapper->GetInput()->GetPoints()->GetPoint(IdPoints->GetId(0),p1);
-       Mapper->GetInput()->GetPoints()->GetPoint(IdPoints->GetId(1),p2);
-
-       int idp1 = StartUGrid->FindPoint(p1);
-       int idp2 = StartUGrid->FindPoint(p2);
-
-       StartUGrid->GetPointCells( idp1, IdCells );
-       
-       //MESSAGE ( " pt 0 : " << IdPoints->GetId(0) )
-       //MESSAGE ( " pt 1 : " << IdPoints->GetId(1) )
-
-       //MESSAGE ( " pt 0 : " << idp1 )
-       //MESSAGE ( " pt 1 : " << idp2 )
-
-       vtkIdList *IdPts = vtkIdList::New();
-       if (IdCells->GetNumberOfIds() >= 2) {
-         int nbCells = IdCells->GetNumberOfIds();
-         //MESSAGE ( " nbCells : " << nbCells )
-         for (int j=0; j<nbCells; j++) {
-           StartUGrid->GetCellPoints( IdCells->GetId(j), IdPts );
-           if ( IdPts->IsId( idp2 ) == -1 ) {
-             IdCells->DeleteId( IdCells->GetId(j) );
-           }
-         }
-       
-
-         //MESSAGE ( " IdCells " << IdCells->GetNumberOfIds() )
-
-         vtkIdList *IdPts0 = vtkIdList::New();
-         vtkIdList *IdPts1 = vtkIdList::New();
-
-         if (IdCells->GetNumberOfIds() == 2) {
-           StartUGrid->GetCellPoints( IdCells->GetId(0), IdPts0 );
-           StartUGrid->GetCellPoints( IdCells->GetId(1), IdPts1 );
-           
-           //Create new faces
-           TColStd_MapOfInteger EndMapIndex;
-           for (int j = 0; j < 3; j++ ) {
-             if ( IdPts0->GetId(j) != idp1 && IdPts0->GetId(j) != idp2 ) {
-               EndMapIndex.Add( IdPts0->GetId(j) );
-             }
-             if ( IdPts1->GetId(j) != idp1 && IdPts1->GetId(j) != idp2 ) {
-               EndMapIndex.Add( IdPts1->GetId(j) );
-             }
-           }
-
-           bool MyAU = myAutomaticUpdate ;
-           myAutomaticUpdate = false ;
-
-           EndMapIndex.Add( idp1 );
-           TColStd_MapIteratorOfMapOfInteger ite1( EndMapIndex );
-           int i = 1;
-           while ( ite1.More() ) {
-             if ( ite1.Key() == idp1 )
-               break;
-             i++;
-             ite1.Next();
-           }
-           bool reverse1 = ( i == 2 );
-           this->AddFace( aMesh, EndMapIndex, reverse1 );
-           
-           EndMapIndex.Remove( idp1 );
-           EndMapIndex.Add( idp2 );
-           TColStd_MapIteratorOfMapOfInteger ite2( EndMapIndex );
-           i = 1;
-           while ( ite2.More() ) {
-             if ( ite2.Key() == idp2 )
-               break;
-             i++;
-             ite2.Next();
-           }
-           bool reverse2 = ( i == 2 );
-           this->AddFace( aMesh, EndMapIndex, !(reverse1 == reverse2) );
-           
-           myAutomaticUpdate = MyAU ;
-           //MESSAGE ( " myAutomaticUpdate = " << MyAU )
-           Mapper->Update();
-           //Remove old faces
-           TColStd_MapOfInteger StartMapIndex;
-           StartMapIndex.Add( IdCells->GetId(0) );
-           StartMapIndex.Add( IdCells->GetId(1) );
-           this->RemoveElements( aMesh, StartMapIndex );
-           
-           Mapper->Update();
-         } 
-       }
+  case 4069: // DUPLICATE NODES
+    {
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_DuplicateNodesDlg( this ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
       }
+      break;
     }
-    
-    //      UGrid->SetPoints( Mapper->GetInput()->GetPoints() );
-    //      int nbCells = Mapper->GetInput()->GetNumberOfCells();
-    //      for ( int i = 0; i < nbCells; i++ ) {
-    //        UGrid->InsertNextCell( Mapper->GetInput()->GetCellType(i), Mapper->GetInput()->GetCell(i)->GetPointIds() );
-    //      }
-    
-    //      vtkDataSetMapper *NewMapper = vtkDataSetMapper::New();
-    //      NewMapper->SetInput( UGrid );
-    //      NewMapper->Update();
-    
-    //      ac->DataSource = NewMapper->GetInput();
-    //      ac->SetMapper( NewMapper );
-  }
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
-  QApplication::restoreOverrideCursor();
-}
 
+  case 4070: // 0D_ON_ALL_NODES
+    startOperation( 4070 );
+    break;
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddEdges( SMESH_Actor* Mactor, int number, 
-                        const SMESH::double_array& coords, const SMESH::long_array& indexes)
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-  int i = 1;
-  int j = 1;
-  while ( i <= number ) {
-    vtkIdList *Ids = vtkIdList::New();
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+1] ) );
-    int id = ugrid->InsertNextCell(VTK_LINE, Ids);
-    Mactor->AddElement( indexes[j-1], id );
-    i++;
-    j = j + 3;
+  case 5105: // Library of selection filters
+  {
+    static QList<int> aTypes;
+    if ( aTypes.isEmpty() )
+    {
+      aTypes.append( SMESH::NODE );
+      aTypes.append( SMESH::EDGE );
+      aTypes.append( SMESH::FACE );
+      aTypes.append( SMESH::VOLUME );
+    }
+    if (!myFilterLibraryDlg)
+      myFilterLibraryDlg = new SMESHGUI_FilterLibraryDlg( this, SMESH::GetDesktop( this ), aTypes, SMESHGUI_FilterLibraryDlg::EDIT );
+    else if (myFilterLibraryDlg->isHidden())
+      myFilterLibraryDlg->Init( aTypes, SMESHGUI_FilterLibraryDlg::EDIT );
+    myFilterLibraryDlg->raise();
+  }
+  break;
+
+  case 6017:                                    // CONTROLS
+  case 6016:
+  case 6015:
+  case 6014:
+  case 6013:
+  case 6012:
+  case 6011:
+  case 6001:
+  case 6018:
+  case 6019:
+  case 6002:
+  case 6003:
+  case 6004:
+  case 6005:
+  case 6009:
+  case 6021:
+  case 6022:
+  case 6023:
+  case 6024:
+  case 6025:
+  case 6026:
+  case 6027:
+  case 6028:
+  case 6029:
+  case 6030:
+  case 6031:
+    if ( vtkwnd ) {
+
+      LightApp_SelectionMgr* mgr = selectionMgr();
+      SALOME_ListIO selected; mgr->selectedObjects( selected );
+
+      if ( selected.Extent() == 1 && selected.First()->hasEntry() ) {
+        _PTR(SObject) SO = aStudy->FindObjectID( selected.First()->getEntry() );
+        if ( SO ) {
+          CORBA::Object_var aObject = SMESH::SObjectToObject( SO );
+          SMESH::SMESH_Mesh_var      aMesh    = SMESH::SMESH_Mesh::_narrow( aObject );
+          SMESH::SMESH_subMesh_var   aSubMesh = SMESH::SMESH_subMesh::_narrow( aObject );
+          SMESH::SMESH_GroupBase_var aGroup   = SMESH::SMESH_GroupBase::_narrow( aObject );
+          if ( !aMesh->_is_nil() || !aSubMesh->_is_nil() || !aGroup->_is_nil() ) {
+            ::Control( theCommandID );
+            break;
+          }
+        }
+      }
+      SUIT_MessageBox::warning(desktop(),
+                               tr( "SMESH_WRN_WARNING" ),
+                               tr( "SMESH_BAD_SELECTION" ) );
+      break;
+    }
+    else {
+      SUIT_MessageBox::warning(desktop(),
+                               tr( "SMESH_WRN_WARNING" ),
+                               tr( "NOT_A_VTK_VIEWER" ) );
+    }
+    break;
+  case 9010:
+    {
+      LightApp_SelectionMgr* mgr = selectionMgr();
+      SALOME_ListIO selected; mgr->selectedObjects( selected );
+
+      SALOME_ListIteratorOfListIO it(selected);
+      for( ; it.More(); it.Next()) {
+        Handle(SALOME_InteractiveObject) anIObject = it.Value();
+        if(anIObject->hasEntry()) {
+          if(SMESH_Actor *anActor = SMESH::FindActorByEntry(anIObject->getEntry())){
+            anActor->SetPointsLabeled( !anActor->GetPointsLabeled() );
+          }
+        }
+      }
+      break;
+    }
+  case 9011:
+    {
+      LightApp_SelectionMgr* mgr = selectionMgr();
+      SALOME_ListIO selected; mgr->selectedObjects( selected );
+
+      SALOME_ListIteratorOfListIO it(selected);
+      for( ; it.More(); it.Next()) {
+        Handle(SALOME_InteractiveObject) anIObject = it.Value();
+        if(anIObject->hasEntry())
+          if(SMESH_Actor *anActor = SMESH::FindActorByEntry(anIObject->getEntry())){
+            anActor->SetCellsLabeled( !anActor->GetCellsLabeled() );
+          }
+      }
+      break;
+    }
+  case 501:
+  case 502:
+    {
+      int page = theCommandID == 501 ? SMESHGUI_MeasureDlg::MinDistance : SMESHGUI_MeasureDlg::BoundingBox;
+      EmitSignalDeactivateDialog();
+      SMESHGUI_MeasureDlg* dlg = new SMESHGUI_MeasureDlg( SMESHGUI::desktop(), page );
+      dlg->show();
+      break;
+    }
   }
-  vtkDataSetMapper *EdgeMapper = vtkDataSetMapper::New();
-  EdgeMapper->SetInput( ugrid );
-  Mactor->DataSource = EdgeMapper->GetInput();
-  Mactor->SetMapper(EdgeMapper);
-  QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddEdge(SMESH_Actor* Mactor, int idedge, int idnode1, int idnode2) 
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  MESSAGE ( "SMESHGUI::AddEdge " << idedge << " : " << idnode1 << ";" << idnode2 )
-  vtkIdList *Ids = vtkIdList::New();
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode1 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode2 ) );
-
-  //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-  int id = ugrid->InsertNextCell(VTK_LINE, Ids);
-  Mactor->AddElement( idedge, id );
-  
-  MESSAGE ( " Edge VTK id " << id )
 
-  vtkDataSetMapper *EdgeMapper = vtkDataSetMapper::New();
-  EdgeMapper->SetInput( ugrid );
-  Mactor->DataSource = EdgeMapper->GetInput();
-  Mactor->SetMapper(EdgeMapper);
-  QApplication::restoreOverrideCursor();
+  anApp->updateActions(); //SRN: To update a Save button in the toolbar
+  //updateObjBrowser();
+  return true;
 }
 
 //=============================================================================
@@ -4176,48 +3462,9 @@ void SMESHGUI::AddEdge(SMESH_Actor* Mactor, int idedge, int idnode1, int idnode2
  *
  */
 //=============================================================================
-void SMESHGUI::AddTriangles( SMESH_Actor* Mactor, int number, 
-                            const SMESH::double_array& coords, const SMESH::long_array& indexes)
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-  int i = 1;
-  int j = 1;
-  while ( i <= number ) {
-    vtkIdList *Ids = vtkIdList::New();
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+1] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+2] ) );
-    int id = ugrid->InsertNextCell(VTK_TRIANGLE, Ids);
-    Mactor->AddElement( indexes[j-1], id );
-    i++;
-    j = j + 4;
-  }
-  vtkDataSetMapper *TriMapper = vtkDataSetMapper::New();
-  TriMapper->SetInput( ugrid );
-  Mactor->DataSource = TriMapper->GetInput();
-  Mactor->SetMapper(TriMapper);
-  QApplication::restoreOverrideCursor();
-}
-void SMESHGUI::AddTriangle(SMESH_Actor* Mactor, int idtri, int idnode1, int idnode2, int idnode3) 
+bool SMESHGUI::OnMousePress( QMouseEvent * pe, SUIT_ViewWindow * wnd )
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  vtkIdList *Ids = vtkIdList::New();
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode1 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode2 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode3 ) );
-
-  //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-  int id = ugrid->InsertNextCell(VTK_TRIANGLE, Ids);
-  Mactor->AddElement( idtri, id );
-
-  vtkDataSetMapper *TriMapper = vtkDataSetMapper::New();
-  TriMapper->SetInput( ugrid );
-  Mactor->DataSource = TriMapper->GetInput();
-  Mactor->SetMapper(TriMapper);
-  QApplication::restoreOverrideCursor();
+  return false;
 }
 
 //=============================================================================
@@ -4225,1740 +3472,3070 @@ void SMESHGUI::AddTriangle(SMESH_Actor* Mactor, int idtri, int idnode1, int idno
  *
  */
 //=============================================================================
-void SMESHGUI::AddQuadrangles( SMESH_Actor* Mactor, int number, 
-                              const SMESH::double_array& coords, const SMESH::long_array& indexes)
+bool SMESHGUI::OnMouseMove( QMouseEvent * pe, SUIT_ViewWindow * wnd )
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-  int i = 1;
-  int j = 1;
-  while ( i <= number ) {
-    vtkIdList *Ids = vtkIdList::New();
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+1] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+2] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+3] ) );
-    int id = ugrid->InsertNextCell(VTK_QUAD, Ids);
-    Mactor->AddElement( indexes[j-1], id );
-    i++;
-    j = j + 5;
-  }
-  vtkDataSetMapper *QuadMapper = vtkDataSetMapper::New();
-  QuadMapper->SetInput( ugrid );
-  Mactor->DataSource = QuadMapper->GetInput();
-  Mactor->SetMapper(QuadMapper);
-  QApplication::restoreOverrideCursor();
+  return true;
 }
 
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::AddQuadrangle(SMESH_Actor* Mactor, int idquad, int idnode1, int idnode2, 
-                            int idnode3, int idnode4) 
+bool SMESHGUI::OnKeyPress( QKeyEvent * pe, SUIT_ViewWindow * wnd )
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  vtkIdList *Ids = vtkIdList::New();
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode1 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode2 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode3 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode4 ) );
-
-  //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-  int id = ugrid->InsertNextCell(VTK_QUAD, Ids);
-  Mactor->AddElement( idquad, id );
-
-  vtkDataSetMapper *QuadMapper = vtkDataSetMapper::New();
-  QuadMapper->SetInput( ugrid );
-  Mactor->DataSource = QuadMapper->GetInput();
-  Mactor->SetMapper(QuadMapper);
-  QApplication::restoreOverrideCursor();
+  return true;
 }
 
-
 //=============================================================================
-/*!
- *
+/*! Method:  BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
+ *  Purpose: ensures that the actor for the given <theIO> exists in the active VTK view
  */
 //=============================================================================
-void SMESHGUI::AddTetras( SMESH_Actor* Mactor, int number, 
-                              const SMESH::double_array& coords, const SMESH::long_array& indexes)
+void SMESHGUI::BuildPresentation( const Handle(SALOME_InteractiveObject) & theIO,
+                                  SUIT_ViewWindow* wnd )
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-    SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-  int i = 1;
-  int j = 1;
-  while ( i <= number ) {
-    vtkIdList *Ids = vtkIdList::New();
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+1] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+2] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+3] ) );
-    int id = ugrid->InsertNextCell(VTK_TETRA, Ids);
-    Mactor->AddElement( indexes[j-1], id );
-    i++;
-    j = j + 5;
+  if(theIO->hasEntry()){
+    //SUIT_ViewWindow* wnd = SMESH::GetActiveWindow();
+    SMESH::UpdateView(wnd,SMESH::eDisplay,theIO->getEntry());
   }
-  vtkDataSetMapper *TetraMapper = vtkDataSetMapper::New();
-  TetraMapper->SetInput( ugrid );
-  Mactor->DataSource = TetraMapper->GetInput();
-  Mactor->SetMapper(TetraMapper);
-  QApplication::restoreOverrideCursor();
 }
 
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddTetra(SMESH_Actor* Mactor, int idtetra, int idnode1, int idnode2, 
-                       int idnode3, int idnode4) 
+//=======================================================================
+// function : createSMESHAction
+// purpose  :
+//=======================================================================
+void SMESHGUI::createSMESHAction( const int id, const QString& po_id, const QString& icon_id,
+                                  const int key, const bool toggle, const QString& shortcutAction  )
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  MESSAGE ( "SMESHGUI::AddTetra " << idtetra << " : " << idnode1 << ";" << idnode2  
-           << ";" << idnode3 << ";" << idnode4 )
-  vtkIdList *Ids = vtkIdList::New();
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode1 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode2 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode3 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode4 ) );
-
-  //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-  int id = ugrid->InsertNextCell(VTK_TETRA, Ids);
-  Mactor->AddElement( idtetra, id );
-  
-  MESSAGE ( " Tetra VTK id " << id )
-
-  vtkDataSetMapper *TetraMapper = vtkDataSetMapper::New();
-  TetraMapper->SetInput( ugrid );
-  Mactor->DataSource = TetraMapper->GetInput();
-  Mactor->SetMapper(TetraMapper);
-  QApplication::restoreOverrideCursor();
-}
+  QIcon icon;
+  QWidget* parent = application()->desktop();
+  SUIT_ResourceMgr* resMgr = resourceMgr();
+  QPixmap pix;
+  if ( !icon_id.isEmpty() )
+    pix = resMgr->loadPixmap( "SMESH", tr( icon_id.toLatin1().data() ) );
+  else
+    pix = resMgr->loadPixmap( "SMESH", tr( QString( "ICO_%1" ).arg( po_id ).toLatin1().data() ), false );
+  if ( !pix.isNull() )
+    icon = QIcon( pix );
 
+  QString tooltip    = tr( QString( "TOP_%1" ).arg( po_id ).toLatin1().data() ),
+          menu       = tr( QString( "MEN_%1" ).arg( po_id ).toLatin1().data() ),
+          status_bar = tr( QString( "STB_%1" ).arg( po_id ).toLatin1().data() );
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddHexaedres( SMESH_Actor* Mactor, int number, 
-                              const SMESH::double_array& coords, const SMESH::long_array& indexes)
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-  int i = 1;
-  int j = 1;
-  while ( i <= number ) {
-    vtkIdList *Ids = vtkIdList::New();
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+1] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+2] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+3] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+4] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+5] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+6] ) );
-    Ids->InsertNextId( Mactor->GetIdVTKNode( indexes[j+7] ) );
-    int id = ugrid->InsertNextCell(VTK_HEXAHEDRON, Ids);
-    Mactor->AddElement( indexes[j-1], id );
-    i++;
-    j = j + 9;
-  }
-  vtkDataSetMapper *HexaMapper = vtkDataSetMapper::New();
-  HexaMapper->SetInput( ugrid );
-  Mactor->DataSource = HexaMapper->GetInput();
-  Mactor->SetMapper(HexaMapper);
-  QApplication::restoreOverrideCursor();
+  createAction( id, tooltip, icon, menu, status_bar, key, parent,
+                toggle, this, SLOT( OnGUIEvent() ), shortcutAction );
 }
 
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddHexaedre(SMESH_Actor* Mactor, int idhexa, int idnode1, int idnode2, 
-                          int idnode3, int idnode4, int idnode5, int idnode6, int idnode7, int idnode8) 
+//=======================================================================
+// function : createPopupItem
+// purpose  :
+//=======================================================================
+void SMESHGUI::createPopupItem( const int id,
+                                const QString& clients,
+                                const QString& types,
+                                const QString& theRule,
+                                const int pId )
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  MESSAGE ( "SMESHGUI::AddHexaedre " << idhexa << " : " << idnode1 << ";" << idnode2  
-           << ";" << idnode3 << ";" << idnode4 << ";" << idnode5 << ";" << idnode6
-           << ";" << idnode7 << ";" << idnode8)
-
-  vtkIdList *Ids = vtkIdList::New();
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode1 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode2 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode3 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode4 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode5 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode6 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode7 ) );
-  Ids->InsertNextId( Mactor->GetIdVTKNode( idnode8 ) );
-
-  //vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  SMESH_Grid* ugrid = SMESH_Grid::SafeDownCast( Mactor->DataSource );
-  int id = ugrid->InsertNextCell(VTK_HEXAHEDRON, Ids);
-  Mactor->AddElement( idhexa, id );
-  
-  MESSAGE ( " Hexa VTK id " << id )
+  if( !popupMgr()->contains( popupMgr()->actionId( action( id ) ) ) )
+    popupMgr()->insert( action( id ), pId, 0 );
+
+  QString lc = "$";        // VSR : instead of QtxPopupSelection::defEquality();
+  QString dc = "selcount"; // VSR : insetad of QtxPopupSelection::defSelCountParam()
+  QString rule = "(%1) and (%2) and (%3)";
+  rule = rule.arg( QString( "%1>0" ).arg( dc ) );
+  if( clients.isEmpty() )
+    rule = rule.arg( QString( "true" ) );
+  else
+    rule = rule.arg( QString( "%1client in {%2}" ).arg( lc ).arg( clients ) );
+  rule = rule.arg( QString( "%1type in {%2}" ).arg( lc ).arg( types ) );
+  rule += theRule;
+
+  bool cont = myRules.contains( id );
+  if( cont )
+    rule = QString( "%1 or (%2)" ).arg( myRules[ id ] ).arg( rule );
 
-  vtkDataSetMapper *HexaMapper = vtkDataSetMapper::New();
-  HexaMapper->SetInput( ugrid );
-  Mactor->DataSource = HexaMapper->GetInput();
-  Mactor->SetMapper(HexaMapper);
-  QApplication::restoreOverrideCursor();
+  popupMgr()->setRule( action( id ), rule, QtxPopupMgr::VisibleRule );
+  myRules[ id ] = QString( cont ? "%1" : "(%1)" ).arg( rule );
 }
 
-//=====================================================================================
-// EXPORTED METHODS
-//=====================================================================================
-extern "C"
+//=======================================================================
+// function : initialize
+// purpose  :
+//=======================================================================
+void SMESHGUI::initialize( CAM_Application* app )
 {
-  bool OnGUIEvent(int theCommandID, QAD_Desktop* parent)
-  {
-    return SMESHGUI::OnGUIEvent(theCommandID, parent);
-  }
+  SalomeApp_Module::initialize( app );
+
+//   SUIT_ResourceMgr* mgr = app->resourceMgr();
+//   if ( mgr )
+  /* Automatic Update flag */
+//     myAutomaticUpdate = mgr->booleanValue( "SMESH", "AutomaticUpdate", myAutomaticUpdate );
+
+  // ----- create actions --------------
+
+  //createSMESHAction(  111, "IMPORT_DAT", "", (Qt::CTRL+Qt::Key_B) );
+  createSMESHAction(  112, "IMPORT_UNV", "", (Qt::CTRL+Qt::Key_U) );
+  createSMESHAction(  113, "IMPORT_MED", "", (Qt::CTRL+Qt::Key_M) );
+  createSMESHAction(  114, "NUM" );
+  createSMESHAction(  115, "IMPORT_STL"  );
+  createSMESHAction(  116, "IMPORT_CGNS" );
+  createSMESHAction(  117, "IMPORT_SAUV" );
+  createSMESHAction(  118, "IMPORT_GMF"  );
+  createSMESHAction(  121, "DAT" );
+  createSMESHAction(  122, "MED" );
+  createSMESHAction(  123, "UNV" );
+  createSMESHAction(  140, "STL" );
+  createSMESHAction(  142, "CGNS");
+  createSMESHAction(  144, "SAUV");
+  createSMESHAction(  146, "GMF" );
+  createSMESHAction(  124, "DAT" );
+  createSMESHAction(  125, "MED" );
+  createSMESHAction(  126, "UNV" );
+  createSMESHAction(  141, "STL" );
+  createSMESHAction(  143, "CGNS");
+  createSMESHAction(  145, "SAUV");
+  createSMESHAction(  147, "GMF" );
+  createSMESHAction(  150, "FILE_INFO" );
+  createSMESHAction(   33, "DELETE",          "ICON_DELETE", Qt::Key_Delete );
+  createSMESHAction( 5105, "SEL_FILTER_LIB" );
+  createSMESHAction(  701, "COMPUTE",         "ICON_COMPUTE" );
+  createSMESHAction(  702, "CREATE_MESH",     "ICON_DLG_INIT_MESH" );
+  createSMESHAction(  703, "CREATE_SUBMESH",  "ICON_DLG_ADD_SUBMESH" );
+  createSMESHAction(  704, "EDIT_MESHSUBMESH","ICON_DLG_EDIT_MESH" );
+  createSMESHAction(  705, "COPY_MESH",       "ICON_COPY_MESH" );
+  createSMESHAction(  710, "BUILD_COMPOUND",  "ICON_BUILD_COMPOUND" );
+  createSMESHAction(  711, "PRECOMPUTE",      "ICON_PRECOMPUTE" );
+  createSMESHAction(  712, "EVALUATE",        "ICON_COMPUTE" );
+  createSMESHAction(  713, "MESH_ORDER",      "ICON_COMPUTE" );
+  createSMESHAction(  806, "CREATE_GEO_GROUP","ICON_CREATE_GEO_GROUP" );
+  createSMESHAction(  801, "CREATE_GROUP",    "ICON_CREATE_GROUP" );
+  createSMESHAction(  802, "CONSTRUCT_GROUP", "ICON_CONSTRUCT_GROUP" );
+  createSMESHAction(  803, "EDIT_GROUP",      "ICON_EDIT_GROUP" );
+  createSMESHAction(  815, "EDIT_GEOMGROUP_AS_GROUP", "ICON_EDIT_GROUP" );
+  createSMESHAction(  804, "ADD" );
+  createSMESHAction(  805, "REMOVE" );
+  createSMESHAction(  810, "UN_GROUP",        "ICON_UNION" );
+  createSMESHAction(  811, "INT_GROUP",       "ICON_INTERSECT" );
+  createSMESHAction(  812, "CUT_GROUP",       "ICON_CUT" );
+  createSMESHAction(  814, "UNDERLYING_ELEMS","ICON_UNDERLYING_ELEMS" );
+  createSMESHAction(  813, "DEL_GROUP",       "ICON_DEL_GROUP" );
+  createSMESHAction(  900, "ADV_INFO",        "ICON_ADV_INFO" );
+  //createSMESHAction(  902, "STD_INFO",        "ICON_STD_INFO" );
+  //createSMESHAction(  903, "WHAT_IS",         "ICON_WHAT_IS" ); // VSR: issue #0021242 (eliminate "Mesh Element Information" command)
+  createSMESHAction(  904, "FIND_ELEM",       "ICON_FIND_ELEM" );
+  createSMESHAction( 6001, "LENGTH",          "ICON_LENGTH",        0, true );
+  createSMESHAction( 6002, "FREE_EDGE",       "ICON_FREE_EDGE",     0, true );
+  createSMESHAction( 6021, "FREE_FACES",      "ICON_FREE_FACES",    0, true );
+  createSMESHAction( 6022, "MAX_ELEMENT_LENGTH_2D",  "ICON_MAX_ELEMENT_LENGTH_2D",   0, true );
+  createSMESHAction( 6023, "MAX_ELEMENT_LENGTH_3D",  "ICON_MAX_ELEMENT_LENGTH_3D",   0, true );
+  createSMESHAction( 6024, "BARE_BORDER_VOLUME",     "ICON_BARE_BORDER_VOLUME",      0, true );
+  createSMESHAction( 6025, "BARE_BORDER_FACE",       "ICON_BARE_BORDER_FACE",        0, true );
+  createSMESHAction( 6026, "OVER_CONSTRAINED_VOLUME","ICON_OVER_CONSTRAINED_VOLUME", 0, true );
+  createSMESHAction( 6027, "OVER_CONSTRAINED_FACE",  "ICON_OVER_CONSTRAINED_FACE",   0, true );
+  createSMESHAction( 6028, "EQUAL_NODE",      "ICON_EQUAL_NODE",    0, true );
+  createSMESHAction( 6029, "EQUAL_EDGE",      "ICON_EQUAL_EDGE",    0, true );
+  createSMESHAction( 6030, "EQUAL_FACE",      "ICON_EQUAL_FACE",    0, true );
+  createSMESHAction( 6031, "EQUAL_VOLUME",    "ICON_EQUAL_VOLUME",  0, true );
+  createSMESHAction( 6003, "FREE_BORDER",     "ICON_FREE_EDGE_2D",  0, true );
+  createSMESHAction( 6004, "CONNECTION",      "ICON_CONNECTION",    0, true );
+  createSMESHAction( 6005, "FREE_NODE",       "ICON_FREE_NODE",     0, true );
+  createSMESHAction( 6011, "AREA",            "ICON_AREA",          0, true );
+  createSMESHAction( 6012, "TAPER",           "ICON_TAPER",         0, true );
+  createSMESHAction( 6013, "ASPECT",          "ICON_ASPECT",        0, true );
+  createSMESHAction( 6014, "MIN_ANG",         "ICON_ANGLE",         0, true );
+  createSMESHAction( 6015, "WARP",            "ICON_WARP",          0, true );
+  createSMESHAction( 6016, "SKEW",            "ICON_SKEW",          0, true );
+  createSMESHAction( 6017, "ASPECT_3D",       "ICON_ASPECT_3D",     0, true );
+  createSMESHAction( 6018, "LENGTH_2D",       "ICON_LENGTH_2D",     0, true );
+  createSMESHAction( 6019, "CONNECTION_2D",   "ICON_CONNECTION_2D", 0, true );
+  createSMESHAction( 6009, "VOLUME_3D",       "ICON_VOLUME_3D",     0, true );
+  createSMESHAction( 4000, "NODE",            "ICON_DLG_NODE" );
+  createSMESHAction( 4009, "ELEM0D",          "ICON_DLG_ELEM0D" );
+  createSMESHAction( 4008, "BALL",            "ICON_DLG_BALL" );
+  createSMESHAction( 4010, "EDGE",            "ICON_DLG_EDGE" );
+  createSMESHAction( 4021, "TRIANGLE",        "ICON_DLG_TRIANGLE" );
+  createSMESHAction( 4022, "QUAD",            "ICON_DLG_QUADRANGLE" );
+  createSMESHAction( 4023, "POLYGON",         "ICON_DLG_POLYGON" );
+  createSMESHAction( 4031, "TETRA",           "ICON_DLG_TETRAS" );
+  createSMESHAction( 4032, "HEXA",            "ICON_DLG_HEXAS" );
+  createSMESHAction( 4133, "PENTA",           "ICON_DLG_PENTA" );
+  createSMESHAction( 4134, "PYRAMID",         "ICON_DLG_PYRAMID" );
+  createSMESHAction( 4135, "OCTA",            "ICON_DLG_OCTA" );
+  createSMESHAction( 4033, "POLYHEDRON",              "ICON_DLG_POLYHEDRON" );
+  createSMESHAction( 4034, "QUADRATIC_EDGE",          "ICON_DLG_QUADRATIC_EDGE" );
+  createSMESHAction( 4035, "QUADRATIC_TRIANGLE",      "ICON_DLG_QUADRATIC_TRIANGLE" );
+  createSMESHAction( 4036, "QUADRATIC_QUADRANGLE",    "ICON_DLG_QUADRATIC_QUADRANGLE" );
+  createSMESHAction( 4136, "BIQUADRATIC_QUADRANGLE",  "ICON_DLG_BIQUADRATIC_QUADRANGLE" );
+  createSMESHAction( 4137, "BIQUADRATIC_TRIANGLE",    "ICON_DLG_BIQUADRATIC_TRIANGLE" );
+  createSMESHAction( 4037, "QUADRATIC_TETRAHEDRON",   "ICON_DLG_QUADRATIC_TETRAHEDRON" );
+  createSMESHAction( 4038, "QUADRATIC_PYRAMID",       "ICON_DLG_QUADRATIC_PYRAMID" );
+  createSMESHAction( 4039, "QUADRATIC_PENTAHEDRON",   "ICON_DLG_QUADRATIC_PENTAHEDRON" );
+  createSMESHAction( 4040, "QUADRATIC_HEXAHEDRON",    "ICON_DLG_QUADRATIC_HEXAHEDRON" );
+  createSMESHAction( 4140, "TRIQUADRATIC_HEXAHEDRON", "ICON_DLG_TRIQUADRATIC_HEXAHEDRON" );
+  createSMESHAction( 4041, "REMOVE_NODES",          "ICON_DLG_REM_NODE" );
+  createSMESHAction( 4042, "REMOVE_ELEMENTS",       "ICON_DLG_REM_ELEMENT" );
+  createSMESHAction( 4044, "REMOVE_ORPHAN_NODES",   "ICON_DLG_REM_ORPHAN_NODES" );
+  createSMESHAction( 4043, "CLEAR_MESH"    ,  "ICON_CLEAR_MESH" );
+  createSMESHAction( 4051, "RENUM_NODES",     "ICON_DLG_RENUMBERING_NODES" );
+  createSMESHAction( 4052, "RENUM_ELEMENTS",  "ICON_DLG_RENUMBERING_ELEMENTS" );
+  createSMESHAction( 4061, "TRANS",           "ICON_SMESH_TRANSLATION_VECTOR" );
+  createSMESHAction( 4062, "ROT",             "ICON_DLG_MESH_ROTATION" );
+  createSMESHAction( 4063, "SYM",             "ICON_SMESH_SYMMETRY_PLANE" );
+  createSMESHAction( 4064, "SEW",             "ICON_SMESH_SEWING_FREEBORDERS" );
+  createSMESHAction( 4065, "MERGE",           "ICON_SMESH_MERGE_NODES" );
+  createSMESHAction( 4066, "MERGE_ELEMENTS",  "ICON_DLG_MERGE_ELEMENTS" );
+  createSMESHAction( 4067, "MESH_THROU_POINT","ICON_DLG_MOVE_NODE" );
+  createSMESHAction( 4068, "SCALE",           "ICON_DLG_MESH_SCALE" );
+  createSMESHAction( 4069, "DUPLICATE_NODES", "ICON_SMESH_DUPLICATE_NODES" );
+  createSMESHAction( 4070, "0D_ON_ALL_NODES", "ICON_0D_ON_ALL_NODES" );
+  createSMESHAction(  407, "INV",             "ICON_DLG_MESH_DIAGONAL" );
+  createSMESHAction(  408, "UNION2",          "ICON_UNION2TRI" );
+  createSMESHAction(  409, "ORIENT",          "ICON_DLG_MESH_ORIENTATION" );
+  createSMESHAction(  410, "UNION",           "ICON_UNIONTRI" );
+  createSMESHAction(  411, "CUT",             "ICON_CUTQUAD" );
+  createSMESHAction(  412, "SMOOTH",          "ICON_DLG_SMOOTHING" );
+  createSMESHAction(  413, "EXTRUSION",       "ICON_EXTRUSION" );
+  createSMESHAction(  414, "REVOLUTION",      "ICON_REVOLUTION" );
+  createSMESHAction(  415, "MAP",             "ICON_MAP" );
+  createSMESHAction(  416, "EXTRUSION_ALONG", "ICON_EXTRUSION_ALONG" );
+  createSMESHAction(  417, "CONV_TO_QUAD",    "ICON_CONV_TO_QUAD" );
+  createSMESHAction(  418, "2D_FROM_3D",      "ICON_2D_FROM_3D" );
+  createSMESHAction(  419, "SPLIT_TO_TETRA",  "ICON_SPLIT_TO_TETRA" );
+  createSMESHAction(  420, "REORIENT_2D",     "ICON_REORIENT_2D" );
+  createSMESHAction(  200, "RESET" );
+  createSMESHAction(  201, "SCALAR_BAR_PROP" );
+  createSMESHAction(  2021, "SAVE_DISTRIBUTION" );
+  createSMESHAction(  2022, "SHOW_DISTRIBUTION","",0, true );
+#ifndef DISABLE_PLOT2DVIEWER
+  createSMESHAction(  2023, "PLOT_DISTRIBUTION" );
+#endif
+  createSMESHAction(  211, "WIRE",           "ICON_WIRE", 0, true );
+  createSMESHAction(  212, "SHADE",          "ICON_SHADE", 0, true );
+  createSMESHAction(  213, "SHRINK",         "ICON_SHRINK", 0, true );
+  createSMESHAction(  214, "UPDATE",         "ICON_UPDATE" );
+  createSMESHAction(  215, "NODES",          "ICON_POINTS", 0, true );
+  createSMESHAction(  222, "BALLS",          "ICON_DLG_BALL", 0, true );
+  createSMESHAction(  216, "ELEMS0D",        "ICON_DLG_ELEM0D", 0, true );
+  createSMESHAction(  217, "EDGES",          "ICON_DLG_EDGE", 0, true );
+  createSMESHAction(  218, "FACES",          "ICON_DLG_TRIANGLE", 0, true );
+  createSMESHAction(  219, "VOLUMES",        "ICON_DLG_TETRAS", 0, true );
+  createSMESHAction(  220, "ALL" );
+  createSMESHAction(  221, "FACE_ORIENTATION", "", 0, true );
+
+  createSMESHAction(  231, "LINE_REPRESENTATION", "", 0, true );
+  createSMESHAction(  232, "ARC_REPRESENTATION", "", 0, true );
+
+  createSMESHAction( 1100, "EDIT_HYPO" );
+  createSMESHAction( 1102, "UNASSIGN" );
+  createSMESHAction( 9010, "NUM_NODES", "", 0, true );
+  createSMESHAction( 9011, "NUM_ELEMENTS", "", 0, true );
+  createSMESHAction( 1131, "DISPMODE" );
+  createSMESHAction( 1132, "COLORS" );
+  createSMESHAction( 1133, "TRANSP" );
+  createSMESHAction( 1134, "CLIP" );
+  createSMESHAction( 1135, "DISP_ENT" );
+  createSMESHAction( 1136, "AUTO_COLOR" );
+  createSMESHAction( 1137, "DISABLE_AUTO_COLOR" );
+  createSMESHAction( 2000, "CTRL" );
+
+  createSMESHAction( 501, "MEASURE_MIN_DIST", "ICON_MEASURE_MIN_DIST" );
+  createSMESHAction( 502, "MEASURE_BND_BOX",  "ICON_MEASURE_BND_BOX" );
+
+  createSMESHAction( 300, "HIDE" );
+  createSMESHAction( 301, "SHOW" );
+  createSMESHAction( 302, "DISPLAY_ONLY" );
+
+  // ----- create menu --------------
+  int fileId    = createMenu( tr( "MEN_FILE" ),    -1,  1 ),
+      editId    = createMenu( tr( "MEN_EDIT" ),    -1,  3 ),
+      toolsId   = createMenu( tr( "MEN_TOOLS" ),   -1,  5, 50 ),
+      meshId    = createMenu( tr( "MEN_MESH" ),    -1, 70, 10 ),
+      ctrlId    = createMenu( tr( "MEN_CTRL" ),    -1, 60, 10 ),
+      modifyId  = createMenu( tr( "MEN_MODIFY" ),  -1, 40, 10 ),
+      measureId = createMenu( tr( "MEN_MEASURE" ), -1, 50, 10 ),
+      viewId    = createMenu( tr( "MEN_VIEW" ),    -1,  2 );
+
+  createMenu( separator(), fileId );
+
+  int importId = createMenu( tr( "MEN_IMPORT" ), fileId, -1, 10 ),
+      exportId = createMenu( tr( "MEN_EXPORT" ), fileId, -1, 10 ),
+      nodeId   = createMenu( tr( "MEN_NODE_CTRL" ), ctrlId, -1, 10 ),
+      edgeId   = createMenu( tr( "MEN_EDGE_CTRL" ), ctrlId, -1, 10 ),
+      faceId   = createMenu( tr( "MEN_FACE_CTRL" ), ctrlId, -1, 10 ),
+      volumeId = createMenu( tr( "MEN_VOLUME_CTRL" ), ctrlId, -1, 10 ),
+      addId    = createMenu( tr( "MEN_ADD" ),    modifyId, 402 ),
+      removeId = createMenu( tr( "MEN_REMOVE" ), modifyId, 403 ),
+      renumId  = createMenu( tr( "MEN_RENUM" ),  modifyId, 404 ),
+      transfId = createMenu( tr( "MEN_TRANSF" ), modifyId, 405 );
+
+  //createMenu( 111, importId, -1 );
+  createMenu( 112, importId, -1 );
+  createMenu( 113, importId, -1 );
+  createMenu( 115, importId, -1 );
+#ifdef WITH_CGNS
+  createMenu( 116, importId, -1 );
+#endif
+  createMenu( 117, importId, -1 );
+  createMenu( 118, importId, -1 );
+  createMenu( 121, exportId, -1 );
+  createMenu( 122, exportId, -1 );
+  createMenu( 123, exportId, -1 );
+  createMenu( 140, exportId, -1 ); // export to STL
+#ifdef WITH_CGNS
+  createMenu( 142, exportId, -1 ); // export to CGNS
+#endif
+  createMenu( 144, exportId, -1 ); // export to SAUV
+  createMenu( 146, exportId, -1 ); // export to GMF
+  createMenu( separator(), fileId, 10 );
+
+  createMenu( 33, editId, -1 );
+
+  createMenu( 5105, toolsId, -1 );
+
+  createMenu( 702, meshId, -1 ); // "Mesh" menu
+  createMenu( 703, meshId, -1 );
+  createMenu( 704, meshId, -1 );
+  createMenu( 710, meshId, -1 );
+  createMenu( 705, meshId, -1 );
+  createMenu( separator(), meshId, -1 );
+  createMenu( 701, meshId, -1 );
+  createMenu( 711, meshId, -1 );
+  createMenu( 712, meshId, -1 );
+  createMenu( 713, meshId, -1 );
+  createMenu( separator(), meshId, -1 );
+  createMenu( 801, meshId, -1 );
+  createMenu( 806, meshId, -1 );
+  createMenu( 802, meshId, -1 );
+  createMenu( 803, meshId, -1 );
+  createMenu( 815, meshId, -1 );
+  createMenu( separator(), meshId, -1 );
+  createMenu( 810, meshId, -1 );
+  createMenu( 811, meshId, -1 );
+  createMenu( 812, meshId, -1 );
+  createMenu( separator(), meshId, -1 );
+  createMenu( 814, meshId, -1 );
+  createMenu( separator(), meshId, -1 );
+  createMenu( 900, meshId, -1 );
+  //createMenu( 902, meshId, -1 );
+  //createMenu( 903, meshId, -1 ); // VSR: issue #0021242 (eliminate "Mesh Element Information" command)
+  createMenu( 904, meshId, -1 );
+  createMenu( separator(), meshId, -1 );
+
+  createMenu( 6005, nodeId, -1 );
+  createMenu( 6028, nodeId, -1 );
+  createMenu( 6002, edgeId, -1 );
+  createMenu( 6003, edgeId, -1 );
+  createMenu( 6001, edgeId, -1 );
+  createMenu( 6004, edgeId, -1 );
+  createMenu( 6029, edgeId, -1 );
+  createMenu( 6021, faceId, -1 );
+  createMenu( 6025, faceId, -1 );
+  createMenu( 6027, faceId, -1 );
+  createMenu( 6018, faceId, -1 );
+  createMenu( 6019, faceId, -1 );
+  createMenu( 6011, faceId, -1 );
+  createMenu( 6012, faceId, -1 );
+  createMenu( 6013, faceId, -1 );
+  createMenu( 6014, faceId, -1 );
+  createMenu( 6015, faceId, -1 );
+  createMenu( 6016, faceId, -1 );
+  createMenu( 6022, faceId, -1 );
+  createMenu( 6030, faceId, -1 );
+  createMenu( 6017, volumeId, -1 );
+  createMenu( 6009, volumeId, -1 );
+  createMenu( 6023, volumeId, -1 );
+  createMenu( 6024, volumeId, -1 );
+  createMenu( 6026, volumeId, -1 );
+  createMenu( 6031, volumeId, -1 );
+
+  createMenu( 4000, addId, -1 );
+  createMenu( 4009, addId, -1 );
+  createMenu( 4070, addId, -1 );
+  createMenu( 4008, addId, -1 );
+  createMenu( 4010, addId, -1 );
+  createMenu( 4021, addId, -1 );
+  createMenu( 4022, addId, -1 );
+  createMenu( 4023, addId, -1 );
+  createMenu( 4031, addId, -1 );
+  createMenu( 4032, addId, -1 );
+  createMenu( 4133, addId, -1 );
+  createMenu( 4134, addId, -1 );
+  createMenu( 4135, addId, -1 );
+  createMenu( 4033, addId, -1 );
+  createMenu( separator(), addId, -1 );
+  createMenu( 4034, addId, -1 );
+  createMenu( 4035, addId, -1 );
+  createMenu( 4137, addId, -1 );
+  createMenu( 4036, addId, -1 );
+  createMenu( 4136, addId, -1 );
+  createMenu( 4037, addId, -1 );
+  createMenu( 4038, addId, -1 );
+  createMenu( 4039, addId, -1 );
+  createMenu( 4040, addId, -1 );
+  createMenu( 4140, addId, -1 );
+
+  createMenu( 4041, removeId, -1 );
+  createMenu( 4042, removeId, -1 );
+  createMenu( 4044, removeId, -1 );
+  createMenu( separator(), removeId, -1 );
+  createMenu( 813, removeId, -1 );
+  createMenu( separator(), removeId, -1 );
+  createMenu( 4043, removeId, -1 );
+
+  createMenu( 4051, renumId, -1 );
+  createMenu( 4052, renumId, -1 );
+
+  createMenu( 4061, transfId, -1 );
+  createMenu( 4062, transfId, -1 );
+  createMenu( 4063, transfId, -1 );
+  createMenu( 4068, transfId, -1 );
+  createMenu( 4064, transfId, -1 );
+  createMenu( 4065, transfId, -1 );
+  createMenu( 4066, transfId, -1 );
+  createMenu( 4069, transfId, -1 );
+
+  createMenu( 4067,modifyId, -1 );
+  createMenu( 407, modifyId, -1 );
+  createMenu( 408, modifyId, -1 );
+  createMenu( 409, modifyId, -1 );
+  createMenu( 420, modifyId, -1 );
+  createMenu( 410, modifyId, -1 );
+  createMenu( 411, modifyId, -1 );
+  createMenu( 419, modifyId, -1 );
+  createMenu( 412, modifyId, -1 );
+  createMenu( 413, modifyId, -1 );
+  createMenu( 416, modifyId, -1 );
+  createMenu( 414, modifyId, -1 );
+  createMenu( 415, modifyId, -1 );
+  createMenu( 417, modifyId, -1 );
+  createMenu( 418, modifyId, -1 );
+
+  createMenu( 501, measureId, -1 );
+  createMenu( 502, measureId, -1 );
+  createMenu( 214, viewId, -1 );
+
+  // ----- create toolbars --------------
+  int meshTb     = createTool( tr( "TB_MESH" ) ),
+      ctrlTb     = createTool( tr( "TB_CTRL" ) ),
+      addRemTb   = createTool( tr( "TB_ADD_REMOVE" ) ),
+      modifyTb   = createTool( tr( "TB_MODIFY" ) ),
+      dispModeTb = createTool( tr( "TB_DISP_MODE" ) );
+
+  createTool( 702, meshTb );
+  createTool( 703, meshTb );
+  createTool( 704, meshTb );
+  createTool( 710, meshTb );
+  createTool( 705, meshTb );
+  createTool( separator(), meshTb );
+  createTool( 701, meshTb );
+  createTool( 711, meshTb );
+  createTool( 712, meshTb );
+  createTool( 713, meshTb );
+  createTool( separator(), meshTb );
+  createTool( 801, meshTb );
+  createTool( 806, meshTb );
+  createTool( 802, meshTb );
+  createTool( 803, meshTb );
+  //createTool( 815, meshTb );
+  createTool( separator(), meshTb );
+  createTool( 900, meshTb );
+  //createTool( 902, meshTb );
+  //createTool( 903, meshTb ); // VSR: issue #0021242 (eliminate "Mesh Element Information" command)
+  createTool( 904, meshTb );
+  createTool( separator(), meshTb );
+
+  createTool( 6005, ctrlTb );
+  createTool( 6028, ctrlTb );
+  createTool( separator(), ctrlTb );
+  createTool( 6002, ctrlTb );
+  createTool( 6003, ctrlTb );
+  createTool( 6001, ctrlTb );
+  createTool( 6004, ctrlTb );
+  createTool( 6029, ctrlTb );
+  createTool( separator(), ctrlTb );
+  createTool( 6021, ctrlTb );
+  createTool( 6025, ctrlTb );
+  createTool( 6027, ctrlTb );
+  createTool( 6018, ctrlTb );
+  createTool( 6019, ctrlTb );
+  createTool( 6011, ctrlTb );
+  createTool( 6012, ctrlTb );
+  createTool( 6013, ctrlTb );
+  createTool( 6014, ctrlTb );
+  createTool( 6015, ctrlTb );
+  createTool( 6016, ctrlTb );
+  createTool( 6022, ctrlTb );
+  createTool( 6030, ctrlTb );
+  createTool( separator(), ctrlTb );
+  createTool( 6017, ctrlTb );
+  createTool( 6009, ctrlTb );
+  createTool( 6023, ctrlTb );
+  createTool( 6024, ctrlTb );
+  createTool( 6026, ctrlTb );
+  createTool( 6031, ctrlTb );
+  createTool( separator(), ctrlTb );
+
+  createTool( 4000, addRemTb );
+  createTool( 4009, addRemTb );
+  createTool( 4070, addRemTb );
+  createTool( 4008, addRemTb );
+  createTool( 4010, addRemTb );
+  createTool( 4021, addRemTb );
+  createTool( 4022, addRemTb );
+  createTool( 4023, addRemTb );
+  createTool( 4031, addRemTb );
+  createTool( 4032, addRemTb );
+  createTool( 4133, addRemTb );
+  createTool( 4134, addRemTb );
+  createTool( 4135, addRemTb );
+  createTool( 4033, addRemTb );
+  createTool( separator(), addRemTb );
+  createTool( 4034, addRemTb );
+  createTool( 4035, addRemTb );
+  createTool( 4137, addRemTb );
+  createTool( 4036, addRemTb );
+  createTool( 4136, addRemTb );
+  createTool( 4037, addRemTb );
+  createTool( 4038, addRemTb );
+  createTool( 4039, addRemTb );
+  createTool( 4040, addRemTb );
+  createTool( 4140, addRemTb );
+  createTool( separator(), addRemTb );
+  createTool( 4041, addRemTb );
+  createTool( 4042, addRemTb );
+  createTool( 4044, addRemTb );
+  createTool( 4043, addRemTb );
+  createTool( separator(), addRemTb );
+  createTool( 4051, addRemTb );
+  createTool( 4052, addRemTb );
+  createTool( separator(), addRemTb );
+  createTool( 4061, addRemTb );
+  createTool( 4062, addRemTb );
+  createTool( 4063, addRemTb );
+  createTool( 4068, addRemTb );
+  createTool( 4064, addRemTb );
+  createTool( 4065, addRemTb );
+  createTool( 4066, addRemTb );
+  createTool( 4069, addRemTb );
+  createTool( separator(), addRemTb );
+
+  createTool( 4067,modifyTb );
+  createTool( 407, modifyTb );
+  createTool( 408, modifyTb );
+  createTool( 409, modifyTb );
+  createTool( 420, modifyTb );
+  createTool( 410, modifyTb );
+  createTool( 411, modifyTb );
+  createTool( 419, modifyTb );
+  createTool( 412, modifyTb );
+  createTool( 413, modifyTb );
+  createTool( 416, modifyTb );
+  createTool( 414, modifyTb );
+  createTool( 415, modifyTb );
+  createTool( 417, modifyTb );
+  createTool( 418, modifyTb );
+
+  createTool( 214, dispModeTb );
+
+  QString lc = "$";        // VSR : instead of QtxPopupSelection::defEquality();
+  QString dc = "selcount"; // VSR : instead of QtxPopupSelection::defSelCountParam()
+
+  myRules.clear();
+  QString OB = "'ObjectBrowser'",
+          View = "'" + SVTK_Viewer::Type() + "'",
+          pat = "'%1'",
+          mesh    = pat.arg( SMESHGUI_Selection::typeName( SMESH::MESH ) ),
+          group   = pat.arg( SMESHGUI_Selection::typeName( SMESH::GROUP ) ),
+          hypo    = pat.arg( SMESHGUI_Selection::typeName( SMESH::HYPOTHESIS ) ),
+          algo    = pat.arg( SMESHGUI_Selection::typeName( SMESH::ALGORITHM ) ),
+          elems   = QString( "'%1' '%2' '%3' '%4' '%5' '%6'" ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH_VERTEX ) ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH_EDGE ) ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH_FACE ) ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH_SOLID ) ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH_COMPOUND ) ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH ) ),
+          subMesh = elems,
+          mesh_part = mesh + " " + subMesh + " " + group,
+          mesh_group = mesh + " " + group,
+          hyp_alg = hypo + " " + algo;
+
+  // popup for object browser
+  QString
+    isInvisible("not( isVisible )"),
+    isEmpty("numberOfNodes = 0"),
+    isNotEmpty("numberOfNodes <> 0"),
+
+    // has nodes, edges, etc in VISIBLE! actor
+    hasNodes("(numberOfNodes > 0 )"),//&& isVisible)"),
+    hasElems("(count( elemTypes ) > 0)"),
+    hasDifferentElems("(count( elemTypes ) > 1)"),
+    hasBalls("({'BallElem'} in elemTypes)"),
+    hasElems0d("({'Elem0d'} in elemTypes)"),
+    hasEdges("({'Edge'} in elemTypes)"),
+    hasFaces("({'Face'} in elemTypes)"),
+    hasVolumes("({'Volume'} in elemTypes)");
+
+  createPopupItem( 150, OB, mesh, "&& selcount=1 && isImported" );      // FILE INFORMATION
+  createPopupItem( 703, OB, mesh, "&& isComputable");      // CREATE_SUBMESH
+  createPopupItem( 704, OB, mesh, "&& isComputable");      // EDIT_MESHSUBMESH
+  createPopupItem( 704, OB, subMesh, "&& isComputable" );  // EDIT_MESHSUBMESH
+  createPopupItem( 803, OB, group );                       // EDIT_GROUP
+  createPopupItem( 815, OB, group, "&& groupType != 'Group'" ); // EDIT AS STANDALONE
+
+  popupMgr()->insert( separator(), -1, 0 );
+  createPopupItem( 701, OB, mesh, "&& isComputable" );     // COMPUTE
+  createPopupItem( 711, OB, mesh, "&& isComputable && isPreComputable" ); // PRECOMPUTE
+  createPopupItem( 712, OB, mesh, "&& isComputable" );     // EVALUATE
+  createPopupItem( 713, OB, mesh, "&& isComputable" );     // MESH ORDER
+  createPopupItem( 214, OB, mesh_part );                   // UPDATE
+  createPopupItem( 900, OB, mesh_part );                   // ADV_INFO
+  createPopupItem( 904, OB, mesh_group );                  // FIND_ELEM
+  popupMgr()->insert( separator(), -1, 0 );
+  createPopupItem( 801, OB, mesh );                        // CREATE_GROUP
+  createPopupItem( 806, OB, mesh );                        // CREATE_GEO_GROUP
+  createPopupItem( 802, OB, subMesh );                     // CONSTRUCT_GROUP
+  popupMgr()->insert( separator(), -1, 0 );
+  createPopupItem( 1100, OB, hypo);                        // EDIT HYPOTHESIS
+  createPopupItem( 1102, OB, hyp_alg );                    // REMOVE HYPOTHESIS / ALGORITHMS
+  popupMgr()->insert( separator(), -1, 0 );
+  createPopupItem( 4043, OB, mesh );                       // CLEAR_MESH
+  popupMgr()->insert( separator(), -1, 0 );
+  createPopupItem( 417, OB, mesh + " " + subMesh );        // convert to quadratic
+  createPopupItem( 418, OB, mesh + " " + group,            // create 2D mesh from 3D
+                   "&& dim>=2");
+  popupMgr()->insert( separator(), -1, 0 );
+
+  QString only_one_non_empty = QString( " && %1=1 && numberOfNodes>0" ).arg( dc );
+  QString multiple_non_empty = QString( " && %1>0 && numberOfNodes>0" ).arg( dc );
+  QString only_one_2D        = only_one_non_empty + " && dim>1";
+
+  int anId = popupMgr()->insert( tr( "MEN_EXPORT" ), -1, -1 );        // EXPORT submenu
+  createPopupItem( 125, OB, mesh_group, multiple_non_empty, anId );   // EXPORT_MED
+  createPopupItem( 126, OB, mesh_group, only_one_non_empty, anId );   // EXPORT_UNV
+  createPopupItem( 141, OB, mesh_group, only_one_2D, anId );          // EXPORT_STL
+#ifdef WITH_CGNS
+  createPopupItem( 143, OB, mesh_group, multiple_non_empty, anId );   // EXPORT_CGNS
+#endif
+  createPopupItem( 145, OB, mesh_group, multiple_non_empty, anId );   // EXPORT_SAUV
+  createPopupItem( 147, OB, mesh_group, multiple_non_empty, anId );   // EXPORT_GMF
+  createPopupItem( 124, OB, mesh_group, multiple_non_empty, anId );   // EXPORT_DAT
+  createPopupItem(  33, OB, mesh_part + " " + hyp_alg );        // DELETE
+  createPopupItem( 813, OB, group );                            // DEL_GROUP with contents
+  popupMgr()->insert( separator(), -1, 0 );
 
-  bool OnKeyPress (QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
-  {
-    return SMESHGUI::OnKeyPress (pe, parent, studyFrame);
-  }
+  // popup for viewer
+  createPopupItem( 803, View, group ); // EDIT_GROUP
+  createPopupItem( 804, View, elems ); // ADD
+  createPopupItem( 805, View, elems ); // REMOVE
+
+  popupMgr()->insert( separator(), -1, 0 );
+  createPopupItem( 214, View, mesh_part );  // UPDATE
+  createPopupItem( 900, View, mesh_part );  // ADV_INFO
+  createPopupItem( 904, View, mesh );       // FIND_ELEM
+  popupMgr()->insert( separator(), -1, 0 );
+
+  createPopupItem( 1136, OB + " " + View, mesh, "&& (not isAutoColor)" ); // AUTO_COLOR
+  createPopupItem( 1137, OB + " " + View, mesh, "&& isAutoColor" );       // DISABLE_AUTO_COLOR
+  popupMgr()->insert( separator(), -1, 0 );
+
+  QString aClient = QString( "%1client in {%2}" ).arg( lc ).arg( "'VTKViewer'" );
+  QString aType = QString( "%1type in {%2}" ).arg( lc );
+  aType = aType.arg( mesh_part );
+  QString aMeshInVTK = aClient + "&&" + aType;
+
+  aClient = "($client in {'VTKViewer' 'ObjectBrowser'})";
+  QString anActiveVTK = QString("activeView = '%1'").arg(SVTK_Viewer::Type());
+  QString aSelCount = QString( "%1 > 0" ).arg( dc );
+
+  //-------------------------------------------------
+  // Numbering
+  //-------------------------------------------------
+  anId = popupMgr()->insert( tr( "MEN_NUM" ), -1, -1 );
+
+  popupMgr()->insert( action( 9010 ), anId, -1 );
+  popupMgr()->setRule( action( 9010 ), aMeshInVTK + "&& isVisible &&" + hasNodes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 9010 ), "{'Point'} in labeledTypes", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( action( 9011 ), anId, -1 );
+  popupMgr()->setRule( action( 9011 ), aMeshInVTK + "&& isVisible &&" + hasElems, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 9011 ), "{'Cell'} in labeledTypes", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( separator(), -1, -1 );
+
+  //-------------------------------------------------
+  // Display Mode
+  //-------------------------------------------------
+  anId = popupMgr()->insert( tr( "MEN_DISPMODE" ), -1, -1 );
+
+  popupMgr()->insert( action( 211 ), anId, -1 ); // WIRE
+  popupMgr()->setRule( action( 211 ), aMeshInVTK + "&&" + hasElems, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 211 ), "displayMode = 'eEdge'", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( action( 212 ), anId, -1 ); // SHADE
+  popupMgr()->setRule( action( 212 ),aMeshInVTK+ "&& (" + hasFaces + "||" + hasVolumes + ")", QtxPopupMgr::VisibleRule);
+  popupMgr()->setRule( action( 212 ), "displayMode = 'eSurface'", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( action( 215 ), anId, -1 ); // POINTS
+  popupMgr()->setRule( action( 215 ), aMeshInVTK + "&&" + hasNodes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 215 ), "displayMode = 'ePoint'", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( separator(), anId, -1 );
+
+  popupMgr()->insert( action( 213 ), anId, -1 ); // SHRINK
+  popupMgr()->setRule( action( 213 ), aMeshInVTK + "&& shrinkMode <> 'IsNotShrinkable' && displayMode <> 'ePoint'", QtxPopupMgr::VisibleRule);
+  popupMgr()->setRule( action( 213 ), "shrinkMode = 'IsShrunk'", QtxPopupMgr::ToggleRule );
+
+  //-------------------------------------------------
+  // Display Entity
+  //-------------------------------------------------
+  QString aDiffElemsInVTK = aMeshInVTK + "&&" + hasDifferentElems;
+
+  anId = popupMgr()->insert( tr( "MEN_DISP_ENT" ), -1, -1 );
+
+  popupMgr()->insert( action(216), anId, -1 ); // ELEMS 0D
+  popupMgr()->setRule(action(216), aDiffElemsInVTK + "&& isVisible &&" + hasElems0d, QtxPopupMgr::VisibleRule);
+  popupMgr()->setRule(action(216), "{'Elem0d'} in entityMode", QtxPopupMgr::ToggleRule);
+
+  popupMgr()->insert( action( 217 ), anId, -1 ); // EDGES
+  popupMgr()->setRule( action( 217 ), aDiffElemsInVTK + "&& isVisible &&" + hasEdges, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 217 ), "{'Edge'} in entityMode", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( action( 218 ), anId, -1 ); // FACES
+  popupMgr()->setRule( action( 218 ), aDiffElemsInVTK + "&& isVisible &&" + hasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 218 ), "{'Face'} in entityMode", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( action( 219 ), anId, -1 ); // VOLUMES
+  popupMgr()->setRule( action( 219 ), aDiffElemsInVTK + "&& isVisible &&" + hasVolumes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 219 ), "{'Volume'} in entityMode", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( action( 222 ), anId, -1 ); // BALLS
+  popupMgr()->setRule( action( 222 ), aDiffElemsInVTK + "&& isVisible &&" + hasBalls, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 222 ), "{'BallElem'} in entityMode", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( separator(), anId, -1 );
+
+  popupMgr()->insert( action( 220 ), anId, -1 ); // ALL
+  popupMgr()->setRule( action( 220 ), aDiffElemsInVTK + "&& isVisible && not( elemTypes in entityMode )", QtxPopupMgr::VisibleRule );
+
+
+  //-------------------------------------------------
+  // Representation of the 2D Quadratic elements
+  //-------------------------------------------------
+  anId = popupMgr()->insert( tr( "MEN_QUADRATIC_REPRESENT" ), -1, -1 );
+  popupMgr()->insert( action( 231 ), anId, -1 ); // LINE REPRESENTATION
+  popupMgr()->setRule( action( 231 ), aMeshInVTK + "and isVisible",QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 231 ), "quadratic2DMode = 'eLines'", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( action( 232 ), anId, -1 ); // ARC REPRESENTATION
+  popupMgr()->setRule( action( 232 ), aMeshInVTK + "and isVisible", QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 232 ), "quadratic2DMode = 'eArcs'", QtxPopupMgr::ToggleRule );
+
+  //-------------------------------------------------
+  // Orientation of faces
+  //-------------------------------------------------
+  popupMgr()->insert( action( 221 ), -1, -1 );
+  popupMgr()->setRule( action( 221 ), aMeshInVTK + "&& isVisible", QtxPopupMgr::VisibleRule);
+  popupMgr()->setRule( action( 221 ), "facesOrientationMode = 'IsOriented'", QtxPopupMgr::ToggleRule );
 
-  bool OnMousePress (QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
-  {
-    return SMESHGUI::OnMousePress (pe, parent, studyFrame);
-  }
+  //-------------------------------------------------
+  // Color / Size
+  //-------------------------------------------------
+  popupMgr()->insert( action( 1132 ), -1, -1 );
+  popupMgr()->setRule( action( 1132 ), aMeshInVTK + "&& isVisible", QtxPopupMgr::VisibleRule );
 
-  bool OnMouseMove (QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
-  {
-    return SMESHGUI::OnMouseMove (pe, parent, studyFrame);
-  }
+  //-------------------------------------------------
+  // Transparency
+  //-------------------------------------------------
+  popupMgr()->insert( action( 1133 ), -1, -1 );
+  popupMgr()->setRule( action( 1133 ), aMeshInVTK + "&& isVisible", QtxPopupMgr::VisibleRule );
+
+  //-------------------------------------------------
+  // Controls
+  //-------------------------------------------------
+  QString
+    aMeshInVtkHasNodes = aMeshInVTK + "&&" + hasNodes,
+    aMeshInVtkHasEdges = aMeshInVTK + "&&" + hasEdges,
+    aMeshInVtkHasFaces = aMeshInVTK + "&&" + hasFaces,
+    aMeshInVtkHasVolumes = aMeshInVTK + "&&" + hasVolumes;
 
-  bool SetSettings ( QAD_Desktop* parent )
-  {
-    return SMESHGUI::SetSettings( parent );
-  }
+  anId = popupMgr()->insert( tr( "MEN_CTRL" ), -1, -1 );
 
-  bool customPopup ( QAD_Desktop* parent, QPopupMenu* popup, const QString & theContext,
-                    const QString & theParent, const QString & theObject )
-  {
-     return SMESHGUI::CustomPopup( parent, popup, theContext, theParent, theObject );
-  }
+  popupMgr()->insert( action( 200 ), anId, -1 ); // RESET
+  popupMgr()->setRule( action( 200 ), aMeshInVTK + "&& controlMode <> 'eNone'", QtxPopupMgr::VisibleRule );
+
+  popupMgr()->insert( separator(), anId, -1 );
 
-  void definePopup ( QString & theContext, QString & theParent, QString & theObject )
-  {
-    SMESHGUI::DefinePopup( theContext, theParent, theObject );
-  }
-  
-  bool activeStudyChanged ( QAD_Desktop* parent )
-  {
-    SMESHGUI::activeStudyChanged( parent );
-  }
+  int aSubId = popupMgr()->insert( tr( "MEN_NODE_CTRL" ), anId, -1 ); // NODE CONTROLS
 
-  void buildPresentation ( const Handle(SALOME_InteractiveObject)& theIO )
-  {
-    SMESHGUI::BuildPresentation(theIO);
-  }
+  popupMgr()->insert( action( 6005 ), aSubId, -1 ); // FREE_NODE
+  popupMgr()->setRule( action( 6005 ), aMeshInVtkHasNodes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6005 ), "controlMode = 'eFreeNodes'", QtxPopupMgr::ToggleRule );
 
-  void supportedViewType(int* buffer, int bufferSize)
-  {
-    if (!buffer || !bufferSize) return;
-    buffer[0] = (int)VIEW_VTK;
-  }
+  popupMgr()->insert ( action( 6028 ), aSubId, -1 ); // EQUAL_NODE
+  popupMgr()->setRule( action( 6028 ), aMeshInVtkHasNodes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6028 ), "controlMode = 'eCoincidentNodes'", QtxPopupMgr::ToggleRule);
 
-}
+  aSubId = popupMgr()->insert( tr( "MEN_EDGE_CTRL" ), anId, -1 ); // EDGE CONTROLS
 
+  popupMgr()->insert( action( 6002 ), aSubId, -1 ); // FREE_EDGE
+  popupMgr()->setRule( action( 6002 ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6002 ), "controlMode = 'eFreeEdges'", QtxPopupMgr::ToggleRule );
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::ViewNodes()
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  popupMgr()->insert( action( 6003 ), aSubId, -1 ); // FREE_BORDER
+  popupMgr()->setRule( action( 6003 ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6003 ), "controlMode = 'eFreeBorders'", QtxPopupMgr::ToggleRule );
 
-  EraseSimulationActors();
-  mySimulationActors = vtkActorCollection::New();
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  vtkActorCollection* theActors = theRenderer->GetActors();
-  theActors->InitTraversal();
-  vtkActor *ac = theActors->GetNextActor();
-  while(!(ac==NULL)) {
-    if ( ac->IsA("SMESH_Actor") ) {
-      SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( ac );
-      if ( anActor->GetVisibility() == 1 ) {
-       vtkGeometryFilter *gf = vtkGeometryFilter::New();
-       gf->SetInput( anActor->DataSource );
-       vtkMaskPoints *verts = vtkMaskPoints::New();
-       verts->SetInput(gf->GetOutput());
-       verts->GenerateVerticesOn();
-       verts->SetOnRatio(1);
-      
-       vtkPolyDataMapper *vertMapper = vtkPolyDataMapper::New();
-       vertMapper->SetInput(verts->GetOutput());
-       vertMapper->ScalarVisibilityOff();
-      
-       vtkActor *vertActor = vtkActor::New();
-       vertActor->SetMapper(vertMapper);
+  popupMgr()->insert( action( 6001 ), aSubId, -1 ); // LENGTH
+  popupMgr()->setRule( action( 6001 ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6001 ), "controlMode = 'eLength'", QtxPopupMgr::ToggleRule );
 
-       float r, g , b ;
-       anActor->GetNodeColor(r, g, b ) ;
-       vertActor->GetProperty()->SetColor( r, g, b ) ;
+  popupMgr()->insert( action( 6004 ), aSubId, -1 ); // CONNECTION
+  popupMgr()->setRule( action( 6004 ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6004 ), "controlMode = 'eMultiConnection'", QtxPopupMgr::ToggleRule );
+  popupMgr()->insert ( action( 6029 ), aSubId, -1 ); // EQUAL_EDGE
+  popupMgr()->setRule( action( 6029 ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6029 ), "controlMode = 'eCoincidentElems1D'", QtxPopupMgr::ToggleRule);
 
-       vertActor->GetProperty()->SetPointSize( anActor->GetNodeSize() );
+  aSubId = popupMgr()->insert( tr( "MEN_FACE_CTRL" ), anId, -1 ); // FACE CONTROLS
 
-       vertActor->PickableOff();
+  popupMgr()->insert ( action( 6021 ), aSubId, -1 ); // FREE_FACE
+  popupMgr()->setRule( action( 6021 ), aMeshInVtkHasFaces /*aMeshInVtkHasVolumes*/,
+                                       QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6021 ), "controlMode = 'eFreeFaces'", QtxPopupMgr::ToggleRule );
 
-       mySimulationActors->AddItem( vertActor );
-       theRenderer->AddActor( vertActor );
-      }
-    }
-    ac = theActors->GetNextActor();
-  }
-  
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
-}
+  popupMgr()->insert ( action( 6018 ), aSubId, -1 ); // LENGTH_2D
+  popupMgr()->setRule( action( 6018 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6018 ), "controlMode = 'eLength2D'", QtxPopupMgr::ToggleRule );
 
+  popupMgr()->insert ( action( 6019 ), aSubId, -1 ); // CONNECTION_2D
+  popupMgr()->setRule( action( 6019 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6019 ), "controlMode = 'eMultiConnection2D'", QtxPopupMgr::ToggleRule );
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Control(int theCommandID)
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  popupMgr()->insert ( action( 6011 ), aSubId, -1 ); // AREA
+  popupMgr()->setRule( action( 6011 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6011 ), "controlMode = 'eArea'", QtxPopupMgr::ToggleRule );
 
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  DisplayScalarBar( false );
+  popupMgr()->insert ( action( 6012 ), aSubId, -1 ); // TAPER
+  popupMgr()->setRule( action( 6012 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6012 ), "controlMode = 'eTaper'", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert ( action( 6013 ), aSubId, -1 ); // ASPECT
+  popupMgr()->setRule( action( 6013 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6013 ), "controlMode = 'eAspectRatio'", QtxPopupMgr::ToggleRule );
 
-  vtkDoubleArray *scalars = vtkDoubleArray::New();
-  scalars->SetNumberOfComponents(1);
+  popupMgr()->insert ( action( 6014 ), aSubId, -1 ); // MIN_ANG
+  popupMgr()->setRule( action( 6014 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6014 ), "controlMode = 'eMinimumAngle'", QtxPopupMgr::ToggleRule );
 
-  vtkDataSetMapper* meshMapper = 0;
-  SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
-  int nbSel = Sel->IObjectCount();
-  Standard_Boolean result;
-  Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-  SMESH_Actor* MeshActor = FindActorByEntry(IObject->getEntry(), result, true);
+  popupMgr()->insert ( action( 6015 ), aSubId, -1 ); // WARP
+  popupMgr()->setRule( action( 6015 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6015 ), "controlMode = 'eWarping'", QtxPopupMgr::ToggleRule );
 
-  // Mesh may be not updated after Compute
-  if (!MeshActor->DataSource || !MeshActor->GetMapper()) {
-    QApplication::restoreOverrideCursor();
-    return;
-  }
+  popupMgr()->insert ( action( 6016 ), aSubId, -1 ); // SKEW
+  popupMgr()->setRule( action( 6016 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6016 ), "controlMode = 'eSkew'", QtxPopupMgr::ToggleRule );
 
-  vtkDataSet* aDataSet = MeshActor->DataSource;
-  typedef double (*TScalarFun)(vtkCell* theCell);
-  TScalarFun aScalarFun;
-  if(result){
-    QString type;
-    switch (theCommandID){
-    case 6001: {
-      type = tr( "SMESH_CONTROL_LENGTH_EDGES");
-      aDataSet = MeshActor->EdgeDevice->GetMapper()->GetInput();
-      aScalarFun = &(SMESHGUI_ComputeScalarValue::LengthEdges);
-      MESSAGE ( " init minimum length " << aDataSet->GetNumberOfCells() );
-      if(MeshActor->getDisplayMode() != 0)
-       ChangeRepresentation( MeshActor, 1);// limitation; in Wireframe, colored edges are not visible
-      break;
-    } 
-    case 6011: {
-      type = tr( "SMESH_CONTROL_AREA_ELEMENTS");
-      aScalarFun = &(SMESHGUI_ComputeScalarValue::AreaElements);
-      if(MeshActor->getDisplayMode() != 1)
-       ChangeRepresentation( MeshActor, 1 );
-      break;
-    }
-    case 6012: {
-      type = tr( "SMESH_CONTROL_TAPER_ELEMENTS");
-      aScalarFun = &(SMESHGUI_ComputeScalarValue::Taper);
-      break;
-    }
-    case 6013: {
-      type = tr( "SMESH_CONTROL_ASPECTRATIO_ELEMENTS");
-      aScalarFun = &(SMESHGUI_ComputeScalarValue::AspectRatio);
-      if(MeshActor->getDisplayMode() != 1)
-       ChangeRepresentation( MeshActor, 1 );
-      break;
-    }
-    case 6014: {
-      type = tr( "SMESH_CONTROL_MINIMUMANGLE_ELEMENTS");
-      aScalarFun = &(SMESHGUI_ComputeScalarValue::MinimumAngle);
-      if(MeshActor->getDisplayMode() != 1)
-       ChangeRepresentation( MeshActor, 1 );
-      break;
-    }
-    case 6015: {
-      type = tr( "SMESH_CONTROL_WARP_ELEMENTS");
-      aScalarFun = &(SMESHGUI_ComputeScalarValue::Warp);
-      break;
-    }
-    case 6016: {
-      type = tr( "SMESH_CONTROL_SKEW_ELEMENTS");
-      aScalarFun = &(SMESHGUI_ComputeScalarValue::Skew);
-      break;
-    }}
-
-    for(int i = 0, iEnd = aDataSet->GetNumberOfCells(); i < iEnd; i++)
-      scalars->InsertTuple1(i,aScalarFun(aDataSet->GetCell(i)));
-
-    float range[2];
-    scalars->GetRange(range);
-
-    vtkLookupTable* wat = vtkLookupTable::New();
-    wat->SetRange( range );
-    wat->Build();
-
-    scalars->SetLookupTable(wat);
-
-    if (!meshMapper) meshMapper = (vtkDataSetMapper*) (MeshActor->getMapper());
-    meshMapper->SetScalarModeToUseCellData();
-    MeshActor->DataSource->GetCellData()->SetScalars(scalars);
-    meshMapper->SetScalarRange( range );
-    meshMapper->ScalarVisibilityOn();
-
-    vtkScalarBarActor* aScalarBar = GetScalarBar();
-    if ( aScalarBar == NULL ) {
-      aScalarBar = vtkScalarBarActor::New();
-      QString Bold = QAD_CONFIG->getSetting("ScalarBar:Bold");
-      QString Italic = QAD_CONFIG->getSetting("ScalarBar:Italic");
-      QString Shadow = QAD_CONFIG->getSetting("ScalarBar:Shadow");    
-      QString FontFamily = QAD_CONFIG->getSetting("ScalarBar:FontFamily");
-      QString Orientation = QAD_CONFIG->getSetting("ScalarBar:Orientation");
-      float Width = QAD_CONFIG->getSetting("ScalarBar:Width").toFloat();  
-      float Height = QAD_CONFIG->getSetting("ScalarBar:Height").toFloat();
-      int NumberOfLabels = QAD_CONFIG->getSetting("ScalarBar:NumberOfLabels").toInt();
-      int NumberOfColors = QAD_CONFIG->getSetting("ScalarBar:NumberOfColors").toInt();
-      
-      SetSettingsScalarBar(aScalarBar, Bold, Italic, Shadow, FontFamily, Orientation,
-                          Width, Height, NumberOfColors, NumberOfLabels);
-      vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-      theRenderer->AddActor2D(aScalarBar);
-    }  
-    aScalarBar->SetLookupTable( wat );
-    aScalarBar->SetTitle( type.latin1() );
-
-    scalars->Delete();
-    //    wat->Delete();
-    DisplayScalarBar( true );
-  }
-  QApplication::restoreOverrideCursor();
-}
+  popupMgr()->insert ( action( 6022 ), aSubId, -1 ); // MAX_ELEMENT_LENGTH_2D
+  popupMgr()->setRule( action( 6022 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6022 ), "controlMode = 'eMaxElementLength2D'", QtxPopupMgr::ToggleRule );
 
+  popupMgr()->insert ( action( 6025 ), aSubId, -1 ); // BARE_BORDER_FACE
+  popupMgr()->setRule( action( 6025 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6025 ), "controlMode = 'eBareBorderFace'", QtxPopupMgr::ToggleRule );
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::SetSettingsScalarBar(vtkScalarBarActor* theScalarBar,
-                                   QString Bold, QString Italic,
-                                   QString Shadow, QString FontFamily, 
-                                   QString Orientation, float Width, float Height, 
-                                   int NbColors, int NbLabels  )
-{
-  if ( Bold.isNull() || Bold.isEmpty() || (Bold.compare( "true" ) == 0) )
-   theScalarBar->BoldOn();
-  else
-    theScalarBar->BoldOff();
+  popupMgr()->insert ( action( 6027 ), aSubId, -1 ); // OVER_CONSTRAINED_FACE
+  popupMgr()->setRule( action( 6027 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6027 ), "controlMode = 'eOverConstrainedFace'", QtxPopupMgr::ToggleRule );
+  popupMgr()->insert ( action( 6030 ), aSubId, -1 ); // EQUAL_FACE
+  popupMgr()->setRule( action( 6030 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6030 ), "controlMode = 'eCoincidentElems2D'", QtxPopupMgr::ToggleRule );
 
-  if ( Italic.isNull() || Italic.isEmpty() || (Italic.compare( "true" ) == 0) )
-    theScalarBar->ItalicOn();
-  else
-    theScalarBar->ItalicOff();
-  
-  if ( Shadow.isNull() || Shadow.isEmpty() || (Shadow.compare( "true" ) == 0) )
-    theScalarBar->ShadowOn();
-  else
-    theScalarBar->ShadowOff();
-    
-  if ( FontFamily.compare( "Arial" ) == 0 )
-    theScalarBar->SetFontFamilyToArial();
-  else if ( FontFamily.compare( "Courier" ) == 0 )
-    theScalarBar->SetFontFamilyToCourier();
-  else if ( FontFamily.compare( "Times" ) == 0 )
-    theScalarBar->SetFontFamilyToTimes();
-  else
-    theScalarBar->SetFontFamilyToArial();
+  aSubId = popupMgr()->insert( tr( "MEN_VOLUME_CTRL" ), anId, -1 ); // VOLUME CONTROLS
 
-  if ( Orientation.isNull() || Orientation.isEmpty() || (Orientation.compare( "Vertical" ) == 0) )
-    theScalarBar->SetOrientationToVertical();
-  else
-    theScalarBar->SetOrientationToHorizontal();
-   
-  
-  theScalarBar->SetWidth((Width == 0)? 0.17 : Width);
-  theScalarBar->SetHeight((Height == 0)? 0.8 : Height);
+  popupMgr()->insert ( action( 6017 ), aSubId, -1 ); // ASPECT_3D
+  popupMgr()->setRule( action( 6017 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6017 ), "controlMode = 'eAspectRatio3D'", QtxPopupMgr::ToggleRule );
 
-  theScalarBar->SetNumberOfLabels((NbLabels == 0)? 5 : NbLabels); 
-  theScalarBar->SetMaximumNumberOfColors((NbColors == 0)? 64 : NbColors);
-}
+  popupMgr()->insert ( action( 6009 ), aSubId, -1 ); // VOLUME_3D
+  popupMgr()->setRule( action( 6009 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6009 ), "controlMode = 'eVolume3D'", QtxPopupMgr::ToggleRule );
 
+  popupMgr()->insert ( action( 6023 ), aSubId, -1 ); // MAX_ELEMENT_LENGTH_3D
+  popupMgr()->setRule( action( 6023 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6023 ), "controlMode = 'eMaxElementLength3D'", QtxPopupMgr::ToggleRule );
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplayScalarBar(bool visibility)
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  popupMgr()->insert ( action( 6024 ), aSubId, -1 ); // BARE_BORDER_VOLUME
+  popupMgr()->setRule( action( 6024 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6024 ), "controlMode = 'eBareBorderVolume'", QtxPopupMgr::ToggleRule );
 
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  vtkScalarBarActor* aScalarBar = GetScalarBar();
+  popupMgr()->insert ( action( 6026 ), aSubId, -1 ); // OVER_CONSTRAINED_VOLUME
+  popupMgr()->setRule( action( 6026 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6026 ), "controlMode = 'eOverConstrainedVolume'", QtxPopupMgr::ToggleRule );
 
-  if ( aScalarBar == NULL ) {
-    MESSAGE("myScalarBar is NULL");
-    return;
-  }
+  popupMgr()->insert ( action( 6031 ), aSubId, -1 ); // EQUAL_VOLUME
+  popupMgr()->setRule( action( 6031 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6031 ), "controlMode = 'eCoincidentElems3D'", QtxPopupMgr::ToggleRule );
 
-  if ( visibility )
-    aScalarBar->VisibilityOn();
-  else {
-    aScalarBar->VisibilityOff();
-    //Turn off mesh coloring (influences on all views)
-    vtkActorCollection* actorList=theRenderer->GetActors();
-    actorList->InitTraversal();
-    vtkActor *ac = actorList->GetNextActor();
-    while(ac!=NULL) {
-      if (ac->GetMapper() != NULL) {
-       ac->GetMapper()->ScalarVisibilityOff();
-      }
-      ac = actorList->GetNextActor();
-    }
-    // Turn off ScalarBar in all views
-    /*QList<QAD_StudyFrame> aFrames = myActiveStudy->getStudyFrames();
-    for ( QAD_StudyFrame* aFrame = aFrames.first(); aFrame; aFrame = aFrames.next() ) {
-      if (aFrame->getTypeView() == VIEW_VTK) {
-       vtkRenderer *aRenderer = ((VTKViewer_ViewFrame*) aFrame->getRightFrame()->getViewFrame())->getRenderer();
-       vtkActor2DCollection* actor2DList = aRenderer->GetActors2D();
-       actor2DList->InitTraversal();
-       vtkActor2D* aActor2d =  actor2DList->GetNextActor2D();
-       while (aActor2d != NULL) {
-         if (aActor2d->IsA("vtkScalarBarActor")) {
-           aActor2d->VisibilityOff();
-           break;
-         }
-         actor2DList->GetNextActor2D();
-       }
-      }
-    }*/
-  }
-  myActiveStudy->update3dViewers();
-}
+  popupMgr()->insert( separator(), anId, -1 );
 
+  popupMgr()->insert( action( 201 ), anId, -1 ); // SCALAR_BAR_PROP
+  popupMgr()->setRule( action( 201 ), aMeshInVTK + "&& controlMode <> 'eNone'", QtxPopupMgr::VisibleRule );
 
-//=============================================================================
+  popupMgr()->insert( separator(), anId, -1 );
+
+  aSubId = popupMgr()->insert( tr( "MEN_DISTRIBUTION_CTRL" ), anId, -1 ); // NODE CONTROLS
+
+  popupMgr()->insert( action( 2021 ), aSubId, -1 ); // SAVE_DISTRIBUTION
+  popupMgr()->setRule( action( 2021 ), aMeshInVTK + "&& isNumFunctor", QtxPopupMgr::VisibleRule );
+
+  popupMgr()->insert( action( 2022 ), aSubId, -1 ); // SHOW_DISTRIBUTION
+  popupMgr()->setRule( action( 2022 ), aMeshInVTK + "&& isNumFunctor", QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 2022 ), aMeshInVTK + "&& isNumFunctor && isDistributionVisible", QtxPopupMgr::ToggleRule);
+
+#ifndef DISABLE_PLOT2DVIEWER
+  popupMgr()->insert( action( 2023 ), aSubId, -1 ); // PLOT_DISTRIBUTION
+  popupMgr()->setRule( action( 2023 ), aMeshInVTK + "&& isNumFunctor", QtxPopupMgr::VisibleRule );
+#endif
+
+  //-------------------------------------------------
+  // Display / Erase
+  //-------------------------------------------------
+  popupMgr()->insert( separator(), -1, -1 );
+  QString aRule = "$component={'SMESH'} and ( type='Component' or (" + aClient + " and " +
+    aType + " and " + aSelCount + " and " + anActiveVTK + " and " + isNotEmpty + " %1 ) )";
+  popupMgr()->insert( action( 301 ), -1, -1 ); // DISPLAY
+  popupMgr()->setRule( action( 301 ), aRule.arg( "and (not isVisible)" ), QtxPopupMgr::VisibleRule );
+
+  popupMgr()->insert( action( 300 ), -1, -1 ); // ERASE
+  popupMgr()->setRule( action( 300 ), aRule.arg( "and isVisible" ), QtxPopupMgr::VisibleRule );
+
+  popupMgr()->insert( action( 302 ), -1, -1 ); // DISPLAY_ONLY
+  popupMgr()->setRule( action( 302 ), aRule.arg( "" ), QtxPopupMgr::VisibleRule );
+
+  popupMgr()->insert( separator(), -1, -1 );
+
+  //-------------------------------------------------
+  // Clipping
+  //-------------------------------------------------
+  popupMgr()->insert( action( 1134 ), -1, -1 );
+  popupMgr()->setRule( action( 1134 ), "client='VTKViewer'", QtxPopupMgr::VisibleRule );
+
+  popupMgr()->insert( separator(), -1, -1 );
+
+  connect( application(), SIGNAL( viewManagerActivated( SUIT_ViewManager* ) ),
+           this, SLOT( onViewManagerActivated( SUIT_ViewManager* ) ) );
+
+  connect( application(), SIGNAL( viewManagerRemoved( SUIT_ViewManager* ) ),
+           this, SLOT( onViewManagerRemoved( SUIT_ViewManager* ) ) );
+}
+
+//================================================================================
 /*!
- *
+ * \brief Return true if SMESH or GEOM objects are selected.
+ * Is called form LightApp_Module::activateModule() which clear selection if
+ * not isSelectionCompatible()
  */
-//=============================================================================
-void SMESHGUI::UpdateScalarBar(float MinRange, float MaxRange)
+//================================================================================
+
+bool SMESHGUI::isSelectionCompatible()
 {
-  vtkScalarBarActor* aScalarBar = GetScalarBar();
-  if ( aScalarBar == NULL ) {
-    MESSAGE("myScalarBar is NULL");
-    return;
-  }  
-  DisplayScalarBar(false); 
-  
-  aScalarBar->GetLookupTable()->SetRange(MinRange, MaxRange);
-  vtkRenderer *aRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  vtkActorCollection* aActorList = aRenderer->GetActors();
-  aActorList->InitTraversal();
-  vtkActor *aActor = aActorList->GetNextActor();
-  while(aActor != NULL) {
-    if (aActor->IsA("SMESH_Actor")) {
-      SMESH_Actor* aMeshActor = SMESH_Actor::SafeDownCast(aActor); 
-      vtkDataSetMapper* aMeshMapper = (vtkDataSetMapper*) (aMeshActor->getMapper());
-      if ((aMeshMapper != NULL)) {
-       aMeshMapper->SetScalarRange( MinRange, MaxRange );
-       aMeshMapper->ScalarVisibilityOn();
-      }
-    }
-    aActor = aActorList->GetNextActor();
-  }
-  DisplayScalarBar(true); 
+  bool isCompatible = true;
+  SALOME_ListIO selected;
+  if ( LightApp_SelectionMgr *Sel = selectionMgr() )
+    Sel->selectedObjects( selected );
+
+  SALOME_ListIteratorOfListIO It( selected );
+  for ( ; isCompatible && It.More(); It.Next())
+    isCompatible =
+      ( strcmp("GEOM", It.Value()->getComponentDataType()) == 0 ) ||
+      ( strcmp("SMESH", It.Value()->getComponentDataType()) == 0 );
+
+  return isCompatible;
 }
 
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::SetDisplaySettings() 
+bool SMESHGUI::reusableOperation( const int id )
 {
-  EmitSignalDeactivateDialog() ;
-  SMESHGUI_Preferences_ColorDlg *aDlg = new SMESHGUI_Preferences_ColorDlg( QAD_Application::getDesktop(), "") ;
-  
-  QString SCr = QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed");
-  QString SCg = QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen");
-  QString SCb = QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue");
-  QColor color = QColor (SCr.toInt(), SCg.toInt(), SCb.toInt());
-  aDlg->SetColor(1,color);
-
-  SCr = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed");
-  SCg = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen");
-  SCb = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue");
-  color = QColor (SCr.toInt(), SCg.toInt(), SCb.toInt());
-  aDlg->SetColor(2,color);
-
-  SCr = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorRed");
-  SCg = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorGreen");
-  SCb = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorBlue");
-  color = QColor (SCr.toInt(), SCg.toInt(), SCb.toInt());
-  aDlg->SetColor(3,color);
-
-  QString SBr = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorRed");
-  QString SBg = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorGreen");
-  QString SBb = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorBlue");
-  color = QColor (SBr.toInt(), SBg.toInt(), SBb.toInt());
-  aDlg->SetColor(4,color);
-
-  QString intValue = QAD_CONFIG->getSetting("SMESH:SettingsWidth");
-  aDlg->SetIntValue(1,intValue.toInt());
-  intValue = QAD_CONFIG->getSetting("SMESH:SettingsNodesSize");
-  aDlg->SetIntValue(2,intValue.toInt());
-  intValue = QAD_CONFIG->getSetting("SMESH:SettingsShrinkCoeff");
-  aDlg->SetIntValue(3,intValue.toInt());
-  
-  if ( aDlg->exec() ) {
-    QColor colorFill = aDlg->GetColor( 1 );
-    QAD_CONFIG->addSetting("SMESH:SettingsFillColorRed",   colorFill.red());
-    QAD_CONFIG->addSetting("SMESH:SettingsFillColorGreen", colorFill.green());
-    QAD_CONFIG->addSetting("SMESH:SettingsFillColorBlue",  colorFill.blue());
-    
-    QColor colorOutline = aDlg->GetColor( 2 );
-    QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorRed",   colorOutline.red());
-    QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorGreen", colorOutline.green());
-    QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorBlue",  colorOutline.blue());
-    
-    QColor colorNode = aDlg->GetColor( 3 );
-    QAD_CONFIG->addSetting("SMESH:SettingsNodeColorRed",   colorNode.red());
-    QAD_CONFIG->addSetting("SMESH:SettingsNodeColorGreen", colorNode.green());
-    QAD_CONFIG->addSetting("SMESH:SettingsNodeColorBlue",  colorNode.blue());
-    
-    QColor colorBackFace = aDlg->GetColor( 4 );
-    QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorRed",   colorBackFace.red());
-    QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorGreen", colorBackFace.green());
-    QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorBlue",  colorBackFace.blue());
+  // compute, evaluate and precompute are not reusable operations
+  return ( id == 701 || id == 711 || id == 712 ) ? false : SalomeApp_Module::reusableOperation( id );
+}
+
+bool SMESHGUI::activateModule( SUIT_Study* study )
+{
+  bool res = SalomeApp_Module::activateModule( study );
 
-    int width = aDlg->GetIntValue( 1 );
-    QAD_CONFIG->addSetting("SMESH:SettingsWidth", width);
+  setMenuShown( true );
+  setToolShown( true );
 
-    int nodes_size = aDlg->GetIntValue( 2 );
-    QAD_CONFIG->addSetting("SMESH:SettingsNodesSize", nodes_size);
+  // import Python module that manages SMESH plugins (need to be here because SalomePyQt API uses active module)
+  PyGILState_STATE gstate = PyGILState_Ensure();
+  PyObject* pluginsmanager=PyImport_ImportModuleNoBlock((char*)"salome_pluginsmanager");
+  if(pluginsmanager==NULL)
+    PyErr_Print();
+  else
+    {
+      PyObject* result=PyObject_CallMethod( pluginsmanager, (char*)"initialize", (char*)"isss",1,"smesh",tr("MEN_MESH").toStdString().c_str(),tr("SMESH_PLUGINS_OTHER").toStdString().c_str());
+      if(result==NULL)
+        PyErr_Print();
+      Py_XDECREF(result);
+    }
+  PyGILState_Release(gstate);
+  // end of GEOM plugins loading
+
+  // Reset actions accelerator keys
+  //action(111)->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_B)); // Import DAT
+  action(112)->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_U)); // Import UNV
+  action(113)->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M)); // Import MED
+
+  action(  33)->setEnabled(true); // Delete: Key_Delete
+
+  //  0020210. Make SMESH_Gen update meshes at switching GEOM->SMESH
+  GetSMESHGen()->SetCurrentStudy(SALOMEDS::Study::_nil());
+  if ( SalomeApp_Study* s = dynamic_cast<SalomeApp_Study*>( study ))
+    if ( _PTR(Study) aStudy = s->studyDS()) {
+      GetSMESHGen()->SetCurrentStudy( _CAST(Study,aStudy)->GetStudy() );
+      updateObjBrowser(); // objects can be removed
+    }
 
-    int shrink_coeff = aDlg->GetIntValue( 3 );
-    QAD_CONFIG->addSetting("SMESH:SettingsShrinkCoeff", shrink_coeff);
+  // get all view currently opened in the study and connect their signals  to
+  // the corresponding slots of the class.
+  SUIT_Desktop* aDesk = study->application()->desktop();
+  if ( aDesk ) {
+    QList<SUIT_ViewWindow*> wndList = aDesk->windows();
+    SUIT_ViewWindow* wnd;
+    foreach ( wnd, wndList )
+      connectView( wnd );
   }
 
-  delete aDlg;
+  return res;
 }
 
-//=======================================================================
-// function : Parameter()
-// purpose  : return a parameter (double) from a dialog box
-//
-//  aValue     : is a double used as a default value displayed
-//  aLabel     : is the title for aValue1
-//  aTitle     : is the main title
-//  bottom     : maximum value to be entered
-//  top               : minimum value to be entered
-//  decimals   : number of decimals
-//=======================================================================
-double SMESHGUI::Parameter( Standard_Boolean& res,
-                           const double      aValue,
-                           const char*       aLabel,
-                           const char*       aTitle,
-                           const double      bottom,
-                           const double      top,
-                           const int         decimals )
+bool SMESHGUI::deactivateModule( SUIT_Study* study )
 {
-  SMESHGUI_aParameterDlg* Dialog =
-    new SMESHGUI_aParameterDlg( QAD_Application::getDesktop(),
-                               aTitle,
-                               aLabel,
-                               bottom, top, decimals,
-                               TRUE );
-  Dialog->setValue( aValue );
-  double X = 0.0;
-  res = ( Dialog->exec() == QDialog::Accepted );
-  if ( res )
-    X = Dialog->getDblValue();
-  return X;
+  setMenuShown( false );
+  setToolShown( false );
+
+  EmitSignalCloseAllDialogs();
+
+  // Unset actions accelerator keys
+  //action(111)->setShortcut(QKeySequence()); // Import DAT
+  action(112)->setShortcut(QKeySequence()); // Import UNV
+  action(113)->setShortcut(QKeySequence()); // Import MED
+
+  action(  33)->setEnabled(false); // Delete: Key_Delete
+
+  return SalomeApp_Module::deactivateModule( study );
 }
 
-//=======================================================================
-// function : Parameter()
-// purpose  : return a parameter (int) from a dialog box
-//
-//  aValue     : is a int used as a default value displayed
-//  aLabel     : is the title for aValue1
-//  aTitle     : is the main title
-//  bottom     : maximum value to be entered
-//  top               : minimum value to be entered
-//=======================================================================
-int SMESHGUI::Parameter( Standard_Boolean& res,
-                        const int         aValue,
-                        const char*       aLabel,
-                        const char*       aTitle,
-                        const int         bottom,
-                        const int         top )
+void SMESHGUI::studyClosed( SUIT_Study* s )
 {
-  SMESHGUI_aParameterDlg* Dialog =
-    new SMESHGUI_aParameterDlg( QAD_Application::getDesktop(),
-                               aTitle,
-                               aLabel,
-                               bottom, top,
-                               TRUE );
-  Dialog->setValue( aValue );
-  int X = 0;
-  res = ( Dialog->exec() == QDialog::Accepted );
-  if ( res )
-    X = Dialog->getIntValue();
-  return X;
+  SMESH::RemoveVisuData( s->id() );
+  SalomeApp_Module::studyClosed( s );
 }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplayEdges(SMESH_Actor* ac, bool visibility)
+void SMESHGUI::OnGUIEvent()
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
-  if (ac->DataSource == NULL || ac->GetMapper() == NULL)
+  const QObject* obj = sender();
+  if ( !obj || !obj->inherits( "QAction" ) )
     return;
+  int id = actionId((QAction*)obj);
+  if ( id != -1 )
+    OnGUIEvent( id );
+}
 
-  vtkGeometryFilter *gf = vtkGeometryFilter::New();
-  gf->SetInput(ac->DataSource);
-  vtkFeatureEdges *edges = vtkFeatureEdges::New();
-  edges->SetInput(gf->GetOutput());
-  edges->BoundaryEdgesOn();
-  edges->ManifoldEdgesOn();
+SMESH::SMESH_Gen_var SMESHGUI::GetSMESHGen()
+{
+  _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); //Document OCAF de l'etude active
+  if ( CORBA::is_nil( myComponentSMESH ) )
+    {
+      SMESHGUI aGUI; //SRN BugID: IPAL9186: Create an instance of SMESHGUI to initialize myComponentSMESH
+      if ( aStudy )
+        aGUI.myComponentSMESH->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy());
+      return aGUI.myComponentSMESH;
+    }
+  if ( aStudy )
+    myComponentSMESH->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy());
+  return myComponentSMESH;
+}
 
-  vtkPolyDataMapper *edgeMapper = vtkPolyDataMapper::New();
-  edgeMapper->SetInput(edges->GetOutput());
-  edgeMapper->ScalarVisibilityOff();
-  
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  vtkActorCollection* actorList=theRenderer->GetActors();
-
-  int test=actorList->IsItemPresent(ac->EdgeDevice);
-  if (test==0) { 
-    vtkProperty* prop = vtkProperty::New();
-    prop->SetColor( QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed").toFloat()/255., 
-                   QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen").toFloat()/255.,
-                   QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue").toFloat()/255. ) ;
-    prop->SetPointSize(QAD_CONFIG->getSetting("SMESH:SettingsNodesSize").toInt());
-    prop->SetLineWidth( QAD_CONFIG->getSetting("SMESH:SettingsWidth").toInt() );
-    ac->EdgeDevice->SetProperty(prop);
-    ac->SetEdgeColor( QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed").toFloat()/255., 
-                     QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen").toFloat()/255.,
-                     QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue").toFloat()/255. );
-    ac->EdgeDevice->SetMapper(edgeMapper);
-    
-    theRenderer->AddActor(ac->EdgeDevice);
-  } else {
-    ac->EdgeDevice->SetMapper(edgeMapper);
-    edgeMapper->Update();
-  }
-  
-  vtkShrinkFilter *shrink = vtkShrinkFilter::New();
-  shrink->SetInput(ac->DataSource);
-  shrink->SetShrinkFactor(ac->GetShrinkFactor());
-  vtkGeometryFilter *Shrinkgf = vtkGeometryFilter::New();
-  Shrinkgf->SetInput( shrink->GetOutput() );
-  vtkFeatureEdges *ShrinkEdges = vtkFeatureEdges::New();
-  ShrinkEdges->SetInput(Shrinkgf->GetOutput());
-  ShrinkEdges->BoundaryEdgesOn();
-  ShrinkEdges->ManifoldEdgesOn();
-
-  vtkPolyDataMapper *ShrinkEdgeMapper = vtkPolyDataMapper::New();
-  ShrinkEdgeMapper->SetInput(ShrinkEdges->GetOutput());
-  ShrinkEdgeMapper->ScalarVisibilityOff();
-
-  test=actorList->IsItemPresent(ac->EdgeShrinkDevice);
-  if (test==0) { 
-    vtkProperty* prop = vtkProperty::New();
-    prop->SetColor( QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed").toFloat()/255., 
-                   QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen").toFloat()/255.,
-                   QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue").toFloat()/255. ) ;
-    prop->SetPointSize(QAD_CONFIG->getSetting("SMESH:SettingsNodesSize").toInt());
-    prop->SetLineWidth( QAD_CONFIG->getSetting("SMESH:SettingsWidth").toInt() );
-    ac->EdgeShrinkDevice->SetProperty(prop);
-    ac->SetEdgeColor( QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed").toFloat()/255., 
-                     QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen").toFloat()/255.,
-                     QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue").toFloat()/255. );
-    ac->EdgeShrinkDevice->SetMapper(ShrinkEdgeMapper);
-    
-    theRenderer->AddActor(ac->EdgeShrinkDevice);
-  } else {
-    ac->EdgeShrinkDevice->SetMapper(ShrinkEdgeMapper);
-    ShrinkEdgeMapper->Update();
+QString SMESHGUI::engineIOR() const
+{
+  CORBA::ORB_var anORB = getApp()->orb();
+  CORBA::String_var anIOR = anORB->object_to_string(GetSMESHGen());
+  return QString( anIOR.in() );
+}
+
+void SMESHGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& title )
+{
+  SalomeApp_Module::contextMenuPopup( client, menu, title );
+  SALOME_ListIO lst;
+  selectionMgr()->selectedObjects( lst );
+  if ( ( client == "OCCViewer" || client == "VTKViewer" ) && lst.Extent() == 1 ) {
+    Handle(SALOME_InteractiveObject) io = lst.First();
+    SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( application()->activeStudy() );
+    _PTR(Study) study = appStudy->studyDS();
+    _PTR(SObject) obj = study->FindObjectID( io->getEntry() );
+    if ( obj ) {
+      QString aName = QString( obj->GetName().c_str() );
+      while ( aName.at( aName.length() - 1 ) == ' ' ) // Remove extraspaces in Name of Popup
+          aName.remove( (aName.length() - 1), 1 );
+      title = aName;
+    }
   }
+}
+
+LightApp_Selection* SMESHGUI::createSelection() const
+{
+  return new SMESHGUI_Selection();
+}
 
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
+void SMESHGUI::windows( QMap<int, int>& aMap ) const
+{
+  aMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
+  aMap.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );
 }
 
+void SMESHGUI::viewManagers( QStringList& list ) const
+{
+  list.append( SVTK_Viewer::Type() );
+}
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::InitActor(SMESH::SMESH_Mesh_ptr aMesh)
+void SMESHGUI::onViewManagerActivated( SUIT_ViewManager* mgr )
 {
-  SALOMEDS::SObject_var aSO_M = myStudyAPI.FindMesh( aMesh );
-  SALOMEDS::GenericAttribute_var anAttr;
-  SALOMEDS::AttributeName_var    aName;
-  if ( !aSO_M->_is_nil() ) {
-    if (aSO_M->FindAttribute(anAttr, "AttributeName") ) {
-      aName = SALOMEDS::AttributeName::_narrow(anAttr);
-      Standard_Boolean result;
-      SMESH_Actor* MeshActor = smeshGUI->FindActorByEntry(aSO_M->GetID(), result, true);
-      if ( !result ) {
-       SMESH_Actor* amesh = SMESH_Actor::New();
-       Handle(SALOME_InteractiveObject) IO = new SALOME_InteractiveObject(aSO_M->GetID(),
-                                                                          "MESH",
-                                                                          aName->Value());
-       amesh->setIO( IO );
-       amesh->setName( aName->Value() );
-       DisplayActor(amesh, false);
-      }
+  if ( dynamic_cast<SVTK_ViewManager*>( mgr ) ) {
+    SMESH::UpdateSelectionProp( this );
+
+    QVector<SUIT_ViewWindow*> aViews = mgr->getViews();
+    for(int i = 0; i < aViews.count() ; i++){
+      SUIT_ViewWindow *sf = aViews[i];
+      connectView( sf );
     }
   }
 }
 
+void SMESHGUI::onViewManagerRemoved( SUIT_ViewManager* theViewManager )
+{
+  if( theViewManager && theViewManager->getType() == SVTK_Viewer::Type() )
+    myClippingPlaneInfoMap.erase( theViewManager );
+}
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Update()
+void SMESHGUI::addActorAsObserver( SMESH_Actor* theActor )
 {
-  if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-    vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-    
-    SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
-    int nbSel = Sel->IObjectCount();
-    if ( nbSel == 0 ) {
-      vtkActorCollection* actorList=theRenderer->GetActors();
-      actorList->InitTraversal();
-      vtkActor *ac = actorList->GetNextActor();
-      while(!(ac==NULL)) {
-       if ( ac->IsA("SMESH_Actor") ) {
-         SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( ac );
-         if ( anActor->hasIO() ) {
-           Handle(SALOME_InteractiveObject) IO = anActor->getIO();
-           Update( IO );
-         }
-       }
-       ac = actorList->GetNextActor();
-      }
-    } else {
-      SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-      for ( ; It.More(); It.Next() ) {
-       Handle(SALOME_InteractiveObject) IO = It.Value();
-       Update( IO );
+  theActor->AddObserver( SMESH::DeleteActorEvent,
+                         myEventCallbackCommand.GetPointer(),
+                         myPriority );
+}
+
+void SMESHGUI::ProcessEvents( vtkObject* theObject,
+                              unsigned long theEvent,
+                              void* theClientData,
+                              void* theCallData )
+{
+  if( SMESHGUI* aSMESHGUI = reinterpret_cast<SMESHGUI*>( theClientData ) ) {
+    if( theObject && theEvent == SMESH::DeleteActorEvent ) {
+      if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( theObject ) ) {
+        SMESHGUI_ClippingPlaneInfoMap& aClippingPlaneInfoMap = aSMESHGUI->getClippingPlaneInfoMap();
+        SMESHGUI_ClippingPlaneInfoMap::iterator anIter1 = aClippingPlaneInfoMap.begin();
+        for( ; anIter1 != aClippingPlaneInfoMap.end(); anIter1++ ) {
+          SMESHGUI_ClippingPlaneInfoList& aClippingPlaneInfoList = anIter1->second;
+          SMESHGUI_ClippingPlaneInfoList::iterator anIter2 = aClippingPlaneInfoList.begin();
+          for( ; anIter2 != aClippingPlaneInfoList.end(); anIter2++ ) {
+            SMESH::ClippingPlaneInfo& aClippingPlaneInfo = *anIter2;
+            std::list<vtkActor*>& anActorList = aClippingPlaneInfo.ActorList;
+            SMESH::TActorList::iterator anIter3 = anActorList.begin();
+            for ( ; anIter3 != anActorList.end(); anIter3++ ) {
+              if( anActor == *anIter3 ) {
+                anActorList.erase( anIter3 );
+                break;
+              }
+            }
+          }
+        }
       }
     }
-    vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-    renWin->Render();
   }
-  QApplication::restoreOverrideCursor();
 }
 
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Update(const Handle(SALOME_InteractiveObject)& IO)
+void SMESHGUI::createPreferences()
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  // General tab ------------------------------------------------------------------------
+  int genTab = addPreference( tr( "PREF_TAB_GENERAL" ) );
+
+  int autoUpdate = addPreference( tr( "PREF_AUTO_UPDATE" ), genTab, LightApp_Preferences::Auto, "SMESH", "auto_update" );
+  int lim = addPreference( tr( "PREF_UPDATE_LIMIT" ), autoUpdate, LightApp_Preferences::IntSpin, "SMESH", "update_limit" );
+  setPreferenceProperty( lim, "min",  0 );
+  setPreferenceProperty( lim, "max",  100000000 );
+  setPreferenceProperty( lim, "step", 1000 );
+  setPreferenceProperty( lim, "special", tr( "PREF_UPDATE_LIMIT_NOLIMIT" ) );
+
+  int qaGroup = addPreference( tr( "PREF_GROUP_QUALITY" ), genTab );
+  setPreferenceProperty( qaGroup, "columns", 2 );
+  addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, LightApp_Preferences::Bool, "SMESH", "display_entity" );
+  addPreference( tr( "PREF_PRECISION_USE" ), qaGroup, LightApp_Preferences::Bool, "SMESH", "use_precision" );
+  int prec = addPreference( tr( "PREF_PRECISION_VALUE" ), qaGroup, LightApp_Preferences::IntSpin, "SMESH", "controls_precision" );
+  setPreferenceProperty( prec, "min", 0 );
+  setPreferenceProperty( prec, "max", 16 );
+  int doubleNodesTol = addPreference( tr( "PREF_EQUAL_NODES_TOL" ), qaGroup, LightApp_Preferences::DblSpin, "SMESH", "equal_nodes_tolerance" );
+  setPreferenceProperty( doubleNodesTol, "precision", 10 );
+  setPreferenceProperty( doubleNodesTol, "min", 0.0000000001 );
+  setPreferenceProperty( doubleNodesTol, "max", 1000000.0 );
+  setPreferenceProperty( doubleNodesTol, "step", 0.0000001 );
+
+  int dispgroup = addPreference( tr( "PREF_DISPLAY_MODE" ), genTab );
+  setPreferenceProperty( dispgroup, "columns", 2 );
+  int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, LightApp_Preferences::Selector, "SMESH", "display_mode" );
+  QStringList modes;
+  modes.append( tr("MEN_WIRE") );
+  modes.append( tr("MEN_SHADE") );
+  modes.append( tr("MEN_NODES") );
+  modes.append( tr("MEN_SHRINK") );
+  QList<QVariant> indices;
+  indices.append( 0 );
+  indices.append( 1 );
+  indices.append( 2 );
+  indices.append( 3 );
+  setPreferenceProperty( dispmode, "strings", modes );
+  setPreferenceProperty( dispmode, "indexes", indices );
+
+  int arcgroup = addPreference( tr( "QUADRATIC_REPRESENT_MODE" ), genTab );
+  setPreferenceProperty( arcgroup, "columns", 2 );
+  int quadraticmode = addPreference( tr( "QUADRATIC_REPRESENT_MODE" ), arcgroup, LightApp_Preferences::Selector, "SMESH", "quadratic_mode" );
+  QStringList quadraticModes;
+  quadraticModes.append(tr("MEN_LINE_REPRESENTATION"));
+  quadraticModes.append(tr("MEN_ARC_REPRESENTATION"));
+  indices.clear();
+  indices.append( 0 );
+  indices.append( 1 );
+  setPreferenceProperty( quadraticmode, "strings", quadraticModes );
+  setPreferenceProperty( quadraticmode, "indexes", indices );
+
+  int maxAngle = addPreference( tr( "MAX_ARC_ANGLE" ), arcgroup, LightApp_Preferences::IntSpin,
+                              "SMESH", "max_angle" );
+  setPreferenceProperty( maxAngle, "min", 1 );
+  setPreferenceProperty( maxAngle, "max", 90 );
+
+
+
+  int exportgroup = addPreference( tr( "PREF_GROUP_EXPORT" ), genTab );
+  setPreferenceProperty( exportgroup, "columns", 2 );
+  addPreference( tr( "PREF_AUTO_GROUPS" ), exportgroup, LightApp_Preferences::Bool, "SMESH", "auto_groups" );
+  //addPreference( tr( "PREF_RENUMBER" ), exportgroup, LightApp_Preferences::Bool, "SMESH", "renumbering" );
+
+  int computeGroup = addPreference( tr( "PREF_GROUP_COMPUTE" ), genTab );
+  setPreferenceProperty( computeGroup, "columns", 2 );
+  int notifyMode = addPreference( tr( "PREF_NOTIFY_MODE" ), computeGroup, LightApp_Preferences::Selector, "SMESH", "show_result_notification" );
+  modes.clear();
+  modes.append( tr( "PREF_NOTIFY_NEVER" ) );
+  modes.append( tr( "PREF_NOTIFY_ERROR" ) );
+  modes.append( tr( "PREF_NOTIFY_ALWAYS" ) );
+  indices.clear();
+  indices.append( 0 );
+  indices.append( 1 );
+  indices.append( 2 );
+  setPreferenceProperty( notifyMode, "strings", modes );
+  setPreferenceProperty( notifyMode, "indexes", indices );
+
+  int infoGroup = addPreference( tr( "PREF_GROUP_INFO" ), genTab );
+  setPreferenceProperty( infoGroup, "columns", 2 );
+  int elemInfo = addPreference( tr( "PREF_ELEM_INFO" ), infoGroup, LightApp_Preferences::Selector, "SMESH", "mesh_elem_info" );
+  modes.clear();
+  modes.append( tr( "PREF_ELEM_INFO_SIMPLE" ) );
+  modes.append( tr( "PREF_ELEM_INFO_TREE" ) );
+  indices.clear();
+  indices.append( 0 );
+  indices.append( 1 );
+  setPreferenceProperty( elemInfo, "strings", modes );
+  setPreferenceProperty( elemInfo, "indexes", indices );
+  int nodesLim = addPreference( tr( "PREF_GPP_NODES_LIMIT" ), infoGroup, LightApp_Preferences::IntSpin, "SMESH", "info_groups_nodes_limit" );
+  setPreferenceProperty( nodesLim, "min", 0 );
+  setPreferenceProperty( nodesLim, "max", 10000000 );
+  setPreferenceProperty( nodesLim, "step", 10000 );
+  setPreferenceProperty( nodesLim, "special", tr( "PREF_UPDATE_LIMIT_NOLIMIT" ) );
+  addPreference( tr( "PREF_ELEM_INFO_GRP_DETAILS" ), infoGroup, LightApp_Preferences::Bool, "SMESH", "elem_info_grp_details" );
+  addPreference( tr( "PREF_DUMP_BASE_INFO" ), infoGroup, LightApp_Preferences::Bool, "SMESH", "info_dump_base" );
+  addPreference( tr( "PREF_DUMP_ELEM_INFO" ), infoGroup, LightApp_Preferences::Bool, "SMESH", "info_dump_elem" );
+  addPreference( tr( "PREF_DUMP_ADD_INFO"  ), infoGroup, LightApp_Preferences::Bool, "SMESH", "info_dump_add" );
+
+  int segGroup = addPreference( tr( "PREF_GROUP_SEGMENT_LENGTH" ), genTab );
+  setPreferenceProperty( segGroup, "columns", 2 );
+  int segLen = addPreference( tr( "PREF_SEGMENT_LENGTH" ), segGroup, LightApp_Preferences::IntSpin,
+                              "SMESH", "segmentation" );
+  setPreferenceProperty( segLen, "min", 1 );
+  setPreferenceProperty( segLen, "max", 10000000 );
+  int nbSeg = addPreference( tr( "PREF_NB_SEGMENTS" ), segGroup, LightApp_Preferences::IntSpin,
+                             "SMESH", "nb_segments_per_edge" );
+  setPreferenceProperty( nbSeg, "min", 1 );
+  setPreferenceProperty( nbSeg, "max", 10000000 );
+
+  int loadGroup = addPreference( tr( "SMESH_PREF_MESH_LOADING" ), genTab );
+  addPreference( tr( "PREF_FORGET_MESH_AT_HYP_MODIF" ), loadGroup, LightApp_Preferences::Bool,
+                 "SMESH", "forget_mesh_on_hyp_modif" );
+
+
+  // Quantities with individual precision settings
+  int precGroup = addPreference( tr( "SMESH_PREF_GROUP_PRECISION" ), genTab );
+  setPreferenceProperty( precGroup, "columns", 2 );
+
+  const int nbQuantities = 6;
+  int precs[nbQuantities], ii = 0;
+  precs[ii++] = addPreference( tr( "SMESH_PREF_length_precision" ), precGroup,
+                            LightApp_Preferences::IntSpin, "SMESH", "length_precision" );
+  precs[ii++] = addPreference( tr( "SMESH_PREF_angle_precision" ), precGroup,
+                            LightApp_Preferences::IntSpin, "SMESH", "angle_precision" );
+  precs[ii++] = addPreference( tr( "SMESH_PREF_len_tol_precision" ), precGroup,
+                            LightApp_Preferences::IntSpin, "SMESH", "len_tol_precision" );
+  precs[ii++] = addPreference( tr( "SMESH_PREF_parametric_precision" ), precGroup,
+                            LightApp_Preferences::IntSpin, "SMESH", "parametric_precision" );
+  precs[ii++] = addPreference( tr( "SMESH_PREF_area_precision" ), precGroup,
+                            LightApp_Preferences::IntSpin, "SMESH", "area_precision" );
+  precs[ii  ] = addPreference( tr( "SMESH_PREF_vol_precision" ), precGroup,
+                            LightApp_Preferences::IntSpin, "SMESH", "vol_precision" );
+
+  // Set property for precision value for spinboxes
+  for ( ii = 0; ii < nbQuantities; ii++ ){
+    setPreferenceProperty( precs[ii], "min", -14 );
+    setPreferenceProperty( precs[ii], "max", 14 );
+    setPreferenceProperty( precs[ii], "precision", 2 );
+  }
 
-  if ( IO->hasEntry() ) {
-    Standard_Boolean res;
-    SMESH::SMESH_Mesh_var aMesh = ConvertIOinMesh( IO, res );
-    if ( res ) {
-      SMESH_Actor* ac = FindActorByEntry( IO->getEntry(), res, false );
-      if ( res ) {
-       // Check whether the actor belongs to the active view
-       VTKViewer_RenderWindowInteractor* rwInter = 
-         ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
-
-       // The actor belongs to inactive view -> create a copy and display it in the active view
-       if (!rwInter->isInViewer(IO)) {
-         SMESH_Actor* acCopy = SMESH_Actor::New();
-         acCopy->ShallowCopy(ac);
-
-         smeshGUI->DisplayActor( acCopy, false );
-       }
-       ac = ReadScript( aMesh );
-       if ( ac != NULL ) {
-#ifdef TRACE
-         Dump( ac );
-#endif
-         DisplayActor( ac );
-         DisplayEdges( ac );
-         smeshGUI->ChangeRepresentation( ac, ac->getDisplayMode() );
-       }
-      }
-    }
+  int previewGroup = addPreference( tr( "SMESH_PREF_GROUP_PREVIEW" ), genTab );
+  setPreferenceProperty( previewGroup, "columns", 2 );
+  int chunkSize = addPreference( tr( "PREF_PREVIEW_CHUNK_SIZE" ), previewGroup, LightApp_Preferences::IntSpin, "SMESH", "preview_actor_chunk_size" );
+  setPreferenceProperty( chunkSize, "min",  1 );
+  setPreferenceProperty( chunkSize, "max",  1000 );
+  setPreferenceProperty( chunkSize, "step", 50 );
+
+  int pyDumpGroup = addPreference( tr( "PREF_PYTHON_DUMP" ), genTab );
+  addPreference( tr( "PREF_HISTORICAL_PYTHON_DUMP" ), pyDumpGroup, LightApp_Preferences::Bool, "SMESH", "historical_python_dump" );
+
+  // Mesh tab ------------------------------------------------------------------------
+  int meshTab = addPreference( tr( "PREF_TAB_MESH" ) );
+  int nodeGroup = addPreference( tr( "PREF_GROUP_NODES" ), meshTab );
+  setPreferenceProperty( nodeGroup, "columns", 3 );
+
+  addPreference( tr( "PREF_COLOR" ), nodeGroup, LightApp_Preferences::Color, "SMESH", "node_color" );
+
+  int typeOfMarker = addPreference( tr( "PREF_TYPE_OF_MARKER" ), nodeGroup, LightApp_Preferences::Selector, "SMESH", "type_of_marker" );
+
+  SUIT_ResourceMgr* aResourceMgr = SMESH::GetResourceMgr(this);
+  QList<QVariant> aMarkerTypeIndicesList;
+  QList<QVariant> aMarkerTypeIconsList;
+  for ( int i = VTK::MT_POINT; i < VTK::MT_USER; i++ ) {
+    QString icoFile = QString( "ICON_VERTEX_MARKER_%1" ).arg( i );
+    QPixmap pixmap = aResourceMgr->loadPixmap( "VTKViewer", tr( qPrintable( icoFile ) ) );
+    aMarkerTypeIndicesList << i;
+    aMarkerTypeIconsList << pixmap;
   }
-}
+  setPreferenceProperty( typeOfMarker, "indexes", aMarkerTypeIndicesList );
+  setPreferenceProperty( typeOfMarker, "icons",   aMarkerTypeIconsList );
 
+  int markerScale = addPreference( tr( "PREF_MARKER_SCALE" ), nodeGroup, LightApp_Preferences::Selector, "SMESH", "marker_scale" );
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-vtkActor* SMESHGUI::SimulationMoveNode(SMESH_Actor* Mactor, int idnode)
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return NULL;
+  QList<QVariant> aMarkerScaleIndicesList;
+  QStringList     aMarkerScaleValuesList;
+  for ( int i = VTK::MS_10; i <= VTK::MS_70; i++ ) {
+    aMarkerScaleIndicesList << i;
+    aMarkerScaleValuesList  << QString::number( (i-(int)VTK::MS_10)*0.5 + 1.0 );
+  }
+  setPreferenceProperty( markerScale, "strings", aMarkerScaleValuesList );
+  setPreferenceProperty( markerScale, "indexes", aMarkerScaleIndicesList );
 
-  mySimulationActors = vtkActorCollection::New();
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
+  int elemGroup = addPreference( tr( "PREF_GROUP_ELEMENTS" ), meshTab );
+  //setPreferenceProperty( elemGroup, "columns", 2 );
 
-  vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-  vtkIdList *IdCells =  vtkIdList::New();
-  ugrid->GetPointCells( idnode, IdCells );
+  int ColorId = addPreference( tr( "PREF_FILL" ), elemGroup, LightApp_Preferences::BiColor, "SMESH", "fill_color" );
+  setPreferenceProperty( ColorId, "text", tr("PREF_BACKFACE") );
+  ColorId = addPreference( tr( "PREF_VOLUME" ), elemGroup, LightApp_Preferences::BiColor, "SMESH", "volume_color" );
+  setPreferenceProperty( ColorId, "text", tr("PREF_REVERSEDVOLUME") );
+  addPreference( tr( "PREF_COLOR_0D" ), elemGroup, LightApp_Preferences::Color, "SMESH", "elem0d_color" );
+  addPreference( tr( "PREF_BALL_COLOR" ), elemGroup, LightApp_Preferences::Color, "SMESH", "ball_elem_color" );
+  addPreference( tr( "PREF_OUTLINE"  ), elemGroup, LightApp_Preferences::Color, "SMESH", "outline_color" );
+  addPreference( tr( "PREF_WIREFRAME"  ), elemGroup, LightApp_Preferences::Color, "SMESH", "wireframe_color" );
 
-  vtkPoints *Pts = vtkPoints::New();
-  Pts = ugrid->GetPoints();
 
-  vtkUnstructuredGrid *ugridSimulation = vtkUnstructuredGrid::New();
-  ugridSimulation->SetPoints( Pts );
-  vtkIdList *IdPts =  vtkIdList::New();
-  for (int j=0; j<IdCells->GetNumberOfIds(); j++) {
-    ugrid->GetCellPoints( IdCells->GetId(j), IdPts );
-    ugridSimulation->InsertNextCell( ugrid->GetCellType( IdCells->GetId(j) ), IdPts );
-  }
+  int grpGroup = addPreference( tr( "PREF_GROUP_GROUPS" ), meshTab );
+  setPreferenceProperty( grpGroup, "columns", 2 );
 
-  vtkProperty* prop = vtkProperty::New();
-  prop->SetColor( 1., 0., 0. );
-  prop->SetRepresentationToWireframe();
-  
-  int Edgewidth = (int)Mactor->EdgeDevice->GetProperty()->GetLineWidth();
-  if ( Edgewidth == 0 )
-    Edgewidth = 1;
-  prop->SetLineWidth( Edgewidth+1 );
-
-  vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-  Mapper->SetInput( ugridSimulation );
-  vtkActor* ac = vtkActor::New();
-  ac->SetMapper( Mapper );
-  ac->SetProperty( prop );
-
-  ac->GetMapper()->SetResolveCoincidentTopologyToShiftZBuffer();
-  ac->GetMapper()->SetResolveCoincidentTopologyZShift(0.02);
-
-  mySimulationActors->AddItem( ac );
-  theRenderer->AddActor( ac );
-  
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
+  addPreference( tr( "PREF_GRP_NAMES" ), grpGroup, LightApp_Preferences::Color, "SMESH", "group_name_color" );
+  addPreference( tr( "PREF_GRP_DEF_COLOR" ), grpGroup, LightApp_Preferences::Color, "SMESH", "default_grp_color" );
 
-  return ac;
-}
+  int size0d = addPreference(tr("PREF_SIZE_0D"), elemGroup,
+                             LightApp_Preferences::IntSpin, "SMESH", "elem0d_size");
+  int ballSize = addPreference(tr("PREF_BALL_SIZE"), elemGroup,
+                             LightApp_Preferences::IntSpin, "SMESH", "ball_elem_size");
+  int elemW  = addPreference(tr("PREF_WIDTH"), elemGroup,
+                             LightApp_Preferences::IntSpin, "SMESH", "element_width");
+  int outW  = addPreference(tr("PREF_OUTLINE_WIDTH"), elemGroup,
+                             LightApp_Preferences::IntSpin, "SMESH", "outline_width");
+  int shrink = addPreference(tr("PREF_SHRINK_COEFF"), elemGroup,
+                             LightApp_Preferences::IntSpin, "SMESH", "shrink_coeff");
 
+  setPreferenceProperty( size0d, "min", 1 );
+  setPreferenceProperty( size0d, "max", 10 );
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplaySimulationNode( SMESH::SMESH_Mesh_ptr aMesh, float x, float y, float z)
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  setPreferenceProperty( ballSize, "min", 1 );
+  setPreferenceProperty( ballSize, "max", 10 );
 
-  EraseSimulationActors();
-  mySimulationActors = vtkActorCollection::New();
-  vtkRenderer* theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
+  setPreferenceProperty( elemW, "min", 1 );
+  setPreferenceProperty( elemW, "max", 5 );
 
-  if ( result ) {
-    vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( ac->DataSource );
-    vtkUnstructuredGrid* newugrid = vtkUnstructuredGrid::New();
+  setPreferenceProperty( outW, "min", 1 );
+  setPreferenceProperty( outW, "max", 5 );
 
-    vtkPoints *Pts = ugrid->GetPoints();
-    vtkPoints *newPts = vtkPoints::New();
-    int nbPts = Pts->GetNumberOfPoints();
-    for ( int i = 0; i < nbPts; i++ ) {
-      newPts->InsertPoint(i, Pts->GetPoint(i) );
-    }
+  setPreferenceProperty( shrink, "min", 0 );
+  setPreferenceProperty( shrink, "max", 100 );
 
-    newugrid->SetPoints(newPts);
-    newugrid->GetPoints()->InsertNextPoint( x, y, z );
-    
-    vtkMaskPoints* verts = vtkMaskPoints::New();
-    verts->SetInput(newugrid);
-    verts->SetGenerateVertices(1);
-    verts->SetOnRatio(1);
-   
-    vtkPolyDataMapper* vertMapper = vtkPolyDataMapper::New();
-    vertMapper->SetInput( verts->GetOutput() );
-    vertMapper->ScalarVisibilityOff();
-
-    vtkActor* node = vtkActor::New();
-    node->SetMapper( vertMapper );
-
-    QString SCr = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorRed");
-    QString SCg = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorGreen");
-    QString SCb = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorBlue");
-    QColor nodecolor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-    if ( !nodecolor.isValid() )
-      nodecolor = QColor(0.,1.,0.);
-
-    node->GetProperty()->SetColor( float(nodecolor.red())/255.,
-                                  float(nodecolor.green())/255.,
-                                  float(nodecolor.blue())/255.);
-
-    int intValue = QAD_CONFIG->getSetting("SMESH:SettingsNodesSize").toInt();
-    if ( intValue < 1 )
-      intValue == 1;
-    
-    node->GetProperty()->SetPointSize( intValue );
+  int numGroup = addPreference( tr( "PREF_GROUP_NUMBERING" ), meshTab );
+  setPreferenceProperty( numGroup, "columns", 2 );
+  
+  addPreference( tr( "PREF_NUMBERING_NODE" ), numGroup, LightApp_Preferences::Color, "SMESH", "numbering_node_color" );
+  addVtkFontPref( tr( "PREF_NUMBERING_FONT" ), numGroup, "numbering_node_font", true );
+
+  addPreference( tr( "PREF_NUMBERING_ELEM" ), numGroup, LightApp_Preferences::Color, "SMESH", "numbering_elem_color" );
+  addVtkFontPref( tr( "PREF_NUMBERING_FONT" ), numGroup, "numbering_elem_font", true );
+
+  int orientGroup = addPreference( tr( "PREF_GROUP_FACES_ORIENTATION" ), meshTab );
+  setPreferenceProperty( orientGroup, "columns", 1 );
+
+  addPreference( tr( "PREF_ORIENTATION_COLOR" ), orientGroup, LightApp_Preferences::Color, "SMESH", "orientation_color" );
+  int orientScale = addPreference( tr( "PREF_ORIENTATION_SCALE" ), orientGroup, LightApp_Preferences::DblSpin, "SMESH", "orientation_scale" );
+
+  setPreferenceProperty( orientScale, "min", 0.05 );
+  setPreferenceProperty( orientScale, "max", 0.5 );
+  setPreferenceProperty( orientScale, "step", 0.05 );
+
+  addPreference( tr( "PREF_ORIENTATION_3D_VECTORS" ), orientGroup, LightApp_Preferences::Bool, "SMESH", "orientation_3d_vectors" );
+
+  // Selection tab ------------------------------------------------------------------------
+  int selTab = addPreference( tr( "PREF_TAB_SELECTION" ) );
+
+  int selGroup = addPreference( tr( "PREF_GROUP_SELECTION" ), selTab );
+  setPreferenceProperty( selGroup, "columns", 2 );
+
+  addPreference( tr( "PREF_OBJECT_COLOR" ), selGroup, LightApp_Preferences::Color, "SMESH", "selection_object_color" );
+  addPreference( tr( "PREF_ELEMENT_COLOR" ), selGroup, LightApp_Preferences::Color, "SMESH", "selection_element_color" );
+
+  int preGroup = addPreference( tr( "PREF_GROUP_PRESELECTION" ), selTab );
+  setPreferenceProperty( preGroup, "columns", 2 );
+
+  addPreference( tr( "PREF_HIGHLIGHT_COLOR" ), preGroup, LightApp_Preferences::Color, "SMESH", "highlight_color" );
+
+  int precSelGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), selTab );
+  setPreferenceProperty( precSelGroup, "columns", 2 );
+
+  addPreference( tr( "PREF_NODES" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_node" );
+  addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_element" );
+  addPreference( tr( "PREF_OBJECTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_object" );
+
+  // Scalar Bar tab ------------------------------------------------------------------------
+  int sbarTab = addPreference( tr( "SMESH_SCALARBAR" ) );
+  int fontGr = addPreference( tr( "SMESH_FONT_SCALARBAR" ), sbarTab );
+  setPreferenceProperty( fontGr, "columns", 2 );
+
+  addVtkFontPref( tr( "SMESH_TITLE" ), fontGr, "scalar_bar_title_font" );
+  addPreference( tr( "PREF_TITLE_COLOR" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_title_color" );
+
+  addVtkFontPref( tr( "SMESH_LABELS" ), fontGr, "scalar_bar_label_font" );
+  addPreference( tr( "PREF_LABELS_COLOR" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_label_color" );
+
+  int colorsLabelsGr = addPreference( tr( "SMESH_LABELS_COLORS_SCALARBAR" ), sbarTab );
+  setPreferenceProperty( colorsLabelsGr, "columns", 2 );
+
+  int numcol = addPreference( tr( "SMESH_NUMBEROFCOLORS" ), colorsLabelsGr, LightApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_colors" );
+  setPreferenceProperty( numcol, "min", 2 );
+  setPreferenceProperty( numcol, "max", 256 );
+
+  int numlab = addPreference( tr( "SMESH_NUMBEROFLABELS" ), colorsLabelsGr, LightApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_labels" );
+  setPreferenceProperty( numlab, "min", 2 );
+  setPreferenceProperty( numlab, "max", 65 );
+
+  int orientGr = addPreference( tr( "SMESH_ORIENTATION" ), sbarTab );
+  setPreferenceProperty( orientGr, "columns", 2 );
+  int orient = addPreference( tr( "SMESH_ORIENTATION" ), orientGr, LightApp_Preferences::Selector, "SMESH", "scalar_bar_orientation" );
+  QStringList orients;
+  orients.append( tr( "SMESH_VERTICAL" ) );
+  orients.append( tr( "SMESH_HORIZONTAL" ) );
+  indices.clear(); indices.append( 0 ); indices.append( 1 );
+  setPreferenceProperty( orient, "strings", orients );
+  setPreferenceProperty( orient, "indexes", indices );
+
+  int posVSizeGr = addPreference( tr( "SMESH_POSITION_SIZE_SCALARBAR" ) + " " + tr( "SMESH_VERTICAL" ), sbarTab );
+  setPreferenceProperty( posVSizeGr, "columns", 2 );
+  int xv = addPreference( tr( "SMESH_X_SCALARBAR" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_x" );
+  int yv = addPreference( tr( "SMESH_Y_SCALARBAR" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_y" );
+  int wv = addPreference( tr( "SMESH_WIDTH" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_width" );
+  int hv = addPreference( tr( "SMESH_HEIGHT" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_height" );
+  setPreferenceProperty( xv, "step", 0.1 );
+  setPreferenceProperty( xv, "min", 0.0 );
+  setPreferenceProperty( xv, "max", 1.0 );
+  setPreferenceProperty( yv, "step", 0.1 );
+  setPreferenceProperty( yv, "min", 0.0 );
+  setPreferenceProperty( yv, "max", 1.0 );
+  setPreferenceProperty( wv, "step", 0.1 );
+  setPreferenceProperty( wv, "min", 0.0 );
+  setPreferenceProperty( wv, "max", 1.0 );
+  setPreferenceProperty( hv, "min", 0.0 );
+  setPreferenceProperty( hv, "max", 1.0 );
+  setPreferenceProperty( hv, "step", 0.1 );
+
+  int posHSizeGr = addPreference( tr( "SMESH_POSITION_SIZE_SCALARBAR" ) + " " + tr( "SMESH_HORIZONTAL" ), sbarTab );
+  setPreferenceProperty( posHSizeGr, "columns", 2 );
+  int xh = addPreference( tr( "SMESH_X_SCALARBAR" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_x" );
+  int yh = addPreference( tr( "SMESH_Y_SCALARBAR" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_y" );
+  int wh = addPreference( tr( "SMESH_WIDTH" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_width" );
+  int hh = addPreference( tr( "SMESH_HEIGHT" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_height" );
+  setPreferenceProperty( xv, "min", 0.0 );
+  setPreferenceProperty( xv, "max", 1.0 );
+  setPreferenceProperty( xv, "step", 0.1 );
+  setPreferenceProperty( xh, "min", 0.0 );
+  setPreferenceProperty( xh, "max", 1.0 );
+  setPreferenceProperty( xh, "step", 0.1 );
+  setPreferenceProperty( yh, "min", 0.0 );
+  setPreferenceProperty( yh, "max", 1.0 );
+  setPreferenceProperty( yh, "step", 0.1 );
+  setPreferenceProperty( wh, "min", 0.0 );
+  setPreferenceProperty( wh, "max", 1.0 );
+  setPreferenceProperty( wh, "step", 0.1 );
+  setPreferenceProperty( hh, "min", 0.0 );
+  setPreferenceProperty( hh, "max", 1.0 );
+  setPreferenceProperty( hh, "step", 0.1 );
+
+  int distributionGr = addPreference( tr( "SMESH_DISTRIBUTION_SCALARBAR" ), sbarTab, LightApp_Preferences::Auto, "SMESH", "distribution_visibility" );
+  int coloringType = addPreference( tr( "SMESH_DISTRIBUTION_COLORING_TYPE" ), distributionGr, LightApp_Preferences::Selector, "SMESH", "distribution_coloring_type" );
+  setPreferenceProperty( distributionGr, "columns", 3 );
+  QStringList types;
+  types.append( tr( "SMESH_MONOCOLOR" ) );
+  types.append( tr( "SMESH_MULTICOLOR" ) );
+  indices.clear(); indices.append( 0 ); indices.append( 1 );
+  setPreferenceProperty( coloringType, "strings", types );
+  setPreferenceProperty( coloringType, "indexes", indices );
+  addPreference( tr( "SMESH_DISTRIBUTION_COLOR" ), distributionGr, LightApp_Preferences::Color, "SMESH", "distribution_color" );
 
-    node->VisibilityOn();
+}
 
-    mySimulationActors->AddItem( node );
-    theRenderer->AddActor(node);
-  }
+void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
+{
+  if( sect=="SMESH" ) {
+    float sbX1,sbY1,sbW,sbH;
+    float aTol = 1.00000009999999;
+    std::string aWarning;
+    SUIT_ResourceMgr* aResourceMgr = SMESH::GetResourceMgr(this);
+    if( name=="selection_object_color" || name=="selection_element_color" ||
+        name=="highlight_color" ||
+        name=="selection_precision_node" || name=="selection_precision_element" ||
+        name=="selection_precision_object")
+      SMESH::UpdateSelectionProp( this );
+    else if (name == QString("scalar_bar_vertical_x") || name == QString("scalar_bar_vertical_width")){
+      sbX1 = aResourceMgr->doubleValue("SMESH", "scalar_bar_vertical_x", sbX1);
+      sbW = aResourceMgr->doubleValue("SMESH", "scalar_bar_vertical_width", sbW);
+      if(sbX1+sbW > aTol){
+        aWarning = "Origin and Size Vertical: X+Width > 1\n";
+        sbX1=0.01;
+        sbW=0.08;
+        aResourceMgr->setValue("SMESH", "scalar_bar_vertical_x", sbX1);
+        aResourceMgr->setValue("SMESH", "scalar_bar_vertical_width", sbW);
+      }
+    }
+    else if(name == QString("scalar_bar_vertical_y") || name == QString("scalar_bar_vertical_height")){
+      sbY1 = aResourceMgr->doubleValue("SMESH", "scalar_bar_vertical_y", sbY1);
+      sbH = aResourceMgr->doubleValue("SMESH", "scalar_bar_vertical_height",sbH);
+      if(sbY1+sbH > aTol){
+        aWarning = "Origin and Size Vertical: Y+Height > 1\n";
+        aResourceMgr->setValue("SMESH", "scalar_bar_vertical_y", sbY1);
+        aResourceMgr->setValue("SMESH", "scalar_bar_vertical_height",sbH);
+      }
+    }
+    else if(name ==  QString("scalar_bar_horizontal_x") || name ==  QString("scalar_bar_horizontal_width")){
+      sbX1 = aResourceMgr->doubleValue("SMESH", "scalar_bar_horizontal_x", sbX1);
+      sbW = aResourceMgr->doubleValue("SMESH", "scalar_bar_horizontal_width", sbW);
+      if(sbX1+sbW > aTol){
+        aWarning = "Origin and Size Horizontal: X+Width > 1\n";
+        sbX1=0.1;
+        sbW=0.08;
+        aResourceMgr->setValue("SMESH", "scalar_bar_horizontal_x", sbX1);
+        aResourceMgr->setValue("SMESH", "scalar_bar_horizontal_width", sbW);
+      }
+    }
+    else if(name ==  QString("scalar_bar_horizontal_y") || name ==  QString("scalar_bar_horizontal_height")){
+      sbY1 = aResourceMgr->doubleValue("SMESH", "scalar_bar_horizontal_y", sbY1);
+      sbH = aResourceMgr->doubleValue("SMESH", "scalar_bar_horizontal_height",sbH);
+      if(sbY1+sbH > aTol){
+        aWarning = "Origin and Size Horizontal: Y+Height > 1\n";
+        sbY1=0.01;
+        sbH=0.08;
+        aResourceMgr->setValue("SMESH", "scalar_bar_horizontal_y", sbY1);
+        aResourceMgr->setValue("SMESH", "scalar_bar_horizontal_height",sbH);
+      }
+    }
+    else if ( name == "segmentation" ) {
+      int nbSeg = aResourceMgr->integerValue( "SMESH", "segmentation", 10 );
+      myComponentSMESH->SetBoundaryBoxSegmentation( nbSeg );
+    }
+    else if ( name == "nb_segments_per_edge" ) {
+      int nbSeg = aResourceMgr->integerValue( "SMESH", "nb_segments_per_edge", 15 );
+      myComponentSMESH->SetDefaultNbSegments( nbSeg );
+    }
+    else if ( name == "historical_python_dump" ||
+              name == "forget_mesh_on_hyp_modif") {
+      QString val = aResourceMgr->stringValue( "SMESH", name );
+      myComponentSMESH->SetOption( name.toLatin1().constData(), val.toLatin1().constData() );
+    }
+    else if ( name == QString( "numbering_node_color" ) || name == QString( "numbering_node_font" ) ) {
+      SMESH::UpdateFontProp( this );    
+    }
+    else if ( name == QString( "numbering_elem_color" ) || name == QString( "numbering_elem_font" ) ) {
+      SMESH::UpdateFontProp( this );
+    }
 
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render(); 
+    if(aWarning.size() != 0){
+      aWarning += "The default values are applied instead.";
+      SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                               QObject::tr("SMESH_ERR_SCALARBAR_PARAMS"),
+                               QObject::tr(aWarning.c_str()));
+    }
+  }
 }
 
-//=============================================================================
+//================================================================================
 /*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplaySimulationMoveNode( vtkActor* ac, int idnode, float x, float y, float z)
+ * \brief Update something in accordance with update flags
+  * \param theFlags - update flags
+*
+* Update viewer or/and object browser etc. in accordance with update flags ( see
+* LightApp_UpdateFlags enumeration ).
+*/
+//================================================================================
+void SMESHGUI::update( const int flags )
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  if ( (flags & UF_Viewer) | (flags & UF_Forced) )
+    SMESH::UpdateView();
+  else
+    SalomeApp_Module::update( flags );
+}
 
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  float *pt  = ac->GetMapper()->GetInput()->GetPoint(idnode);
-  pt[0] = x; pt[1] = y; pt[2] = z;
+//================================================================================
+/*!
+ * \brief Set default selection mode
+*
+* SLOT called when operation commited. Sets default selection mode
+*/
+//================================================================================
+void SMESHGUI::onOperationCommited( SUIT_Operation* )
+{
+  SVTK_ViewWindow* vtkWnd =
+    dynamic_cast<SVTK_ViewWindow*>( application()->desktop()->activeWindow() );
+  if ( vtkWnd )
+    vtkWnd->SetSelectionMode( ActorSelection );
+}
 
-  ac->GetMapper()->ImmediateModeRenderingOn();
-  ac->GetProperty()->SetRepresentationToWireframe();
+//================================================================================
+/*!
+ * \brief Set default selection mode
+*
+* SLOT called when operation aborted. Sets default selection mode
+*/
+//================================================================================
+void SMESHGUI::onOperationAborted( SUIT_Operation* )
+{
+  SVTK_ViewWindow* vtkWnd =
+    dynamic_cast<SVTK_ViewWindow*>( application()->desktop()->activeWindow() );
+  if ( vtkWnd )
+    vtkWnd->SetSelectionMode( ActorSelection );
+}
 
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
+//================================================================================
+/*!
+ * \brief Creates operation with given identifier
+  * \param id - identifier of operation to be started
+  * \return Pointer on created operation or NULL if operation is not created
+*
+* Virtual method redefined from the base class creates operation with given id.
+* It is called called automatically from startOperation method of base class.
+*/
+//================================================================================
+LightApp_Operation* SMESHGUI::createOperation( const int id ) const
+{
+  LightApp_Operation* op = 0;
+  // to do : create operation here
+  switch( id )
+  {
+    case 417: //convert to quadratic
+      op = new SMESHGUI_ConvToQuadOp();
+    break;
+    case 418: // create 2D mesh as boundary on 3D
+      op = new SMESHGUI_Make2DFrom3DOp();
+    break;
+    case 420: // Reorient faces
+      op = new SMESHGUI_ReorientFacesOp();
+      break;
+    case 701: // Compute mesh
+      op = new SMESHGUI_ComputeOp();
+    break;
+    case 702: // Create mesh
+      op = new SMESHGUI_MeshOp( true, true );
+    break;
+    case 703: // Create sub-mesh
+      op = new SMESHGUI_MeshOp( true, false );
+    break;
+    case 704: // Edit mesh/sub-mesh
+      op = new SMESHGUI_MeshOp( false );
+    break;
+    case 711: // Precompute mesh
+      op = new SMESHGUI_PrecomputeOp();
+    break;
+    case 712: // Evaluate mesh
+      op = new SMESHGUI_EvaluateOp();
+    break;
+    case 713: // Evaluate mesh
+      op = new SMESHGUI_MeshOrderOp();
+    break;
+    case 806: // Create group on geom
+      op = new SMESHGUI_GroupOnShapeOp();
+      break;
+    case 904: // Find element
+      op = new SMESHGUI_FindElemByPointOp();
+      break;
+    case 4067: // Make mesh pass through point
+      op = new SMESHGUI_MakeNodeAtPointOp();
+      break;
+    case 4070: // Create 0D elements on all nodes
+      op = new SMESHGUI_Add0DElemsOnAllNodesOp();
+      break;
+    default:
+    break;
+  }
 
-  renWin->Render(); 
+  if( !op )
+    op = SalomeApp_Module::createOperation( id );
+  return op;
 }
 
-
-//=============================================================================
+//================================================================================
 /*!
- *
+ * \brief Stops current operations and starts a given one
+  * \param id - The id of the operation to start
  */
-//=============================================================================
-void SMESHGUI::MoveNode( SMESH::SMESH_Mesh_ptr aMesh, int idnode, float x, float y, float z)
-{
-  Standard_Boolean result;
+//================================================================================
 
-  SMESH_Actor* MeshActor = FindActor(aMesh, result, true);
-  if ( result ) {
-  }
+void SMESHGUI::switchToOperation(int id)
+{
+  if ( _PTR(Study) aStudy = SMESH::GetActiveStudyDocument() )
+    activeStudy()->abortAllOperations();
+  startOperation( id );
 }
 
+LightApp_Displayer* SMESHGUI::displayer()
+{
+  if( !myDisplayer )
+    myDisplayer = new SMESHGUI_Displayer( getApp() );
+  return myDisplayer;
+}
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::ScalarVisibilityOff()
+SALOMEDS::Color SMESHGUI::getUniqueColor( const QList<SALOMEDS::Color>& theReservedColors )
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  int aHue = -1;
+  int aTolerance = 64;
+  int anIterations = 0;
+  int aPeriod = 5;
+
+  while( 1 )
+  {
+    anIterations++;
+    if( anIterations % aPeriod == 0 )
+    {
+      aTolerance /= 2;
+      if( aTolerance < 1 )
+        break;
+    }
 
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  vtkActorCollection* actorList=theRenderer->GetActors();
-
-  actorList->InitTraversal();
-  vtkActor *ac = actorList->GetNextActor();
-  while(!(ac==NULL)) {
-    if ( ac->IsA("SMESH_Actor") ) {
-      SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( ac );
-      if ( anActor->GetVisibility() == 1 ) {
-       vtkDataSetMapper* meshMapper = (vtkDataSetMapper*) (anActor->getMapper());
-       meshMapper->ScalarVisibilityOff();
-       meshMapper->SetInput( anActor->DataSource );
-       ChangeRepresentation( anActor, anActor->getDisplayMode() );
+    aHue = (int)( 360.0 * rand() / RAND_MAX );
+
+    bool ok = true;
+    QList<SALOMEDS::Color>::const_iterator it = theReservedColors.constBegin();
+    QList<SALOMEDS::Color>::const_iterator itEnd = theReservedColors.constEnd();
+    for( ; it != itEnd; ++it )
+    {
+      SALOMEDS::Color anAutoColor = *it;
+      QColor aQColor( (int)( anAutoColor.R * 255.0 ), (int)( anAutoColor.G * 255.0 ), (int)( anAutoColor.B * 255.0 ) );
+
+      int h, s, v;
+      aQColor.getHsv( &h, &s, &v );
+      if( abs( h - aHue ) < aTolerance )
+      {
+        ok = false;
+        break;
       }
     }
-    ac = actorList->GetNextActor();
+
+    if( ok )
+      break;
   }
 
-  theRenderer->Render();
+  QColor aColor;
+  aColor.setHsv( aHue, 255, 255 );
+
+  SALOMEDS::Color aSColor;
+  aSColor.R = aColor.redF();
+  aSColor.G = aColor.greenF();
+  aSColor.B = aColor.blueF();
+
+  return aSColor;
 }
 
+const char* gSeparator = "_"; // character used to separate parameter names
+const char* gDigitsSep = ":"; // character used to separate numeric parameter values (color = r:g:b)
+const char* gPathSep   = "|"; // character used to separate paths
 
-//=============================================================================
 /*!
+ * \brief Store visual parameters
  *
+ * This method is called just before the study document is saved.
+ * Store visual parameters in AttributeParameter attribue(s)
  */
-//=============================================================================
-void SMESHGUI::DisplaySimulationEdge( SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex )
+void SMESHGUI::storeVisualParameters (int savePoint)
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  // localizing
+  Kernel_Utils::Localizer loc;
 
-  EraseSimulationActors();
-  mySimulationActors = vtkActorCollection::New();
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    int idNodes[2];
-    int pts[2];
-    int i = 0;
-    vtkIdList *Ids = vtkIdList::New();
-    for ( ; ite.More(); ite.Next() ) {
-      idNodes[i] = ite.Key();
-      i++;
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(application()->activeStudy());
+  if (!appStudy || !appStudy->studyDS())
+    return;
+  _PTR(Study) studyDS = appStudy->studyDS();
+
+  // componentName is used for encoding of entries when storing them in IParameters
+  std::string componentName = myComponentSMESH->ComponentDataType();
+  //_PTR(SComponent) aSComponent = studyDS->FindComponent("SMESH");
+  //if (!aSComponent) return;
+
+  // IParameters
+  _PTR(AttributeParameter) ap = studyDS->GetModuleParameters("Interface Applicative",
+                                                             componentName.c_str(),
+                                                             savePoint);
+  _PTR(IParameters) ip = ClientFactory::getIParameters(ap);
+
+  // store map of custom markers
+  const VTK::MarkerMap& aMarkerMap = myMarkerMap[ studyDS->StudyId() ];
+  if( !aMarkerMap.empty() )
+  {
+    VTK::MarkerMap::const_iterator anIter = aMarkerMap.begin();
+    for( ; anIter != aMarkerMap.end(); anIter++ )
+    {
+      int anId = anIter->first;
+      VTK::MarkerData aMarkerData = anIter->second;
+      std::string aMarkerFileName = aMarkerData.first;
+      VTK::MarkerTexture aMarkerTexture = aMarkerData.second;
+      if( aMarkerTexture.size() < 3 )
+        continue; // should contain at least width, height and the first value
+
+      QString aPropertyName( "texture" );
+      aPropertyName += gSeparator;
+      aPropertyName += QString::number( anId );
+
+      QString aPropertyValue = aMarkerFileName.c_str();
+      aPropertyValue += gPathSep;
+
+      VTK::MarkerTexture::const_iterator aTextureIter = aMarkerTexture.begin();
+      ushort aWidth = *aTextureIter++;
+      ushort aHeight = *aTextureIter++;
+      aPropertyValue += QString::number( aWidth ); aPropertyValue += gDigitsSep;
+      aPropertyValue += QString::number( aHeight ); aPropertyValue += gDigitsSep;
+      for( ; aTextureIter != aMarkerTexture.end(); aTextureIter++ )
+        aPropertyValue += QString::number( *aTextureIter );
+
+      ip->setProperty( aPropertyName.toStdString(), aPropertyValue.toStdString() );
     }
-    
-    Ids->InsertId( 0, idNodes[0] );
-    pts[0] = idNodes[0];
-    Ids->InsertId( 1, idNodes[1] );
-    pts[1] = idNodes[1];
-
-    vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( ac->DataSource );
-    vtkUnstructuredGrid* newugrid = vtkUnstructuredGrid::New();
-    newugrid->SetPoints( ugrid->GetPoints() ) ;
-    newugrid->InsertNextCell(VTK_LINE, 2, pts);
-
-    vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-    Mapper->SetInput( newugrid );
-    Mapper->Update();
-
-    vtkActor* edge = vtkActor::New();
-    edge->SetMapper( Mapper );
-    edge->SetProperty( ac->GetProperty() );
-    edge->SetBackfaceProperty( ac->GetBackfaceProperty() );
-    edge->VisibilityOn();
-    mySimulationActors->AddItem( edge );
-    theRenderer->AddActor(edge);
   }
 
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
+  // viewers counters are used for storing view_numbers in IParameters
+  int vtkViewers = 0;
+
+  // main cycle to store parameters of displayed objects
+  QList<SUIT_ViewManager*> lst;
+  QList<SUIT_ViewManager*>::Iterator it;
+  getApp()->viewManagers(lst);
+  for (it = lst.begin(); it != lst.end(); it++)
+  {
+    SUIT_ViewManager* vman = *it;
+    QString vType = vman->getType();
+
+    // saving VTK actors properties
+    if (vType == SVTK_Viewer::Type())
+    {
+      // store the clipping planes attached to the view manager
+      SMESHGUI_ClippingPlaneInfoList aClippingPlaneInfoList;
+      SMESHGUI_ClippingPlaneInfoMap::const_iterator anIter = myClippingPlaneInfoMap.find( vman );
+      if( anIter != myClippingPlaneInfoMap.end() )
+        aClippingPlaneInfoList = anIter->second;
+
+      if( !aClippingPlaneInfoList.empty() ) {
+        SMESHGUI_ClippingPlaneInfoList::const_iterator anIter = aClippingPlaneInfoList.begin();
+        for( int anId = 0; anIter != aClippingPlaneInfoList.end(); anIter++, anId++ )
+        {
+          const SMESH::ClippingPlaneInfo& aClippingPlaneInfo = *anIter;
+          SMESH::OrientedPlane* aPlane = aClippingPlaneInfo.Plane;
+
+          QString aPropertyName( "ClippingPlane" );
+          aPropertyName += gSeparator;
+          aPropertyName += QString::number( vtkViewers );
+          aPropertyName += gSeparator;
+          aPropertyName += QString::number( anId );
+
+          QString aPropertyValue = QString::number( (int)aPlane->GetOrientation() ).toLatin1().constData();
+          aPropertyValue += gDigitsSep;
+          aPropertyValue += QString::number( aPlane->GetDistance() ).toLatin1().constData();
+          aPropertyValue += gDigitsSep;
+          aPropertyValue += QString::number( aPlane->myAngle[0] ).toLatin1().constData();
+          aPropertyValue += gDigitsSep;
+          aPropertyValue += QString::number( aPlane->myAngle[1] ).toLatin1().constData();
+
+          ip->setProperty( aPropertyName.toStdString(), aPropertyValue.toStdString() );
+        }
+      }
+
+      QVector<SUIT_ViewWindow*> views = vman->getViews();
+      for (int i = 0, iEnd = vman->getViewsCount(); i < iEnd; i++)
+      {
+        if (SVTK_ViewWindow* vtkView = dynamic_cast<SVTK_ViewWindow*>(views[i]))
+        {
+          VTK::ActorCollectionCopy aCopy(vtkView->getRenderer()->GetActors());
+          vtkActorCollection* allActors = aCopy.GetActors();
+          allActors->InitTraversal();
+          while (vtkActor* actor = allActors->GetNextActor())
+          {
+            if (actor->GetVisibility()) // store only visible actors
+            {
+              SMESH_Actor* aSmeshActor = 0;
+              if (actor->IsA("SMESH_Actor"))
+                aSmeshActor = SMESH_Actor::SafeDownCast(actor);
+              if (aSmeshActor && aSmeshActor->hasIO())
+              {
+                Handle(SALOME_InteractiveObject) io = aSmeshActor->getIO();
+                if (io->hasEntry())
+                {
+                  // entry is "encoded" = it does NOT contain component adress,
+                  // since it is a subject to change on next component loading
+                  std::string entry = ip->encodeEntry(io->getEntry(), componentName);
+
+                  std::string param, vtkParam = vType.toLatin1().data();
+                  vtkParam += gSeparator;
+                  vtkParam += QString::number(vtkViewers).toLatin1().data();
+                  vtkParam += gSeparator;
+
+                  // Visibility
+                  param = vtkParam + "Visibility";
+                  ip->setParameter(entry, param, "On");
+
+                  // Representation
+                  param = vtkParam + "Representation";
+                  ip->setParameter(entry, param, QString::number
+                                   ((int)aSmeshActor->GetRepresentation()).toLatin1().data());
+
+                  // IsShrunk
+                  param = vtkParam + "IsShrunk";
+                  ip->setParameter(entry, param, QString::number
+                                   ((int)aSmeshActor->IsShrunk()).toLatin1().data());
+
+                  // Displayed entities
+                  unsigned int aMode = aSmeshActor->GetEntityMode();
+                  bool isE  = aMode & SMESH_Actor::eEdges;
+                  bool isF  = aMode & SMESH_Actor::eFaces;
+                  bool isV  = aMode & SMESH_Actor::eVolumes;
+                  bool is0d = aMode & SMESH_Actor::e0DElements;
+                  bool isB  = aMode & SMESH_Actor::eBallElem;
+
+                  QString modeStr ("e");
+                  modeStr += gDigitsSep; modeStr += QString::number(isE);
+                  modeStr += gDigitsSep; modeStr += "f";
+                  modeStr += gDigitsSep; modeStr += QString::number(isF);
+                  modeStr += gDigitsSep; modeStr += "v";
+                  modeStr += gDigitsSep; modeStr += QString::number(isV);
+                  modeStr += gDigitsSep; modeStr += "0d";
+                  modeStr += gDigitsSep; modeStr += QString::number(is0d);
+                  modeStr += gDigitsSep; modeStr += "b";
+                  modeStr += gDigitsSep; modeStr += QString::number(isB);
+
+                  param = vtkParam + "Entities";
+                  ip->setParameter(entry, param, modeStr.toLatin1().data());
+
+                  // Colors
+                  double r, g, b;
+                  int delta;
+
+                  aSmeshActor->GetSufaceColor(r, g, b, delta);
+                  QStringList colorStr;
+                  colorStr << "surface";
+                  colorStr << QString::number(r);
+                  colorStr << QString::number(g);
+                  colorStr << QString::number(b);
+
+                  colorStr << "backsurface";
+                  colorStr << QString::number(delta);
+
+                  aSmeshActor->GetVolumeColor(r, g, b, delta);
+                  colorStr << "volume";
+                  colorStr << QString::number(r);
+                  colorStr << QString::number(g);
+                  colorStr << QString::number(b);
+                  colorStr << QString::number(delta);
+
+                  aSmeshActor->GetEdgeColor(r, g, b);
+                  colorStr << "edge";
+                  colorStr << QString::number(r);
+                  colorStr << QString::number(g);
+                  colorStr << QString::number(b);
+
+                  aSmeshActor->GetNodeColor(r, g, b);
+                  colorStr << "node";
+                  colorStr << QString::number(r);
+                  colorStr << QString::number(g);
+                  colorStr << QString::number(b);
+
+                  aSmeshActor->GetOutlineColor(r, g, b);
+                  colorStr << "outline";
+                  colorStr << QString::number(r);
+                  colorStr << QString::number(g);
+                  colorStr << QString::number(b);
+
+                  aSmeshActor->Get0DColor(r, g, b);
+                  colorStr << "elem0d";
+                  colorStr << QString::number(r);
+                  colorStr << QString::number(g);
+                  colorStr << QString::number(b);
+
+                  aSmeshActor->GetBallColor(r, g, b);
+                  colorStr << "ball";
+                  colorStr << QString::number(r);
+                  colorStr << QString::number(g);
+                  colorStr << QString::number(b);
+
+                  aSmeshActor->GetFacesOrientationColor(r, g, b);
+                  colorStr << "orientation";
+                  colorStr << QString::number(r);
+                  colorStr << QString::number(g);
+                  colorStr << QString::number(b);
+
+                  param = vtkParam + "Colors";
+                  ip->setParameter(entry, param, qPrintable(colorStr.join(gDigitsSep)));
+
+                  // Sizes
+                  QStringList sizeStr;
+                  sizeStr << "line";
+                  sizeStr << QString::number((int)aSmeshActor->GetLineWidth());
+                  sizeStr << "outline";
+                  sizeStr << QString::number((int)aSmeshActor->GetOutlineWidth());
+                  sizeStr << "elem0d";
+                  sizeStr << QString::number((int)aSmeshActor->Get0DSize());
+                  sizeStr << "ball";
+                  sizeStr << QString::number((int)aSmeshActor->GetBallSize());
+                  sizeStr << "shrink";
+                  sizeStr << QString::number(aSmeshActor->GetShrinkFactor());
+                  sizeStr << "orientation";
+                  sizeStr << QString::number(aSmeshActor->GetFacesOrientationScale());
+                  sizeStr << QString::number(aSmeshActor->GetFacesOrientation3DVectors());
+
+                  param = vtkParam + "Sizes";
+                  ip->setParameter(entry, param, qPrintable(sizeStr.join(gDigitsSep)));
+
+                  // Point marker
+                  QString markerStr;
+
+                  VTK::MarkerType aMarkerType = aSmeshActor->GetMarkerType();
+                  if( aMarkerType == VTK::MT_USER ) {
+                    markerStr += "custom";
+                    markerStr += gDigitsSep;
+                    markerStr += QString::number( aSmeshActor->GetMarkerTexture() );
+                  }
+                  else {
+                    markerStr += "std";
+                    markerStr += gDigitsSep;
+                    markerStr += QString::number( (int)aMarkerType );
+                    markerStr += gDigitsSep;
+                    markerStr += QString::number( (int)aSmeshActor->GetMarkerScale() );
+                  }
+
+                  param = vtkParam + "PointMarker";
+                  ip->setParameter(entry, param, markerStr.toLatin1().data());
+
+                  // Opacity
+                  param = vtkParam + "Opacity";
+                  ip->setParameter(entry, param,
+                                   QString::number(aSmeshActor->GetOpacity()).toLatin1().data());
+
+                  // Clipping
+                  param = vtkParam + "ClippingPlane";
+                  int aPlaneId = 0;
+                  if( !aClippingPlaneInfoList.empty() ) {
+                    SMESHGUI_ClippingPlaneInfoList::const_iterator anIter1 = aClippingPlaneInfoList.begin();
+                    for( int anId = 0; anIter1 != aClippingPlaneInfoList.end(); anIter1++, anId++ )
+                    {
+                      const SMESH::ClippingPlaneInfo& aClippingPlaneInfo = *anIter1;
+                      std::list<vtkActor*> anActorList = aClippingPlaneInfo.ActorList;
+                      SMESH::TActorList::iterator anIter2 = anActorList.begin();
+                      for ( ; anIter2 != anActorList.end(); anIter2++ ) {
+                        if( aSmeshActor == *anIter2 ) {
+                          ip->setParameter( entry, param + QString::number( ++aPlaneId ).toLatin1().constData(),
+                                            QString::number( anId ).toLatin1().constData() );
+                          break;
+                        }
+                      }
+                    }
+                  }
+                  if( aPlaneId == 0 )
+                    ip->setParameter( entry, param, "Off" );
+                } // if (io->hasEntry())
+              } // SMESH_Actor && hasIO
+            } // isVisible
+          } // while.. actors traversal
+        } // if (vtkView)
+      } // for (views)
+      vtkViewers++;
+    } // if (SVTK view model)
+  } // for (viewManagers)
 }
 
+// data structures for clipping planes processing
+typedef struct {
+  int Id;
+  vtkIdType Orientation;
+  double Distance;
+  double Angle[2];
+} TPlaneData;
+typedef std::list<TPlaneData>         TPlaneDataList;
+typedef std::map<int, TPlaneDataList> TPlaneDataMap;
+
+typedef std::list<vtkActor*>          TActorList;
+typedef struct {
+  int PlaneId;
+  TActorList ActorList;
+  SUIT_ViewManager* ViewManager;
+} TPlaneInfo;
+typedef std::list<TPlaneInfo>         TPlaneInfoList;
+typedef std::map<int, TPlaneInfoList> TPlaneInfoMap;
 
-//=============================================================================
 /*!
+ * \brief Restore visual parameters
  *
+ * This method is called after the study document is opened.
+ * Restore visual parameters from AttributeParameter attribue(s)
  */
-//=============================================================================
-void SMESHGUI::DisplaySimulationTriangle( SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex, bool reverse )
+void SMESHGUI::restoreVisualParameters (int savePoint)
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
+  // localizing
+  Kernel_Utils::Localizer loc;
+
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(application()->activeStudy());
+  if (!appStudy || !appStudy->studyDS())
     return;
+  _PTR(Study) studyDS = appStudy->studyDS();
 
-  EraseSimulationActors();
-  mySimulationActors = vtkActorCollection::New();
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    int idNodes[3];
-    int pts[3];
-    int i = 0;
-    vtkIdList *Ids = vtkIdList::New();
-    for ( ; ite.More(); ite.Next() ) {
-      idNodes[i] = ite.Key();
-      i++;
-    }
-    
-    if ( reverse ) {
-      Ids->InsertId( 0, idNodes[2] );
-      pts[0] = idNodes[2];
-      Ids->InsertId( 1, idNodes[1] );   
-      pts[1] = idNodes[1];
-      Ids->InsertId( 2, idNodes[0] );
-      pts[2] = idNodes[0];
-    } else {
-      Ids->InsertId( 0, idNodes[0] );
-      pts[0] = idNodes[0];
-      Ids->InsertId( 1, idNodes[1] );
-      pts[1] = idNodes[1];
-      Ids->InsertId( 2, idNodes[2] );  
-      pts[2] = idNodes[2];     
-    }
-    vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( ac->DataSource );
-    vtkUnstructuredGrid* newugrid = vtkUnstructuredGrid::New();
-    newugrid->SetPoints( ugrid->GetPoints() ) ;
-    newugrid->InsertNextCell(VTK_TRIANGLE, 3, pts);
-
-    vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-    Mapper->SetInput( newugrid );
-    Mapper->Update();
-
-    vtkActor* tri = vtkActor::New();
-    tri->SetMapper( Mapper );
-    tri->SetProperty( ac->GetProperty() );
-    tri->SetBackfaceProperty( ac->GetBackfaceProperty() );
-    tri->VisibilityOn();
-    mySimulationActors->AddItem( tri );
-    theRenderer->AddActor(tri);
-  }
+  // componentName is used for encoding of entries when storing them in IParameters
+  std::string componentName = myComponentSMESH->ComponentDataType();
+  //_PTR(SComponent) aSComponent = studyDS->FindComponent("GEOM");
+  //if (!aSComponent) return;
 
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
-}
+  // IParameters
+  _PTR(AttributeParameter) ap = studyDS->GetModuleParameters("Interface Applicative",
+                                                             componentName.c_str(),
+                                                             savePoint);
+  _PTR(IParameters) ip = ClientFactory::getIParameters(ap);
 
+  // restore map of custom markers and map of clipping planes
+  VTK::MarkerMap& aMarkerMap = myMarkerMap[ studyDS->StudyId() ];
+  TPlaneDataMap aPlaneDataMap;
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplaySimulationQuadrangle( SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex, bool reverse )
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  std::vector<std::string> properties = ip->getProperties();
+  for (std::vector<std::string>::iterator propIt = properties.begin(); propIt != properties.end(); ++propIt)
+  {
+    std::string property = *propIt;
+    QString aPropertyName( property.c_str() );
+    QString aPropertyValue( ip->getProperty( property ).c_str() );
 
-  EraseSimulationActors();
-  mySimulationActors = vtkActorCollection::New();
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
+    QStringList aPropertyNameList = aPropertyName.split( gSeparator, QString::SkipEmptyParts );
+    if( aPropertyNameList.isEmpty() )
+      continue;
 
-  vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( ac->DataSource );
-  
-  if ( result ) {
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    int i = 0;
-    int idNodes[4];
-    vtkIdList *Ids = vtkIdList::New();
-    for ( ; ite.More(); ite.Next() ) {
-      idNodes[i] = ite.Key();
-      i++;
-    }
-
-    float *p0 = ugrid->GetPoint(idNodes[0]);
-    float *p1 = ugrid->GetPoint(idNodes[1]);
-    float *p2 = ugrid->GetPoint(idNodes[2]);
-    float *p3 = ugrid->GetPoint(idNodes[3]);
-
-    gp_Pnt P0(p0[0],p0[1],p0[2]);
-
-    gp_Vec V1( P0, gp_Pnt(p1[0],p1[1],p1[2]) );
-    gp_Vec V2( P0, gp_Pnt(p2[0],p2[1],p2[2]) );
-    gp_Vec V3( P0, gp_Pnt(p3[0],p3[1],p3[2]) );
-
-    gp_Vec Cross1 = V1 ^ V2;
-    gp_Vec Cross2 = V2 ^ V3;
-
-    int tmp;
-    if ( Cross1.Dot(Cross2) < 0 ) {
-      V1 = gp_Vec(P0, gp_Pnt(p2[0],p2[1],p2[2]) );
-      V2 = gp_Vec(P0, gp_Pnt(p1[0],p1[1],p1[2]) );
-      Cross1 = V1 ^ V2;
-      Cross2 = V2 ^ V3;
-      
-      if ( Cross1.Dot(Cross2) < 0 ) {
-       tmp = idNodes[2];
-       idNodes[2] = idNodes[3];
-       idNodes[3] = tmp;         
-      } else {
-       tmp = idNodes[1];
-       idNodes[1] = idNodes[2];
-       idNodes[2] = tmp;
+    QString aPropertyType = aPropertyNameList[0];
+    if( aPropertyType == "texture" )
+    {
+      if( aPropertyNameList.size() != 2 )
+        continue;
+
+      bool ok = false;
+      int anId = aPropertyNameList[1].toInt( &ok );
+      if( !ok || anId < 1 )
+        continue;
+
+      QStringList aPropertyValueList = aPropertyValue.split( gPathSep, QString::SkipEmptyParts );
+      if( aPropertyValueList.size() != 2 )
+        continue;
+
+      std::string aMarkerFileName = aPropertyValueList[0].toStdString();
+      QString aMarkerTextureString = aPropertyValueList[1];
+      QStringList aMarkerTextureStringList = aMarkerTextureString.split( gDigitsSep, QString::SkipEmptyParts );
+      if( aMarkerTextureStringList.size() != 3 )
+        continue;
+
+      ok = false;
+      ushort aWidth = aMarkerTextureStringList[0].toUShort( &ok );
+      if( !ok )
+        continue;
+
+      ok = false;
+      ushort aHeight = aMarkerTextureStringList[1].toUShort( &ok );
+      if( !ok )
+        continue;
+
+      VTK::MarkerTexture aMarkerTexture;
+      aMarkerTexture.push_back( aWidth );
+      aMarkerTexture.push_back( aHeight );
+
+      QString aMarkerTextureData = aMarkerTextureStringList[2];
+      for( int i = 0, n = aMarkerTextureData.length(); i < n; i++ )
+      {
+        QChar aChar = aMarkerTextureData.at( i );
+        if( aChar.isDigit() )
+          aMarkerTexture.push_back( aChar.digitValue() );
       }
-    }
 
-    if ( reverse ) {
-      Ids->InsertId( 0, idNodes[3] );
-      Ids->InsertId( 1, idNodes[2] );   
-      Ids->InsertId( 2, idNodes[1] );
-      Ids->InsertId( 3, idNodes[0] );
-    } else {
-      Ids->InsertId( 0, idNodes[0] );
-      Ids->InsertId( 1, idNodes[1] );
-      Ids->InsertId( 2, idNodes[2] );  
-      Ids->InsertId( 3, idNodes[3] );  
-    }
-
-    //    vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( ac->DataSource );
-    vtkUnstructuredGrid* newugrid = vtkUnstructuredGrid::New();
-    newugrid->SetPoints( ugrid->GetPoints() ) ;
-    newugrid->InsertNextCell(VTK_QUAD, Ids);
-
-    vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-    Mapper->SetInput( newugrid );
-    Mapper->Update();
-
-    vtkActor* quad = vtkActor::New();
-    quad->SetMapper( Mapper );
-    quad->SetProperty( ac->GetProperty() );
-    quad->SetBackfaceProperty( ac->GetBackfaceProperty() );
-    quad->VisibilityOn();
-    mySimulationActors->AddItem( quad );
-    theRenderer->AddActor(quad);
+      aMarkerMap[ anId ] = VTK::MarkerData( aMarkerFileName, aMarkerTexture );
+    }
+    else if( aPropertyType == "ClippingPlane" )
+    {
+      if( aPropertyNameList.size() != 3 )
+        continue;
+
+      bool ok = false;
+      int aViewId = aPropertyNameList[1].toInt( &ok );
+      if( !ok || aViewId < 0 )
+        continue;
+
+      ok = false;
+      int aClippingPlaneId = aPropertyNameList[2].toInt( &ok );
+      if( !ok || aClippingPlaneId < 0 )
+        continue;
+
+      QStringList aPropertyValueList = aPropertyValue.split( gDigitsSep, QString::SkipEmptyParts );
+      if( aPropertyValueList.size() != 4 )
+        continue;
+
+      TPlaneData aPlaneData;
+      aPlaneData.Id = aClippingPlaneId;
+
+      ok = false;
+      aPlaneData.Orientation = aPropertyValueList[0].toInt( &ok );
+      if( !ok )
+        continue;
+
+      ok = false;
+      aPlaneData.Distance = aPropertyValueList[1].toDouble( &ok );
+      if( !ok )
+        continue;
+
+      ok = false;
+      aPlaneData.Angle[0] = aPropertyValueList[2].toDouble( &ok );
+      if( !ok )
+        continue;
+
+      ok = false;
+      aPlaneData.Angle[1] = aPropertyValueList[3].toDouble( &ok );
+      if( !ok )
+        continue;
+
+      TPlaneDataList& aPlaneDataList = aPlaneDataMap[ aViewId ];
+      aPlaneDataList.push_back( aPlaneData );
+    }
   }
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
-}
 
+  TPlaneInfoMap aPlaneInfoMap;
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplaySimulationTetra( SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex )
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  std::vector<std::string> entries = ip->getEntries();
 
-  EraseSimulationActors();
-  mySimulationActors = vtkActorCollection::New();
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    int i = 0;
-    int idNodes[4];
-    vtkIdList *Ids = vtkIdList::New();
-    for ( ; ite.More(); ite.Next() ) {
-      idNodes[i] = ite.Key();
-      i++;
-    }
-    
-    Ids->InsertId( 0, idNodes[0] );
-    Ids->InsertId( 1, idNodes[1] );
-    Ids->InsertId( 2, idNodes[2] );  
-    Ids->InsertId( 3, idNodes[3] );  
-
-    vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( ac->DataSource );
-    vtkUnstructuredGrid* newugrid = vtkUnstructuredGrid::New();
-    newugrid->SetPoints( ugrid->GetPoints() ) ;
-    newugrid->InsertNextCell(VTK_TETRA, Ids);
-
-    vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-    Mapper->SetInput( newugrid );
-    Mapper->Update();
-
-    vtkActor* tetra = vtkActor::New();
-    tetra->SetMapper( Mapper );
-    tetra->SetProperty( ac->GetProperty() );
-    tetra->SetBackfaceProperty( ac->GetBackfaceProperty() );
-    tetra->VisibilityOn();
-    mySimulationActors->AddItem( tetra );
-    theRenderer->AddActor(tetra);
-  }
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
-}
+  for (std::vector<std::string>::iterator entIt = entries.begin(); entIt != entries.end(); ++entIt)
+  {
+    // entry is a normal entry - it should be "decoded" (setting base adress of component)
+    QString entry (ip->decodeEntry(*entIt).c_str());
 
+    // Check that the entry corresponds to a real object in the Study
+    // as the object may be deleted or modified after the visual state is saved.
+    _PTR(SObject) so = studyDS->FindObjectID(entry.toLatin1().data());
+    if (!so) continue; //Skip the not existent entry
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplaySimulationHexa( SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex )
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+    std::vector<std::string> paramNames = ip->getAllParameterNames( *entIt );
+    std::vector<std::string> paramValues = ip->getAllParameterValues( *entIt );
 
-  EraseSimulationActors();
-  mySimulationActors = vtkActorCollection::New();
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    int i = 0;
-    int idNodes[8];
-    vtkIdList *Ids = vtkIdList::New();
-    for ( ; ite.More(); ite.Next() ) {
-      idNodes[i] = ite.Key();
-      i++;
-    }
-    
-    Ids->InsertId( 0, idNodes[0] );
-    Ids->InsertId( 1, idNodes[1] );
-    Ids->InsertId( 2, idNodes[2] );  
-    Ids->InsertId( 3, idNodes[3] );  
-    Ids->InsertId( 4, idNodes[4] );
-    Ids->InsertId( 5, idNodes[5] );
-    Ids->InsertId( 6, idNodes[6] );  
-    Ids->InsertId( 7, idNodes[7] );  
-
-    vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( ac->DataSource );
-    vtkUnstructuredGrid* newugrid = vtkUnstructuredGrid::New();
-    newugrid->SetPoints( ugrid->GetPoints() ) ;
-    newugrid->InsertNextCell(VTK_HEXAHEDRON, Ids);
-
-    vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-    Mapper->SetInput( newugrid );
-    Mapper->Update();
-
-    vtkActor* hexa = vtkActor::New();
-    hexa->SetMapper( Mapper );
-    hexa->SetProperty( ac->GetProperty() );
-    hexa->SetBackfaceProperty( ac->GetBackfaceProperty() );
-    hexa->VisibilityOn();
-    mySimulationActors->AddItem( hexa );
-    theRenderer->AddActor(hexa);
-  }
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
-}
+    std::vector<std::string>::iterator namesIt = paramNames.begin();
+    std::vector<std::string>::iterator valuesIt = paramValues.begin();
 
+    // actors are stored in a map after displaying of them for
+    // quicker access in the future: map < viewID to actor >
+    NCollection_DataMap<int, SMESH_Actor*> vtkActors;
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddFace( SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex, bool reverse )
-{  
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    SMESH::long_array_var anArrayOfIdeces = new  SMESH::long_array;
-    anArrayOfIdeces->length(MapIndex.Extent());
-    
-    int i = 0;
-    for ( ; ite.More(); ite.Next() ) {
-      anArrayOfIdeces[i] = ac->GetIdSMESHDSNode(ite.Key());
-      i++;
-    }
-
-    int tmp;
-    if ( MapIndex.Extent() == 4 ) {
-      int idNodes[4];
-      int i = 0;
-      TColStd_MapIteratorOfMapOfInteger ite1( MapIndex );
-      for ( ; ite1.More(); ite1.Next() ) {
-       idNodes[i] = ite1.Key();
-       i++;
+    for (; namesIt != paramNames.end(); ++namesIt, ++valuesIt)
+    {
+      // visual parameters are stored in strings as follows: ViewerType_ViewIndex_ParamName.
+      // '_' is used as separator and should not be used in viewer type or parameter names.
+      QStringList lst = QString((*namesIt).c_str()).split(gSeparator, QString::SkipEmptyParts);
+      if (lst.size() != 3)
+        continue;
+
+      QString viewerTypStr = lst[0];
+      QString viewIndexStr = lst[1];
+      QString paramNameStr = lst[2];
+
+      bool ok;
+      int viewIndex = viewIndexStr.toUInt(&ok);
+      if (!ok) // bad conversion of view index to integer
+        continue;
+
+      // viewers
+      if (viewerTypStr == SVTK_Viewer::Type())
+      {
+        SMESH_Actor* aSmeshActor = 0;
+        if (vtkActors.IsBound(viewIndex))
+          aSmeshActor = vtkActors.Find(viewIndex);
+
+        QList<SUIT_ViewManager*> lst;
+        getApp()->viewManagers(viewerTypStr, lst);
+
+        // SVTK ViewManager always has 1 ViewWindow, so view index is index of view manager
+        SUIT_ViewManager* vman = NULL;
+        if (viewIndex >= 0 && viewIndex < lst.count())
+          vman = lst.at(viewIndex);
+
+        if (paramNameStr == "Visibility")
+        {
+          if (!aSmeshActor && displayer() && vman)
+          {
+            SUIT_ViewModel* vmodel = vman->getViewModel();
+            // SVTK view model can be casted to SALOME_View
+            displayer()->Display(entry, true, dynamic_cast<SALOME_View*>(vmodel));
+
+            // store displayed actor in a temporary map for quicker
+            // access later when restoring other parameters
+            SVTK_ViewWindow* vtkView = (SVTK_ViewWindow*) vman->getActiveView();
+            vtkRenderer* Renderer = vtkView->getRenderer();
+            VTK::ActorCollectionCopy aCopy(Renderer->GetActors());
+            vtkActorCollection* theActors = aCopy.GetActors();
+            theActors->InitTraversal();
+            bool isFound = false;
+            vtkActor *ac = theActors->GetNextActor();
+            for (; ac != NULL && !isFound; ac = theActors->GetNextActor()) {
+              if (ac->IsA("SMESH_Actor")) {
+                SMESH_Actor* aGeomAc = SMESH_Actor::SafeDownCast(ac);
+                if (aGeomAc->hasIO()) {
+                  Handle(SALOME_InteractiveObject) io =
+                    Handle(SALOME_InteractiveObject)::DownCast(aGeomAc->getIO());
+                  if (io->hasEntry() && strcmp(io->getEntry(), entry.toLatin1().data()) == 0) {
+                    isFound = true;
+                    vtkActors.Bind(viewIndex, aGeomAc);
+                  }
+                }
+              }
+            }
+          }
+        } // if (paramNameStr == "Visibility")
+        else
+        {
+          // the rest properties "work" with SMESH_Actor
+          if (aSmeshActor)
+          {
+            QString val ((*valuesIt).c_str());
+
+            // Representation
+            if (paramNameStr == "Representation") {
+              aSmeshActor->SetRepresentation((SMESH_Actor::EReperesent)val.toInt());
+            }
+            // IsShrunk
+            else if (paramNameStr == "IsShrunk") {
+              if (val.toInt()) {
+                if (!aSmeshActor->IsShrunk())
+                  aSmeshActor->SetShrink();
+              }
+              else {
+                if (aSmeshActor->IsShrunk())
+                  aSmeshActor->UnShrink();
+              }
+            }
+            // Displayed entities
+            else if (paramNameStr == "Entities") {
+              QStringList mode = val.split(gDigitsSep, QString::SkipEmptyParts);
+              int aEntityMode = SMESH_Actor::eAllEntity;
+              for ( int i = 0; i < mode.count(); i+=2 ) {
+                if ( i < mode.count()-1 ) {
+                  QString type = mode[i];
+                  bool val = mode[i+1].toInt();
+                  if      ( type == "e" && !val )
+                    aEntityMode = aEntityMode & ~SMESH_Actor::eEdges;
+                  else if ( type == "f" && !val )
+                    aEntityMode = aEntityMode & ~SMESH_Actor::eFaces;
+                  else if ( type == "v" && !val )
+                    aEntityMode = aEntityMode & ~SMESH_Actor::eVolumes;
+                  else if ( type == "0d" && !val )
+                    aEntityMode = aEntityMode & ~SMESH_Actor::e0DElements;
+                  else if ( type == "b" && !val )
+                    aEntityMode = aEntityMode & ~SMESH_Actor::eBallElem;
+                }
+              }
+              aSmeshActor->SetEntityMode( aEntityMode );
+            }
+            // Colors
+            else if (paramNameStr == "Colors") {
+              QStringList colors = val.split(gDigitsSep, QString::SkipEmptyParts);
+              QColor nodeColor;
+              QColor edgeColor;
+              QColor faceColor;
+              QColor volumeColor;
+              QColor elem0dColor;
+              QColor ballColor;
+              QColor outlineColor;
+              QColor orientationColor;
+              int deltaF;
+              int deltaV;
+              QColor c;
+              double r, g, b;
+              bool bOk;
+              // below lines are required to get default values for delta coefficients
+              // of backface color for faces and color of reversed volumes
+              SMESH::GetColor( "SMESH", "fill_color",   c, deltaF, "0,170,255|-100" );
+              SMESH::GetColor( "SMESH", "volume_color", c, deltaV, "255,0,170|-100" );
+              for ( int i = 0; i < colors.count(); i++ ) {
+                QString type = colors[i];
+                if ( type == "surface" ) {
+                  // face color is set by 3 values r:g:b, where
+                  // - r,g,b - is rgb color components
+                  if ( i+1 >= colors.count() ) break;                  // format error
+                  r = colors[i+1].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+2 >= colors.count() ) break;                  // format error
+                  g = colors[i+2].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+3 >= colors.count() ) break;                  // format error
+                  b = colors[i+3].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  faceColor.setRgbF( r, g, b );
+                  i += 3;
+                }
+                else if ( type == "backsurface" ) {
+                  // backface color can be defined in several ways
+                  // - in old versions, it is set as rgb triple r:g:b - this was is unsupported now
+                  // - in latest versions, it is set as delta coefficient
+                  bool rgbOk = false, deltaOk;
+                  if ( i+1 >= colors.count() ) break;                  // format error
+                  r = colors[i+1].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  int delta = colors[i+1].toInt( &deltaOk );
+                  i++;                                 // shift index
+                  if ( i+1 < colors.count() )          // index is shifted to 1
+                    g = colors[i+1].toDouble( &rgbOk );
+                  if ( rgbOk ) i++;                    // shift index
+                  if ( rgbOk && i+1 < colors.count() ) // index is shifted to 2
+                    b = colors[i+1].toDouble( &rgbOk );
+                  if ( rgbOk ) i++;
+                  // - as currently there's no way to set directly backsurface color as it was before,
+                  // we ignore old dump where r,g,b triple was set
+                  // - also we check that delta parameter is set properly
+                  if ( !rgbOk && deltaOk )
+                    deltaF = delta;
+                }
+                else if ( type == "volume" ) {
+                  // volume color is set by 4 values r:g:b:delta, where
+                  // - r,g,b - is a normal volume rgb color components
+                  // - delta - is a reversed volume color delta coefficient
+                  if ( i+1 >= colors.count() ) break;                  // format error
+                  r = colors[i+1].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+2 >= colors.count() ) break;                  // format error
+                  g = colors[i+2].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+3 >= colors.count() ) break;                  // format error
+                  b = colors[i+3].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+4 >= colors.count() ) break;                  // format error
+                  int delta = colors[i+4].toInt( &bOk );
+                  if ( !bOk ) break;                                   // format error
+                  volumeColor.setRgbF( r, g, b );
+                  deltaV = delta;
+                  i += 4;
+                }
+                else if ( type == "edge" ) {
+                  // edge color is set by 3 values r:g:b, where
+                  // - r,g,b - is rgb color components
+                  if ( i+1 >= colors.count() ) break;                  // format error
+                  r = colors[i+1].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+2 >= colors.count() ) break;                  // format error
+                  g = colors[i+2].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+3 >= colors.count() ) break;                  // format error
+                  b = colors[i+3].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  edgeColor.setRgbF( r, g, b );
+                  i += 3;
+                }
+                else if ( type == "node" ) {
+                  // node color is set by 3 values r:g:b, where
+                  // - r,g,b - is rgb color components
+                  if ( i+1 >= colors.count() ) break;                  // format error
+                  r = colors[i+1].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+2 >= colors.count() ) break;                  // format error
+                  g = colors[i+2].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+3 >= colors.count() ) break;                  // format error
+                  b = colors[i+3].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  nodeColor.setRgbF( r, g, b );
+                  i += 3;
+                }
+                else if ( type == "elem0d" ) {
+                  // 0d element color is set by 3 values r:g:b, where
+                  // - r,g,b - is rgb color components
+                  if ( i+1 >= colors.count() ) break;                  // format error
+                  r = colors[i+1].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+2 >= colors.count() ) break;                  // format error
+                  g = colors[i+2].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+3 >= colors.count() ) break;                  // format error
+                  b = colors[i+3].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  elem0dColor.setRgbF( r, g, b );
+                  i += 3;
+                }
+                else if ( type == "ball" ) {
+                  // ball color is set by 3 values r:g:b, where
+                  // - r,g,b - is rgb color components
+                  if ( i+1 >= colors.count() ) break;                  // format error
+                  r = colors[i+1].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+2 >= colors.count() ) break;                  // format error
+                  g = colors[i+2].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+3 >= colors.count() ) break;                  // format error
+                  b = colors[i+3].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  ballColor.setRgbF( r, g, b );
+                  i += 3;
+                }
+                else if ( type == "outline" ) {
+                  // outline color is set by 3 values r:g:b, where
+                  // - r,g,b - is rgb color components
+                  if ( i+1 >= colors.count() ) break;                  // format error
+                  r = colors[i+1].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+2 >= colors.count() ) break;                  // format error
+                  g = colors[i+2].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+3 >= colors.count() ) break;                  // format error
+                  b = colors[i+3].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  outlineColor.setRgbF( r, g, b );
+                  i += 3;
+                }
+                else if ( type == "orientation" ) {
+                  // orientation color is set by 3 values r:g:b, where
+                  // - r,g,b - is rgb color components
+                  if ( i+1 >= colors.count() ) break;                  // format error
+                  r = colors[i+1].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+2 >= colors.count() ) break;                  // format error
+                  g = colors[i+2].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+3 >= colors.count() ) break;                  // format error
+                  b = colors[i+3].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  orientationColor.setRgbF( r, g, b );
+                  i += 3;
+                }
+              }
+              // node color
+              if ( nodeColor.isValid() )
+                aSmeshActor->SetNodeColor( nodeColor.redF(), nodeColor.greenF(), nodeColor.blueF() );
+              // edge color
+              if ( edgeColor.isValid() )
+                aSmeshActor->SetEdgeColor( edgeColor.redF(), edgeColor.greenF(), edgeColor.blueF() );
+              // face color
+              if ( faceColor.isValid() )
+                aSmeshActor->SetSufaceColor( faceColor.redF(), faceColor.greenF(), faceColor.blueF(), deltaF );
+              // volume color
+              if ( volumeColor.isValid() )
+                aSmeshActor->SetVolumeColor( volumeColor.redF(), volumeColor.greenF(), volumeColor.blueF(), deltaV );
+              else if ( faceColor.isValid() ) // backward compatibility (no separate color for volumes)
+                aSmeshActor->SetVolumeColor( faceColor.redF(), faceColor.greenF(), faceColor.blueF(), deltaF );
+              // 0d element color
+              if ( elem0dColor.isValid() )
+                aSmeshActor->Set0DColor( elem0dColor.redF(), elem0dColor.greenF(), elem0dColor.blueF() );
+              // ball color
+              if ( ballColor.isValid() )
+                aSmeshActor->SetBallColor( ballColor.redF(), ballColor.greenF(), ballColor.blueF() );
+              // outline color
+              if ( outlineColor.isValid() )
+                aSmeshActor->SetOutlineColor( outlineColor.redF(), outlineColor.greenF(), outlineColor.blueF() );
+              // orientation color
+              if ( orientationColor.isValid() )
+                aSmeshActor->SetFacesOrientationColor( orientationColor.redF(), orientationColor.greenF(), orientationColor.blueF() );
+            }
+            // Sizes
+            else if (paramNameStr == "Sizes") {
+              QStringList sizes = val.split(gDigitsSep, QString::SkipEmptyParts);
+              bool bOk;
+              int lineWidth = -1;
+              int outlineWidth = -1;
+              int elem0dSize = -1;
+              int ballSize = -1;
+              double shrinkSize = -1;
+              double orientationSize = -1;
+              bool orientation3d = false;
+              for ( int i = 0; i < sizes.count(); i++ ) {
+                QString type = sizes[i];
+                if ( type == "line" ) {
+                  // line (wireframe) width is given as single integer value
+                  if ( i+1 >= sizes.count() ) break;                    // format error
+                  int v = sizes[i+1].toInt( &bOk ); if ( !bOk ) break;  // format error
+                  lineWidth = v;
+                  i++;
+                }
+                if ( type == "outline" ) {
+                  // outline width is given as single integer value
+                  if ( i+1 >= sizes.count() ) break;                    // format error
+                  int v = sizes[i+1].toInt( &bOk ); if ( !bOk ) break;  // format error
+                  outlineWidth = v;
+                  i++;
+                }
+                else if ( type == "elem0d" ) {
+                  // 0d element size is given as single integer value
+                  if ( i+1 >= sizes.count() ) break;                    // format error
+                  int v = sizes[i+1].toInt( &bOk ); if ( !bOk ) break;  // format error
+                  elem0dSize = v;
+                  i++;
+                }
+                else if ( type == "ball" ) {
+                  // ball size is given as single integer value
+                  if ( i+1 >= sizes.count() ) break;                    // format error
+                  int v = sizes[i+1].toInt( &bOk ); if ( !bOk ) break;  // format error
+                  ballSize = v;
+                  i++;
+                }
+                else if ( type == "shrink" ) {
+                  // shrink factor is given as single floating point value
+                  if ( i+1 >= sizes.count() ) break;                          // format error
+                  double v = sizes[i+1].toDouble( &bOk ); if ( !bOk ) break;  // format error
+                  shrinkSize = v;
+                  i++;
+                }
+                else if ( type == "orientation" ) {
+                  // orientation vectors are specified by two values size:3d, where
+                  // - size - is a floating point value specifying scale factor
+                  // - 3d - is a boolean
+                  if ( i+1 >= sizes.count() ) break;                          // format error
+                  double v1 = sizes[i+1].toDouble( &bOk ); if ( !bOk ) break; // format error
+                  if ( i+2 >= sizes.count() ) break;                          // format error
+                  int v2 = sizes[i+2].toInt( &bOk ); if ( !bOk ) break;       // format error
+                  orientationSize = v1;
+                  orientation3d = (bool)v2;
+                  i += 2;
+                }
+              }
+              // line (wireframe) width
+              if ( lineWidth > 0 )
+                aSmeshActor->SetLineWidth( lineWidth );
+              // outline width
+              if ( outlineWidth > 0 )
+                aSmeshActor->SetOutlineWidth( outlineWidth );
+              else if ( lineWidth > 0 ) // backward compatibility (no separate width for outlines)
+                aSmeshActor->SetOutlineWidth( lineWidth );
+              // 0d element size
+              if ( elem0dSize > 0 )
+                aSmeshActor->Set0DSize( elem0dSize );
+              // ball size
+              if ( ballSize > 0 )
+                aSmeshActor->SetBallSize( ballSize );
+              // shrink factor
+              if ( shrinkSize > 0 )
+                aSmeshActor->SetShrinkFactor( shrinkSize );
+              // orientation vectors
+              if ( orientationSize > 0 ) {
+                aSmeshActor->SetFacesOrientationScale( orientationSize );
+                aSmeshActor->SetFacesOrientation3DVectors( orientation3d );
+              }
+            }
+            // Point marker
+            else if (paramNameStr == "PointMarker") {
+              QStringList data = val.split(gDigitsSep, QString::SkipEmptyParts);
+              if( data.count() >= 2 ) {
+                bool ok = false;
+                int aParam1 = data[1].toInt( &ok );
+                if( ok ) {
+                  if( data[0] == "std" && data.count() == 3 ) {
+                    int aParam2 = data[2].toInt( &ok );
+                    aSmeshActor->SetMarkerStd( (VTK::MarkerType)aParam1, (VTK::MarkerScale)aParam2 );
+                  }
+                  else if( data[0] == "custom" ) {
+                    VTK::MarkerMap::const_iterator markerIt = aMarkerMap.find( aParam1 );
+                    if( markerIt != aMarkerMap.end() ) {
+                      VTK::MarkerData aMarkerData = markerIt->second;
+                      aSmeshActor->SetMarkerTexture( aParam1, aMarkerData.second );
+                    }
+                  }
+                }
+              }
+            }
+            // Opacity
+            else if (paramNameStr == "Opacity") {
+              aSmeshActor->SetOpacity(val.toFloat());
+            }
+            // Clipping
+            else if (paramNameStr.startsWith("ClippingPlane")) {
+              QStringList vals = val.split(gDigitsSep, QString::SkipEmptyParts);
+              // old format - val looks like "Off" or "0:0.5:0:0" (orientation, distance, two angles)
+              // new format - val looks like "Off" or "0" (plane id)
+              // (note: in new format "Off" value is used only for consistency,
+              //  so it is processed together with values in old format)
+              bool anIsOldFormat = ( vals.count() == 4 || val == "Off" );
+              if( anIsOldFormat ) {
+                if (paramNameStr == "ClippingPlane1" || val == "Off")
+                  aSmeshActor->RemoveAllClippingPlanes();
+                if (val != "Off") {
+                  SMESH::Orientation anOrientation = (SMESH::Orientation)vals[0].toInt();
+                  double aDistance = vals[1].toFloat();
+                  double anAngle[2];
+                  anAngle[0] = vals[2].toFloat();
+                  anAngle[1] = vals[3].toFloat();
+
+                  QList<SUIT_ViewManager*> lst;
+                  getApp()->viewManagers(viewerTypStr, lst);
+                  // SVTK ViewManager always has 1 ViewWindow, so view index is index of view manager
+                  if (viewIndex >= 0 && viewIndex < lst.count()) {
+                    SUIT_ViewManager* vman = lst.at(viewIndex);
+                    SVTK_ViewWindow* vtkView = (SVTK_ViewWindow*) vman->getActiveView();
+
+                    SMESHGUI_ClippingPlaneInfoList& aClippingPlaneInfoList = myClippingPlaneInfoMap[ vman ];
+
+                    SMESH::TActorList anActorList;
+                    anActorList.push_back( aSmeshActor );
+                    SMESH::OrientedPlane* aPlane =
+                      SMESHGUI_ClippingDlg::AddPlane(anActorList, vtkView, anOrientation, aDistance, anAngle);
+                    if( aPlane ) {
+                      SMESH::ClippingPlaneInfo aClippingPlaneInfo;
+                      aClippingPlaneInfo.Plane = aPlane;
+                      aClippingPlaneInfo.ActorList = anActorList;
+                      aClippingPlaneInfoList.push_back( aClippingPlaneInfo );
+                    }
+                  }
+                }
+              }
+              else {
+                bool ok = false;
+                int aPlaneId = val.toInt( &ok );
+                if( ok && aPlaneId >= 0 ) {
+                  bool anIsDefinedPlane = false;
+                  TPlaneInfoList& aPlaneInfoList = aPlaneInfoMap[ viewIndex ];
+                  TPlaneInfoList::iterator anIter = aPlaneInfoList.begin();
+                  for( ; anIter != aPlaneInfoList.end(); anIter++ ) {
+                    TPlaneInfo& aPlaneInfo = *anIter;
+                    if( aPlaneInfo.PlaneId == aPlaneId ) {
+                      aPlaneInfo.ActorList.push_back( aSmeshActor );
+                      anIsDefinedPlane = true;
+                      break;
+                    }
+                  }
+                  if( !anIsDefinedPlane ) {
+                    TPlaneInfo aPlaneInfo;
+                    aPlaneInfo.PlaneId = aPlaneId;
+                    aPlaneInfo.ActorList.push_back( aSmeshActor );
+                    aPlaneInfo.ViewManager = vman;
+
+                    // to make the list sorted by plane id
+                    anIter = aPlaneInfoList.begin();
+                    for( ; anIter != aPlaneInfoList.end(); anIter++ ) {
+                      const TPlaneInfo& aPlaneInfoRef = *anIter;
+                      if( aPlaneInfoRef.PlaneId > aPlaneId )
+                        break;
+                    }
+                    aPlaneInfoList.insert( anIter, aPlaneInfo );
+                  }
+                }
+              }
+            }
+          } // if (aSmeshActor)
+        } // other parameters than Visibility
       }
-      
-      vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( ac->DataSource );
-      float *p0 = ugrid->GetPoint(idNodes[0]);
-      float *p1 = ugrid->GetPoint(idNodes[1]);
-      float *p2 = ugrid->GetPoint(idNodes[2]);
-      float *p3 = ugrid->GetPoint(idNodes[3]);
-
-      gp_Pnt P0(p0[0],p0[1],p0[2]);
-
-      gp_Vec V1( P0, gp_Pnt(p1[0],p1[1],p1[2]) );
-      gp_Vec V2( P0, gp_Pnt(p2[0],p2[1],p2[2]) );
-      gp_Vec V3( P0, gp_Pnt(p3[0],p3[1],p3[2]) );
-
-      gp_Vec Cross1 = V1 ^ V2;
-      gp_Vec Cross2 = V2 ^ V3;
-
-      if ( Cross1.Dot(Cross2) < 0 ) {
-
-       V1 = gp_Vec(P0, gp_Pnt(p2[0],p2[1],p2[2]) );
-       V2 = gp_Vec(P0, gp_Pnt(p1[0],p1[1],p1[2]) );
-       Cross1 = V1 ^ V2;
-       Cross2 = V2 ^ V3;
-       
-       if ( Cross1.Dot(Cross2) < 0 ) {
-         tmp = anArrayOfIdeces[2];
-         anArrayOfIdeces[2] = anArrayOfIdeces[3];
-         anArrayOfIdeces[3] = tmp;       
-       } else {
-         tmp = anArrayOfIdeces[1];
-         anArrayOfIdeces[1] = anArrayOfIdeces[2];
-         anArrayOfIdeces[2] = tmp;
-       }
+    } // for names/parameters iterator
+  } // for entries iterator
+
+  // take into account planes with empty list of actors referred to them
+  QList<SUIT_ViewManager*> aVMList;
+  getApp()->viewManagers(SVTK_Viewer::Type(), aVMList);
+
+  TPlaneDataMap::const_iterator aPlaneDataIter = aPlaneDataMap.begin();
+  for( ; aPlaneDataIter != aPlaneDataMap.end(); aPlaneDataIter++ ) {
+    int aViewId = aPlaneDataIter->first;
+    if( aViewId >= 0 && aViewId < aVMList.count() ) {
+      SUIT_ViewManager* aViewManager = aVMList.at( aViewId );
+
+      const TPlaneDataList& aPlaneDataList = aPlaneDataIter->second;
+
+      TPlaneInfoList& aPlaneInfoList = aPlaneInfoMap[ aViewId ];
+      TPlaneDataList::const_iterator anIter2 = aPlaneDataList.begin();
+      for( ; anIter2 != aPlaneDataList.end(); anIter2++ ) {
+        const TPlaneData& aPlaneData = *anIter2;
+        int aPlaneId = aPlaneData.Id;
+
+        bool anIsFound = false;
+        TPlaneInfoList::const_iterator anIter3 = aPlaneInfoList.begin();
+        for( ; anIter3 != aPlaneInfoList.end(); anIter3++ ) {
+          const TPlaneInfo& aPlaneInfo = *anIter3;
+          if( aPlaneInfo.PlaneId == aPlaneId ) {
+            anIsFound = true;
+            break;
+          }
+        }
+
+        if( !anIsFound ) {
+          TPlaneInfo aPlaneInfo; // ActorList field is empty
+          aPlaneInfo.PlaneId = aPlaneId;
+          aPlaneInfo.ViewManager = aViewManager;
+
+          // to make the list sorted by plane id
+          TPlaneInfoList::iterator anIter4 = aPlaneInfoList.begin();
+          for( ; anIter4 != aPlaneInfoList.end(); anIter4++ ) {
+            const TPlaneInfo& aPlaneInfoRef = *anIter4;
+            if( aPlaneInfoRef.PlaneId > aPlaneId )
+              break;
+          }
+          aPlaneInfoList.insert( anIter4, aPlaneInfo );
+        }
       }
     }
+  }
 
-    //    int tmp;
-    if ( reverse ) {
-      for (i=0; i < (MapIndex.Extent()/2); i++) {
-       tmp = anArrayOfIdeces[i];
-       anArrayOfIdeces[i] = anArrayOfIdeces[MapIndex.Extent()-i-1];
-       anArrayOfIdeces[MapIndex.Extent()-i-1] = tmp;
+  // add clipping planes to actors according to the restored parameters
+  // and update the clipping plane map
+  TPlaneInfoMap::const_iterator anIter1 = aPlaneInfoMap.begin();
+  for( ; anIter1 != aPlaneInfoMap.end(); anIter1++ ) {
+    int aViewId = anIter1->first;
+    const TPlaneInfoList& aPlaneInfoList = anIter1->second;
+
+    TPlaneDataMap::const_iterator anIter2 = aPlaneDataMap.find( aViewId );
+    if( anIter2 == aPlaneDataMap.end() )
+      continue;
+    const TPlaneDataList& aPlaneDataList = anIter2->second;
+
+    TPlaneInfoList::const_iterator anIter3 = aPlaneInfoList.begin();
+    for( ; anIter3 != aPlaneInfoList.end(); anIter3++ ) {
+      const TPlaneInfo& aPlaneInfo = *anIter3;
+      int aPlaneId = aPlaneInfo.PlaneId;
+      const TActorList& anActorList = aPlaneInfo.ActorList;
+      SUIT_ViewManager* aViewManager = aPlaneInfo.ViewManager;
+      if( !aViewManager )
+        continue;
+
+      SVTK_ViewWindow* aViewWindow = dynamic_cast<SVTK_ViewWindow*>( aViewManager->getActiveView() );
+      if( !aViewWindow )
+        continue;
+
+      SMESHGUI_ClippingPlaneInfoList& aClippingPlaneInfoList = myClippingPlaneInfoMap[ aViewManager ];
+
+      TPlaneDataList::const_iterator anIter4 = aPlaneDataList.begin();
+      for( ; anIter4 != aPlaneDataList.end(); anIter4++ ) {
+        const TPlaneData& aPlaneData = *anIter4;
+        if( aPlaneData.Id == aPlaneId ) {
+          SMESH::OrientedPlane* aPlane =
+            SMESHGUI_ClippingDlg::AddPlane( anActorList,
+                                            aViewWindow,
+                                            (SMESH::Orientation)aPlaneData.Orientation,
+                                            aPlaneData.Distance,
+                                            aPlaneData.Angle );
+          if( aPlane ) {
+            SMESH::ClippingPlaneInfo aClippingPlaneInfo;
+            aClippingPlaneInfo.Plane = aPlane;
+            aClippingPlaneInfo.ActorList = anActorList;
+            aClippingPlaneInfoList.push_back( aClippingPlaneInfo );
+          }
+          break;
+        }
       }
     }
-    SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-    aMeshEditor->AddFace(anArrayOfIdeces);
   }
-  if ( myAutomaticUpdate ) {
-    SMESH_Actor* Mesh = smeshGUI->ReadScript(aMesh);
-    if ( Mesh != NULL ) {
-      smeshGUI->DisplayActor( Mesh );
-      smeshGUI->DisplayEdges( Mesh );
-      smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-      AddActorInSelection( Mesh );
+
+  // update all VTK views
+  QList<SUIT_ViewManager*> lst;
+  getApp()->viewManagers(lst);
+  for (QList<SUIT_ViewManager*>::Iterator it = lst.begin(); it != lst.end(); it++) {
+    SUIT_ViewModel* vmodel = (*it)->getViewModel();
+    if (vmodel && vmodel->getType() == SVTK_Viewer::Type()) {
+      SVTK_ViewWindow* vtkView = (SVTK_ViewWindow*) (*it)->getActiveView();
+      vtkView->getRenderer()->ResetCameraClippingRange();
+      vtkView->Repaint();
     }
   }
-  QApplication::restoreOverrideCursor();
 }
 
-
-//=============================================================================
 /*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddVolume( SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex )
-{  
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    SMESH::long_array_var anArrayOfIdeces = new  SMESH::long_array;
-    anArrayOfIdeces->length(MapIndex.Extent());
-    
-    int i = 0;
-    for ( ; ite.More(); ite.Next() ) {
-      anArrayOfIdeces[i] = ac->GetIdSMESHDSNode(ite.Key());
-      i++;
-    }
+  \brief Adds preferences for dfont of VTK viewer
+  \param label label
+  \param pIf group identifier
+  \param param parameter
+  \return identifier of preferences
+*/
+int SMESHGUI::addVtkFontPref( const QString& label, const int pId, const QString& param, const bool needSize )
+{
+  int tfont = addPreference( label, pId, LightApp_Preferences::Font, "SMESH", param );
 
-    SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-    aMeshEditor->AddVolume(anArrayOfIdeces);
-  }
-  if ( myAutomaticUpdate ) {
-    SMESH_Actor* Mesh = smeshGUI->ReadScript(aMesh);
-    if ( Mesh != NULL ) {
-      smeshGUI->DisplayActor( Mesh );
-      smeshGUI->DisplayEdges( Mesh );
-      smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-      AddActorInSelection( Mesh );
-    }
-  }
-  QApplication::restoreOverrideCursor();
+  setPreferenceProperty( tfont, "mode", QtxFontEdit::Custom );
+
+  QStringList fam;
+  fam.append( tr( "SMESH_FONT_ARIAL" ) );
+  fam.append( tr( "SMESH_FONT_COURIER" ) );
+  fam.append( tr( "SMESH_FONT_TIMES" ) );
+
+  setPreferenceProperty( tfont, "fonts", fam );
+
+  int f = QtxFontEdit::Family | QtxFontEdit::Bold | QtxFontEdit::Italic | QtxFontEdit::Shadow;
+  if ( needSize ) f = f | QtxFontEdit::Size;
+  setPreferenceProperty( tfont, "features", f );
+
+  return tfont;
+}
+
+/*!
+  \brief Actions after hypothesis edition
+  Updates object browser after hypothesis edition
+*/
+void SMESHGUI::onHypothesisEdit( int result )
+{
+  if( result == 1 )
+    SMESHGUI::Modified();
+  updateObjBrowser( true );
 }
 
 
-//=============================================================================
 /*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddEdge( SMESH::SMESH_Mesh_ptr aMesh, const TColStd_MapOfInteger& MapIndex )
-{  
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    SMESH::long_array_var anArrayOfIdeces = new  SMESH::long_array;
-    anArrayOfIdeces->length(MapIndex.Extent());
-    
-    int i = 0;
-    for ( ; ite.More(); ite.Next() ) {
-      anArrayOfIdeces[i] = ac->GetIdSMESHDSNode(ite.Key());
-      i++;
-    }
+  \brief Signal handler closing(SUIT_ViewWindow*) of a view
+  \param pview view being closed
+*/
+void SMESHGUI::onViewClosed( SUIT_ViewWindow* pview ) {
+#ifndef DISABLE_PLOT2DVIEWER
+  //Crear all Plot2d Viewers if need.
+  SMESH::ClearPlot2Viewers(pview);
+#endif
+}
 
-    SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-    aMeshEditor->AddEdge(anArrayOfIdeces);
-  }
-  if ( myAutomaticUpdate ) {
-    SMESH_Actor* Mesh = smeshGUI->ReadScript(aMesh);
-    if ( Mesh != NULL ) {
-      smeshGUI->DisplayActor( Mesh );
-      smeshGUI->DisplayEdges( Mesh );
-      smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-      AddActorInSelection( Mesh );
+void SMESHGUI::message( const QString& msg )
+{
+  // dispatch message
+  QStringList data = msg.split("/");
+  if ( data.count() > 0 ) {
+    if ( data.first() == "mesh_loading" ) {
+      // get mesh entry
+      QString entry = data.count() > 1 ? data[1] : QString();
+      if ( entry.isEmpty() )
+        return;
+      // get study
+      _PTR(Study) study = dynamic_cast<SalomeApp_Study*>( application()->activeStudy() )->studyDS();
+      // get mesh name
+      _PTR(SObject) obj = study->FindObjectID( entry.toLatin1().constData() );
+      QString name;
+      if ( obj )
+        name = obj->GetName().c_str();
+      if ( name.isEmpty() )
+        return;
+      
+      if ( data.last() == "stop" )
+        application()->putInfo( tr( "MESH_LOADING_MSG_FINISHED" ).arg( name ) );
+      else
+        application()->putInfo( tr( "MESH_LOADING_MSG" ).arg( name ) );
+      QApplication::processEvents();
     }
   }
-  QApplication::restoreOverrideCursor();
 }
 
-//=============================================================================
 /*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddNode( SMESH::SMESH_Mesh_ptr aMesh, float x, float y, float z)
-{  
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  Standard_Boolean result;
-  SMESH_Actor* ac = FindActor( aMesh, result, true );
-  if ( result ) {
-    SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-    aMeshEditor->AddNode(x,y,z);
-  
-    if ( myAutomaticUpdate ) {
-      SMESH_Actor* Mesh = smeshGUI->ReadScript(aMesh);
-      if ( Mesh != NULL ) {
-       smeshGUI->DisplayActor( Mesh );
-       smeshGUI->DisplayEdges( Mesh );
-       smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-       AddActorInSelection( Mesh );
-      }
-    }
+  \brief Connects or disconnects signals about activating and cloning view on the module slots
+  \param pview view which is connected/disconnected
+*/
+void SMESHGUI::connectView( const SUIT_ViewWindow* pview ) {
+  if(!pview)
+    return;
+
+  SUIT_ViewManager* viewMgr = pview->getViewManager();
+  if ( viewMgr ) {
+    disconnect( viewMgr, SIGNAL( deleteView( SUIT_ViewWindow* ) ),
+                this, SLOT( onViewClosed( SUIT_ViewWindow* ) ) );
+
+    connect( viewMgr, SIGNAL( deleteView( SUIT_ViewWindow* ) ),
+             this, SLOT( onViewClosed( SUIT_ViewWindow* ) ) );
   }
-  QApplication::restoreOverrideCursor();
 }
 
-//=============================================================================
 /*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplayEdgesConnectivityLegendBox(vtkActor *ac)
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+  \brief Return \c true if object can be renamed
+*/
+bool SMESHGUI::renameAllowed( const QString& entry) const {
+  SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( application() );
+  if( !anApp )
+    return false;
 
-  EraseSimulationActors();
-  mySimulationActors2D = vtkActor2DCollection::New();
-
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-
-  vtkGlyphSource2D *gs2 = vtkGlyphSource2D::New();
-  gs2->SetGlyphTypeToTriangle();
-  gs2->FilledOff();
-
-  vtkLegendBoxActor *legend = vtkLegendBoxActor::New();
-  legend->GetPositionCoordinate()->SetValue(0.025, 0.025, 0.);
-  legend->GetPosition2Coordinate()->SetValue(0.3, 0.3, 0.); //relative to Position
-
-  legend->SetNumberOfEntries(4);
-  legend->SetEntryString( 0, tr( "SMESH_BOUNDARYEDGES" ) );
-  legend->SetEntrySymbol( 0, gs2->GetOutput() );
-  legend->SetEntryColor(0, ac->GetMapper()->GetLookupTable()->GetColor(0.) );
-  legend->SetEntryString( 1,  tr( "SMESH_MANIFOLDEDGES" ) );
-  legend->SetEntrySymbol( 1, gs2->GetOutput() );
-  legend->SetEntryColor(1, ac->GetMapper()->GetLookupTable()->GetColor(0.666667) );
-  legend->SetEntryString( 2, tr( "SMESH_NONMANIFOLDEDGES" ) );
-  legend->SetEntrySymbol( 2, gs2->GetOutput() );
-  legend->SetEntryColor(2, ac->GetMapper()->GetLookupTable()->GetColor(0.222222) );
-  legend->SetEntryString( 3, tr( "SMESH_FEATUREEDGES" ) );
-  legend->SetEntrySymbol( 3, gs2->GetOutput() );
-  legend->SetEntryColor(3, ac->GetMapper()->GetLookupTable()->GetColor(0.444444) );
-  legend->SetPadding( 5 );
-  //  legend->GetProperty()->SetColor();
-
-  mySimulationActors2D->AddItem( legend );
-  theRenderer->AddActor2D( legend );
-
-  // Update the view
-  myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame()->Repaint();
-}
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() );
+  if( !appStudy )
+    return false;
 
-//===============================================================================
-// function : OnEditDelete()
-// purpose  :
-//===============================================================================
-void SMESHGUI::OnEditDelete()
-{
-  if ( QAD_MessageBox::warn2
-       ( QAD_Application::getDesktop(),
-        tr ("SMESH_WRN_WARNING"),
-        tr ("SMESH_REALLY_DELETE"),
-        tr ("SMESH_BUT_YES"), tr ("SMESH_BUT_NO"), 1, 0, 0 ) != 1 )
-    return;
+  SalomeApp_DataObject* obj = dynamic_cast<SalomeApp_DataObject*>(appStudy->findObjectByEntry(entry));
   
-  int nbSf = myActiveStudy->getStudyFramesCount();
+  if(!obj)
+    return false;
+
+  if(appStudy->isComponent(entry) || obj->isReference())
+    return false;
+
+  // check type to prevent renaming of inappropriate objects
+  int aType = SMESHGUI_Selection::type(qPrintable(entry), SMESH::GetActiveStudyDocument());
+  if (aType == SMESH::MESH || aType == SMESH::GROUP ||
+      aType == SMESH::SUBMESH || aType == SMESH::SUBMESH_COMPOUND ||
+      aType == SMESH::SUBMESH_SOLID || aType == SMESH::SUBMESH_FACE ||
+      aType == SMESH::SUBMESH_EDGE || aType == SMESH::SUBMESH_VERTEX ||
+      aType == SMESH::HYPOTHESIS || aType == SMESH::ALGORITHM)
+    return true;
+
+  return false;
+}
+
+/*!
+  Rename object by entry.
+  \param entry entry of the object
+  \param name new name of the object
+  \brief Return \c true if rename operation finished successfully, \c false otherwise.
+*/
+bool SMESHGUI::renameObject( const QString& entry, const QString& name) {
+
+  SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( application() );
+  if( !anApp )
+    return false;
     
-  Standard_Boolean found;
-  SALOMEDS::Study_var aStudy = myActiveStudy->getStudyDocument();
-  SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
-  SALOMEDS::GenericAttribute_var anAttr;
-  SALOMEDS::AttributeIOR_var     anIOR;
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() );
+
+  if(!appStudy)
+    return false;
   
-  SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
-  SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-  for(;It.More();It.Next()) {
-    Handle(SALOME_InteractiveObject) IObject = It.Value();
-    if ( IObject->hasEntry() ) {
-      SALOMEDS::SObject_var SO = myStudy->FindObjectID( IObject->getEntry() );
-      
-      /* Erase child graphical objects */
-      SALOMEDS::ChildIterator_var it = aStudy->NewChildIterator(SO);
-      for (; it->More();it->Next()) {
-       SALOMEDS::SObject_var CSO= it->Value();
-       if (CSO->FindAttribute(anAttr, "AttributeIOR") ) {
-          anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-
-         for ( int i = 0; i < nbSf; i++ ) {
-           QAD_StudyFrame* sf = myActiveStudy->getStudyFrame(i);
-           if ( sf->getTypeView() == VIEW_VTK ) {
-             vtkRenderer* Renderer = ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-             SMESH_Actor* ac = smeshGUI->FindActorByEntry( CSO->GetID(), found, false );
-             if ( found ) {
-               Renderer->RemoveActor(ac->EdgeDevice);
-               Renderer->RemoveActor(ac->EdgeShrinkDevice);
-               Renderer->RemoveActor(ac);
-             }
-           }
-         }
-       }
-      }
-      
-      /* Erase main graphical object */
-      for ( int i = 0; i < nbSf; i++ ) {
-       QAD_StudyFrame* sf = myActiveStudy->getStudyFrame(i);
-       if ( sf->getTypeView() == VIEW_VTK ) {
-         vtkRenderer* Renderer = ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-         VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)sf->getRightFrame()->getViewFrame())->getRWInteractor();
-         SMESH_Actor* ac = smeshGUI->FindActorByEntry( IObject->getEntry(), found, false );
-         if (found) {
-           Renderer->RemoveActor(ac->EdgeDevice);
-           Renderer->RemoveActor(ac->EdgeShrinkDevice);
-         }
-         myRenderInter->Remove( IObject );
-       }
-      }
-      
-      /* Erase objects in Study */
-      SALOMEDS::SObject_var obj = myStudy->FindObjectID( IObject->getEntry() );
-      if ( !obj->_is_nil() ) {
-       QAD_Operation* op = new SALOMEGUI_ImportOperation( myActiveStudy );
-       op->start();
-       aStudyBuilder->RemoveObject(obj);
-       op->finish();
-      }
+  _PTR(Study) aStudy = appStudy->studyDS();
+  
+  if(!aStudy)
+    return false;
+  
+  bool aLocked = (_PTR(AttributeStudyProperties)(appStudy->studyDS()->GetProperties()))->IsLocked();
+  if ( aLocked ) {
+    SUIT_MessageBox::warning ( anApp->desktop(), QObject::tr("WRN_WARNING"), QObject::tr("WRN_STUDY_LOCKED") );
+    return false;
+  }
 
-    } /* IObject->hasEntry() */
-  }   /* more/next           */
 
-  /* Clear any previous selection */
-  Sel->ClearIObjects() ; 
-  myActiveStudy->updateObjBrowser();
+  _PTR(SObject) obj = aStudy->FindObjectID( qPrintable(entry) );
+  _PTR(GenericAttribute) anAttr;
+  _PTR(AttributeName) aName;
+  if ( obj ) {
+    if ( obj->FindAttribute(anAttr, "AttributeName") ) {
+      aName = anAttr;
+      // check type to prevent renaming of inappropriate objects
+      int aType = SMESHGUI_Selection::type( qPrintable(entry), SMESH::GetActiveStudyDocument() );
+      if (aType == SMESH::MESH || aType == SMESH::GROUP ||
+          aType == SMESH::SUBMESH || aType == SMESH::SUBMESH_COMPOUND ||
+          aType == SMESH::SUBMESH_SOLID || aType == SMESH::SUBMESH_FACE ||
+          aType == SMESH::SUBMESH_EDGE || aType == SMESH::SUBMESH_VERTEX ||
+          aType == SMESH::HYPOTHESIS || aType == SMESH::ALGORITHM) {
+        if ( !name.isEmpty() ) {
+          SMESHGUI::GetSMESHGen()->SetName(obj->GetIOR().c_str(), qPrintable(name) );
+
+          // update name of group object and its actor
+          Handle(SALOME_InteractiveObject) IObject =
+            new SALOME_InteractiveObject ( qPrintable(entry), "SMESH", qPrintable(name) );
+
+          SMESH::SMESH_GroupBase_var aGroupObject = SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(IObject);
+          if( !aGroupObject->_is_nil() ) {
+            aGroupObject->SetName( qPrintable(name) );
+            if ( SMESH_Actor *anActor = SMESH::FindActorByEntry( qPrintable(entry) ) )
+              anActor->setName( qPrintable(name) );
+          }
+          return true;
+        }
+      }
+    }
+  }
+  return false;
 }