PR: display submeshes and groups

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

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 4d94be4c84f429ea20aa10f5a1af09b54a8ece4a..53d8b7373a459d3b5c0c8d6e285f562368ab04b3 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -1,535 +1,1117 @@
-//  SMESH SMESHGUI : GUI for SMESH component
+//  Copyright (C) 2007-2008  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

 //
 //

-//  File   : SMESHGUI.cxx
-//  Author : Nicolas REJNERI
-//  Module : SMESH
-//  $Header$
+//  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
+//
+// SMESH SMESHGUI : GUI for SMESH component
+// File   : SMESHGUI.cxx
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
+// SMESH includes

 
 #include "SMESHGUI.h"
 
 #include "SMESHGUI.h"

-#include "SMESHGUI_AddHypothesisDlg.h"
-#include "SMESHGUI_AddAlgorithmDlg.h"
-#include "SMESHGUI_InitMeshDlg.h"
-#include "SMESHGUI_AddSubMeshDlg.h"

 #include "SMESHGUI_NodesDlg.h"
 #include "SMESHGUI_TransparencyDlg.h"
 #include "SMESHGUI_NodesDlg.h"
 #include "SMESHGUI_TransparencyDlg.h"

+#include "SMESHGUI_ClippingDlg.h"

 #include "SMESHGUI_GroupDlg.h"
 #include "SMESHGUI_RemoveNodesDlg.h"
 #include "SMESHGUI_RemoveElementsDlg.h"
 #include "SMESHGUI_MeshInfosDlg.h"
 #include "SMESHGUI_GroupDlg.h"
 #include "SMESHGUI_RemoveNodesDlg.h"
 #include "SMESHGUI_RemoveElementsDlg.h"
 #include "SMESHGUI_MeshInfosDlg.h"

+#include "SMESHGUI_StandardMeshInfosDlg.h"
+#include "SMESHGUI_WhatIsDlg.h"

 #include "SMESHGUI_Preferences_ColorDlg.h"
 #include "SMESHGUI_Preferences_ScalarBarDlg.h"
 #include "SMESHGUI_Preferences_ColorDlg.h"
 #include "SMESHGUI_Preferences_ScalarBarDlg.h"

-#include "SMESHGUI_Preferences_SelectionDlg.h"
-#include "SMESHGUI_aParameterDlg.h"
-#include "SMESHGUI_ComputeScalarValue.h"
+#include "SMESHGUI_Hypotheses.h"

 #include "SMESHGUI_MoveNodesDlg.h"
 #include "SMESHGUI_MoveNodesDlg.h"

-#include "SMESHGUI_OrientationElementsDlg.h"
-#include "SMESHGUI_DiagonalInversionDlg.h"
-#include "SMESHGUI_AddFaceDlg.h"
-#include "SMESHGUI_AddEdgeDlg.h"
-#include "SMESHGUI_AddVolumeDlg.h"
-#include "SMESHGUI_EditHypothesesDlg.h"
-#include "SMESHGUI_CreateHypothesesDlg.h"
+#include "SMESHGUI_AddMeshElementDlg.h"
+#include "SMESHGUI_AddQuadraticElementDlg.h"

 #include "SMESHGUI_FilterDlg.h"
 #include "SMESHGUI_FilterDlg.h"

-#include "SMESHGUI_XmlHandler.h"
-
-#include "SMESH_Actor.h"
-#include "SMESH_Object.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 "QAD_Desktop.h"
-#include "QAD_ResourceMgr.h"
-#include "QAD_WaitCursor.h"
-
-#include "OCCViewer_ViewPort.h"
-#include "OCCViewer_ViewPort3d.h"
-#include "OCCViewer_Viewer3d.h"
-
-#include "GEOM_InteractiveObject.hxx"
-
-#include "SALOME_NamingService.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SALOME_InteractiveObject.hxx"
-
-#include "SALOMEGUI_Desktop.h"
-#include "SALOMEGUI_NameDlg.h"
-#include "SALOMEGUI_ImportOperation.h"
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
-
-#include "utilities.h"
-#include <dlfcn.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 <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 "VTKViewer_InteractorStyleSALOME.h"
+#include "SMESHGUI_FilterLibraryDlg.h"
+#include "SMESHGUI_SingleEditDlg.h"
+#include "SMESHGUI_MultiEditDlg.h"
+#include "SMESHGUI_GroupOpDlg.h"
+#include "SMESHGUI_GroupOnShapeDlg.h"
+#include "SMESHGUI_DeleteGroupDlg.h"
+#include "SMESHGUI_SmoothingDlg.h"
+#include "SMESHGUI_RenumberingDlg.h"
+#include "SMESHGUI_ExtrusionDlg.h"
+#include "SMESHGUI_ExtrusionAlongPathDlg.h"
+#include "SMESHGUI_RevolutionDlg.h"
+#include "SMESHGUI_TranslationDlg.h"
+#include "SMESHGUI_RotationDlg.h"
+#include "SMESHGUI_SymmetryDlg.h"
+#include "SMESHGUI_SewingDlg.h"
+#include "SMESHGUI_EditMeshDlg.h"
+#include "SMESHGUI_MeshPatternDlg.h"
+#include "SMESHGUI_Selection.h"
+#include "SMESHGUI_CreatePolyhedralVolumeDlg.h"
+#include "SMESHGUI_ConvToQuadOp.h"
+#include "SMESHGUI_MeshOp.h"
+#include "SMESHGUI_Displayer.h"
+#include "SMESHGUI_MakeNodeAtPointDlg.h"
+#include "SMESHGUI_BuildCompoundDlg.h"
+#include "SMESHGUI_ComputeDlg.h"
+#include "SMESHGUI_FileInfoDlg.h"
+#include "SMESHGUI_Make2DFrom3DOp.h"
+
+#include "SMESHGUI_Utils.h"
+#include "SMESHGUI_MeshUtils.h"
+#include "SMESHGUI_GroupUtils.h"
+#include "SMESHGUI_FilterUtils.h"
+#include "SMESHGUI_PatternUtils.h"
+#include "SMESHGUI_VTKUtils.h"
+#include "SMESHGUI_HypothesesUtils.h"
+
+#include <SMESH_Client.hxx>
+#include <SMESH_Actor.h>
+#include <SMESH_TypeFilter.hxx>
+
+// SALOME GUI includes
+#include <SalomeApp_Tools.h>
+#include <SalomeApp_Study.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_CheckFileDlg.h>
+
+#include <LightApp_DataOwner.h>
+#include <LightApp_Preferences.h>
+#include <LightApp_SelectionMgr.h>
+#include <LightApp_UpdateFlags.h>
+#include <LightApp_NameDlg.h>
+
+#include <SVTK_ViewWindow.h>
+#include <SVTK_ViewModel.h>
+#include <SVTK_ViewManager.h>
+
+#include <VTKViewer_Algorithm.h>
+
+#include <SUIT_MessageBox.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_FileDlg.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_OverrideCursor.h>
+#include <SUIT_Session.h>
+
+#include <QtxPopupMgr.h>
+#include <QtxFontEdit.h>
+
+#include <SALOME_ListIO.hxx>
+#include <SALOME_ListIteratorOfListIO.hxx>
+
+// IDL includes
+#include <SALOMEconfig.h>
+#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
+#include CORBA_CLIENT_HEADER(SMESH_MeshEditor)
+
+// Qt includes
+// #define       INCLUDE_MENUITEM_DEF // VSR commented ????????
+#include <QMenu>
+
+// BOOST includes
+#include <boost/shared_ptr.hpp>

 
 

+// VTK includes

 #include <vtkScalarBarActor.h>
 #include <vtkScalarBarActor.h>

-#include <vtkLegendBoxActor.h>
-#include <vtkFeatureEdges.h>
-#include <vtkDoubleArray.h>
-#include <vtkTextProperty.h>
+#include <vtkCamera.h>
+#include <vtkRenderer.h>
+#include <vtkPlane.h>

 
 

-// Open CASCADE Includes
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
+// SALOME KERNEL includes
+#include <SALOMEDS_Study.hxx>
+#include <SALOMEDSClient_StudyBuilder.hxx>
+#include <SALOMEDSClient_SComponent.hxx>
+#include <SALOMEDSClient_ClientFactory.hxx>
+#include <SALOMEDSClient_IParameters.hxx>

 
 

-#include <boost/shared_ptr.hpp>
+// OCCT includes
+#include <Standard_ErrorHandler.hxx>
+#include <NCollection_DataMap.hxx>

 
 

-static SMESHGUI *smeshGUI = 0;
-static CORBA::ORB_var _orb;
-
-using namespace std;
-
-typedef pair<int,string> TKeyOfVisualObj;
-typedef boost::shared_ptr<SMESH_VisualObj> TVisualObjPtr;
-typedef map<TKeyOfVisualObj,TVisualObjPtr> TVisualObjCont;
-static TVisualObjCont VISUALOBJCONT;
-
-
-TVisualObjPtr GetVisualObj(int theStudyId, const char* theEntry){
-  TVisualObjPtr aVisualObj;
-  try{
-    TVisualObjCont::key_type aKey(theStudyId,theEntry);
-    TVisualObjCont::iterator anIter = VISUALOBJCONT.find(aKey);
-    if(anIter != VISUALOBJCONT.end()){
-      aVisualObj = anIter->second;
-    }else{
-      SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
-      SALOMEDS::SObject_var aSObj = aStudy->FindObjectID(theEntry);
-      if(!CORBA::is_nil(aSObj)){
-       SALOMEDS::GenericAttribute_var anAttr;
-       if(aSObj->FindAttribute(anAttr,"AttributeIOR")){
-         SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-         CORBA::String_var aVal = anIOR->Value();
-         CORBA::Object_var anObj =_orb->string_to_object(aVal.in());
-         if(!CORBA::is_nil(anObj)){
-           //Try narrow to SMESH_Mesh interafce
-           SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(anObj);
-           if(!aMesh->_is_nil()){
-             aVisualObj.reset(new SMESH_MeshObj(aMesh));
-             aVisualObj->Update();
-             TVisualObjCont::value_type aValue(aKey,aVisualObj); 
-             VISUALOBJCONT.insert(aValue);
-             return aVisualObj;
-           }
-           //Try narrow to SMESH_Group interafce
-           SMESH::SMESH_Group_var aGroup = SMESH::SMESH_Group::_narrow(anObj);
-           if(!aGroup->_is_nil()){
-             SALOMEDS::SObject_var aFatherSObj = aSObj->GetFather();
-             if(aFatherSObj->_is_nil()) return aVisualObj;
-             aFatherSObj = aFatherSObj->GetFather();
-             if(aFatherSObj->_is_nil()) return aVisualObj;
-             CORBA::String_var anEntry = aFatherSObj->GetID();
-             TVisualObjPtr aVisObj = GetVisualObj(theStudyId,anEntry.in());
-             if(SMESH_MeshObj* aMeshObj = dynamic_cast<SMESH_MeshObj*>(aVisObj.get())){
-               aVisualObj.reset(new SMESH_GroupObj(aGroup,aMeshObj));
-               aVisualObj->Update();
-               TVisualObjCont::value_type aValue(aKey,aVisualObj); 
-               VISUALOBJCONT.insert(aValue);
-               return aVisualObj;
-             }
-           }
-           //Try narrow to SMESH_subMesh interafce
-           SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(anObj);
-           if(!aSubMesh->_is_nil()){
-             SALOMEDS::SObject_var aFatherSObj = aSObj->GetFather();
-             if(aFatherSObj->_is_nil()) return aVisualObj;
-             aFatherSObj = aFatherSObj->GetFather();
-             if(aFatherSObj->_is_nil()) return aVisualObj;
-             CORBA::String_var anEntry = aFatherSObj->GetID();
-             TVisualObjPtr aVisObj = GetVisualObj(theStudyId,anEntry.in());
-             if(SMESH_MeshObj* aMeshObj = dynamic_cast<SMESH_MeshObj*>(aVisObj.get())){
-               aVisualObj.reset(new SMESH_subMeshObj(aSubMesh,aMeshObj));
-               aVisualObj->Update();
-               TVisualObjCont::value_type aValue(aKey,aVisualObj); 
-               VISUALOBJCONT.insert(aValue);
-               return aVisualObj;
-             }
-           }
-         }
-       }
-      }
+//namespace{
+  // Declarations
+  //=============================================================
+  void ImportMeshesFromFile(SMESH::SMESH_Gen_ptr theComponentMesh,
+                            int theCommandID);
+
+  void ExportMeshToFile(int theCommandID);
+
+  void SetDisplayMode(int theCommandID);
+
+  void SetDisplayEntity(int theCommandID);
+
+  void Control( int theCommandID );
+
+
+  // Definitions
+  //=============================================================
+  void ImportMeshesFromFile( SMESH::SMESH_Gen_ptr theComponentMesh,
+                             int theCommandID )
+  {
+    QStringList filter;
+    std::string myExtension;
+
+    if ( theCommandID == 113 ) {
+      filter.append( QObject::tr( "MED files (*.med)" ) );
+      filter.append( QObject::tr( "All files (*)" ) );

     }
     }

-  }catch(...){
-    INFOS("GetMeshObj - There is no SMESH_Mesh object for the SALOMEDS::Strudy and Entry!!!");
-  }
-  return aVisualObj;
-}
+    else if ( theCommandID == 112 ) {
+      filter.append( QObject::tr( "IDEAS files (*.unv)" ) );
+    }
+    else if ( theCommandID == 111 ) {
+      filter.append( QObject::tr( "DAT files (*.dat)" ) );
+    }
+
+    QString anInitialPath = "";
+    if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+      anInitialPath = QDir::currentPath();
+
+    QStringList 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;
+      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;
+            }
+          }
+        }
+        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() );
+          }
+          else {
+            isEmpty = true;
+          }
+        }
+      }

 
 

-VTKViewer_ViewFrame* GetVtkViewFrame(QAD_StudyFrame* theStudyFrame){
-  QAD_ViewFrame* aViewFrame = theStudyFrame->getRightFrame()->getViewFrame();
-  return dynamic_cast<VTKViewer_ViewFrame*>(aViewFrame);
-}
+      // update Object browser
+      SMESHGUI::GetSMESHGUI()->updateObjBrowser();

 
 

-void UpdateSelectionProp() {
-  QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy();
-  QList<QAD_StudyFrame> aFrameList = aStudy->getStudyFrames();
-
-  QString SCr, SCg, SCb;
-  SCr = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorRed");
-  SCg = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorGreen");
-  SCb = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorBlue");
-  QColor aHiColor = Qt::white;
-  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-    aHiColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-
-  SCr = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorRed");
-  SCg = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorGreen");
-  SCb = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorBlue");
-  QColor aSelColor = Qt::yellow;
-  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-    aSelColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-  QString SW = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectWidth");
-  if (SW.isEmpty()) SW = "5";
-
-  SCr = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorRed");
-  SCg = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorGreen");
-  SCb = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorBlue");
-  QColor aPreColor = Qt::cyan;
-  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-    aPreColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-  QString PW = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectWidth");
-  if (PW.isEmpty()) PW = "5";
-
-  QString SP1 = QAD_CONFIG->getSetting("SMESH:SettingsNodeSelectTol");
-  if (SP1.isEmpty()) SP1 = "0.025";
-  QString SP2 = QAD_CONFIG->getSetting("SMESH:SettingsElementsSelectTol");
-  if (SP2.isEmpty()) SP2 = "0.001";
-
-  for (QAD_StudyFrame* aStudyFrame = aFrameList.first(); aStudyFrame; aStudyFrame = aFrameList.next()) {
-    if (aStudyFrame->getTypeView() == VIEW_VTK) {
-      VTKViewer_ViewFrame* aVtkViewFrame = GetVtkViewFrame(aStudyFrame);
-      if (!aVtkViewFrame) continue;
-      // update VTK viewer properties
-      VTKViewer_RenderWindowInteractor* anInteractor = aVtkViewFrame->getRWInteractor();
-      if (anInteractor) {
-       // mesh element selection
-       anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255., 
-                                      aSelColor.blue()/255., SW.toInt());
-         
-       // tolerances
-       anInteractor->SetSelectionTolerance(SP1.toDouble(), SP2.toDouble());
-         
-       // pre-selection
-       VTKViewer_InteractorStyleSALOME* aStyle = anInteractor->GetInteractorStyleSALOME();
-       if (aStyle) {
-         aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255., 
-                                     aPreColor.blue()/255., PW.toInt());
-       }
+      // 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" ) );

       }
       }

-      // update actors
-      vtkRenderer* aRenderer = aVtkViewFrame->getRenderer();
-      vtkActorCollection *aCollection = aRenderer->GetActors();
-      aCollection->InitTraversal();
-      while(vtkActor *anAct = aCollection->GetNextActor()){
-       if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-         anActor->SetHighlightColor(aHiColor.red()/255., aHiColor.green()/255., 
-                                    aHiColor.blue()/255.);
-         anActor->SetPreHighlightColor(aPreColor.red()/255., aPreColor.green()/255., 
-                                       aPreColor.blue()/255.);
-       }
+
+      // 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" ) );

       }
     }
   }
       }
     }
   }

-}

 
 

-VTKViewer_ViewFrame* GetCurrentVtkView(){
-  QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy();
-  QAD_StudyFrame *aStudyFrame = aStudy->getActiveStudyFrame();
-  return GetVtkViewFrame(aStudyFrame);
-}
+  void ExportMeshToFile( int theCommandID )
+  {
+    LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+    SALOME_ListIO selected;
+    if( aSel )
+      aSel->selectedObjects( selected );
+
+    SMESH::SMESH_Mesh_var aMesh;
+    if(selected.Extent() == 1)
+      aMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(selected.First());
+    if ( aMesh->_is_nil() ) {
+      SUIT_MessageBox::warning( SMESHGUI::desktop(),
+                                QObject::tr( "SMESH_WRN_WARNING" ),
+                                QObject::tr( "SMESH_BAD_MESH_SELECTION" ));
+      return;
+    }

 
 

+    Handle(SALOME_InteractiveObject) anIObject = selected.First();
+    QString aFilter, aTitle = QObject::tr("Export mesh");
+    QMap<QString, SMESH::MED_VERSION> aFilterMap;
+    QMap<QString, int> aFilterMapSTL;
+    switch ( theCommandID ) {
+    case 125:
+    case 122:
+      {
+        if (aMesh->HasDuplicatedGroupNamesMED()) {
+          int aRet = SUIT_MessageBox::warning
+            (SMESHGUI::desktop(),
+             QObject::tr("SMESH_WRN_WARNING"),
+             QObject::tr("SMESH_EXPORT_MED_DUPLICATED_GRP").arg(anIObject->getName()),
+             SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
+          if (aRet != SUIT_MessageBox::Yes)
+            return;
+        }
+        // PAL18696
+        QString v21 (aMesh->GetVersionString(SMESH::MED_V2_1, 2));
+        QString v22 (aMesh->GetVersionString(SMESH::MED_V2_2, 2));
+        aFilterMap.insert( QString("MED ") +  v21 + " (*.med)", SMESH::MED_V2_1 );
+        aFilterMap.insert( QString("MED ") +  v22 + " (*.med)", SMESH::MED_V2_2 );
+      }
+      break;
+    case 124:
+    case 121:
+      aFilter = QObject::tr("DAT files (*.dat)");
+      break;
+    case 126:
+    case 123:
+      {
+        if (aMesh->NbPyramids()) {
+          int aRet = SUIT_MessageBox::warning
+            (SMESHGUI::desktop(),
+             QObject::tr("SMESH_WRN_WARNING"),
+             QObject::tr("SMESH_EXPORT_UNV").arg(anIObject->getName()),
+             SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
+          if (aRet != SUIT_MessageBox::Yes)
+            return;
+        }
+        aFilter = QObject::tr("IDEAS files (*.unv)");
+      }
+      break;
+    case 140:
+    case 141:
+      {
+        // export STL
+        /*
+          there must be check on others mesh elements not equal triangles
+        */
+        if (aMesh->NbTriangles() < 1) {
+          SUIT_MessageBox::warning
+            (SMESHGUI::desktop(),
+             QObject::tr("SMESH_WRN_WARNING"),
+             QObject::tr("SMESH_EXPORT_STL1").arg(anIObject->getName()));
+          return;
+        }
+        if (!(aMesh->NbElements() - aMesh->NbTriangles())) {
+          int aRet = SUIT_MessageBox::warning
+            (SMESHGUI::desktop(),
+             QObject::tr("SMESH_WRN_WARNING"),
+             QObject::tr("SMESH_EXPORT_STL2").arg(anIObject->getName()),
+             SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
+          if (aRet != SUIT_MessageBox::Yes)
+            return;
+        }

 
 

-SMESH_Actor* FindActorByEntry(QAD_StudyFrame *theStudyFrame, 
-                             const char* theEntry)
-{
-  if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
-    vtkRenderer *aRenderer = aViewFrame->getRenderer();
-    vtkActorCollection *aCollection = aRenderer->GetActors();
-    aCollection->InitTraversal();
-    while(vtkActor *anAct = aCollection->GetNextActor()){
-      if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-       if(anActor->hasIO()){
-         Handle(SALOME_InteractiveObject) anIO = anActor->getIO();
-         if(anIO->hasEntry() && strcmp(anIO->getEntry(),theEntry) == 0){
-           return anActor;
-         }
-       }
+        aFilterMapSTL.insert( QObject::tr("STL ASCII  (*.stl)"), 1 ); // 1 - ASCII mode
+        aFilterMapSTL.insert( QObject::tr("STL Binary (*.stl)"), 0 ); // 0 - Binary mode

       }
       }

+      break;
+    default:
+      return;

     }
     }

-  }
-  return NULL;
-}

 
 

+    QString aFilename;
+    SMESH::MED_VERSION aFormat;
+    // Init the parameter with the default value
+    bool aIsASCII_STL = true;
+    bool toCreateGroups = false;
+    SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+    if ( resMgr )
+      toCreateGroups = resMgr->booleanValue( "SMESH", "auto_groups", false );
+
+    QString anInitialPath = "";
+    if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+      anInitialPath = QDir::currentPath();
+
+    if ( theCommandID != 122 && theCommandID != 125 && theCommandID != 140 && theCommandID != 141) {
+      if ( anInitialPath.isEmpty() ) anInitialPath = SUIT_FileDlg::getLastVisitedPath();
+      aFilename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(), anInitialPath + QString("/") + anIObject->getName(),
+                                            aFilter, aTitle, false);
+    }
+    else if(theCommandID == 140 || theCommandID == 141) { // Export to STL
+      QStringList filters;
+      QMap<QString, int>::const_iterator it = aFilterMapSTL.begin();
+      for ( ; it != aFilterMapSTL.end(); ++it )
+        filters.push_back( it.key() );
+
+      SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
+      fd->setWindowTitle( aTitle );
+      fd->setFilters( filters );
+      fd->selectFilter( QObject::tr("STL ASCII  (*.stl)") );
+      if ( !anInitialPath.isEmpty() )
+        fd->setDirectory( anInitialPath );
+      fd->selectFile(anIObject->getName());
+      bool is_ok = false;
+      while (!is_ok) {
+        if ( fd->exec() )
+          aFilename = fd->selectedFile();
+        aIsASCII_STL = (aFilterMapSTL[fd->selectedFilter()]) == 1 ? true: false;
+        is_ok = true;
+      }
+      delete fd;
+    }
+    else { // Export to MED
+      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();
+      }

 
 

-SMESH_Actor* FindActorByEntry(const char* theEntry){
-  QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy();
-  QAD_StudyFrame *aStudyFrame = aStudy->getActiveStudyFrame();
-  return FindActorByEntry(aStudyFrame,theEntry);
-}
+      //SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
+      SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg
+        ( SMESHGUI::desktop(), false, QObject::tr("SMESH_AUTO_GROUPS"), true, true );
+      fd->setWindowTitle( aTitle );
+      fd->setFilters( filters );
+      //fd->setSelectedFilter( QObject::tr("MED 2.2 (*.med)") );
+      fd->selectFilter(aDefaultFilter);
+      fd->SetChecked(toCreateGroups);
+      if ( !anInitialPath.isEmpty() )
+        fd->setDirectory( anInitialPath );
+      fd->selectFile(anIObject->getName());
+      bool is_ok = false;
+      while (!is_ok) {
+        if ( fd->exec() )
+          aFilename = fd->selectedFile();
+        aFormat = aFilterMap[fd->selectedFilter()];
+        is_ok = true;
+        if ( !aFilename.isEmpty()
+             && (aMesh->NbPolygons()>0 || aMesh->NbPolyhedrons()>0)
+             && aFormat==SMESH::MED_V2_1) {
+          int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                              QObject::tr("SMESH_WRN_WARNING"),
+                                              QObject::tr("SMESH_EXPORT_MED_V2_1").arg(anIObject->getName()),
+                                              SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
+          if (aRet != SUIT_MessageBox::Yes) {
+            is_ok = false;
+          }
+        }
+      }
+      toCreateGroups = fd->IsChecked();
+      delete fd;
+    }
+    if ( !aFilename.isEmpty() ) {
+      // Check whether the file already exists and delete it if yes
+      QFile aFile( aFilename );
+      if ( aFile.exists() )
+        aFile.remove();
+      SUIT_OverrideCursor wc;
+
+      try {
+        bool Renumber = false;
+        // PAL 14172  : Check of we have to renumber or not from the preferences before export
+        if (resMgr)
+          Renumber= resMgr->booleanValue("SMESH","renumbering");
+        if (Renumber){
+          SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
+          aMeshEditor->RenumberNodes();
+          aMeshEditor->RenumberElements();
+          if ( SMESHGUI::automaticUpdate() )
+            SMESH::UpdateView();
+        }
+        switch ( theCommandID ) {
+        case 125:
+        case 122:
+          aMesh->ExportToMED( aFilename.toLatin1().data(), toCreateGroups, aFormat );
+          break;
+        case 124:
+        case 121:
+          aMesh->ExportDAT( aFilename.toLatin1().data() );
+          break;
+        case 126:
+        case 123:
+          aMesh->ExportUNV( aFilename.toLatin1().data() );
+          break;
+        case 140:
+        case 141:
+          aMesh->ExportSTL( aFilename.toLatin1().data(), aIsASCII_STL );
+          break;
+        default:
+          break;
+        }
+      }
+      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();
+      }
+    }
+  }

 
 

+  inline void InverseEntityMode(unsigned int& theOutputMode,
+                                unsigned int theMode)
+  {
+    bool anIsNotPresent = ~theOutputMode & theMode;
+    if(anIsNotPresent)
+      theOutputMode |= theMode;
+    else
+      theOutputMode &= ~theMode;
+  }

 
 

-SMESH_Actor* CreateActor(SALOMEDS::Study_ptr theStudy,
-                        const char* theEntry,
-                        int theIsClear = false)
-{
-  SMESH_Actor *anActor = NULL;
-  CORBA::Long anId = theStudy->StudyId();
-  if(TVisualObjPtr aVisualObj = GetVisualObj(anId,theEntry)){
-    SALOMEDS::SObject_var aSObj = theStudy->FindObjectID(theEntry);
-    if(!aSObj->_is_nil()){
-      SALOMEDS::GenericAttribute_var anAttr;
-      if(aSObj->FindAttribute(anAttr,"AttributeName")){
-       SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
-       CORBA::String_var aVal = aName->Value();
-       string aNameVal = aVal.in();
-       SMESH::FilterManager_ptr aFilterMgr = smeshGUI->GetFilterMgr();
-       anActor = SMESH_Actor::New(aVisualObj,aFilterMgr,theEntry,aNameVal.c_str(),theIsClear);
+  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 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);
+          }
+        }

       }
     }
   }
       }
     }
   }

-  return anActor;
-}

 
 

+  void AutoColor(){
+    SALOME_ListIO selected;
+    SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+    if( !app )
+      return;

 
 

-void DisplayActor(QAD_StudyFrame *theStudyFrame, SMESH_Actor* theActor){
-  if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
-    aViewFrame->AddActor(theActor);
-    aViewFrame->Repaint();
-  }
-}
+    LightApp_SelectionMgr* aSel = app->selectionMgr();
+    SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
+    if( !aSel || !appStudy )
+      return;

 
 

+    aSel->selectedObjects( selected );
+    if( selected.IsEmpty() )
+      return;

 
 

-void RemoveActor(QAD_StudyFrame *theStudyFrame, SMESH_Actor* theActor){
-  if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
-    aViewFrame->RemoveActor(theActor);
-    aViewFrame->Repaint();
-  }
-}
+    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;

 
 

-void FitAll(){
-  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView()){
-    aViewFrame->onViewFitAll();
-    aViewFrame->Repaint();
-  }
-}
+    aMainObject->SetAutoColor( true );

 
 

-vtkRenderer* GetCurrentRenderer(){
-  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView())
-    return aViewFrame->getRenderer();
-  return NULL;
-}
+    QList<SALOMEDS::Color> aReservedColors;

 
 

-void RepaintCurrentView(){
-  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView())
-    aViewFrame->Repaint();
-}
+    SMESH::ListOfGroups aListOfGroups = *aMainObject->GetGroups();
+    for( int i = 0, n = aListOfGroups.length(); i < n; i++ )
+    {
+      SMESH::SMESH_GroupBase_var aGroupObject = aListOfGroups[i];
+      SALOMEDS::Color aCurrentColor = aGroupObject->GetColor();

 
 

+      SALOMEDS::Color aColor = SMESHGUI::getUniqueColor( aReservedColors );
+      aGroupObject->SetColor( aColor );
+      aReservedColors.append( aColor );

 
 

-enum EDisplaing {eDisplayAll, eDisplay, eDisplayOnly, eErase, eEraseAll};
-void UpdateView(QAD_StudyFrame *theStudyFrame, EDisplaing theAction,
-               const char* theEntry = "")
-{
-  if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
-    vtkRenderer *aRenderer = aViewFrame->getRenderer();
-    vtkActorCollection *aCollection = aRenderer->GetActors();
-    aCollection->InitTraversal();
-    switch(theAction){
-      case eDisplayAll: {
-       while(vtkActor *anAct = aCollection->GetNextActor()){
-         if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-           anActor->SetVisibility(true);
-         }
-       }
-       break;
-      }
-      case eDisplayOnly:
-      case eEraseAll: {
-       while(vtkActor *anAct = aCollection->GetNextActor()){
-         if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-           anActor->SetVisibility(false);
-         }
-       }
+      _PTR(SObject) aGroupSObject = SMESH::FindSObject(aGroupObject);
+      if(SMESH_Actor *anActor = SMESH::FindActorByEntry(aGroupSObject->GetID().c_str()))
+      {
+        if( aGroupObject->GetType() == SMESH::NODE )
+          anActor->SetNodeColor( aColor.R, aColor.G, aColor.B );
+        else if( aGroupObject->GetType() == SMESH::EDGE )
+          anActor->SetEdgeColor( aColor.R, aColor.G, aColor.B );
+        else
+          anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B );

       }
       }

-      default: {
-       if(SMESH_Actor *anActor = FindActorByEntry(theStudyFrame,theEntry)){
-         switch(theAction) {
-           case eDisplay:
-           case eDisplayOnly:
-             anActor->SetVisibility(true);
-             break;
-           case eErase:
-             anActor->SetVisibility(false);
-             break;
-           }
-       } else {
-         switch(theAction){
-           case eDisplay:
-           case eDisplayOnly:{
-             QAD_Study* aStudy = theStudyFrame->getStudy();
-             SALOMEDS::Study_var aDocument = aStudy->getStudyDocument();
-             if(anActor = CreateActor(aDocument,theEntry,true)) {
-               DisplayActor(theStudyFrame,anActor);
-               FitAll();
-             }
-             break;
-           }
-         }
-       }
+    }
+
+    SMESH::RepaintCurrentView();
+  }
+
+  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 );

       }
     }
   }
       }
     }
   }

-}

 
 

+  void SetDisplayMode(int theCommandID){
+    SALOME_ListIO selected;
+    SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+    if( !app )
+      return;

 
 

-void UpdateView(EDisplaing theAction, const char* theEntry = ""){
-  QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy();
-  QAD_StudyFrame *aStudyFrame = aStudy->getActiveStudyFrame();
-  UpdateView(aStudyFrame,theAction,theEntry);
-}
+    LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+    SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
+    if( !aSel || !appStudy )
+      return;

 
 

-static bool IsReferencedObject( SALOMEDS::SObject_ptr SO ) 
-{
-  if ( !SO->_is_nil() ) {
-    SALOMEDS::GenericAttribute_var anAttr;
-    if ( SO->FindAttribute( anAttr, "AttributeTarget" ) ) {
-      SALOMEDS::AttributeTarget_var aTarget = SALOMEDS::AttributeTarget::_narrow( anAttr );
-      SALOMEDS::Study::ListOfSObject_var aList = aTarget->Get();
-      if ( aList->length() > 0 ) {
-       return true;
+    _PTR(Study) aStudy = appStudy->studyDS();
+
+    aSel->selectedObjects( selected );
+
+    if(selected.Extent() >= 1){
+      switch(theCommandID){
+      case 1134:{
+        SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog();
+        (new SMESHGUI_ClippingDlg( SMESHGUI::GetSMESHGUI() ))->show();
+        return;
+      }
+      case 1133:{
+        SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog();
+        (new SMESHGUI_TransparencyDlg( SMESHGUI::GetSMESHGUI() ))->show();
+        return;
+      }}
+      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;
+            case 1132:{
+              vtkFloatingPointType color[3];
+              anActor->GetSufaceColor(color[0], color[1], color[2]);
+              int c0 = int (color[0] * 255);
+              int c1 = int (color[1] * 255);
+              int c2 = int (color[2] * 255);
+              QColor c(c0, c1, c2);
+
+              vtkFloatingPointType edgecolor[3];
+              anActor->GetEdgeColor(edgecolor[0], edgecolor[1], edgecolor[2]);
+              c0 = int (edgecolor[0] * 255);
+              c1 = int (edgecolor[1] * 255);
+              c2 = int (edgecolor[2] * 255);
+              QColor e(c0, c1, c2);
+
+              vtkFloatingPointType backfacecolor[3];
+              anActor->GetBackSufaceColor(backfacecolor[0], backfacecolor[1], backfacecolor[2]);
+              c0 = int (backfacecolor[0] * 255);
+              c1 = int (backfacecolor[1] * 255);
+              c2 = int (backfacecolor[2] * 255);
+              QColor b(c0, c1, c2);
+
+              vtkFloatingPointType nodecolor[3];
+              anActor->GetNodeColor(nodecolor[0], nodecolor[1], nodecolor[2]);
+              c0 = int (nodecolor[0] * 255);
+              c1 = int (nodecolor[1] * 255);
+              c2 = int (nodecolor[2] * 255);
+              QColor n(c0, c1, c2);
+
+              int Edgewidth = (int)anActor->GetLineWidth();
+              if(Edgewidth == 0)
+                Edgewidth = 1;
+              int intValue = int(anActor->GetNodeSize());
+              vtkFloatingPointType Shrink = anActor->GetShrinkFactor();
+
+              SMESHGUI_Preferences_ColorDlg *aDlg =
+                new SMESHGUI_Preferences_ColorDlg( SMESHGUI::GetSMESHGUI() );
+              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()){
+                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 */
+                anActor->SetSufaceColor(vtkFloatingPointType (color.red()) / 255.,
+                                        vtkFloatingPointType (color.green()) / 255.,
+                                        vtkFloatingPointType (color.blue()) / 255.);
+                anActor->SetBackSufaceColor(vtkFloatingPointType (backfacecolor.red()) / 255.,
+                                            vtkFloatingPointType (backfacecolor.green()) / 255.,
+                                            vtkFloatingPointType (backfacecolor.blue()) / 255.);
+
+                /* edge color */
+                anActor->SetEdgeColor(vtkFloatingPointType (edgecolor.red()) / 255.,
+                                      vtkFloatingPointType (edgecolor.green()) / 255.,
+                                      vtkFloatingPointType (edgecolor.blue()) / 255.);
+
+                /* Shrink factor and size edges */
+                anActor->SetShrinkFactor(aDlg->GetIntValue(3) / 100.);
+                anActor->SetLineWidth(aDlg->GetIntValue(1));
+
+                /* Nodes color and size */
+                anActor->SetNodeColor(vtkFloatingPointType (nodecolor.red()) / 255.,
+                                      vtkFloatingPointType (nodecolor.green()) / 255.,
+                                      vtkFloatingPointType (nodecolor.blue()) / 255.);
+                anActor->SetNodeSize(aDlg->GetIntValue(2));
+
+                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;
+                    default: aColor = color; break;
+                  }
+
+                  SALOMEDS::Color aGroupColor;
+                  aGroupColor.R = (float)aColor.red() / 255.0;
+                  aGroupColor.G = (float)aColor.green() / 255.0;
+                  aGroupColor.B = (float)aColor.blue() / 255.0;
+                  aGroupObject->SetColor( aGroupColor );
+                }
+
+                delete aDlg;
+              }
+              break;
+            }}
+          }
+        }

       }
       }

+      SMESH::RepaintCurrentView();

     }
   }
     }
   }

-  return false;
-}

 
 

-void SetPointRepresentation(bool theIsVisible){
-  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView()){
-    vtkRenderer *aRenderer = aViewFrame->getRenderer();
-    vtkActorCollection *aCollection = aRenderer->GetActors();
-    aCollection->InitTraversal();
-    while(vtkActor *anAct = aCollection->GetNextActor()){
-      if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-       if(anActor->GetVisibility()){
-         anActor->SetPointRepresentation(theIsVisible);
-       }
+  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()){
+        QString aTitle;
+        SMESH_Actor::eControl aControl = SMESH_Actor::eNone;
+        if(SMESH_Actor *anActor = SMESH::FindActorByEntry(anIO->getEntry())){
+          switch ( theCommandID ){
+          case 6001:
+            aTitle = QObject::tr( "LENGTH_EDGES" );
+            aControl = SMESH_Actor::eLength;
+            break;
+          case 6018:
+            aTitle = QObject::tr( "LENGTH2D_EDGES" );
+            aControl = SMESH_Actor::eLength2D;
+            break;
+          case 6002:
+            aTitle = QObject::tr( "FREE_EDGES" );
+            aControl = SMESH_Actor::eFreeEdges;
+            break;
+          case 6003:
+            aTitle = QObject::tr( "FREE_BORDERS" );
+            aControl = SMESH_Actor::eFreeBorders;
+            break;
+          case 6004:
+            aTitle = QObject::tr( "MULTI_BORDERS" );
+            aControl = SMESH_Actor::eMultiConnection;
+            break;
+          case 6005:
+            aTitle = QObject::tr( "FREE_NODES" );
+            aControl = SMESH_Actor::eFreeNodes;
+            break;
+          case 6019:
+            aTitle = QObject::tr( "MULTI2D_BORDERS" );
+            aControl = SMESH_Actor::eMultiConnection2D;
+            break;
+          case 6011:
+            aTitle = QObject::tr( "AREA_ELEMENTS" );
+            aControl = SMESH_Actor::eArea;
+            break;
+          case 6012:
+            aTitle = QObject::tr( "TAPER_ELEMENTS" );
+            aControl = SMESH_Actor::eTaper;
+            break;
+          case 6013:
+            aTitle = QObject::tr( "ASPECTRATIO_ELEMENTS" );
+            aControl = SMESH_Actor::eAspectRatio;
+            break;
+          case 6017:
+            aTitle = QObject::tr( "ASPECTRATIO_3D_ELEMENTS" );
+            aControl = SMESH_Actor::eAspectRatio3D;
+            break;
+          case 6014:
+            aTitle = QObject::tr( "MINIMUMANGLE_ELEMENTS" );
+            aControl = SMESH_Actor::eMinimumAngle;
+            break;
+          case 6015:
+            aTitle = QObject::tr( "WARP_ELEMENTS" );
+            aControl = SMESH_Actor::eWarping;
+            break;
+          case 6016:
+            aTitle = QObject::tr( "SKEW_ELEMENTS" );
+            aControl = SMESH_Actor::eSkew;
+            break;
+          case 6009:
+            aTitle = QObject::tr( "SMESH_VOLUME" );
+            aControl = SMESH_Actor::eVolume3D;
+            break;
+          case 6021:
+            aTitle = QObject::tr( "FREE_FACES" );
+            aControl = SMESH_Actor::eFreeFaces;
+            break;
+          }
+          anActor->SetControlMode(aControl);
+          anActor->GetScalarBarActor()->SetTitle(aTitle.toLatin1().data());
+          SMESH::RepaintCurrentView();
+        }

       }
     }
       }
     }

-    RepaintCurrentView();

   }
   }

-}

 
 
 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-class CustomItem:public QCustomMenuItem
-{
- public:
-  CustomItem(const QString & s, const QFont & f):string(s), font(f)
+  bool CheckOIType(const Handle(SALOME_InteractiveObject) & theIO,
+                   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;
+      }
+    }
+    return false;
+  }
+
+
+  QString CheckTypeObject(const Handle(SALOME_InteractiveObject) & theIO)

   {
   {

-  };
-  ~CustomItem()
+    _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, HYPOTHESIS,    "Hypothesis", aTypeName ) ||
+        CheckOIType ( theIO, ALGORITHM,     "Algorithm",  aTypeName ) ||
+        CheckOIType ( theIO, MESH,          "Mesh",       aTypeName ) ||
+        CheckOIType ( theIO, SUBMESH,       "SubMesh",    aTypeName ) ||
+        CheckOIType ( theIO, GROUP,         "Group",      aTypeName )
+        )
+      return aTypeName;
+
+    return "NoType";
+  }
+
+
+  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 paint(QPainter * p, const QColorGroup & /*cg */ , bool /*act */ ,
-             bool /*enabled */ , int x, int y, int w, int h)
+
+  void SMESHGUI::OnEditDelete()

   {
   {

-    p->setFont(font);
-    p->drawText(x, y, w, h,
-                AlignHCenter | AlignVCenter | ShowPrefix | DontClip, string);
+    // 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 = "";
+    }
+
+    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;
+    }
+    // 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;
+
+    SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+    SUIT_ViewManager* vm = anApp->activeViewManager();
+    int nbSf = vm->getViewsCount();
+
+    SALOME_ListIteratorOfListIO It(selected);
+
+    aStudyBuilder->NewCommand();  // There is a transaction
+    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
+
+        // put the whole hierarchy of sub-objects of the selected SO into a list and
+        // then treat them all starting from the deepest objects (at list back)
+
+        std::list< _PTR(SObject) > listSO;
+        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() );
+        }
+
+        // treat SO's in the list starting from the back
+
+        std::list< _PTR(SObject) >::reverse_iterator ritSO = listSO.rbegin();
+        for ( ; ritSO != listSO.rend(); ++ritSO ) {
+          _PTR(SObject) SO = *ritSO;
+          if ( !SO ) continue;
+          std::string anEntry = SO->GetID();
+
+          /** Erase graphical object **/
+          if(SO->FindAttribute(anAttr, "AttributeIOR")){
+            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 {
+            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 */
+      } /* IObject->hasEntry() */
+    } /* more/next */
+    aStudyBuilder->CommitCommand();
+
+    /* Clear any previous selection */
+    SALOME_ListIO l1;
+    aSel->setSelectedObjects( l1 );
+
+    SMESHGUI::GetSMESHGUI()->updateObjBrowser();

   }
   }

+//}

 
 

-  QSize sizeHint()
+extern "C" {
+  SMESHGUI_EXPORT CAM_Module* createModule()

   {
   {

-    return QFontMetrics(font).
-      size(AlignHCenter | AlignVCenter | ShowPrefix | DontClip, string);
+    return new SMESHGUI();

   }
   }

- private:
-  QString string;
-  QFont font;
-};
+}
+
+SMESH::SMESH_Gen_var SMESHGUI::myComponentSMESH = SMESH::SMESH_Gen::_nil();

 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================

-SMESHGUI::SMESHGUI( const QString& theName, QObject* theParent ) :
-  SALOMEGUI( theName, theParent )
+SMESHGUI::SMESHGUI() :
+SalomeApp_Module( "SMESH" ),
+LightApp_Module( "SMESH" )

 {
 {

+  if ( CORBA::is_nil( myComponentSMESH ) )
+  {
+    CORBA::Boolean anIsEmbeddedMode;
+    myComponentSMESH = SMESH_Client::GetSMESHGen(getApp()->orb(),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 );
+  }
+
+  myActiveDialogBox = 0;
+  myFilterLibraryDlg = 0;
+  myState = -1;
+  myDisplayer = 0;
+
+  SMESH::GetFilterManager();
+  SMESH::GetPattern();
+
+  /* load resources for all available meshers */
+  SMESH::InitAvailableHypotheses();

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -539,6 +1121,8 @@ SMESHGUI::SMESHGUI( const QString& theName, QObject* theParent ) :
 //=============================================================================
 SMESHGUI::~SMESHGUI()
 {
 //=============================================================================
 SMESHGUI::~SMESHGUI()
 {

+  SMESH::GetFilterManager()->Destroy();
+  SMESH::GetFilterManager() = SMESH::FilterManager::_nil();

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -546,78 +1130,32 @@ SMESHGUI::~SMESHGUI()
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-SMESHGUI* SMESHGUI::GetSMESHGUI()
+LightApp_SelectionMgr* SMESHGUI::selectionMgr()

 {
 {

-  if ( !smeshGUI )
-    GetOrCreateSMESHGUI( QAD_Application::getDesktop() );
-  return smeshGUI;
+  SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+  if( anApp )
+    return dynamic_cast<LightApp_SelectionMgr*>( anApp->selectionMgr() );
+  else
+    return 0;

 }
 
 }
 

-extern "C"
+bool SMESHGUI::automaticUpdate()

 {
 {

-  Standard_EXPORT SALOMEGUI* GetComponentGUI() {
-    return SMESHGUI::GetSMESHGUI();
-  }
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  if ( !resMgr )
+    return false;
+
+  return resMgr->booleanValue( "SMESH", "auto_update", false );

 }
 }

+

 //=============================================================================
 /*!
  *
  */
 //=============================================================================
 //=============================================================================
 /*!
  *
  */
 //=============================================================================

-SMESHGUI* SMESHGUI::GetOrCreateSMESHGUI( QAD_Desktop* desktop )
+SUIT_ResourceMgr* SMESHGUI::resourceMgr()

 {
 {

-  if( !smeshGUI ) {
-    setOrb();
-    smeshGUI = new SMESHGUI;
-    smeshGUI->myActiveDialogBox = 0 ;
-    smeshGUI->myState = -1 ;
-    smeshGUI->myDesktop = desktop ; 
-
-    /* get smesh engine */
-    Engines::Component_var comp = desktop->getEngine("FactoryServer", "SMESH");
-    smeshGUI->myComponentMesh = SMESH::SMESH_Gen::_narrow(comp);
-    
-    /* get geom engine */
-    Engines::Component_var comp1 = desktop->getEngine("FactoryServer", "GEOM");    
-    smeshGUI->myComponentGeom = GEOM::GEOM_Gen::_narrow(comp1);
-      
-    /* set current study */
-    smeshGUI->myActiveStudy = desktop->getActiveStudy();
-    smeshGUI->myStudyId     = smeshGUI->myActiveStudy->getStudyId();
-    smeshGUI->myStudy       = smeshGUI->myActiveStudy->getStudyDocument();
-    smeshGUI->myComponentGeom->GetCurrentStudy( smeshGUI->myStudyId );
-    smeshGUI->myComponentMesh->SetCurrentStudy( smeshGUI->myStudy );
-    //    smeshGUI->myComponentGeom->NbLabels();
-    
-    /* create service object */
-    smeshGUI->myStudyAPI = SMESHGUI_StudyAPI(smeshGUI->myStudy, smeshGUI->myComponentMesh);
-
-    smeshGUI->myDocument = new SMESHDS_Document(1);//NBU
-
-    smeshGUI->mySimulationActors = vtkActorCollection::New();
-    smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
-
-    /*filter manager*/
-    smeshGUI->myFilterMgr = smeshGUI->myComponentMesh->CreateFilterManager();
-
-    /* load resources for all available meshers */
-    smeshGUI->InitAvailableHypotheses();
-  } else {
-    /* study may have changed - set current study */
-    smeshGUI->myActiveStudy = desktop->getActiveStudy();
-    smeshGUI->myStudyId     = smeshGUI->myActiveStudy->getStudyId();
-    smeshGUI->myStudy       = smeshGUI->myActiveStudy->getStudyDocument();
-    smeshGUI->myComponentGeom->GetCurrentStudy( smeshGUI->myStudyId );
-    smeshGUI->myComponentMesh->SetCurrentStudy( smeshGUI->myStudy );
-    
-    // Set active study to Study API
-    smeshGUI->myStudyAPI.Update( smeshGUI->myStudy );
-  }
-  
-  /* Automatic Update flag */
-  smeshGUI->myAutomaticUpdate = ( QAD_CONFIG->getSetting( "SMESH:AutomaticUpdate" ).compare( "true" ) == 0 );
-
-  return smeshGUI;
+  return dynamic_cast<SUIT_ResourceMgr*>( SUIT_Session::session()->resourceMgr() );

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -625,10 +1163,36 @@ SMESHGUI* SMESHGUI::GetOrCreateSMESHGUI( QAD_Desktop* desktop )
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-void SMESHGUI::SetState(int aState)
+SMESHGUI* SMESHGUI::GetSMESHGUI()

 {
 {

-  this->myState = aState;
-  return;
+  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 smeshMod;
+}
+
+extern "C"
+{
+  Standard_EXPORT SMESHGUI* GetComponentGUI()
+  {
+    return SMESHGUI::GetSMESHGUI();
+  }

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -636,10 +1200,9 @@ void SMESHGUI::SetState(int aState)
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-void SMESHGUI::ResetState()
+void SMESHGUI::SetState(int aState)

 {
 {

-  this->myState = -1;
-  return;
+  myState = aState;

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -647,10 +1210,9 @@ void SMESHGUI::ResetState()
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-void SMESHGUI::EmitSignalDeactivateDialog()
+void SMESHGUI::ResetState()

 {
 {

-  emit this->SignalDeactivateActiveDialog();
-  return;
+  myState = -1;

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -658,10 +1220,9 @@ void SMESHGUI::EmitSignalDeactivateDialog()
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-void SMESHGUI::EmitSignalCloseAllDialogs()
+void SMESHGUI::EmitSignalDeactivateDialog()

 {
 {

-  emit SignalCloseAllDialogs();
-  return;
+  emit SignalDeactivateActiveDialog();

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -669,9 +1230,9 @@ void SMESHGUI::EmitSignalCloseAllDialogs()
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-QDialog *SMESHGUI::GetActiveDialogBox()
+void SMESHGUI::EmitSignalStudyFrameChanged()

 {
 {

-  return this->myActiveDialogBox;
+  emit SignalStudyFrameChanged();

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -679,10 +1240,9 @@ QDialog *SMESHGUI::GetActiveDialogBox()
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-void SMESHGUI::SetActiveDialogBox(QDialog * aDlg)
+void SMESHGUI::EmitSignalCloseAllDialogs()

 {
 {

-  this->myActiveDialogBox = (QDialog *) aDlg;
-  return;
+  emit SignalCloseAllDialogs();

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -690,9 +1250,9 @@ void SMESHGUI::SetActiveDialogBox(QDialog * aDlg)
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-QAD_Study *SMESHGUI::GetActiveStudy()
+void SMESHGUI::EmitSignalVisibilityChanged()

 {
 {

-  return this->myActiveStudy;
+  emit SignalVisibilityChanged();

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -700,9 +1260,9 @@ QAD_Study *SMESHGUI::GetActiveStudy()
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-SALOMEDS::Study_ptr SMESHGUI::GetStudy()
+QDialog *SMESHGUI::GetActiveDialogBox()

 {
 {

-  return SALOMEDS::Study::_narrow(myStudy);
+  return myActiveDialogBox;

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -710,9 +1270,10 @@ SALOMEDS::Study_ptr SMESHGUI::GetStudy()
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-SMESHGUI_StudyAPI SMESHGUI::GetStudyAPI()
+void SMESHGUI::SetActiveDialogBox(QDialog * aDlg)

 {
 {

-  return myStudyAPI;
+  myActiveDialogBox = (QDialog *) aDlg;
+  return;

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -720,9 +1281,13 @@ SMESHGUI_StudyAPI SMESHGUI::GetStudyAPI()
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-QAD_Desktop *SMESHGUI::GetDesktop()
+SUIT_Desktop* SMESHGUI::desktop()

 {
 {

-  return this->myDesktop;
+  SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+  if( app )
+    return app->desktop();
+  else
+    return 0;

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -730,24 +1295,13 @@ QAD_Desktop *SMESHGUI::GetDesktop()
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-bool SMESHGUI::ActiveStudyChanged(QAD_Desktop* parent)
+SalomeApp_Study* SMESHGUI::activeStudy()

 {
 {

-  MESSAGE("SMESHGUI::activeStudyChanged init.");
-  QAD_Study* prevStudy = 0;
-  if ( smeshGUI )
-    prevStudy = smeshGUI->myActiveStudy;
-  /* Create or retrieve an object SMESHGUI */
-  MESSAGE("Active study changed : prev study =" << prevStudy);
-  SMESHGUI::GetOrCreateSMESHGUI( parent );
-  MESSAGE("Active study changed : active study =" << smeshGUI->myActiveStudy);
-  if ( prevStudy != smeshGUI->myActiveStudy ) {
-    smeshGUI->EmitSignalCloseAllDialogs();
-    MESSAGE("Active study changed : SMESHGUI nullified" << endl);
-    //smeshGUI = 0;
-    ::UpdateSelectionProp();
-  }
-  MESSAGE("SMESHGUI::activeStudyChanged done.");
-  return true;
+  SUIT_Application* app = SUIT_Session::session()->activeApplication();
+  if( app )
+    return dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
+  else
+    return NULL;

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -760,7 +1314,7 @@ 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()));
   aDlg->adjustSize();
   /* Here the position is on the bottom right corner - 10 */
   // aDlg->resize(QSize().expandedTo(aDlg->minimumSizeHint()));
   aDlg->adjustSize();

-  QAD_Desktop *PP = QAD_Application::getDesktop();
+  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;
   x = abs(PP->x() + PP->size().width() - aDlg->size().width() - 10);
   y = abs(PP->y() + PP->size().height() - aDlg->size().height() - 10);
   return true;


@@ -771,1390 +1325,29 @@ bool SMESHGUI::DefineDlgPosition(QWidget * aDlg, int &x, int &y)
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-void SMESHGUI::EraseSimulationActors()
-{
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK)
-  {                                                    //VTK
-    vtkRenderer *theRenderer =
-      ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-       getRightFrame()->getViewFrame())->getRenderer();
-    vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-
-    if (mySimulationActors != NULL)
-    {
-      mySimulationActors->InitTraversal();
-      vtkActor *ac = mySimulationActors->GetNextActor();
-      while (!(ac == NULL))
-      {
-        theRenderer->RemoveActor(ac);
-        ac = mySimulationActors->GetNextActor();
-      }
-      mySimulationActors->RemoveAllItems();
-    }
-    if (mySimulationActors2D != NULL)
-    {
-      mySimulationActors2D->InitTraversal();
-      vtkActor2D *ac = mySimulationActors2D->GetNextActor2D();
-      while (!(ac == NULL))
-      {
-        theRenderer->RemoveActor2D(ac);
-        ac = mySimulationActors2D->GetNextActor2D();
-      }
-      mySimulationActors2D->RemoveAllItems();
-    }
-    SetPointRepresentation(false);
+static int isStudyLocked(_PTR(Study) theStudy){
+  return theStudy->GetProperties()->IsLocked();
+}
+
+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;

 }
 
 }
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-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->CreateMesh( aShape );
-      if ( !aMesh->_is_nil() ) {
-       SALOMEDS::SObject_var SM = smeshGUI->myStudy->FindObjectIOR( _orb->object_to_string( aMesh ) );
-       myStudyAPI.SetName( SM, NameMesh );
-       return SMESH::SMESH_Mesh::_narrow(aMesh);
-      }
-    }
-  }
-  catch( const SALOME::SALOME_Exception& S_ex ) {
-    QtCatchCorbaException( S_ex );
-  }
-  return SMESH::SMESH_Mesh::_nil();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH::SMESH_subMesh_ptr SMESHGUI::AddSubMesh( SMESH::SMESH_Mesh_ptr aMesh,
-                                              GEOM::GEOM_Shape_ptr  aShape,
-                                              QString               NameMesh )
-{
-  SMESH::SMESH_subMesh_var aSubMesh;
-  try {
-    if ( !aMesh->_is_nil() && !aShape->_is_nil() )
-      // create sub mesh
-      aSubMesh = SMESH::SMESH_subMesh::_duplicate( aMesh->GetSubMesh( aShape, NameMesh.latin1() ) ); //VSR: published automatically
-  }
-  catch( const SALOME::SALOME_Exception& S_ex ) {
-    QtCatchCorbaException( S_ex );
-    aSubMesh = SMESH::SMESH_subMesh::_nil();
-  }
-  return aSubMesh._retn();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH::SMESH_Group_ptr SMESHGUI::AddGroup( SMESH::SMESH_Mesh_ptr    aMesh,
-                                          SMESH::ElementType       aType,
-                                          QString                  aName )
-{
-  SMESH::SMESH_Group_var aGroup;
-  try {
-    if ( !aMesh->_is_nil() )
-      // create group
-      aGroup = SMESH::SMESH_Group::_duplicate( aMesh->CreateGroup( aType, strdup(aName) ) ); //VSR: published automatically
-  }
-  catch( const SALOME::SALOME_Exception& S_ex ) {
-    QtCatchCorbaException( S_ex );
-    aGroup = SMESH::SMESH_Group::_nil();
-  }
-  myActiveStudy->updateObjBrowser( true );
-  return aGroup._retn();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
-static void addMap( const map<string, HypothesisData*>& theMap,
-                   map<string, HypothesisData*>&       toMap)
-{
-  map<string, HypothesisData*>::const_iterator it;
-  for ( it = theMap.begin(); it != theMap.end(); it++ )
-    toMap.insert( *it );
-}
-
-    
-//=============================================================================
-/*!
- *  InitAvailableHypotheses (read from resource XML file)
- */
-//=============================================================================
-void SMESHGUI::InitAvailableHypotheses ()
-{
-  QAD_WaitCursor wc;
-  if ((myHypothesesMap.begin() == myHypothesesMap.end()) &&
-      (myAlgorithmsMap.begin() == myAlgorithmsMap.end()))
-  {
-    // Resource manager
-    QAD_ResourceMgr* resMgr = QAD_Desktop::createResourceManager();
-    if (!resMgr) return;
-
-    // Find name of a resource XML file ("SMESH_Meshers.xml");
-    QString HypsXml;
-    char* cenv = getenv("SMESH_MeshersList");
-    if (cenv)
-      HypsXml.sprintf("%s", cenv);
-
-    QStringList HypsXmlList = QStringList::split( ":", HypsXml, false );
-    if (HypsXmlList.count() == 0)
-    {
-      QAD_MessageBox::error1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"),
-                             tr("MESHERS_FILE_NO_VARIABLE"),
-                             tr("SMESH_BUT_OK"));
-      return;
-    }
-
-    // loop on files in HypsXml
-    QString aNoAccessFiles;
-    for ( int i = 0; i < HypsXmlList.count(); i++ ) {
-      QString HypsXml = HypsXmlList[ i ];
-
-      // Find full path to the resource XML file
-      QString xmlFile = HypsXml + ".xml";
-      xmlFile = QAD_Tools::addSlash(resMgr->findFile(xmlFile, HypsXml)) + xmlFile;
-
-      QFile file (QAD_Tools::unix2win(xmlFile));
-      if (file.exists() && file.open(IO_ReadOnly))
-      {
-        file.close();
-
-        SMESHGUI_XmlHandler* myXmlHandler = new SMESHGUI_XmlHandler();
-        ASSERT(myXmlHandler);
-
-        QXmlInputSource source (file);
-        QXmlSimpleReader reader;
-        reader.setContentHandler(myXmlHandler);
-        reader.setErrorHandler(myXmlHandler);
-        bool ok = reader.parse(source);
-        file.close();
-        if (ok)
-        {
-          addMap( myXmlHandler->myHypothesesMap, myHypothesesMap );
-          addMap( myXmlHandler->myAlgorithmsMap, myAlgorithmsMap );
-        }
-        else
-        {
-          QAD_MessageBox::error1(myDesktop, 
-                                tr("INF_PARSE_ERROR"),
-                                tr(myXmlHandler->errorProtocol()),
-                                tr("SMESH_BUT_OK"));
-        }
-      }
-      else
-      {
-        if (aNoAccessFiles.isEmpty())
-          aNoAccessFiles = xmlFile;
-        else
-          aNoAccessFiles += ", " + xmlFile;
-      }
-    } // end loop
-
-
-    if (!aNoAccessFiles.isEmpty())
-    {
-      QString aMess = tr("MESHERS_FILE_CANT_OPEN") + " " + aNoAccessFiles + "\n";
-      aMess += tr("MESHERS_FILE_CHECK_VARIABLE");
-      wc.stop();
-      QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                            tr("SMESH_WRN_WARNING"),
-                            aMess,
-                            tr("SMESH_BUT_OK"));
-      wc.start();
-    }
-  }
-}
-
-//=============================================================================
-/*!
- *  GetAvailableHypotheses (read from resource XML file)
- */
-//=============================================================================
-QStringList SMESHGUI::GetAvailableHypotheses (const bool isAlgo)
-{
-  QStringList aHypList;
-
-  // Init list of available hypotheses, if needed
-  InitAvailableHypotheses();
-
-  // fill list of hypotheses/algorithms
-  map<string, HypothesisData*>::iterator anIter;
-  if (isAlgo)
-  {
-    anIter = myAlgorithmsMap.begin();
-    for (; anIter != myAlgorithmsMap.end(); anIter++)
-    {
-      aHypList.append(((*anIter).first).c_str());
-    }
-  }
-  else
-  {
-    anIter = myHypothesesMap.begin();
-    for (; anIter != myHypothesesMap.end(); anIter++)
-    {
-      aHypList.append(((*anIter).first).c_str());
-    }
-  }
-
-  return aHypList;
-}
-
-//=============================================================================
-/*!
- *  GetHypothesisData
- */
-//=============================================================================
-HypothesisData* SMESHGUI::GetHypothesisData (const char* aHypType)
-{
-  HypothesisData* aHypData = 0;
-
-  // Init list of available hypotheses, if needed
-  InitAvailableHypotheses();
-
-  if (myHypothesesMap.find(aHypType) == myHypothesesMap.end())
-  {
-    if (myAlgorithmsMap.find(aHypType) != myAlgorithmsMap.end())
-    {
-      aHypData = myAlgorithmsMap[aHypType];
-    }
-  }
-  else
-  {
-    aHypData = myHypothesesMap[aHypType];
-  }
-  return aHypData;
-}
-
-//=============================================================================
-/*! 
- *  Get a Hypothesis Creator from a Plugin Library
- */
-//=============================================================================
-SMESHGUI_GenericHypothesisCreator* SMESHGUI::GetHypothesisCreator(const QString& aHypType)
-{
-  char* sHypType = (char*)aHypType.latin1();
-  MESSAGE("Get HypothesisCreator for " << sHypType);
-
-  SMESHGUI_GenericHypothesisCreator* aCreator = 0;
-
-  // check, if creator for this hypothesis type already exists
-  if (myHypCreatorMap.find(sHypType) != myHypCreatorMap.end())
-  {
-    aCreator = myHypCreatorMap[sHypType];
-  }
-  else
-  {
-    // 1. Init list of available hypotheses, if needed
-    InitAvailableHypotheses();
-
-    // 2. Get names of plugin libraries
-    HypothesisData* aHypData = GetHypothesisData(sHypType);
-    if (!aHypData)
-    {
-      return aCreator;
-    }
-    QString aClientLibName = aHypData->ClientLibName;
-    QString aServerLibName = aHypData->ServerLibName;
-
-    // 3. Load Client Plugin Library
-    try
-    {
-      // load plugin library
-      MESSAGE("Loading client meshers plugin library ...");
-      void* libHandle = dlopen (aClientLibName, RTLD_LAZY);
-      if (!libHandle)
-      {
-        // report any error, if occured
-        const char* anError = dlerror();
-        MESSAGE(anError);
-      }
-      else
-      {
-        // get method, returning hypothesis creator
-        MESSAGE("Find GetHypothesisCreator() method ...");
-        typedef SMESHGUI_GenericHypothesisCreator* (*GetHypothesisCreator) \
-          (QString aHypType, QString aServerLibName, SMESHGUI* aSMESHGUI);
-        GetHypothesisCreator procHandle =
-          (GetHypothesisCreator)dlsym( libHandle, "GetHypothesisCreator" );
-        if (!procHandle)
-        {
-          MESSAGE("bad hypothesis client plugin library");
-          dlclose(libHandle);
-        }
-        else
-        {
-          // get hypothesis creator
-          MESSAGE("Get Hypothesis Creator for " << aHypType);
-          aCreator = procHandle(aHypType, aServerLibName, smeshGUI);
-          if (!aCreator)
-          {
-            MESSAGE("no such a hypothesis in this plugin");
-          }
-          else
-          {
-            // map hypothesis creator to a hypothesis name
-            myHypCreatorMap[sHypType] = aCreator;
-          }
-        }
-      }
-    }
-    catch (const SALOME::SALOME_Exception& S_ex)
-    {
-      QtCatchCorbaException(S_ex);
-    }
-  }
-
-  return aCreator;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH::SMESH_Hypothesis_ptr SMESHGUI::CreateHypothesis (const QString& aHypType,
-                                                       const QString& aHypName,
-                                                        const bool     isAlgo)
-{
-  MESSAGE("Create " << aHypType << " with name " << aHypName);
-
-  SMESH::SMESH_Hypothesis_var Hyp;
-
-  HypothesisData* aHypData = GetHypothesisData((char*)aHypType.latin1());
-  QString aServLib = aHypData->ServerLibName;
-
-  try
-  {
-    Hyp = myComponentMesh->CreateHypothesis(aHypType, aServLib);
-    if (!Hyp->_is_nil())
-    {
-      SALOMEDS::SObject_var SHyp =
-        smeshGUI->myStudy->FindObjectIOR( _orb->object_to_string( Hyp ) );
-      if (!SHyp->_is_nil())
-      {
-       if ( !aHypName.isEmpty() )
-         myStudyAPI.SetName( SHyp, aHypName );
-        myActiveStudy->updateObjBrowser(true);
-       return Hyp._retn();
-      }
-    }
-  }
-  catch (const SALOME::SALOME_Exception & S_ex)
-  {
-    QtCatchCorbaException(S_ex);
-  }
-
-  return SMESH::SMESH_Hypothesis::_nil();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::AddHypothesisOnMesh(SMESH::SMESH_Mesh_ptr aMesh,
-                                  SMESH::SMESH_Hypothesis_ptr aHyp)
-{
-  int res = SMESH::HYP_UNKNOWN_FATAL; 
-  QAD_WaitCursor wc;
-
-  if ( !aMesh->_is_nil() ) {
-    SALOMEDS::SObject_var SM = myStudyAPI.FindObject( aMesh );
-    GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh(SM);
-    try {
-      res = aMesh->AddHypothesis( aShape, aHyp );
-      if ( res < SMESH::HYP_UNKNOWN_FATAL ) {
-       SALOMEDS::SObject_var SH = myStudyAPI.FindObject(aHyp);
-       if ( !SM->_is_nil() && !SH->_is_nil() ) {
-         //myStudyAPI.SetHypothesis(SM, SH); // VSR: published automatically by engine
-         myStudyAPI.ModifiedMesh(SM, false);
-       }
-      }
-      if ( res >= SMESH::HYP_UNKNOWN_FATAL ) {
-       wc.stop();
-       QAD_MessageBox::error1(QAD_Application::getDesktop(),
-                             tr("SMESH_ERROR"),
-                             tr(QString("SMESH_HYP_%1").arg(res)),
-                             tr("SMESH_BUT_OK"));
-       wc.start();
-      }
-      else if ( res > SMESH::HYP_OK ) {
-       wc.stop();
-       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"),
-                             tr(QString("SMESH_HYP_%1").arg(res)),
-                             tr("SMESH_BUT_OK"));
-       wc.start();
-      }
-    }
-    catch( const SALOME::SALOME_Exception& S_ex ) {
-      wc.stop();
-      QtCatchCorbaException( S_ex );
-      res = SMESH::HYP_UNKNOWN_FATAL;
-    }
-  }
-  return res < SMESH::HYP_UNKNOWN_FATAL;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh
-               (const Handle(SALOME_InteractiveObject)& IObject)
-{
-  int res = SMESH::HYP_UNKNOWN_FATAL;
-  QAD_WaitCursor wc;
-
-  if (IObject->hasReference())
-  {
-    try {
-      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()) {
-       if (SO_Hypothesis->FindAttribute(anAttr, "AttributeIOR")) {
-         anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-         anHyp = SMESH::SMESH_Hypothesis::_narrow
-           (_orb->string_to_object(anIOR->Value()));
-       }
-
-       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()) {
-           GEOM::GEOM_Shape_var aShape =
-             smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(MorSM);
-           if (!aShape->_is_nil() && 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 (!aSubMesh->_is_nil())
-                aMesh = aSubMesh->GetFather();
-
-              if (!aMesh->_is_nil())
-              {
-                res = aMesh->RemoveHypothesis(aShape, anHyp);
-               if ( res < SMESH::HYP_UNKNOWN_FATAL )
-                 smeshGUI->myStudyAPI.ModifiedMesh(MorSM, false);
-                if ( res > SMESH::HYP_OK ) {
-                 wc.stop();
-                  QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                                        tr("SMESH_WRN_WARNING"),
-                                        tr(QString("SMESH_HYP_%1").arg(res)),
-                                        tr("SMESH_BUT_OK"));
-                 wc.start();
-               }
-              }
-            }
-          }
-        }
-      }
-    }
-    catch( const SALOME::SALOME_Exception& S_ex ) {
-      wc.stop();
-      QtCatchCorbaException( S_ex );
-      res = SMESH::HYP_UNKNOWN_FATAL;
-    }
-  }
-  else if (IObject->hasEntry())
-  {
-    MESSAGE("IObject entry " << IObject->getEntry());
-  }
-  return res < SMESH::HYP_UNKNOWN_FATAL;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh(SALOMEDS::SObject_ptr MorSM,
-       SMESH::SMESH_Hypothesis_ptr anHyp)
-{
-  SALOMEDS::SObject_var AHR, aRef;
-  SALOMEDS::GenericAttribute_var anAttr;
-  SALOMEDS::AttributeIOR_var anIOR;
-  int res = SMESH::HYP_UNKNOWN_FATAL;
-  QAD_WaitCursor wc;
-
-  if (!MorSM->_is_nil()) {
-    try {
-      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 ( !aSubMesh->_is_nil() )
-           aMesh = aSubMesh->GetFather();
-         
-         if (!aMesh->_is_nil()) {
-           res = aMesh->RemoveHypothesis(aShape, anHyp);
-           if ( res < SMESH::HYP_UNKNOWN_FATAL )
-             smeshGUI->myStudyAPI.ModifiedMesh(MorSM, false);
-           if ( res > SMESH::HYP_OK ) {
-             wc.stop();
-             QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                                   tr("SMESH_WRN_WARNING"),
-                                   tr(QString("SMESH_HYP_%1").arg(res)),
-                                   tr("SMESH_BUT_OK"));
-             wc.start();
-           }
-         }
-       }
-      }
-    }
-    catch( const SALOME::SALOME_Exception& S_ex ) {
-      wc.stop();
-      QtCatchCorbaException( S_ex );
-      res = SMESH::HYP_UNKNOWN_FATAL;
-    }
-  }
-  return res < SMESH::HYP_UNKNOWN_FATAL;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::AddAlgorithmOnMesh( SMESH::SMESH_Mesh_ptr       aMesh,
-                                  SMESH::SMESH_Hypothesis_ptr aHyp )
-{
-  int res = SMESH::HYP_UNKNOWN_FATAL;
-  QAD_WaitCursor wc;
-
-  if ( !aMesh->_is_nil() ) {
-    SALOMEDS::SObject_var SM = myStudyAPI.FindObject( aMesh );
-    GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SM );
-    try {
-      res = aMesh->AddHypothesis( aShape, aHyp );
-      if ( res < SMESH::HYP_UNKNOWN_FATAL ) {
-       //SALOMEDS::SObject_var SH = myStudyAPI.FindObject( aHyp );
-       //if ( !SM->_is_nil() && !SH->_is_nil() ) {
-         //myStudyAPI.SetAlgorithms(SM, SH);
-       myStudyAPI.ModifiedMesh( SM, false );
-       //}
-      }
-      if ( res >= SMESH::HYP_UNKNOWN_FATAL ) {
-       wc.stop();
-       QAD_MessageBox::error1(QAD_Application::getDesktop(),
-                             tr("SMESH_ERROR"),
-                             tr(QString("SMESH_HYP_%1").arg(res)),
-                             tr("SMESH_BUT_OK"));
-       wc.start();
-      }
-      else if ( res > SMESH::HYP_OK ) {
-       wc.stop();
-       QAD_MessageBox::warn1( QAD_Application::getDesktop(),
-                              tr( "SMESH_WRN_WARNING" ),
-                              tr(QString("SMESH_HYP_%1").arg(res)),
-                              tr( "SMESH_BUT_OK" ) );
-       wc.start();
-      }
-    }
-    catch( const SALOME::SALOME_Exception& S_ex ) {
-      wc.stop();
-      QtCatchCorbaException( S_ex );
-      res = SMESH::HYP_UNKNOWN_FATAL;
-    }
-  }
-  return res < SMESH::HYP_UNKNOWN_FATAL;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::AddHypothesisOnSubMesh( SMESH::SMESH_subMesh_ptr    aSubMesh,
-                                      SMESH::SMESH_Hypothesis_ptr aHyp )
-{
-  int res = SMESH::HYP_UNKNOWN_FATAL;
-  QAD_WaitCursor wc;
-
-  if ( !aSubMesh->_is_nil() ) {
-    try {
-      SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
-      SALOMEDS::SObject_var SsubM = myStudyAPI.FindObject( aSubMesh );
-      GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SsubM );
-      if ( !aMesh->_is_nil() && !SsubM->_is_nil() && !aShape->_is_nil() ) {
-       res = aMesh->AddHypothesis( aShape, aHyp );
-       if ( res < SMESH::HYP_UNKNOWN_FATAL )  {
-         //SALOMEDS::SObject_var SH = myStudyAPI.FindObject(aHyp);
-         //                    if (!SsubM->_is_nil() && !SH->_is_nil())
-         //                    {
-         //                            myStudyAPI.SetHypothesis(SsubM, SH);
-         myStudyAPI.ModifiedMesh( SsubM, false );
-         //                    }
-       }
-       if ( res >= SMESH::HYP_UNKNOWN_FATAL ) {
-         wc.stop();
-         QAD_MessageBox::error1(QAD_Application::getDesktop(),
-                                tr("SMESH_ERROR"),
-                                tr(QString("SMESH_HYP_%1").arg(res)),
-                                tr("SMESH_BUT_OK"));
-         wc.start();
-       }
-       else if ( res > SMESH::HYP_OK ) {
-         wc.stop();
-         QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                               tr( "SMESH_WRN_WARNING" ),
-                               tr(QString("SMESH_HYP_%1").arg(res)),
-                               tr( "SMESH_BUT_OK" ) );
-         wc.start();
-       }
-      }
-    }
-    catch( const SALOME::SALOME_Exception& S_ex ) {
-      wc.stop();
-      QtCatchCorbaException( S_ex );
-      res = SMESH::HYP_UNKNOWN_FATAL;
-    }
-  }
-  return res < SMESH::HYP_UNKNOWN_FATAL;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::AddAlgorithmOnSubMesh( SMESH::SMESH_subMesh_ptr    aSubMesh,
-                                     SMESH::SMESH_Hypothesis_ptr aHyp )
-{
-  int res = SMESH::HYP_UNKNOWN_FATAL;
-  QAD_WaitCursor wc;
-
-  if ( !aSubMesh->_is_nil() ) {
-    try {
-      SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
-      SALOMEDS::SObject_var SsubM = myStudyAPI.FindObject(aSubMesh);
-      GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh(SsubM);
-      if ( !aMesh->_is_nil() && !SsubM->_is_nil() && !aShape->_is_nil() ) {
-       res = aMesh->AddHypothesis( aShape, aHyp );
-       if ( res < SMESH::HYP_UNKNOWN_FATAL )  {
-         //SALOMEDS::SObject_var SH = myStudyAPI.FindObject(aHyp);
-         //if (!SsubM->_is_nil() && !SH->_is_nil()) {
-         //myStudyAPI.SetAlgorithms(SsubM, SH);
-         myStudyAPI.ModifiedMesh( SsubM, false );
-         //}
-       }
-       if ( res >= SMESH::HYP_UNKNOWN_FATAL ) {
-         wc.stop();
-         QAD_MessageBox::error1(QAD_Application::getDesktop(),
-                                tr("SMESH_ERROR"),
-                                tr(QString("SMESH_HYP_%1").arg(res)),
-                                tr("SMESH_BUT_OK"));
-         wc.start();
-       }
-       else if ( res > SMESH::HYP_OK ) {
-         wc.stop();
-         QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                               tr( "SMESH_WRN_WARNING" ),
-                               tr(QString("SMESH_HYP_%1").arg(res)),
-                               tr( "SMESH_BUT_OK" ) );
-         wc.start();
-       }
-      }
-    }
-    catch( const SALOME::SALOME_Exception& S_ex ) {
-      wc.stop();
-      QtCatchCorbaException( S_ex );
-      res = SMESH::HYP_UNKNOWN_FATAL;
-    }
-  }
-  return res < SMESH::HYP_UNKNOWN_FATAL;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-int SMESHGUI::GetNameOfSelectedIObjects(SALOME_Selection * Sel, QString & aName)
-{
-       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;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-int SMESHGUI::GetNameOfSelectedNodes(SALOME_Selection * Sel, QString & aName){
-  aName = "";
-  if(Sel->IObjectCount() == 1){
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    if(IObject->hasEntry()){
-      if(SMESH_Actor *anActor = ::FindActorByEntry(IObject->getEntry())){
-       TColStd_MapOfInteger MapIndex;
-       Sel->GetIndex(IObject, MapIndex);
-       TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-       for(; ite.More(); ite.Next()){
-         aName += QString(" %1").arg(anActor->GetNodeObjId(ite.Key()));
-       }
-       return MapIndex.Extent();
-      }
-    }
-  }
-  return -1;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-int SMESHGUI::GetNameOfSelectedElements(SALOME_Selection * Sel, QString & aName){
-  aName = "";
-  if(Sel->IObjectCount() == 1){
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    if(IObject->hasEntry()){
-      if(SMESH_Actor *anActor = ::FindActorByEntry(IObject->getEntry())){
-       TColStd_MapOfInteger MapIndex;
-       Sel->GetIndex(IObject, MapIndex);
-       TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-       std::vector<int> aList;
-       for(; ite.More(); ite.Next()){
-         int aVtkId = ite.Key();
-         int anObjId = anActor->GetElemObjId(aVtkId);
-         std::vector<int>::iterator found = find(aList.begin(), aList.end(), anObjId);
-         //      MESSAGE("GetNameOfSelectedElements(): VTK Id = " << aVtkId << ", OBJECT Id = " << anObjId);
-         if (found == aList.end()) {
-           aList.push_back(anObjId);
-           aName += QString(" %1").arg(anObjId);
-         }
-       }
-       return aList.size();
-      }
-    }
-  }
-  return -1;
-}
-
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-int SMESHGUI::GetNameOfSelectedEdges(SALOME_Selection * Sel, QString & aName){
-  aName = "";
-  if(Sel->IObjectCount() == 1){
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    if(IObject->hasEntry()){
-      if(SMESH_Actor *anActor = ::FindActorByEntry(IObject->getEntry())){
-       TColStd_MapOfInteger MapIndex;
-       Sel->GetIndex(IObject, MapIndex);
-       TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-       for(; ite.More(); ite.Next()){
-         aName += QString(" %1").arg(ite.Key());
-       }
-       return MapIndex.Extent();
-      }
-    }
-  }
-  return -1;
-}
-
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH_Actor *SMESHGUI::FindActorByEntry(QString theEntry,
-                                       Standard_Boolean & theResult, 
-                                       bool onlyInActiveView)
-{
-  theResult = false;
-  int aNbStudyFrames = myActiveStudy->getStudyFramesCount();
-  for (int i = 0; i < aNbStudyFrames; i++){
-    QAD_StudyFrame *aStudyFrame = myActiveStudy->getStudyFrame(i);
-    if(SMESH_Actor *anActor = ::FindActorByEntry(aStudyFrame,theEntry.latin1())){
-      theResult = true;
-      return anActor;
-    }
-  }
-  return NULL;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH_Actor* SMESHGUI::FindActor(CORBA::Object_ptr theObj,
-                                Standard_Boolean & theResult, 
-                                bool theOnlyInActiveView)
-{
-  theResult = false;
-  SMESH_Actor* aRes = NULL;
-  if ( !CORBA::is_nil( theObj ) ) {
-    SALOMEDS::SObject_var aSObject = SALOMEDS::SObject::_narrow( myStudy->FindObjectIOR( _orb->object_to_string( theObj ) ) );
-    if( !aSObject->_is_nil()) {
-      CORBA::String_var anEntry = aSObject->GetID();
-      aRes = FindActorByEntry( anEntry.in(), theResult, theOnlyInActiveView );
-    }
-  }
-  return aRes;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH::SMESH_Mesh_ptr SMESHGUI::ConvertIOinMesh(const Handle(SALOME_InteractiveObject) & IO,
-                                               Standard_Boolean & testResult)
-{
-  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();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH::SMESH_subMesh_ptr SMESHGUI::ConvertIOinSubMesh(const Handle(SALOME_InteractiveObject) & IO,
-                                                     Standard_Boolean & testResult)
-{
-  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();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH::SMESH_Hypothesis_ptr SMESHGUI::ConvertIOinSMESHHypothesis(const Handle(SALOME_InteractiveObject) & IO,
-                                                                Standard_Boolean & testResult)
-{
-  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();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH::SMESH_Group_ptr SMESHGUI::ConvertIOinSMESHGroup(const Handle(SALOME_InteractiveObject) & IO,
-                                                      Standard_Boolean & testResult)
-{
-  SMESH::SMESH_Group_var aGroup;
-  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);
-        aGroup = SMESH::SMESH_Group::_narrow(_orb->string_to_object(anIOR->Value()));
-        if (!aGroup->_is_nil()) {
-          testResult = true;
-          return SMESH::SMESH_Group::_duplicate(aGroup);
-        }
-      }
-    }
-  }
-  return SMESH::SMESH_Group::_nil();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-GEOM::GEOM_Shape_ptr SMESHGUI::ConvertIOinGEOMShape(const Handle(SALOME_InteractiveObject) & IO,
-                                                   Standard_Boolean & testResult)
-{
-  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();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::SetViewMode(int commandId){
-  SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection());
-  if(Sel->IObjectCount() >= 1){
-    SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-    for(; It.More(); It.Next()){
-      Handle(SALOME_InteractiveObject) IObject = It.Value();
-      if(IObject->hasEntry()){
-       if(SMESH_Actor *anActor = ::FindActorByEntry(IObject->getEntry())){
-         switch(commandId){
-         case 211:
-           ChangeRepresentation(anActor,0);
-           break;
-         case 212:
-           ChangeRepresentation(anActor,1);
-           break;
-         case 213:
-           ChangeRepresentation(anActor,2);
-           break;
-         case 215:
-           ChangeRepresentation(anActor,5);
-           break;
-         case 1132:
-           ChangeRepresentation(anActor,3);
-           break;
-         }
-       }
-      }
-    }
-    if(commandId == 1133)
-      ChangeRepresentation(NULL,4);
-  }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::ChangeRepresentation(SMESH_Actor * theActor, int type){
-  switch (type){
-  case 0:{
-    //theActor->UnShrink();
-    theActor->SetRepresentation(SMESH_Actor::eEdge);
-    break;
-  }
-  case 1:{
-    //theActor->UnShrink();
-    theActor->SetRepresentation(SMESH_Actor::eSurface);
-    break;
-  }
-  case 2:{
-    theActor->IsShrunk() ? theActor->UnShrink() : theActor->SetShrink();
-    //theActor->SetRepresentation(SMESH_Actor::eSurface);
-    break;
-  }
-  case 5:{
-    //theActor->UnShrink();
-    theActor->SetRepresentation(SMESH_Actor::ePoint);
-    break;
-  }
-  case 3:{
-    float color[3];
-    theActor->GetSufaceColor(color[0], color[1], color[2]);
-    int c0 = int (color[0] * 255);
-    int c1 = int (color[1] * 255);
-    int c2 = int (color[2] * 255);
-    QColor c(c0, c1, c2);
-
-    float edgecolor[3];
-    theActor->GetEdgeColor(edgecolor[0], edgecolor[1], edgecolor[2]);
-    c0 = int (edgecolor[0] * 255);
-    c1 = int (edgecolor[1] * 255);
-    c2 = int (edgecolor[2] * 255);
-    QColor e(c0, c1, c2);
-
-    float backfacecolor[3];
-    theActor->GetBackSufaceColor(backfacecolor[0], backfacecolor[1], backfacecolor[2]);
-    c0 = int (backfacecolor[0] * 255);
-    c1 = int (backfacecolor[1] * 255);
-    c2 = int (backfacecolor[2] * 255);
-    QColor b(c0, c1, c2);
-
-    float nodecolor[3];
-    theActor->GetNodeColor(nodecolor[0], nodecolor[1], nodecolor[2]);
-    c0 = int (nodecolor[0] * 255);
-    c1 = int (nodecolor[1] * 255);
-    c2 = int (nodecolor[2] * 255);
-    QColor n(c0, c1, c2);
-
-    int Edgewidth = (int)theActor->GetLineWidth();
-    if(Edgewidth == 0)
-      Edgewidth = 1;
-    int intValue = int(theActor->GetNodeSize());
-    float Shrink = theActor->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()){
-      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 */
-      theActor->SetSufaceColor(float (color.red()) / 255.,
-                              float (color.green()) / 255., 
-                              float (color.blue()) / 255.);
-      theActor->SetBackSufaceColor(float (backfacecolor.red()) / 255., 
-                                  float (backfacecolor.green()) / 255.,
-                                  float (backfacecolor.blue()) / 255.);
-
-      /* edge color */
-      theActor->SetEdgeColor(float (edgecolor.red()) / 255.,
-                            float (edgecolor.green()) / 255.,
-                            float (edgecolor.blue()) / 255.);
-      
-      /* Shrink factor and size edges */
-      theActor->SetShrinkFactor(aDlg->GetIntValue(3) / 100.);
-      theActor->SetLineWidth(aDlg->GetIntValue(1));
-      
-      /* Nodes color and size */
-      theActor->SetNodeColor(float (nodecolor.red()) / 255.,
-                            float (nodecolor.green()) / 255.,
-                            float (nodecolor.blue()) / 255.);
-      theActor->SetNodeSize(aDlg->GetIntValue(2));
-
-      delete aDlg;
-    }
-    break;
-  }
-  case 4:{
-    EmitSignalDeactivateDialog();
-    SMESHGUI_TransparencyDlg *aDlg = new SMESHGUI_TransparencyDlg(QAD_Application::getDesktop(),"",false);
-    break;
-  }
-  }
-  UpdateView();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::UpdateView(){
-  ::RepaintCurrentView();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplayActor(SMESH_Actor * theActor, bool theVisibility){
-  theActor->SetVisibility(theVisibility);
-  ::DisplayActor(myActiveStudy->getActiveStudyFrame(),theActor);
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::EraseActor(SMESH_Actor * theActor){
-  theActor->SetVisibility(false);
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-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;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-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());
-       }
-
-       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";
-       }
-
-       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;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-QString SMESHGUI::CheckTypeObject(const Handle(SALOME_InteractiveObject) & IO)
-{
-  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";
-      }
-  }
-
-  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) aGroupFilter = new SMESH_TypeFilter(GROUP);
-  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(aGroupFilter);
-  if (Sel->AddIObject(IO) != -1) {
-    Sel->ClearFilters();
-    return "Group";
-  }
-
-  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";
-}
-
-
-static int isStudyLocked(const SALOMEDS::Study_var& theStudy){
-  return theStudy->GetProperties()->IsLocked();
-}
+//=======================================================================
+//function : CheckActiveStudyLocked
+//purpose  :
+//=======================================================================

 
 

-static int checkLock(const SALOMEDS::Study_var& theStudy) {
-  if (isStudyLocked(theStudy)) {
-    QAD_MessageBox::warn1 ( (QWidget*)QAD_Application::getDesktop(),
-                          QObject::tr("WRN_WARNING"), 
-                          QObject::tr("WRN_STUDY_LOCKED"),
-                          QObject::tr("BUT_OK") );
-    return true;
-  }
-  return false;
+bool SMESHGUI::isActiveStudyLocked()
+{
+  _PTR(Study) aStudy = activeStudy()->studyDS();
+  return checkLock( aStudy );

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -2162,435 +1355,589 @@ static int checkLock(const SALOMEDS::Study_var& theStudy) {
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent)
+bool SMESHGUI::OnGUIEvent( int theCommandID )

 {
 {

-  SALOMEDS::Study_var aStudy = smeshGUI->myActiveStudy->getStudyDocument(); //Document OCAF de l'etude active
-  //  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();
+  SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( application() );
+  if( !anApp )
+    return false;
+
+  _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); //Document OCAF de l'etude active
+  SUIT_ResourceMgr* mgr = resourceMgr();
+  if( !mgr )
+    return false;
+
+  if (CORBA::is_nil(GetSMESHGen()->GetCurrentStudy())) {
+    GetSMESHGen()->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy());

   }
 
   }
 

-  switch (theCommandID)        {
-  case 33:                                     // DELETE
+  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;
     if(checkLock(aStudy)) break;

-    smeshGUI->OnEditDelete();
+    OnEditDelete();

     break;
     break;

-    
-  case 113:                                    // IMPORT
+
+  case 113:                                     // IMPORT

   case 112:
   case 111:
     {
       if(checkLock(aStudy)) break;
   case 112:
   case 111:
     {
       if(checkLock(aStudy)) break;

-      //Import_Document(parent, theCommandID); //NBU
-      Import_Mesh(parent,theCommandID);
+      ::ImportMeshesFromFile(GetSMESHGen(),theCommandID);
+      break;
+    }
+
+  case 150:    //MED FILE INFORMATION
+    {
+      SALOME_ListIO selected;
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      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() )
+        {
+          SMESHGUI_FileInfoDlg dlg( desktop(), aMesh->GetMEDFileInfo() );
+          dlg.exec();
+        }
+      }

       break;
     }
 
       break;
     }
 

-  case 122:                                    // EXPORT MED
+  case 122:                                     // EXPORT MED

   case 121:
   case 123:
   case 121:
   case 123:

+  case 124:
+  case 125:
+  case 126:
+  case 140:
+  case 141:

     {
     {

-      Export_Mesh(parent, theCommandID);
+      ::ExportMeshToFile(theCommandID);

       break;
     }
 
       break;
     }
 

-  case 200:                                    // SCALAR BAR
+  case 200:                                     // SCALAR BAR

     {
     {

-      SALOME_Selection *Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-      if( Sel && Sel->IObjectCount() ) {
-       Handle(SALOME_InteractiveObject) anIO = Sel->firstIObject();
-       if( anIO->hasEntry() ) {
-         if( SMESH_Actor* anActor = ::FindActorByEntry( anIO->getEntry() ) ) {
-           anActor->SetControlMode( SMESH_Actor::eNone );
-         }
-       }
+      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 );
+          }
+        }

       }
       break;
     }
   case 201:
     {
       }
       break;
     }
   case 201:
     {

-      SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-      SMESHGUI_Preferences_ScalarBarDlg::ScalarBarProperties( parent, Sel );
+      SMESHGUI_Preferences_ScalarBarDlg::ScalarBarProperties( this );

       break;
     }
 
       break;
     }
 

-  case 1133:                                   // DISPLAY MODE : WireFrame, Surface, Shrink
-  case 1132:
-  case 215:
-  case 213:
-  case 212:
-  case 211:
+    // Auto-color
+  case 1136:
+    ::AutoColor();
+  break;
+
+  case 1137:
+    ::DisableAutoColor();
+  break;
+
+  case 1134: // Clipping
+  case 1133: // Tranparency
+  case 1132: // Colors / Size
+
+    // Display Mode
+  case 215: // Nodes
+  case 213: // Nodes
+  case 212: // Nodes
+  case 211: // Nodes
+    ::SetDisplayMode(theCommandID);
+  break;
+
+  //2D quadratic representation
+  case 231:
+  case 232:
+    ::SetDisplayMode(theCommandID);
+  break;
+  
+  // Display Entity
+  case 216: // 0D elements
+  case 217: // Edges
+  case 218: // Faces
+  case 219: // Volumes
+  case 220: // All Entity
+    ::SetDisplayEntity(theCommandID);
+  break;
+
+  case 221: // Orientation of faces

     {
     {

-      smeshGUI->SetViewMode(theCommandID);
+      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() );
+          }
+        }
+      }

       break;
     }
 
       break;
     }
 

-  case 214:                                    // UPDATE
+  case 214:                                     // UPDATE

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      smeshGUI->Update();
+      try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+        OCC_CATCH_SIGNALS;
+#endif
+        SMESH::UpdateView();
+      }
+      catch (std::bad_alloc) { // PAL16774 (Crash after display of many groups)
+        SMESH::OnVisuException();
+      }
+      catch (...) { // PAL16774 (Crash after display of many groups)
+        SMESH::OnVisuException();
+      }
+
+      SALOME_ListIO l;
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      aSel->selectedObjects( l );
+      aSel->setSelectedObjects( l );

       break;
     }
 
       break;
     }
 

-  case 300:                                    // ERASE
-  case 301:                                    // DISPLAY
-  case 302:                                    // DISPLAY ONLY
+  case 300:                                     // ERASE
+  case 301:                                     // DISPLAY
+  case 302:                                     // DISPLAY ONLY

     {
     {

-      EDisplaing anAction;
-      switch(theCommandID){
-      case 300:        anAction = eErase; break;
-      case 301:        anAction = eDisplay; break;
-      case 302:        anAction = eDisplayOnly; break;
+      SMESH::EDisplaing anAction;
+      switch (theCommandID) {
+      case 300: anAction = SMESH::eErase; break;
+      case 301: anAction = SMESH::eDisplay; break;
+      case 302: anAction = SMESH::eDisplayOnly; break;

       }
       }

-      
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-       for (; It.More(); It.Next()) {
-         Handle(SALOME_InteractiveObject) IOS = It.Value();
-         if (IOS->hasEntry()) {
-           ::UpdateView(anAction,IOS->getEntry());
-         }
-       }
+
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO sel_objects, to_process;
+      if (aSel)
+        aSel->selectedObjects( sel_objects );
+
+      if( theCommandID==302 )
+      {
+       MESSAGE("anAction = SMESH::eDisplayOnly");
+        startOperation( myEraseAll );
+      }
+
+      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 <--
+      }
+      catch (...) { // PAL16774 (Crash after display of many groups)
+        SMESH::OnVisuException();
+      }
+
+      if (anAction == SMESH::eErase) {
+       MESSAGE("anAction == SMESH::eErase");
+        SALOME_ListIO l1;
+        aSel->setSelectedObjects( l1 );

       }
       }

-      Sel->ClearIObjects();
+      else
+        aSel->setSelectedObjects( to_process );
+      

       break;
     }
 
       break;
     }
 

-  case 400:                                    // NODES
+  case 4000:                                    // NODES

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       smeshGUI->EmitSignalDeactivateDialog();
-       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       Sel->ClearIObjects();
-       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
-       smeshGUI->ViewNodes();
-       SMESHGUI_NodesDlg *aDlg = new SMESHGUI_NodesDlg(parent, "", Sel);
+
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+
+        ( new SMESHGUI_NodesDlg( this ) )->show();

       }
       else {
       }
       else {

-       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"), 
-                             tr("SMESH_WRN_VIEWER_VTK"),
-                             tr("SMESH_BUT_OK"));
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"),
+                                 tr("SMESH_WRN_VIEWER_VTK"));

       }
       break;
     }
 
   case 2151:  // FILTER
   {
       }
       break;
     }
 
   case 2151:  // FILTER
   {

-    if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK )
+    if ( vtkwnd )

     {
     {

-      smeshGUI->EmitSignalDeactivateDialog();
-      SMESHGUI_FilterDlg *aDlg = new SMESHGUI_FilterDlg( parent, SMESH::EDGE );
+      EmitSignalDeactivateDialog();
+      ( new SMESHGUI_FilterDlg( this, SMESH::EDGE ) )->show();

     }
     break;
   }
     }
     break;
   }

-    
-  case 405:                                    // MOVE NODE
+
+  case 406:                                     // MOVE NODE

     {
     {

+      if ( !vtkwnd )
+      {
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
+      }
+

       if(checkLock(aStudy)) break;
       if(checkLock(aStudy)) break;

-      smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      SMESHGUI_MoveNodesDlg *aDlg = new SMESHGUI_MoveNodesDlg(parent, "", Sel);
+      ( new SMESHGUI_MoveNodesDlg( this ) )->show();

       break;
     }
       break;
     }

-    
-  case 701:                                    // COMPUTE MESH 
+
+  case 701:                                     // COMPUTE MESH
+  case 711:                                     // PRECOMPUTE MESH
+  case 712:                                     // EVALUATE MESH

     {
     {

-      if(checkLock(aStudy)) break;
-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       int nbSel = Sel->IObjectCount();
-       if (nbSel != 1){
-         break;
-       }
-
-       SMESH::SMESH_Mesh_var aMesh;
-       SMESH::SMESH_subMesh_var aSubMesh;
-       Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-       if (IObject->hasEntry()){
-         SALOMEDS::SObject_var aMeshSObj = smeshGUI->myStudy->FindObjectID(IObject->getEntry());
-         GEOM::GEOM_Shape_var aShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh( aMeshSObj );
-         if ( aShape->_is_nil() ) {
-           // imported mesh
-           break;
-         }
-         SALOMEDS::GenericAttribute_var anAttr;
-         if(!aMeshSObj->_is_nil() && aMeshSObj->FindAttribute(anAttr, "AttributeIOR")){
-           SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-           MESSAGE("SMESHGUI::OnGUIEvent - Compute mesh : IOR = "<< anIOR->Value());
-           CORBA::Object_var anObj;
-           try{
-             anObj = _orb->string_to_object(anIOR->Value());
-             if (CORBA::is_nil(anObj)){
-               MESSAGE("SMESHGUI::OnGUIEvent - Compute mesh : nil object");
-             }
-           }catch(CORBA::COMM_FAILURE & ex){
-             INFOS("SMESHGUI::OnGUIEvent - Compute mesh : exception (1)");
-           }
-           aMesh = SMESH::SMESH_Mesh::_narrow(anObj);
-           aSubMesh = SMESH::SMESH_subMesh::_narrow(anObj);
-           if (!aMesh->_is_nil()){
-             GEOM::GEOM_Shape_var refShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(aMeshSObj);
-             if (!refShape->_is_nil()) {
-               if(!smeshGUI->myComponentMesh->IsReadyToCompute(aMesh,refShape)){
-                 QAD_MessageBox::warn1(QAD_Application::getDesktop(), 
-                                       tr("SMESH_WRN_WARNING"),
-                                       tr("SMESH_WRN_MISSING_PARAMETERS"),
-                                       tr("SMESH_BUT_OK"));
-                 break;
-               }
-               try{
-                 if (smeshGUI->myComponentMesh->Compute(aMesh,refShape))
-                    smeshGUI->myStudyAPI.ModifiedMesh(aMeshSObj,true);
-                 // TO Do : change icon of all submeshes
-               }
-               catch(const SALOME::SALOME_Exception & S_ex){
-                 QtCatchCorbaException(S_ex);
-               }
-             }
-           }else if(!aSubMesh->_is_nil()){
-             aMesh = aSubMesh->GetFather();
-             GEOM::GEOM_Shape_var refShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(aMeshSObj);
-             if(!refShape->_is_nil()){
-               bool compute = smeshGUI->myComponentMesh->IsReadyToCompute(aMesh,refShape);
-               if(!compute){
-                 QAD_MessageBox::warn1(QAD_Application::getDesktop(), 
-                                       tr("SMESH_WRN_WARNING"),
-                                       tr("SMESH_WRN_MISSING_PARAMETERS"),
-                                       tr("SMESH_BUT_OK"));
-                 break;
-               }
-               try{
-                 if ( smeshGUI->myComponentMesh->Compute(aMesh,refShape) )
-                    smeshGUI->myStudyAPI.ModifiedMesh(aMeshSObj,true);
-                 // TO Do : change icon of all submeshes
-               }catch(const SALOME::SALOME_Exception & S_ex){
-                 QtCatchCorbaException(S_ex);
-               }
-             }
-           }
-         }
-       }
-       CORBA::Long anId = smeshGUI->myStudy->StudyId();
-       TVisualObjPtr aVisualObj = GetVisualObj(anId,IObject->getEntry());
-       if(smeshGUI->myAutomaticUpdate && aVisualObj){
-         aVisualObj->Update();
-         SMESH_Actor* anActor = ::FindActorByEntry(IObject->getEntry());
-         if(!anActor){
-           anActor = ::CreateActor(smeshGUI->myStudy,IObject->getEntry());
-           if(anActor){
-             ::DisplayActor(smeshGUI->myActiveStudy->getActiveStudyFrame(),anActor); //apo
-             ::FitAll();
-           }
-         }
-       }
-      }else{
-       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"), 
-                             tr("SMESH_WRN_VIEWER_VTK"),
-                             tr("SMESH_BUT_OK"));
+      if (checkLock(aStudy)) break;
+      startOperation( theCommandID );
+    }
+    break;
+
+  case 702: // Create mesh
+  case 703: // Create sub-mesh
+  case 704: // Edit mesh/sub-mesh
+    startOperation( theCommandID );
+    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 )
+      {
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
+      }
+
+      if ( checkLock( aStudy ) )
+        break;
+
+      /*Standard_Boolean aRes;
+      SMESH::SMESH_Mesh_var aMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(IObject);
+      if ( aMesh->_is_nil() )
+      {
+        SUIT_MessageBox::warning(GetDesktop(), tr( "SMESH_WRN_WARNING" ),
+          tr( "SMESH_BAD_SELECTION" ) );
+        break;

       }
       }

+      */
+      EmitSignalDeactivateDialog();
+      if ( theCommandID == 407 )
+        ( new SMESHGUI_TrianglesInversionDlg( this ) )->show();
+      else
+        ( new SMESHGUI_UnionOfTwoTrianglesDlg( this ) )->show();

       break;
     }
       break;
     }

+    case 409: // Change orientation
+    case 410: // Union of triangles
+    case 411: // Cutting of quadrangles
+    {
+      if ( !vtkwnd )
+      {
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
+      }

 
 

-  case 702:                                    // ADD SUB MESH 
+      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
+        aDlg = new SMESHGUI_CuttingOfQuadsDlg(this);
+
+      aDlg->show();
+      break;
+    }
+  case 412: // Smoothing

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       smeshGUI->EmitSignalDeactivateDialog();
-       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       SMESHGUI_AddSubMeshDlg *aDlg = new SMESHGUI_AddSubMeshDlg(parent, "", Sel);
+      if( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_SmoothingDlg( this ) )->show();

       }
       else {
       }
       else {

-       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
-                             tr("SMESH_BUT_OK"));
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));

       }
       break;
     }
       }
       break;
     }

-    
-  case 703:                                    // INIT MESH 
+  case 413: // Extrusion

     {
     {

-      if(checkLock(aStudy)) break;
-      smeshGUI->EmitSignalDeactivateDialog();
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      SMESHGUI_InitMeshDlg *aDlg = new SMESHGUI_InitMeshDlg(parent, "", Sel);
+      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"));
+      }

       break;
     }
       break;
     }

-
-  case 704:                                    // EDIT Hypothesis 
+  case 414: // Revolution

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      smeshGUI->EmitSignalDeactivateDialog();
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg(parent, "", Sel);
+      if( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_RevolutionDlg( this ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }

       break;
     }
       break;
     }

-
-  case 705:                                    //  EDIT Global Hypothesis
+  case 415: // Pattern mapping

     {
     {

-      if(checkLock(aStudy)) break;
-      smeshGUI->EmitSignalDeactivateDialog();
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg(parent, "", Sel);
+      if ( checkLock( aStudy ) )
+        break;
+      if ( vtkwnd )
+      {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_MeshPatternDlg( this ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }

       break;
     }
       break;
     }

-
-  case 706:                                    //  EDIT Local Hypothesis
+  case 416: // Extrusion along a path

     {
     {

-      if(checkLock(aStudy)) break;
-      smeshGUI->EmitSignalDeactivateDialog();
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg(parent, "", Sel);
+      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"));
+      }

       break;
     }
       break;
     }

-
-  case 406:                                    // ORIENTATION ELEMENTS
+  case 417: // Convert mesh to quadratic

     {
     {

-      if(checkLock(aStudy)) break;
-      smeshGUI->EmitSignalDeactivateDialog();
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      smeshGUI->myDesktop->SetSelectionMode(FaceSelection, true);
-      SMESHGUI_OrientationElementsDlg *aDlg = new SMESHGUI_OrientationElementsDlg(parent, "", Sel);
+    startOperation( 417 );
+      /*      if (checkLock(aStudy)) break;
+      if (vtkwnd) {
+        EmitSignalDeactivateDialog();
+        new SMESHGUI_ConvToQuadDlg();
+      } else {
+        SUIT_MessageBox::warning(desktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+                               }*/

       break;
     }
       break;
     }

-
-  case 407:                                    // DIAGONAL INVERSION
+  case 418: // create 2D mesh from 3D

     {
     {

-      if(checkLock(aStudy)) break;
-      smeshGUI->EmitSignalDeactivateDialog();
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      Sel->ClearIObjects();
-      smeshGUI->myDesktop->SetSelectionMode(EdgeOfCellSelection, true);
-      SMESHGUI_DiagonalInversionDlg *aDlg = new SMESHGUI_DiagonalInversionDlg(parent, "", Sel);
+      startOperation( 418 );
+      break;
+    }
+  case 806:                                     // CREATE GEO GROUP
+    {
+      startOperation( 806 );

       break;
     }
       break;
     }

-

   case 801:                                     // CREATE GROUP
     {
   case 801:                                     // CREATE GROUP
     {

+      if ( !vtkwnd )
+      {
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
+      }
+

       if(checkLock(aStudy)) break;
       if(checkLock(aStudy)) break;

-      smeshGUI->EmitSignalDeactivateDialog();
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      int nbSel = Sel->IObjectCount();
+      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) {
       if (nbSel == 1) {

-       // check if mesh is selected
-       Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-       if (IObject->hasEntry()) {
-         SALOMEDS::SObject_var aMeshSObj = smeshGUI->myStudy->FindObjectID(IObject->getEntry());
-         if (!aMeshSObj->_is_nil()) {
-           CORBA::Object_var anObj = aMeshSObj->GetObject();
-           SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(anObj);
-           SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(anObj);
-           if (aMesh->_is_nil() && !aSubMesh->_is_nil()) {
-             aMesh = aSubMesh->GetFather();
-           }
-           if (!aMesh->_is_nil()) {
-             SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg(parent, "", Sel, aMesh);
-             aDlg->show();
-           }
-         }
-       }
+        // check if mesh is selected
+        aMesh = SMESH::GetMeshByIO( selected.First() );

       }
       }

+      SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg( this, aMesh);
+      aDlg->show();

       break;
     }
 
   case 802:                                     // CONSTRUCT GROUP
     {
       break;
     }
 
   case 802:                                     // CONSTRUCT GROUP
     {

+      if ( !vtkwnd )
+      {
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
+      }
+

       if(checkLock(aStudy)) break;
       if(checkLock(aStudy)) break;

-      smeshGUI->EmitSignalDeactivateDialog();
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      int nbSel = Sel->IObjectCount();
+      EmitSignalDeactivateDialog();
+
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      int nbSel = selected.Extent();

       if (nbSel == 1) {
       if (nbSel == 1) {

-       // check if submesh is selected
-       Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-       if (IObject->hasEntry()) {
-         SALOMEDS::SObject_var aSObj = smeshGUI->myStudy->FindObjectID(IObject->getEntry());
-         if(!aSObj->_is_nil()) {
-           SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(aSObj->GetObject());
-           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();
-               MESSAGE("SMESHGUI::OnGUIEvent - Construct group on submesh : "<<aName);
-               MESSAGE(" Number of elements : nodes "<<aNodes->length() << ", edges " << aEdges->length()
-                       << ", faces " << aFaces->length() << ", volumes " << aVolumes->length());
-               if (aNodes->length() > 0) {
-                 SMESH::SMESH_Group_var aGroup = smeshGUI->AddGroup(aMesh, SMESH::NODE, aName);
-                 aGroup->Add(aNodes);
-               }
-               if (aEdges->length() > 0) {
-                 SMESH::SMESH_Group_var aGroup = smeshGUI->AddGroup(aMesh, SMESH::EDGE, aName);
-                 aGroup->Add(aEdges);
-               }
-               if (aFaces->length() > 0) {
-                 SMESH::SMESH_Group_var aGroup = smeshGUI->AddGroup(aMesh, SMESH::FACE, aName);
-                 aGroup->Add(aFaces);
-               }
-               if (aVolumes->length() > 0) {
-                 SMESH::SMESH_Group_var aGroup = smeshGUI->AddGroup(aMesh, SMESH::VOLUME, aName);
-                 aGroup->Add(aVolumes);
-               }
-               smeshGUI->myActiveStudy->updateObjBrowser(true);
-             }catch(const SALOME::SALOME_Exception & S_ex){
-               QtCatchCorbaException(S_ex);
-             }
-           }
-         }
-       }
+        // 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();
+                if (aNodes->length() > 0) {
+                  SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::NODE, aName + "_Nodes");
+                  aGroup->Add(aNodes.inout());
+                }
+                if (aEdges->length() > 0) {
+                  SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::EDGE, aName + "_Edges");
+                  aGroup->Add(aEdges.inout());
+                }
+                if (aFaces->length() > 0) {
+                  SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::FACE, aName + "_Faces");
+                  aGroup->Add(aFaces.inout());
+                }
+                if (aVolumes->length() > 0) {
+                  SMESH::SMESH_Group_var aGroup = SMESH::AddGroup(aMesh, SMESH::VOLUME, aName + "_Volumes");
+                  aGroup->Add(aVolumes.inout());
+                }
+                updateObjBrowser();
+
+              }
+              catch(const SALOME::SALOME_Exception & S_ex){
+                SalomeApp_Tools::QtCatchCorbaException(S_ex);
+              }
+            }
+          }
+        }
+      }
+      else if(nbSel==0) {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"),
+                                 tr("SMESH_WRN_NO_AVAILABLE_DATA"));

       }
       break;
     }
 
   case 803:                                     // EDIT GROUP
     {
       }
       break;
     }
 
   case 803:                                     // EDIT GROUP
     {

+      if ( !vtkwnd )
+      {
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
+      }
+

       if(checkLock(aStudy)) break;
       if(checkLock(aStudy)) break;

-      smeshGUI->EmitSignalDeactivateDialog();
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      int nbSel = Sel->IObjectCount();
-      if (nbSel == 1) {
-       // check if group is selected
-       Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-       if (IObject->hasEntry()) {
-         SALOMEDS::SObject_var aSObj = smeshGUI->myStudy->FindObjectID(IObject->getEntry());
-         if(!aSObj->_is_nil()) {
-           SMESH::SMESH_Group_var aGroup = SMESH::SMESH_Group::_narrow(aSObj->GetObject());
-           if (!aGroup->_is_nil()) {
-             SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg(parent, "", Sel, aGroup);
-             aDlg->show();
-           }
-         }
-       }
+      EmitSignalDeactivateDialog();
+
+      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() )
+      {
+        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 804:                                     // Add elements to group
     {
       if(checkLock(aStudy)) break;
       break;
     }
 
   case 804:                                     // Add elements to group
     {
       if(checkLock(aStudy)) break;

-      if (smeshGUI->myState == 800) {
-       SMESHGUI_GroupDlg *aDlg = (SMESHGUI_GroupDlg*) smeshGUI->myActiveDialogBox;
-       if (aDlg) aDlg->onAdd();
+      if (myState == 800) {
+        SMESHGUI_GroupDlg *aDlg = (SMESHGUI_GroupDlg*) myActiveDialogBox;
+        if (aDlg) aDlg->onAdd();

       }
       break;
     }
       }
       break;
     }


@@ -2598,176 +1945,183 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent)
   case 805:                                     // Remove elements from group
     {
       if(checkLock(aStudy)) break;
   case 805:                                     // Remove elements from group
     {
       if(checkLock(aStudy)) break;

-      if (smeshGUI->myState == 800) {
-       SMESHGUI_GroupDlg *aDlg = (SMESHGUI_GroupDlg*) smeshGUI->myActiveDialogBox;
-       if (aDlg) aDlg->onRemove();
+      if (myState == 800) {
+        SMESHGUI_GroupDlg *aDlg = (SMESHGUI_GroupDlg*) myActiveDialogBox;
+        if (aDlg) aDlg->onRemove();

       }
       break;
     }
 
       }
       break;
     }
 

-  case 900:                                    // MESH INFOS
+  case 815:                                     // Edit GEOM GROUP as standalone

     {
     {

-      smeshGUI->EmitSignalDeactivateDialog();
-      SMESHGUI_MeshInfosDlg *aDlg = new SMESHGUI_MeshInfosDlg(parent, "", false);
+      if ( !vtkwnd )
+      {
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
+      }
+
+      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() )
+      {
+        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();
+        }
+      }

       break;
     }
 
       break;
     }
 

-  case 1001:                                   // AUTOMATIC UPDATE PREFERENCES
+    case 810: // Union Groups
+    case 811: // Intersect groups
+    case 812: // Cut groups

     {
     {

-      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;
+      if ( !vtkwnd )
+      {
+        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;
+    }
+
+    case 814: // Create groups of entities from existing groups of superior dimensions
+    {
+      if ( checkLock( aStudy ) )
+        break;
+
+      EmitSignalDeactivateDialog();
+      SMESHGUI_GroupOpDlg* aDlg = new SMESHGUI_DimGroupDlg( this );
+      aDlg->show();
+

       break;
     }
 
       break;
     }
 

-  case 1003:                                   // MESH PREFERENCES
+    case 813: // Delete groups with their contents

     {
     {

-      smeshGUI->SetDisplaySettings();
+      if ( !vtkwnd )
+      {
+        SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+                                  tr( "NOT_A_VTK_VIEWER" ) );
+        break;
+      }
+
+      if ( checkLock( aStudy ) )
+        break;
+
+      EmitSignalDeactivateDialog();
+
+      ( new SMESHGUI_DeleteGroupDlg( this ) )->show();

       break;
     }
 
       break;
     }
 

-  case 1005:
+  case 900:                                     // MESH INFOS

     {
     {

-      SMESHGUI_Preferences_ScalarBarDlg::ScalarBarPreferences( parent );
+      EmitSignalDeactivateDialog();
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      if ( selected.Extent() > 1 ) { // a dlg for each IO
+        SALOME_ListIO IOs;
+        SALOME_ListIteratorOfListIO It (selected);
+        for ( ; It.More(); It.Next() ) {
+          IOs.Clear(); IOs.Append( It.Value() );
+          aSel->setSelectedObjects( IOs );
+          ( new SMESHGUI_MeshInfosDlg( this ) )->show();
+        }
+        // restore selection
+        aSel->setSelectedObjects( selected );
+      }
+      else
+        ( new SMESHGUI_MeshInfosDlg( this ) )->show();

       break;
     }
 
       break;
     }
 

-  case 1006: 
+  case 902:                                     // STANDARD MESH INFOS

     {
     {

-      SMESHGUI_Preferences_SelectionDlg* aDlg = 
-       new SMESHGUI_Preferences_SelectionDlg(parent);
-
-      QColor aColor;
-      QString SCr, SCg, SCb;
-      SCr = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorRed");
-      SCg = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorGreen");
-      SCb = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorBlue");
-      if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-       aColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-      else aColor = Qt::cyan;
-      aDlg->SetColor(1, aColor);
-
-      SCr = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorRed");
-      SCg = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorGreen");
-      SCb = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorBlue");
-      if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-       aColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-      else aColor = Qt::yellow;
-      aDlg->SetColor(2, aColor);
-
-      SCr = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorRed");
-      SCg = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorGreen");
-      SCb = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorBlue");
-      if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-       aColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-      else aColor = Qt::white;
-      aDlg->SetColor(3, aColor);
-
-      QString SW1 = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectWidth");
-      if (SW1.isEmpty()) SW1 = "5";
-      aDlg->SetWidth(1, SW1.toInt());
-
-      QString SW2 = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectWidth");
-      if (SW2.isEmpty()) SW2 = "5";
-      aDlg->SetWidth(2, SW2.toInt());
-
-      QString SP1 = QAD_CONFIG->getSetting("SMESH:SettingsNodeSelectTol");
-      if (SP1.isEmpty()) SP1 = "0.025";
-      aDlg->SetPrecision(1, SP1.toDouble());
-
-      QString SP2 = QAD_CONFIG->getSetting("SMESH:SettingsElementsSelectTol");
-      if (SP2.isEmpty()) SP2 = "0.001";
-      aDlg->SetPrecision(2, SP2.toDouble());
-
-      if (aDlg->exec()) {
-       QColor aPreColor = aDlg->GetColor(1);
-       QAD_CONFIG->addSetting("SMESH:SettingsPreSelectColorRed", aPreColor.red());
-       QAD_CONFIG->addSetting("SMESH:SettingsPreSelectColorGreen", aPreColor.green());
-       QAD_CONFIG->addSetting("SMESH:SettingsPreSelectColorBlue", aPreColor.blue());
-
-       QColor aSelColor = aDlg->GetColor(2);
-       QAD_CONFIG->addSetting("SMESH:SettingsItemSelectColorRed", aSelColor.red());
-       QAD_CONFIG->addSetting("SMESH:SettingsItemSelectColorGreen", aSelColor.green());
-       QAD_CONFIG->addSetting("SMESH:SettingsItemSelectColorBlue", aSelColor.blue());
-
-       QColor aHiColor = aDlg->GetColor(3);
-       QAD_CONFIG->addSetting("SMESH:SettingsSelectColorRed", aHiColor.red());
-       QAD_CONFIG->addSetting("SMESH:SettingsSelectColorGreen", aHiColor.green());
-       QAD_CONFIG->addSetting("SMESH:SettingsSelectColorBlue", aHiColor.blue());
-
-       int aPreWidth = aDlg->GetWidth(1);
-       QAD_CONFIG->addSetting("SMESH:SettingsPreSelectWidth", aPreWidth);
-       int aSelWidth = aDlg->GetWidth(2);
-       QAD_CONFIG->addSetting("SMESH:SettingsItemSelectWidth", aSelWidth);
-
-       double aTolNodes = aDlg->GetPrecision(1);
-       QAD_CONFIG->addSetting("SMESH:SettingsNodeSelectTol", aTolNodes);
-       double aTolItems = aDlg->GetPrecision(2);
-       QAD_CONFIG->addSetting("SMESH:SettingsElementsSelectTol", aTolItems);
-
-       // update current study settings
-       ::UpdateSelectionProp();
-
-       QAD_StudyFrame* studyFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
-       if (studyFrame->getTypeView() == VIEW_VTK) {
-         VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(studyFrame);
-         // update VTK viewer properties
-         VTKViewer_RenderWindowInteractor* anInteractor = aViewFrame->getRWInteractor();
-         if (anInteractor) {
-           anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255., 
-                                          aSelColor.blue()/255., aSelWidth);
-           anInteractor->SetSelectionTolerance(aTolNodes, aTolItems);
-           VTKViewer_InteractorStyleSALOME* aStyle = anInteractor->GetInteractorStyleSALOME();
-           if (aStyle)
-             aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255., 
-                                         aPreColor.blue()/255., aPreWidth);
-         }
-         // update actors
-         vtkRenderer* aRenderer = aViewFrame->getRenderer();
-         vtkActorCollection *aCollection = aRenderer->GetActors();
-         aCollection->InitTraversal();
-         while(vtkActor *anAct = aCollection->GetNextActor()){
-           if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-             anActor->SetHighlightColor(aHiColor.red()/255., aHiColor.green()/255., 
-                                        aHiColor.blue()/255.);
-             anActor->SetPreHighlightColor(aPreColor.red()/255., aPreColor.green()/255., 
-                                           aPreColor.blue()/255.);
-           }
-         }
-       }
+      EmitSignalDeactivateDialog();
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      if ( selected.Extent() > 1 ) { // a dlg for each IO
+        SALOME_ListIO IOs;
+        SALOME_ListIteratorOfListIO It (selected);
+        for ( ; It.More(); It.Next() ) {
+          IOs.Clear();
+          IOs.Append( It.Value() );
+          aSel->setSelectedObjects( IOs );
+          ( new SMESHGUI_StandardMeshInfosDlg( this ) )->show();
+        }
+        // restore selection
+        aSel->setSelectedObjects( selected );

       }
       }

+      else
+        ( new SMESHGUI_StandardMeshInfosDlg( this ) )->show();
+      break;
+    }

 
 

+  case 903:                                     // WHAT IS
+    {
+      EmitSignalDeactivateDialog();
+      ( new SMESHGUI_WhatIsDlg( this ) )->show();

       break;
     }
 
       break;
     }
 

-  case 1100:                                   // EDIT HYPOTHESIS
+  case 1100:                                    // EDIT HYPOTHESIS

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      SALOME_Selection *Sel =
-        SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      int nbSel = Sel->IObjectCount();
+
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      int nbSel = selected.Extent();

 
       if (nbSel == 1) {
 
       if (nbSel == 1) {

-        Standard_Boolean res;
-        SMESH::SMESH_Hypothesis_var Hyp =
-          smeshGUI->ConvertIOinSMESHHypothesis(Sel->firstIObject(), res);
+        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 !                     */
 
         /* 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 ( res )
+        if ( !aHypothesis->_is_nil() )

         {
         {

-          char* sName = Hyp->GetName();
-          SMESHGUI_GenericHypothesisCreator* aCreator = smeshGUI->GetHypothesisCreator(sName);
-          if (aCreator)
-          {
-            aCreator->EditHypothesis(Hyp);
+          // 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
           {
           }
           else
           {


@@ -2778,460 +2132,464 @@ bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent)
       break;
     }
 
       break;
     }
 

-  case 1101:                                   // RENAME
+  case 1101:                                    // RENAME
+    {
+      if ( checkLock( aStudy ) )
+        break;
+
+      LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+      SALOME_ListIO selected;
+      if( aSel )
+        aSel->selectedObjects( selected );
+
+      bool isAny = false; // is there any appropriate object selected
+
+      SALOME_ListIteratorOfListIO It( selected );
+      for ( ; It.More(); It.Next() )
+      {
+        Handle(SALOME_InteractiveObject) IObject = It.Value();
+        _PTR(SObject) obj = aStudy->FindObjectID( IObject->getEntry() );
+        _PTR(GenericAttribute) anAttr;
+        _PTR(AttributeName) aName;
+        if ( obj )
+        {
+          if ( obj->FindAttribute(anAttr, "AttributeName") )
+          {
+            aName = anAttr;
+            QString newName = QString(aName->Value().c_str());
+
+            // check type to prevent renaming of inappropriate objects
+            int aType = SMESHGUI_Selection::type(IObject->getEntry(), aStudy);
+            if (aType == MESH || aType == GROUP ||
+                aType == SUBMESH || aType == SUBMESH_COMPOUND ||
+                aType == SUBMESH_SOLID || aType == SUBMESH_FACE ||
+                aType == SUBMESH_EDGE || aType == SUBMESH_VERTEX ||
+                aType == HYPOTHESIS || aType == ALGORITHM)
+            {
+              isAny = true;
+              newName = LightApp_NameDlg::getName(desktop(), newName);
+              if ( !newName.isEmpty() )
+              {
+                SMESHGUI::GetSMESHGen()->SetName(obj->GetIOR().c_str(), newName.toLatin1().data());
+
+                // update name of group object and its actor
+                SMESH::SMESH_GroupBase_var aGroupObject = SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(IObject);
+                if( !aGroupObject->_is_nil() )
+                {
+                  aGroupObject->SetName( newName.toLatin1().data() );
+                  if ( SMESH_Actor *anActor = SMESH::FindActorByEntry( IObject->getEntry() ) )
+                    anActor->setName( newName.toLatin1().data() );
+                }
+
+                updateObjBrowser();
+              }
+            }
+          }
+        }
+      } // for
+
+      if (!isAny) {
+        SUIT_MessageBox::warning(desktop(),
+                                 QObject::tr("SMESH_WRN_WARNING"),
+                                 QObject::tr("SMESH_WRN_NO_APPROPRIATE_SELECTION"));
+      }
+      break;
+    }
+
+  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;
+    }
+
+  case 4009:                                    // ELEM0D
+  case 4010:                                    // GEOM::EDGE
+  case 4021:                                    // TRIANGLE
+  case 4022:                                    // QUAD
+  case 4023:                                    // POLYGON
+  case 4031:                                    // TETRA
+  case 4032:                                    // HEXA
+    {
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        SMDSAbs_ElementType type    = SMDSAbs_Edge;
+        int                 nbNodes = 2;
+        switch (theCommandID) {
+        case 4009:                                      // ELEM0D
+          type = SMDSAbs_0DElement; nbNodes = 1; break;
+        case 4021:                                      // TRIANGLE
+          type = SMDSAbs_Face; nbNodes = 3; break;
+        case 4022:                                      // QUAD
+          type = SMDSAbs_Face; nbNodes = 4; break;
+        case 4031:                                      // TETRA
+          type = SMDSAbs_Volume; nbNodes = 4; break;
+        case 4023:                                      // POLYGON
+          type = SMDSAbs_Face; nbNodes = 5; break;     // 5 - identificator for POLYGON
+        case 4032:                                      // HEXA
+          type = SMDSAbs_Volume; nbNodes = 8; break;
+        case 4033:                                      // POLYHEDRE
+          type = SMDSAbs_Volume; nbNodes = 9; break; // 9 - identificator for POLYHEDRE
+        default:;
+        }
+        ( new SMESHGUI_AddMeshElementDlg( this, type, nbNodes ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }
+      break;
+    }
+  case 4033:                                    // POLYHEDRON
+    {
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_CreatePolyhedralVolumeDlg( this ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }
+      break;
+    }
+  case 4034:     // QUADRATIC EDGE
+  case 4035:     // QUADRATIC TRIANGLE
+  case 4036:     // QUADRATIC QUADRANGLE
+  case 4037:     // QUADRATIC TETRAHEDRON
+  case 4038:     // QUADRATIC PYRAMID
+  case 4039:     // QUADRATIC PENTAHEDRON
+  case 4040:     // QUADRATIC HEXAHEDRON
+    {
+      if(checkLock(aStudy)) break;
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        int type;
+
+        switch (theCommandID) {
+        case 4034:
+          type = QUAD_EDGE; break;
+        case 4035:
+          type = QUAD_TRIANGLE; break;
+        case 4036:
+          type = QUAD_QUADRANGLE; break;
+        case 4037:
+          type = QUAD_TETRAHEDRON; break;
+        case 4038:
+          type = QUAD_PYRAMID; break;
+        case 4039:
+          type = QUAD_PENTAHEDRON; break;
+        case 4040:
+          type = QUAD_HEXAHEDRON;
+          break;
+        default:;
+        }
+         ( new SMESHGUI_AddQuadraticElementDlg( this, type ) )->show();
+      }
+      else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+      }
+      break;
+    }
+  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;
+    }
+  case 4042:                                    // REMOVES ELEMENTS
+    {
+      if(checkLock(aStudy)) break;
+      if( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_RemoveElementsDlg( this ) )->show();
+      }
+      else
+        {
+          SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                   tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+        }
+      break;
+    }
+  case 4043: {                                // CLEAR_MESH
+
+    if(checkLock(aStudy)) break;
+
+    SALOME_ListIO selected;
+    if( LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr() )
+      aSel->selectedObjects( selected );
+
+    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::UpdateView(SMESH::eErase, IOS->getEntry());
+        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::UpdateView(SMESH::eErase, so->GetID().c_str());
+        }
+      }
+      catch (const SALOME::SALOME_Exception& S_ex){
+        wc.suspend();
+        SalomeApp_Tools::QtCatchCorbaException(S_ex);
+        wc.resume();
+      }
+    }
+    SMESH::UpdateView();
+    updateObjBrowser();
+    break;
+  }
+  case 4051:                                    // RENUMBERING NODES

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      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()) {
-             smeshGUI->myActiveStudy->renameIObject(IObject, newName);
-           }
-         }
-       }
+      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;
     }
       break;
     }

-    
-  case 1102:                                   // REMOVE HYPOTHESIS / ALGORITHMS
+  case 4052:                                    // RENUMBERING ELEMENTS

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      QAD_WaitCursor wc;
-      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);
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_RenumberingDlg( this, 1 ) )->show();

       }
       }

-      Sel->ClearIObjects();
-      smeshGUI->myActiveStudy->updateObjBrowser(true);
+      else
+        {
+          SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                   tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
+        }

       break;
     }
       break;
     }

-
-  case 401:                                    // GEOM::EDGE
+  case 4061:                                   // TRANSLATION

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       smeshGUI->EmitSignalDeactivateDialog();
-       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       Sel->ClearIObjects();
-       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
-       smeshGUI->ViewNodes();
-       SMESHGUI_AddEdgeDlg *aDlg = new SMESHGUI_AddEdgeDlg(parent, "", Sel);
+      if ( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_TranslationDlg( this ) )->show();

       }
       else {
       }
       else {

-       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
-                             tr("SMESH_BUT_OK"));
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));

       }
       break;
     }
       }
       break;
     }

-  case 4021:                                   // TRIANGLE
+  case 4062:                                   // ROTATION

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       smeshGUI->EmitSignalDeactivateDialog();
-       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       Sel->ClearIObjects();
-       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
-       smeshGUI->ViewNodes();
-       SMESHGUI_AddFaceDlg *aDlg = new SMESHGUI_AddFaceDlg(parent, "", Sel, 3);
+      if( vtkwnd ) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_RotationDlg( this ) )->show();

       }
       else {
       }
       else {

-       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
-                             tr("SMESH_BUT_OK"));
-      }
-      break;
-    }
-  case 4022:                                   // QUAD
-    {
-      if(checkLock(aStudy)) break;
-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       smeshGUI->EmitSignalDeactivateDialog();
-       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       Sel->ClearIObjects();
-       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
-       smeshGUI->ViewNodes();
-       SMESHGUI_AddFaceDlg *aDlg = new SMESHGUI_AddFaceDlg(parent, "", Sel, 4);
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));

       }
       }

-      else
-       {
-         QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
-                               tr("SMESH_BUT_OK"));
-       }

       break;
     }
       break;
     }

-  case 4031:                                   // TETRA
+  case 4063:                                   // SYMMETRY

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       smeshGUI->EmitSignalDeactivateDialog();
-       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       Sel->ClearIObjects();
-       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
-       smeshGUI->ViewNodes();
-       SMESHGUI_AddVolumeDlg *aDlg = new SMESHGUI_AddVolumeDlg(parent, "", Sel, 4);
+      if(vtkwnd) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_SymmetryDlg( this ) )->show();

       }
       else {
       }
       else {

-       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
-                             tr("SMESH_BUT_OK"));
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));

       }
       break;
     }
       }
       break;
     }

-  case 4032:                                   // HEXA
+  case 4064:                                   // SEWING

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       smeshGUI->EmitSignalDeactivateDialog();
-       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       Sel->ClearIObjects();
-       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
-       smeshGUI->ViewNodes();
-       SMESHGUI_AddVolumeDlg *aDlg = new SMESHGUI_AddVolumeDlg(parent, "", Sel, 8);
+      if(vtkwnd) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_SewingDlg( this ) )->show();

       }
       else {
       }
       else {

-       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
-                             tr("SMESH_BUT_OK"));
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));

       }
       break;
     }
       }
       break;
     }

-
-  case 4041:                                   // REMOVES NODES
+  case 4065:                                   // MERGE NODES

     {
       if(checkLock(aStudy)) break;
     {
       if(checkLock(aStudy)) break;

-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       smeshGUI->EmitSignalDeactivateDialog();
-       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       Sel->ClearIObjects();
-       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
-       smeshGUI->ViewNodes();
-       SMESHGUI_RemoveNodesDlg *aDlg = new SMESHGUI_RemoveNodesDlg(parent, "", Sel);
+      if(vtkwnd) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_EditMeshDlg( this, 0 ) )->show();

       }
       else {
       }
       else {

-       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
-                             tr("SMESH_BUT_OK"));
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));

       }
       break;
     }
       }
       break;
     }

-  case 4042:                                   // REMOVES ELEMENTS
+  case 4066:                                   // MERGE EQUAL ELEMENTS

     {
     {

-      if(checkLock(aStudy)) break;
-      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       smeshGUI->EmitSignalDeactivateDialog();
-       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       Sel->ClearIObjects();
-       smeshGUI->myDesktop->SetSelectionMode(CellSelection, true);
-       SMESHGUI_RemoveElementsDlg *aDlg = new SMESHGUI_RemoveElementsDlg(parent, "", Sel);
+      if (checkLock(aStudy)) break;
+      if (vtkwnd) {
+        EmitSignalDeactivateDialog();
+        ( new SMESHGUI_EditMeshDlg( this, 1 ) )->show();
+      } else {
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));

       }
       }

-      else
-       {
-         QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
-                               tr("SMESH_BUT_OK"));
-       }

       break;
     }
 
       break;
     }
 

-  case 5000: // HYPOTHESIS
-    {
-      if(checkLock(aStudy)) break;
-      smeshGUI->EmitSignalDeactivateDialog();
-      SMESHGUI_CreateHypothesesDlg *aDlg =
-        new SMESHGUI_CreateHypothesesDlg (parent, "", FALSE, false);
-      break;
-    }
-  case 5010: // ALGO
+  case 4067: // MAKE MESH PASS THROUGH POINT
+    startOperation( 4067 );
+    break;
+
+  case 5105: // Library of selection filters
+  {
+    static QList<int> aTypes;
+    if ( aTypes.isEmpty() )

     {
     {

-      if(checkLock(aStudy)) break;
-      smeshGUI->EmitSignalDeactivateDialog();
-      SMESHGUI_CreateHypothesesDlg *aDlg =
-        new SMESHGUI_CreateHypothesesDlg (parent, "", FALSE, true);
-      break;
+      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 6016:                                   // CONTROLS 
+  case 6017:                                    // CONTROLS
+  case 6016:

   case 6015:
   case 6014:
   case 6013:
   case 6012:
   case 6011:
   case 6001:
   case 6015:
   case 6014:
   case 6013:
   case 6012:
   case 6011:
   case 6001:

+  case 6018:
+  case 6019:
+  case 6002:

   case 6003:
   case 6003:

-  case 6004:    
-    if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) {
-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      if ( Sel->IObjectCount() == 1 && Sel->firstIObject()->hasEntry() ) {
-       SALOMEDS::SObject_var SO = smeshGUI->myStudy->FindObjectID( Sel->firstIObject()->getEntry() );
-       if ( !SO->_is_nil() ) {
-         CORBA::Object_var aObject = SO->GetObject();
-         SMESH::SMESH_Mesh_var    aMesh    = SMESH::SMESH_Mesh::_narrow( aObject );
-         SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( aObject );
-         SMESH::SMESH_Group_var   aGroup   = SMESH::SMESH_Group::_narrow( aObject );
-         if ( !aMesh->_is_nil() || !aSubMesh->_is_nil() || !aGroup->_is_nil() ) {
-           smeshGUI->Control( theCommandID );
-           break;
-         }
-       }
+  case 6004:
+  case 6005:
+  case 6009:
+  case 6021:
+    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;
+          }
+        }

       }
       }

-      QAD_MessageBox::warn1(smeshGUI->GetDesktop(), 
-                           tr( "SMESH_WRN_WARNING" ),
-                           tr( "SMESH_BAD_SELECTION" ), 
-                           tr( "SMESH_BUT_OK" ) );
+      SUIT_MessageBox::warning(desktop(),
+                               tr( "SMESH_WRN_WARNING" ),
+                               tr( "SMESH_BAD_SELECTION" ) );

       break;
     }
     else {
       break;
     }
     else {

-      QAD_MessageBox::warn1(smeshGUI->GetDesktop(), 
-                           tr( "SMESH_WRN_WARNING" ),
-                           tr( "NOT_A_VTK_VIEWER" ), 
-                           tr( "SMESH_BUT_OK" ) );
+      SUIT_MessageBox::warning(desktop(),
+                               tr( "SMESH_WRN_WARNING" ),
+                               tr( "NOT_A_VTK_VIEWER" ) );

     }
     break;
   case 9010:
     {
     }
     break;
   case 9010:
     {

-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      if (Sel->IObjectCount() == 1)    {
-       Handle(SALOME_InteractiveObject) anIObject = Sel->firstIObject();
-       if(anIObject->hasEntry())
-         if(SMESH_Actor *anActor = ::FindActorByEntry(anIObject->getEntry())){
-           anActor->SetPointsLabeled( !anActor->GetPointsLabeled() );
-         }
+      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:
     {
       }
       break;
     }
   case 9011:
     {

-      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-      if (Sel->IObjectCount() == 1)    {
-       Handle(SALOME_InteractiveObject) anIObject = Sel->firstIObject();
-       if(anIObject->hasEntry())
-         if(SMESH_Actor *anActor = ::FindActorByEntry(anIObject->getEntry())){
-           anActor->SetCellsLabeled( !anActor->GetCellsLabeled() );
-         }
+      LightApp_SelectionMgr* mgr = selectionMgr();
+      SALOME_ListIO selected; mgr->selectedObjects( selected );
+
+      if (selected.Extent() == 1)       {
+        Handle(SALOME_InteractiveObject) anIObject = selected.First();
+        if(anIObject->hasEntry())
+          if(SMESH_Actor *anActor = SMESH::FindActorByEntry(anIObject->getEntry())){
+            anActor->SetCellsLabeled( !anActor->GetCellsLabeled() );
+          }

       }
       break;
     }
       }
       break;
     }

-  case 10001:                          // DISPLAY MODE PREFERENCE
-    {
-      // Wireframe
-      parent->menuBar()->setItemChecked(10001, true);
-      parent->menuBar()->setItemChecked(10002, false);
-      parent->menuBar()->setItemChecked(10004, false);
-      parent->menuBar()->setItemEnabled(10003, true);
-      QAD_CONFIG->addSetting("SMESH:DisplayMode", "Wireframe");
-      break;
-    }
-  case 10002:
-    {
-      parent->menuBar()->setItemChecked(10002, true);
-      parent->menuBar()->setItemChecked(10001, false);
-      parent->menuBar()->setItemChecked(10004, false);
-      parent->menuBar()->setItemEnabled(10003, true);
-      QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading");
-      break;
-    }
-  case 10003:
-    {
-      parent->menuBar()->setItemChecked(10003,!parent->menuBar()->isItemChecked(10003));
-      QAD_CONFIG->addSetting("SMESH:Shrink", parent->menuBar()->isItemChecked(10003) ? "yes" : "no");
-      break;
-    }
-  case 10004:
-    {
-      parent->menuBar()->setItemChecked(10001, false);
-      parent->menuBar()->setItemChecked(10004, true);
-      parent->menuBar()->setItemChecked(10002, false);
-      parent->menuBar()->setItemEnabled(10003, false);
-      QAD_CONFIG->addSetting("SMESH:DisplayMode", "Nodes");
-      break;
-    }
-    

   }
 
   }
 

-  smeshGUI->myActiveStudy->updateObjBrowser(true);
+  anApp->updateActions(); //SRN: To update a Save button in the toolbar
+  //updateObjBrowser();

   return true;
 }
 
   return true;
 }
 

-//=============================================================================
-/*! 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().FindObject(AlgoOrHyp);
-    if (!SO_Hypothesis->_is_nil()) {
-      SALOMEDS::Study::ListOfSObject_var listSO =
-       smeshGUI->myStudy->FindDependances(SO_Hypothesis);
-      MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency number ="<<listSO->length());
-      for (unsigned int i = 0; i < listSO->length(); i++) {
-       SALOMEDS::SObject_ptr SO = listSO[i];
-       if (!SO->_is_nil()) { 
-         SALOMEDS::SObject_var aFather = SO->GetFather();
-         if (!aFather->_is_nil()) {
-           SALOMEDS::SObject_var SOfatherFather = aFather->GetFather();
-           if (!SOfatherFather->_is_nil()) {
-             MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency added to list");
-             index++;
-             listSOmesh->length(index);
-             listSOmesh[index - 1] = SOfatherFather;
-           }
-         }
-       }
-      }
-    }
-  }
-  MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): completed");
-  return listSOmesh._retn();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Import_Mesh(QAD_Desktop * parent, int theCommandID){
-  QString filter;
-  string myExtension;
-  
-  if(theCommandID == 113){
-    filter = tr("MED files (*.med)");
-  }else if (theCommandID == 112){
-    filter = tr("IDEAS files (*.unv)");
-  }else if (theCommandID == 111){
-    filter = tr("DAT files (*.dat)");
-  }
-  QString filename = QAD_FileDlg::getFileName(parent,
-                                             "",
-                                             filter,
-                                             tr("Import mesh"),
-                                             true);
-  if(!filename.isEmpty()){
-    QAD_WaitCursor wc;
-    SMESH::mesh_array_var aMeshes;
-    try {
-      SMESH::DriverMED_ReadStatus res;
-      aMeshes = smeshGUI->myComponentMesh->CreateMeshesFromMED(filename.latin1(),
-                                                               res);
-      if ( res > SMESH::DRS_OK ) {
-       wc.stop();
-       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                             tr("SMESH_WRN_WARNING"),
-                             tr(QString("SMESH_DRS_%1").arg(res)),
-                             tr("SMESH_BUT_OK"));
-       wc.start();
-
-      }
-    }
-    catch (const SALOME::SALOME_Exception& S_ex)
-    {
-      wc.stop();
-      QtCatchCorbaException(S_ex);
-      wc.start();
-    }
-    for ( int i = 0, n = aMeshes->length(); i < n; i++ ) {
-      SALOMEDS::SObject_var aMeshSO = smeshGUI->myStudyAPI.FindObject( aMeshes[i] );
-      if ( !aMeshSO->_is_nil() ) {
-       SALOMEDS::StudyBuilder_var aBuilder = smeshGUI->myStudy->NewBuilder();
-       SALOMEDS::AttributePixMap_var aPixmap = SALOMEDS::AttributePixMap::_narrow( aBuilder->FindOrCreateAttribute( aMeshSO, "AttributePixMap" ) );
-       aPixmap->SetPixMap( "ICON_SMESH_TREE_MESH_IMPORTED" );
-      }
-    }
-  }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Export_Mesh(QAD_Desktop * parent, int theCommandID)
-{
-  SALOME_Selection *Sel =
-    SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-  int nbSel = Sel->IObjectCount();
-  if ( !nbSel )
-    return;
-  Standard_Boolean res;
-  Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-  SMESH::SMESH_Mesh_var aMesh = smeshGUI->ConvertIOinMesh(IObject, res);
-  if ( res && ( nbSel == 1 || theCommandID == 122 ) ) {// MED export supports multiple meshes
-    QString aFilter, aTitle = tr("Export mesh");
-    switch ( theCommandID ) {
-    case 122:
-      aFilter = tr("MED files (*.med)");
-      break;
-    case 121:
-      aFilter = tr("DAT files (*.dat)");
-      break;
-    case 123:
-      aFilter = tr("IDEAS files (*.unv)");
-      break;
-    default:
-      break;
-    }
-    
-    QString filename = QAD_FileDlg::getFileName(parent, "", aFilter, aTitle, false);
-    
-    if ( !filename.isEmpty() ) {
-      // Check whether the file already exists and delete it if yes
-      QFile aFile( filename );
-      if ( aFile.exists() )
-       aFile.remove();
-      
-      QAD_WaitCursor wc;
-      for ( SALOME_ListIteratorOfListIO it( Sel->StoredIObjects() ); it.More(); it.Next() ) {
-       aMesh = smeshGUI->ConvertIOinMesh( it.Value(), res );
-       if ( res ) {
-         switch ( theCommandID ) {
-         case 122:
-           aMesh->ExportMED( filename.latin1(), true ); // currently, automatic groups are always created
-           break;
-         case 121:
-           aMesh->ExportDAT( filename.latin1() );
-           break;
-         case 123:
-           aMesh->ExportUNV( filename.latin1() );
-           break;
-         default:
-           break;
-         }
-       }
-      }
-    }
-  }
-}
-

 //=============================================================================
 /*!
  *
  */
 //=============================================================================
 //=============================================================================
 /*!
  *
  */
 //=============================================================================

-bool SMESHGUI::OnMousePress(QMouseEvent * pe, QAD_Desktop * parent,
-                           QAD_StudyFrame * studyFrame)
+bool SMESHGUI::OnMousePress( QMouseEvent * pe, SUIT_ViewWindow * wnd )

 {
   return false;
 }
 {
   return false;
 }


@@ -3241,8 +2599,7 @@ bool SMESHGUI::OnMousePress(QMouseEvent * pe, QAD_Desktop * parent,
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-bool SMESHGUI::OnMouseMove(QMouseEvent * pe, QAD_Desktop * parent,
-                          QAD_StudyFrame * studyFrame)
+bool SMESHGUI::OnMouseMove( QMouseEvent * pe, SUIT_ViewWindow * wnd )

 {
   return true;
 }
 {
   return true;
 }


@@ -3252,1763 +2609,1856 @@ bool SMESHGUI::OnMouseMove(QMouseEvent * pe, QAD_Desktop * parent,
  *
  */
 //=============================================================================
  *
  */
 //=============================================================================

-bool SMESHGUI::OnKeyPress(QKeyEvent * pe, QAD_Desktop * parent,
-                         QAD_StudyFrame * studyFrame)
+bool SMESHGUI::OnKeyPress( QKeyEvent * pe, SUIT_ViewWindow * wnd )

 {
   return true;
 }
 
 //=============================================================================
 {
   return true;
 }
 
 //=============================================================================

-/*!
- *
+/*! Method:  BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
+ *  Purpose: ensures that the actor for the given <theIO> exists in the active VTK view

  */
 //=============================================================================
  */
 //=============================================================================

-bool SMESHGUI::SetSettings(QAD_Desktop * parent)
+void SMESHGUI::BuildPresentation( const Handle(SALOME_InteractiveObject) & theIO,
+                                  SUIT_ViewWindow* wnd )

 {
 {

-  MESSAGE("SMESHGUI::SetSettings.");
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-  /* Display mode */
-  QString DisplayMode = "Shading";
-  if ( QAD_CONFIG->hasSetting("SMESH:DisplayMode") )
-    DisplayMode = QAD_CONFIG->getSetting("SMESH:DisplayMode");
-  else
-    QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading");
-
-  bool Shrink = false;
-  if ( QAD_CONFIG->hasSetting("SMESH:Shrink") )
-    Shrink = QAD_CONFIG->getSetting("SMESH:Shrink") == "yes";
-
-  if (DisplayMode == "Wireframe") {
-    // wireframe
-    parent->menuBar()->setItemChecked(10004, false);
-    parent->menuBar()->setItemChecked(10002, false);
-    parent->menuBar()->setItemChecked(10001, true);
-    parent->menuBar()->setItemEnabled(10003, true);
-  }
-  else if (DisplayMode == "Nodes") {
-    // poins
-    parent->menuBar()->setItemChecked(10004, true);
-    parent->menuBar()->setItemChecked(10002, false);
-    parent->menuBar()->setItemChecked(10001, false);
-    parent->menuBar()->setItemEnabled(10003, false);
-  }
-  else {
-    // default is shading
-    parent->menuBar()->setItemChecked(10004, false);
-    parent->menuBar()->setItemChecked(10002, true);
-    parent->menuBar()->setItemChecked(10001, false);
-    parent->menuBar()->setItemEnabled(10003, true);
-  }
-  parent->menuBar()->setItemChecked(10003, Shrink);
-
-  /* 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;
+  if(theIO->hasEntry()){
+    //SUIT_ViewWindow* wnd = SMESH::GetActiveWindow();
+    SMESH::UpdateView(wnd,SMESH::eDisplay,theIO->getEntry());

   }
   }

+}

 
 

-  /* Selection */
-  ::UpdateSelectionProp();
+//=======================================================================
+// function : createSMESHAction
+// purpose  :
+//=======================================================================
+void SMESHGUI::createSMESHAction( const int id, const QString& po_id, const QString& icon_id, const int key, const bool toggle  )
+{
+  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 );

 
 

-  /* menus disable */
-  parent->menuBar()->setItemEnabled(111, false);       // IMPORT DAT
-  parent->menuBar()->setItemEnabled(112, false);       // IMPORT UNV
+  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() );

 
 

-  return true;
+  createAction( id, tooltip, icon, menu, status_bar, key, parent, toggle, this, SLOT( OnGUIEvent() )  );

 }
 
 }
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DefinePopup(QString & theContext, QString & theParent, QString & theObject)
+//=======================================================================
+// function : createPopupItem
+// purpose  :
+//=======================================================================
+void SMESHGUI::createPopupItem( const int id,
+                                const QString& clients,
+                                const QString& types,
+                                const QString& theRule,
+                                const int pId )

 {
 {

-  // 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();
-  switch ( nbSel ) {
-  case 0:
-    theObject = "NothingSelected";
-    theContext = "NothingSelected";
-    break;
-  case 1:
-    if ( smeshGUI->myState == 800 && Sel->HasIndex( Sel->firstIObject() ) )
-      theObject = "Elements";
-    else
-      theObject = smeshGUI->CheckTypeObject( Sel->firstIObject() );
-    theContext = "";
-    break;
-  default:
-    theObject = smeshGUI->CheckHomogeneousSelection();
-    theContext = "";
-  }
+  int parentId = pId;
+  if( pId!=-1 )
+    parentId = popupMgr()->actionId( action( pId ) );
+
+  if( !popupMgr()->contains( popupMgr()->actionId( action( id ) ) ) )
+    popupMgr()->insert( action( id ), parentId, 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 );
+
+  popupMgr()->setRule( action( id ), rule, QtxPopupMgr::VisibleRule );
+  myRules[ id ] = QString( cont ? "%1" : "(%1)" ).arg( rule );

 }
 
 }
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString& theContext,
-                          const QString& theParent, const QString& theObject)
+//=======================================================================
+// function : initialize
+// purpose  :
+//=======================================================================
+void SMESHGUI::initialize( CAM_Application* app )

 {
 {

-  // get active study frame
-  QAD_StudyFrame* studyFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
+  SalomeApp_Module::initialize( app );
+
+//   SUIT_ResourceMgr* mgr = app->resourceMgr();
+//   if ( mgr )
+  /* Automatic Update flag */
+//     myAutomaticUpdate = mgr->booleanValue( "SMESH", "AutomaticUpdate", myAutomaticUpdate );
+
+  // ----- create actions --------------
+
+  createSMESHAction(  111, "DAT", "", (Qt::CTRL+Qt::Key_B) );
+  createSMESHAction(  112, "UNV", "", (Qt::CTRL+Qt::Key_U) );
+  createSMESHAction(  113, "MED", "", (Qt::CTRL+Qt::Key_M) );
+  createSMESHAction(  114, "NUM" );
+  createSMESHAction(  121, "DAT" );
+  createSMESHAction(  122, "MED" );
+  createSMESHAction(  123, "UNV" );
+  createSMESHAction(  140, "STL" );
+  createSMESHAction(  124, "EXPORT_DAT" );
+  createSMESHAction(  125, "EXPORT_MED" );
+  createSMESHAction(  126, "EXPORT_UNV" );
+  createSMESHAction(  141, "EXPORT_STL" );
+  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(  710, "BUILD_COMPOUND",  "ICON_BUILD_COMPOUND" );
+  createSMESHAction(  711, "PRECOMPUTE",      "ICON_PRECOMPUTE" );
+  createSMESHAction(  712, "EVALUATE",        "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" );
+  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( 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( 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( 4041, "REMOVE_NODES",    "ICON_DLG_REM_NODE" );
+  createSMESHAction( 4042, "REMOVE_ELEMENTS", "ICON_DLG_REM_ELEMENT" );
+  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_MESH_THROU_POINT" );
+  createSMESHAction(  406, "MOVE",            "ICON_DLG_MOVE_NODE" );
+  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(  200, "RESET" );
+  createSMESHAction(  201, "SCALAR_BAR_PROP" );
+  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(  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( 1101, "RENAME", "", Qt::Key_F2 );
+  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( 300, "ERASE" );
+  createSMESHAction( 301, "DISPLAY" );
+  createSMESHAction( 302, "DISPLAY_ONLY" );
+  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( 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" );
+
+  // ----- 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 ),
+      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 ),
+      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( 121, exportId, -1 );
+  createMenu( 122, exportId, -1 );
+  createMenu( 123, exportId, -1 );
+  createMenu( 140, exportId, -1 ); // export to stl STL
+
+  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( separator(), meshId, -1 );
+  createMenu( 701, meshId, -1 );
+  createMenu( 711, meshId, -1 );
+  createMenu( 712, 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( 813, meshId, -1 );
+  createMenu( separator(), meshId, -1 );
+  createMenu( 900, meshId, -1 );
+  createMenu( 902, meshId, -1 );
+  createMenu( 903, meshId, -1 );
+  createMenu( separator(), meshId, -1 );
+
+  createMenu( 6003, ctrlId, -1 );
+  createMenu( 6001, ctrlId, -1 );
+  createMenu( 6004, ctrlId, -1 );
+  createMenu( separator(), ctrlId, -1 );
+  createMenu( 6005, ctrlId, -1 );
+  createMenu( 6002, ctrlId, -1 );
+  createMenu( 6018, ctrlId, -1 );
+  createMenu( 6019, ctrlId, -1 );
+  createMenu( 6011, ctrlId, -1 );
+  createMenu( 6012, ctrlId, -1 );
+  createMenu( 6013, ctrlId, -1 );
+  createMenu( 6014, ctrlId, -1 );
+  createMenu( 6015, ctrlId, -1 );
+  createMenu( 6016, ctrlId, -1 );
+  createMenu( separator(), ctrlId, -1 );
+  createMenu( 6017, ctrlId, -1 );
+  createMenu( 6009, ctrlId, -1 );
+  createMenu( 6021, ctrlId, -1 );
+  createMenu( separator(), ctrlId, -1 );
+
+  createMenu( 4000, addId, -1 );
+  createMenu( 4009, 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( 4033, addId, -1 );
+  createMenu( separator(), addId, -1 );
+  createMenu( 4034, addId, -1 );
+  createMenu( 4035, addId, -1 );
+  createMenu( 4036, addId, -1 );
+  createMenu( 4037, addId, -1 );
+  createMenu( 4038, addId, -1 );
+  createMenu( 4039, addId, -1 );
+  createMenu( 4040, addId, -1 );
+
+  createMenu( 4041, removeId, -1 );
+  createMenu( 4042, 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( 4064, transfId, -1 );
+  createMenu( 4065, transfId, -1 );
+  createMenu( 4066, transfId, -1 );
+
+  createMenu( 406, modifyId, -1 );
+  createMenu( 4067,modifyId, -1 );
+  createMenu( 407, modifyId, -1 );
+  createMenu( 408, modifyId, -1 );
+  createMenu( 409, modifyId, -1 );
+  createMenu( 410, modifyId, -1 );
+  createMenu( 411, 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( 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( separator(), meshTb );
+  createTool( 701, meshTb );
+  createTool( 711, meshTb );
+  createTool( 712, 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 );
+  createTool( separator(), meshTb );
+
+  createTool( 6001, ctrlTb );
+  createTool( 6003, ctrlTb );
+  createTool( 6004, ctrlTb );
+  createTool( separator(), ctrlTb );
+  createTool( 6005, ctrlTb );
+  createTool( 6002, 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( separator(), ctrlTb );
+  createTool( 6017, ctrlTb );
+  createTool( 6009, ctrlTb );
+  createTool( 6021, ctrlTb );
+  createTool( separator(), ctrlTb );
+
+  createTool( 4000, addRemTb );
+  createTool( 4009, addRemTb );
+  createTool( 4010, addRemTb );
+  createTool( 4021, addRemTb );
+  createTool( 4022, addRemTb );
+  createTool( 4023, addRemTb );
+  createTool( 4031, addRemTb );
+  createTool( 4032, addRemTb );
+  createTool( 4033, addRemTb );
+  createTool( separator(), addRemTb );
+  createTool( 4034, addRemTb );
+  createTool( 4035, addRemTb );
+  createTool( 4036, addRemTb );
+  createTool( 4037, addRemTb );
+  createTool( 4038, addRemTb );
+  createTool( 4039, addRemTb );
+  createTool( 4040, addRemTb );
+  createTool( separator(), addRemTb );
+  createTool( 4041, addRemTb );
+  createTool( 4042, 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( 4064, addRemTb );
+  createTool( 4065, addRemTb );
+  createTool( 4066, addRemTb );
+  createTool( separator(), addRemTb );
+
+  createTool( 406, modifyTb );
+  createTool( 4067,modifyTb );
+  createTool( 407, modifyTb );
+  createTool( 408, modifyTb );
+  createTool( 409, modifyTb );
+  createTool( 410, modifyTb );
+  createTool( 411, 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( MESH ) ),
+          group   = pat.arg( SMESHGUI_Selection::typeName( GROUP ) ),
+          hypo    = pat.arg( SMESHGUI_Selection::typeName( HYPOTHESIS ) ),
+          algo    = pat.arg( SMESHGUI_Selection::typeName( ALGORITHM ) ),
+          elems   = QString( "'%1' '%2' '%3' '%4' '%5' '%6'" ).
+                       arg( SMESHGUI_Selection::typeName( SUBMESH_VERTEX ) ).
+                       arg( SMESHGUI_Selection::typeName( SUBMESH_EDGE ) ).
+                       arg( SMESHGUI_Selection::typeName( SUBMESH_FACE ) ).
+                       arg( SMESHGUI_Selection::typeName( SUBMESH_SOLID ) ).
+                       arg( SMESHGUI_Selection::typeName( SUBMESH_COMPOUND ) ).
+                       arg( SMESHGUI_Selection::typeName( SUBMESH ) ),
+          subMesh = elems,
+          mesh_group = mesh + " " + subMesh + " " + 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)"),
+    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( 703, OB, subMesh, "&& 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 = 'GroupOnGeom'" ); // EDIT_GROUP
+
+  popupMgr()->insert( separator(), -1, 0 );
+  createPopupItem( 701, OB, mesh, "&& isComputable" );     // COMPUTE
+  createPopupItem( 711, OB, mesh, "&& isComputable && isPreComputable" ); // PRECOMPUTE
+  createPopupItem( 712, OB, mesh, "&& isComputable" );     // COMPUTE
+  createPopupItem( 214, OB, mesh_group );                  // UPDATE
+  createPopupItem( 900, OB, mesh_group );                  // ADV_INFO
+  createPopupItem( 902, OB, mesh );                        // STD_INFO
+  createPopupItem( 903, OB, mesh_group );                  // WHAT_IS
+  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
+  createPopupItem( 1101, OB, mesh_group + " " + hyp_alg ); // RENAME
+  popupMgr()->insert( separator(), -1, 0 );
+  createPopupItem( 4043, OB, mesh );                       // CLEAR_MESH
+  popupMgr()->insert( separator(), -1, 0 );
+  createPopupItem( 417, OB, mesh/*, "&& " + hasElems*/);       // convert to quadratic
+  createPopupItem( 418, OB, mesh/*, "&& " + hasVolumes*/);     // create 2D mesh on 3D
+  popupMgr()->insert( separator(), -1, 0 );
+
+  QString only_one_non_empty = QString( " && %1=1 && numberOfNodes>0" ).arg( dc );
+
+  createPopupItem( 125, OB, mesh, only_one_non_empty );   // EXPORT_MED
+  createPopupItem( 126, OB, mesh, only_one_non_empty );   // EXPORT_UNV
+  createPopupItem( 141, OB, mesh, only_one_non_empty );   // EXPORT_STL
+  //createPopupItem( 33, OB, subMesh + " " + group );       // DELETE
+  createPopupItem(  33, OB, mesh_group + " " + hyp_alg ); // DELETE
+  popupMgr()->insert( separator(), -1, 0 );
+
+  // 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_group ); // UPDATE
+  createPopupItem( 900, View, mesh_group ); // ADV_INFO
+  createPopupItem( 902, View, mesh );       // STD_INFO
+  createPopupItem( 903, View, mesh_group ); // WHAT_IS
+  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 );
+
+  int anId;
+  QString aClient = QString( "%1client in {%2}" ).arg( lc ).arg( "'VTKViewer'" );
+  QString aType = QString( "%1type in {%2}" ).arg( lc );
+  aType = aType.arg( mesh_group );
+  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( 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 );
+
+  //-------------------------------------------------
+  // Color / Size
+  //-------------------------------------------------
+  popupMgr()->insert( action( 1132 ), -1, -1 );
+  popupMgr()->setRule( action( 1132 ), aMeshInVTK + "&& isVisible", QtxPopupMgr::VisibleRule );
+
+  //-------------------------------------------------
+  // Transparency
+  //-------------------------------------------------
+  popupMgr()->insert( action( 1133 ), -1, -1 );
+  popupMgr()->setRule( action( 1133 ), aMeshInVTK + "&& isVisible", QtxPopupMgr::VisibleRule );
+
+  //-------------------------------------------------
+  // Clipping
+  //-------------------------------------------------
+  popupMgr()->insert( action( 1134 ), -1, -1 );
+  popupMgr()->setRule( action( 1134 ), aMeshInVTK + "&& selcount=1 && isVisible", QtxPopupMgr::VisibleRule );
+
+  popupMgr()->insert( separator(), -1, -1 );
+
+  //-------------------------------------------------
+  // Controls
+  //-------------------------------------------------
+  QString
+    aMeshInVtkHasNodes = aMeshInVTK + "&&" + hasNodes,
+    aMeshInVtkHasEdges = aMeshInVTK + "&&" + hasEdges,
+    aMeshInVtkHasFaces = aMeshInVTK + "&&" + hasFaces,
+    aMeshInVtkHasVolumes = aMeshInVTK + "&&" + hasVolumes;
+
+  anId = popupMgr()->insert( tr( "MEN_CTRL" ), -1, -1 );

   
   

-  // get parent component which selected object(s) belongs to
-  QString parentComp = ( (SALOMEGUI_Desktop*)parent )->getComponentFromSelection();
+  popupMgr()->insert( action( 200 ), anId, -1 ); // RESET
+  popupMgr()->setRule( action( 200 ), aMeshInVTK + "&& controlMode <> 'eNone'", QtxPopupMgr::VisibleRule );

 
 

-  // get selection
-  SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-  int nbSel = Sel->IObjectCount();
+  popupMgr()->insert( separator(), anId, -1 );

 
 

-  if ( nbSel == 0 ) {
-    popup->clear();
-  }
-  else if ( nbSel == 1 ) {
-    if ( parentComp != parent->getActiveComponent() ) {
-      // object not belongs to SMESH module - remove all commands except common Display/Erase...
-      while ( 1 ) {
-       int id = popup->idAt( 0 );
-       if ( id <= QAD_TopLabel_Popup_ID )
-         popup->removeItemAt( 0 );
-       else
-         break;
-      }
-    }
-    else {
-      // get selected interactive object 
-      Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-      SALOMEDS::SObject_var SO = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-      // find popup menu's TopLabel item
-      int topItem = popup->indexOf( QAD_TopLabel_Popup_ID );
-      if ( topItem >= 0 ) {
-       if ( theParent == "Viewer" ) {
-         // set bold font for popup menu's TopLabel item (Viewer popup)
-         QFont fnt = QApplication::font(); fnt.setBold( TRUE );
-         popup->removeItem( QAD_TopLabel_Popup_ID );
-         popup->insertItem( new CustomItem( QString( IObject->getName() ), fnt ), QAD_TopLabel_Popup_ID, topItem );
-       }
-       else if ( theParent == "ObjectBrowser" ) {
-         // remove popup menu's TopLabel item (Object Browser popup)
-         popup->removeItem( QAD_TopLabel_Popup_ID );
-       }
-      }
+  popupMgr()->insert( action( 6003 ), anId, -1 ); // FREE_BORDER
+  popupMgr()->setRule( action( 6003 ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6003 ), "controlMode = 'eFreeBorders'", QtxPopupMgr::ToggleRule );

 
 

-      // remove "Display only" command for component object
-      if ( theObject.compare( "Component" ) == 0 ) {
-       popup->removeItem( QAD_DisplayOnly_Popup_ID );
-      }
-      else if ( theObject == "Hypothesis" || theObject == "Algorithm" ) {
-       // remove Display/Erase commands
-       popup->removeItem( QAD_Display_Popup_ID );
-       popup->removeItem( QAD_DisplayOnly_Popup_ID );
-       popup->removeItem( QAD_Erase_Popup_ID );
-       // remove "Unassign ..." command if hyp/algo is not assigned
-       if ( SO->_is_nil() || !IObject->hasReference()/* !IsReferencedObject( SO ) */)
-         popup->removeItem( 1102 );
-      }
-      else if ( theObject == "Mesh" || theObject == "SubMesh" || theObject == "Group" ) {
-       // get actor
-       GEOM::GEOM_Shape_var aShape = GetSMESHGUI()->GetStudyAPI().GetShapeOnMeshOrSubMesh( SO );
-       if ( aShape->_is_nil() ) {
-         // imported mesh
-         popup->removeItem( 701 ); // Compute
-         popup->removeItem( 705 ); // Edit hypothesis
-         popup->removeItem( 706 ); // ...
-       }
-       SMESH_Actor* ac = ::FindActorByEntry(IObject->getEntry());
-       // if object has actor
-       if ( ac && studyFrame->getTypeView() == VIEW_VTK ) {
-         VTKViewer_RenderWindowInteractor* myRenderInter =
-           ( ( VTKViewer_ViewFrame* ) studyFrame->getRightFrame()->getViewFrame() )->getRWInteractor();
-         if ( myRenderInter->isVisible( IObject ) ) {
-           popup->removeItem( QAD_Display_Popup_ID );
-           popup->setItemChecked( 9010, ac->GetPointsLabeled() ); // Numbering / Display Nodes #
-           popup->setItemChecked( 9011, ac->GetCellsLabeled() );  // Numbering / Display Elements #
-           TVisualObjPtr aVisualObj = ac->GetObject();
-           int aNbEdges = aVisualObj->GetNbEntities(SMESH::EDGE);
-           int aNbFaces = aVisualObj->GetNbEntities(SMESH::FACE);
-           int aNbVolumes = aVisualObj->GetNbEntities(SMESH::VOLUME);
-           QMenuItem* mi = popup->findItem( 1131 );
-           if ( mi && mi->popup() ) {
-             int  prType = ac->GetRepresentation();
-             // Display Mode / Wireframe
-             if(!aNbFaces && !aNbVolumes && !aNbEdges){
-               mi->popup()->removeItem( 211 );
-             }else{
-               mi->popup()->setItemChecked( 211, prType == SMESH_Actor::eEdge );
-             }
-             // Display Mode / Shading
-             if(!aNbFaces && !aNbVolumes){
-               mi->popup()->removeItem( 212 );
-             }else{
-               mi->popup()->setItemChecked( 212, prType == SMESH_Actor::eSurface );
-             }
-             // Display Mode / Points
-             mi->popup()->setItemChecked( 215, prType == SMESH_Actor::ePoint );  
-             // Display Mode / Shrink
-             bool isShrunk = ac->IsShrunk();
-             bool isShrunkable = ac->IsShrunkable();
-             mi->popup()->setItemChecked( 213, isShrunk );   
-             mi->popup()->setItemEnabled( 213, prType != SMESH_Actor::ePoint && isShrunkable);
-           }
-           // Scalar Bar
-           mi = popup->findItem( 2000 );
-           if ( mi && mi->popup() ) {
-             SMESH_Actor::eControl cMode = ac->GetControlMode();
-             switch ( cMode ) {
-             case SMESH_Actor::eLengthEdges:
-               mi->popup()->setItemChecked( 6001, true ); break;
-             case SMESH_Actor::eFreeBorders:
-               mi->popup()->setItemChecked( 6003, true );
-               mi->popup()->removeItem( 201 );
-               break;
-             case SMESH_Actor::eMultiConnection:
-               mi->popup()->setItemChecked( 6004, true ); break;
-             case SMESH_Actor::eArea:
-               mi->popup()->setItemChecked( 6011, true ); break;
-             case SMESH_Actor::eTaper:
-               mi->popup()->setItemChecked( 6012, true ); break;
-             case SMESH_Actor::eAspectRatio:
-               mi->popup()->setItemChecked( 6013, true ); break;
-             case SMESH_Actor::eMinimumAngle:
-               mi->popup()->setItemChecked( 6014, true ); break;
-             case SMESH_Actor::eWarping:
-               mi->popup()->setItemChecked( 6015, true ); break;
-             case SMESH_Actor::eSkew:
-               mi->popup()->setItemChecked( 6016, true ); break;
-             case SMESH_Actor::eNone:
-             default:
-               mi->popup()->removeItem( 200 );
-               mi->popup()->removeItem( 201 );
-               break;
-             }
-             TVisualObjPtr aVisualObj = ac->GetObject();
-             SMESH::ElementType aType;
-             if(!aNbEdges){
-               mi->popup()->removeItem( 6001 );
-               mi->popup()->removeItem( 6003 );
-               mi->popup()->removeItem( 6004 );
-             }
-             if(!aNbFaces){
-               mi->popup()->removeItem( 6011 );
-               mi->popup()->removeItem( 6012 );
-               mi->popup()->removeItem( 6013 );
-               mi->popup()->removeItem( 6014 );
-               mi->popup()->removeItem( 6015 );
-               mi->popup()->removeItem( 6016 );
-             }
-             if(!aNbFaces && !aNbEdges)
-               popup->removeItem( 2000 );                         // Scalar Bar
-           }
-         }
-         else {
-           popup->removeItem( QAD_Erase_Popup_ID );
-           popup->removeItem( 114 );                              // Numbering popup menu
-           popup->removeItem( 1131 );                             // Display mode
-           popup->removeItem( 1132 );                             // Color / size
-           popup->removeItem( 1133 );                             // Transparency
-           popup->removeItem( 2000 );                             // Scalar Bar
-         }
-       }
-       else {
-         // object doesn't have actor
-         CORBA::Object_var anObject = SO->GetObject();
-         bool bDisplay = false;
-         if ( !CORBA::is_nil( anObject ) ) {
-           SMESH::SMESH_Mesh_var aMeshObj = SMESH::SMESH_Mesh::_narrow( anObject );
-           if ( !aMeshObj->_is_nil() && ( aMeshObj->NbNodes() > 0 || aMeshObj->NbFaces() > 0  || aMeshObj->NbVolumes() > 0 ) )
-             bDisplay = true;
-           SMESH::SMESH_subMesh_var aSubMeshObj = SMESH::SMESH_subMesh::_narrow( anObject );
-           if ( !aSubMeshObj->_is_nil() && ( aSubMeshObj->GetNumberOfNodes() > 0 || aSubMeshObj->GetNumberOfElements() > 0 ) )
-             bDisplay = true;
-           SMESH::SMESH_Group_var aGroupObj = SMESH::SMESH_Group::_narrow( anObject );
-           if ( !aGroupObj->_is_nil() && aGroupObj->Size() > 0 )
-             bDisplay = true;
-         }
-         if ( !bDisplay ) {
-           popup->removeItem( QAD_Display_Popup_ID );
-           popup->removeItem( QAD_DisplayOnly_Popup_ID );
-         }
-         popup->removeItem( QAD_Erase_Popup_ID );
-         popup->removeItem( 114 );                              // Numbering popup menu
-         popup->removeItem( 1131 );                             // Display mode
-         popup->removeItem( 1132 );                             // Color / size
-         popup->removeItem( 1133 );                             // Transparency
-         popup->removeItem( 2000 );                             // Scalar Bar
-       }
-      }
-      else {
-       // another SMESH object
-       popup->removeItem( QAD_Display_Popup_ID );
-       popup->removeItem( QAD_DisplayOnly_Popup_ID );
-       popup->removeItem( QAD_Erase_Popup_ID );
-      }
-    }
-  }
-  else {
-    // multiple selection
-    if ( parentComp != parent->getActiveComponent() ) {
-      // object not belongs to SMESH module - remove all commands except common Display/Erase...
-      while ( 1 )      {
-       int id = popup->idAt( 0 );
-       if ( id <= QAD_TopLabel_Popup_ID )
-         popup->removeItemAt( 0 );
-       else
-         break;
-      }
-      if ( parentComp.isNull() ) {
-       // objects from different components are selected
-       popup->removeItem( QAD_DisplayOnly_Popup_ID );
-       popup->removeItem( QAD_Display_Popup_ID );
-       popup->removeItem( QAD_Erase_Popup_ID );
-      }
-    }
-    else {
-      QString type = smeshGUI->CheckHomogeneousSelection();
-      if ( type != "Heterogeneous Selection" ) {
-       int topItem = popup->indexOf( QAD_TopLabel_Popup_ID );
-       if ( topItem >= 0 ) {
-         // set bold font for popup menu's TopLabel item
-         QFont fnt = QApplication::font(); fnt.setBold( TRUE );
-         popup->removeItem( QAD_TopLabel_Popup_ID );
-         popup->insertItem( new CustomItem( QString("%1 ").arg( nbSel ) + type + "(s) ", fnt ), QAD_TopLabel_Popup_ID, topItem );
-       }
-      }
-    }
-  }
-  return false;
-}
+  popupMgr()->insert( action( 6001 ), anId, -1 ); // LENGTH
+  popupMgr()->setRule( action( 6001 ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6001 ), "controlMode = 'eLength'", QtxPopupMgr::ToggleRule );

 
 

-//=============================================================================
-/*! 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)
-{
-  if(theIO->hasEntry()){
-    QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy();
-    QAD_StudyFrame *aStudyFrame = aStudy->getActiveStudyFrame();
-    ::UpdateView(aStudyFrame,eDisplay,theIO->getEntry());
-  }
-}
+  popupMgr()->insert( action( 6004 ), anId, -1 ); // CONNECTION
+  popupMgr()->setRule( action( 6004 ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6004 ), "controlMode = 'eMultiConnection'", QtxPopupMgr::ToggleRule );

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-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));
-}
+  popupMgr()->insert( separator(), anId, -1 );

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH_Actor *SMESHGUI::ReadScript(SMESH::SMESH_Mesh_ptr theMesh){}
+  popupMgr()->insert( action( 6005 ), anId, -1 ); // FREE_NODE
+  popupMgr()->setRule( action( 6005 ), aMeshInVtkHasNodes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6005 ), "controlMode = 'eFreeNodes'", QtxPopupMgr::ToggleRule );

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Dump(SMESH_Actor * Mactor)
-{
-       vtkUnstructuredGrid *ugrid = Mactor->GetUnstructuredGrid();
-       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));
-               }
-               fprintf(In, "\n");
-       }
-       fclose(In);
-}
+  popupMgr()->insert( action( 6002 ), anId, -1 ); // FREE_EDGE
+  popupMgr()->setRule( action( 6002 ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6002 ), "controlMode = 'eFreeEdges'", QtxPopupMgr::ToggleRule );

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveNodes(SMESH::SMESH_Mesh_ptr theMesh,
-                          const TColStd_MapOfInteger & MapIndex)
-{
-  QAD_WaitCursor wc;
-  try{
-    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
-    CORBA::String_var anEntry = aSobj->GetID();
-    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
-      SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
-      anArrayOfIdeces->length(MapIndex.Extent());
-      TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-      for(int i = 0; ite.More(); ite.Next(), i++){
-       anArrayOfIdeces[i] = anActor->GetNodeObjId(ite.Key());
-      }
-      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
-      aMeshEditor->RemoveNodes(anArrayOfIdeces);
-      if(myAutomaticUpdate){
-       CORBA::Long anId = smeshGUI->myStudy->StudyId();
-       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
-         aVisualObj->Update(true);
-       }
-      }
-    }
-  }catch(SALOME::SALOME_Exception& exc) {
-    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
-  }catch(const std::exception& exc){
-    INFOS("Follow exception was cought:\n\t"<<exc.what());
-  }catch(...){
-    INFOS("Unknown exception was cought !!!");
-  }
-}
+  popupMgr()->insert( action( 6018 ), anId, -1 ); // LENGTH_2D
+  popupMgr()->setRule( action( 6018 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6018 ), "controlMode = 'eLength2D'", QtxPopupMgr::ToggleRule );

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveElements(SMESH::SMESH_Mesh_ptr theMesh,
-                             const TColStd_MapOfInteger & MapIndex)
-{
-  QAD_WaitCursor wc;
-  try{
-    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
-    CORBA::String_var anEntry = aSobj->GetID();
-    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
-      SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
-      anArrayOfIdeces->length(MapIndex.Extent());
-      TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-      for(int i = 0; ite.More(); ite.Next(), i++){
-       anArrayOfIdeces[i] = anActor->GetElemObjId(ite.Key());
-      }
-      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
-      aMeshEditor->RemoveElements(anArrayOfIdeces);
-      if(myAutomaticUpdate){
-       CORBA::Long anId = smeshGUI->myStudy->StudyId();
-       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
-         aVisualObj->Update(true);
-       }
-      }
-    }
-  }catch(SALOME::SALOME_Exception& exc) {
-    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
-  }catch(const std::exception& exc){
-    INFOS("Follow exception was cought:\n\t"<<exc.what());
-  }catch(...){
-    INFOS("Unknown exception was cought !!!");
-  }
-}
+  popupMgr()->insert( action( 6019 ), anId, -1 ); // CONNECTION_2D
+  popupMgr()->setRule( action( 6019 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6019 ), "controlMode = 'eMultiConnection2D'", QtxPopupMgr::ToggleRule );

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::OrientationElements(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
-{
-  MESSAGE("OrientationElements - not implemeted yet!");
-}
+  popupMgr()->insert( action( 6011 ), anId, -1 ); // AREA
+  popupMgr()->setRule( action( 6011 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6011 ), "controlMode = 'eArea'", QtxPopupMgr::ToggleRule );

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DiagonalInversion(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
-{
-  MESSAGE("OrientationElements - not implemeted yet!");
-}
+  popupMgr()->insert( action( 6012 ), anId, -1 ); // TAPER
+  popupMgr()->setRule( action( 6012 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6012 ), "controlMode = 'eTaper'", QtxPopupMgr::ToggleRule );

 
 

-//=====================================================================================
-// EXPORTED METHODS
-//=====================================================================================
-void SMESHGUI::SupportedViewType(int *buffer, int bufferSize)
-{
-  if (!buffer || !bufferSize)
-    return;
-  buffer[0] = (int)VIEW_VTK;
-}
+  popupMgr()->insert( action( 6013 ), anId, -1 ); // ASPECT
+  popupMgr()->setRule( action( 6013 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6013 ), "controlMode = 'eAspectRatio'", QtxPopupMgr::ToggleRule );

 
 

-void SMESHGUI::Deactivate()
-{
-  if ( SMESHGUI::GetSMESHGUI() ) {
-    SMESHGUI::GetSMESHGUI()->EmitSignalCloseAllDialogs();
-  }
-}
+  popupMgr()->insert( action( 6014 ), anId, -1 ); // MIN_ANG
+  popupMgr()->setRule( action( 6014 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6014 ), "controlMode = 'eMinimumAngle'", QtxPopupMgr::ToggleRule );

 
 

+  popupMgr()->insert( action( 6015 ), anId, -1 ); // WARP
+  popupMgr()->setRule( action( 6015 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6015 ), "controlMode = 'eWarping'", QtxPopupMgr::ToggleRule );

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::SetPickable(SMESH_Actor* theActor){
-  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView()){
-    int anIsAllPickable = (theActor == NULL);
-    vtkRenderer *aRenderer = aViewFrame->getRenderer();
-    vtkActorCollection *aCollection = aRenderer->GetActors();
-    aCollection->InitTraversal();
-    while(vtkActor *anAct = aCollection->GetNextActor()){
-      if(SALOME_Actor *anActor = dynamic_cast<SALOME_Actor*>(anAct)){
-       if(anActor->GetVisibility()){
-         anActor->SetPickable(anIsAllPickable);
-       }
-      }
-    }
-    if(theActor)
-      theActor->SetPickable(!anIsAllPickable);
-    RepaintCurrentView();
-  }
-}
+  popupMgr()->insert( action( 6016 ), anId, -1 ); // SKEW
+  popupMgr()->setRule( action( 6016 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6016 ), "controlMode = 'eSkew'", QtxPopupMgr::ToggleRule );

 
 

+  popupMgr()->insert( separator(), anId, -1 );

 
 

-void SMESHGUI::ViewNodes(){
-  EraseSimulationActors();
-  ::SetPointRepresentation(true);
-}
+  popupMgr()->insert( action( 6017 ), anId, -1 ); // ASPECT_3D
+  popupMgr()->setRule( action( 6017 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6017 ), "controlMode = 'eAspectRatio3D'", QtxPopupMgr::ToggleRule );

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Control( int theCommandID ){
-  SALOME_Selection *Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
-  if(Sel){
-    Handle(SALOME_InteractiveObject) anIO = Sel->firstIObject();
-    if(!anIO.IsNull()){
-      QString aTitle;
-      SMESH_Actor::eControl aControl = SMESH_Actor::eNone;
-      if(SMESH_Actor *anActor = ::FindActorByEntry(anIO->getEntry())){
-       switch ( theCommandID ){
-       case 6001:
-         aTitle = tr( "LENGTH_EDGES" );
-         aControl = SMESH_Actor::eLengthEdges;
-         break;
-       case 6003:
-         aTitle = tr( "FREE_BORDERS" );
-         aControl = SMESH_Actor::eFreeBorders;
-         break;
-       case 6004:
-         aTitle = tr( "MULTI_BORDERS" );
-         aControl = SMESH_Actor::eMultiConnection;
-         break;
-       case 6011:
-         aTitle = tr( "AREA_ELEMENTS" );
-         aControl = SMESH_Actor::eArea;
-         break;
-       case 6012:
-         aTitle = tr( "TAPER_ELEMENTS" );
-         aControl = SMESH_Actor::eTaper;
-         break;
-       case 6013:
-         aTitle = tr( "ASPECTRATIO_ELEMENTS" );
-         aControl = SMESH_Actor::eAspectRatio;
-         break;
-       case 6014:
-         aTitle = tr( "MINIMUMANGLE_ELEMENTS" );
-         aControl = SMESH_Actor::eMinimumAngle;
-         break;
-       case 6015:
-         aTitle = tr( "WARP_ELEMENTS" );
-         aControl = SMESH_Actor::eWarping;
-         break;
-       case 6016:
-         aTitle = tr( "SKEW_ELEMENTS" );
-         aControl = SMESH_Actor::eSkew;
-         break;
-       }
-       anActor->SetControlMode(aControl);
-       anActor->GetScalarBarActor()->SetTitle(aTitle.latin1());
-      }
-    }
-  }
+  popupMgr()->insert ( action( 6009 ), anId, -1 ); // VOLUME_3D
+  popupMgr()->setRule( action( 6009 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6009 ), "controlMode = 'eVolume3D'", QtxPopupMgr::ToggleRule );
+
+  popupMgr()->insert( action( 6021 ), anId, -1 ); // FREE_FACE
+  popupMgr()->setRule( action( 6021 ), aMeshInVtkHasFaces /*aMeshInVtkHasVolumes*/,
+                                       QtxPopupMgr::VisibleRule );
+  popupMgr()->setRule( action( 6021 ), "controlMode = 'eFreeFaces'", QtxPopupMgr::ToggleRule );
+
+  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(), -1, -1 );
+  
+  //-------------------------------------------------
+  // Display / Erase
+  //-------------------------------------------------
+  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 );
+
+  connect( application(), SIGNAL( viewManagerActivated( SUIT_ViewManager* ) ),
+           this, SLOT( onViewManagerActivated( 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::SetSettingsScalarBar(vtkScalarBarActor * theScalarBar,
-                                   QString Bold, 
-                                   QString Italic,
-                                   QString Shadow, 
-                                   QString FontFamily,
-                                   QString Orientation, 
-                                   float Width, 
-                                   float Height, 
-                                   int NbColors, 
-                                   int NbLabels)
+//================================================================================
+
+bool SMESHGUI::isSelectionCompatible()

 {
 {

-  if (Bold.isNull() || Bold.isEmpty() || (Bold.compare("true") == 0))
-    theScalarBar->BoldOn();
-  else
-    theScalarBar->BoldOff();
-  
-  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();
-  
-  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);
-  
-  theScalarBar->SetNumberOfLabels((NbLabels == 0) ? 5 : NbLabels);
-  theScalarBar->SetMaximumNumberOfColors((NbColors == 0) ? 64 : NbColors);
+  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::activateModule( SUIT_Study* study )

 {
 {

-  EmitSignalDeactivateDialog();
-  SMESHGUI_Preferences_ColorDlg *aDlg =
-    new SMESHGUI_Preferences_ColorDlg(QAD_Application::getDesktop(), "");
-
-  QColor color;
-  QString SCr, SCg, SCb;
-  SCr = QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed");
-  SCg = QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen");
-  SCb = QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue");
-  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-    color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-  else color = QColor(0, 170, 255);
-  aDlg->SetColor(1, color);
-
-  SCr = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed");
-  SCg = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen");
-  SCb = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue");
-  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-    color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-  else color = QColor(0, 170, 255);
-  aDlg->SetColor(2, color);
-
-  SCr = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorRed");
-  SCg = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorGreen");
-  SCb = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorBlue");
-  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-    color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-  else color = Qt::red;
-  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");
-  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
-    color = QColor(SBr.toInt(), SBg.toInt(), SBb.toInt());
-  else color = Qt::blue;
-  aDlg->SetColor(4, color);
-
-  QString intValue = QAD_CONFIG->getSetting("SMESH:SettingsWidth");
-  if (intValue.isEmpty()) intValue = "1";
-  aDlg->SetIntValue(1, intValue.toInt());
-  intValue = QAD_CONFIG->getSetting("SMESH:SettingsNodesSize");
-  if (intValue.isEmpty()) intValue = "3";
-  aDlg->SetIntValue(2, intValue.toInt());
-  intValue = QAD_CONFIG->getSetting("SMESH:SettingsShrinkCoeff");
-  if (intValue.isEmpty()) intValue = "75";
-  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());
-
-    int width = aDlg->GetIntValue(1);
-    QAD_CONFIG->addSetting("SMESH:SettingsWidth", width);
-
-    int nodes_size = aDlg->GetIntValue(2);
-    QAD_CONFIG->addSetting("SMESH:SettingsNodesSize", nodes_size);
-
-    int shrink_coeff = aDlg->GetIntValue(3);
-    QAD_CONFIG->addSetting("SMESH:SettingsShrinkCoeff", shrink_coeff);
-  }
+  bool res = SalomeApp_Module::activateModule( study );
+
+  setMenuShown( true );
+  setToolShown( true );

 
 

-  delete aDlg;
+  // 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
+  action(1101)->setEnabled(true); // Rename: Key_F2
+
+  //  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
+    }
+
+  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
+  action(1101)->setEnabled(false); // Rename: Key_F2
+
+  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()
+{
+  const QObject* obj = sender();
+  if ( !obj || !obj->inherits( "QAction" ) )
+    return;
+  int id = actionId((QAction*)obj);
+  if ( id != -1 )
+    OnGUIEvent( id );
+}

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::InitActor(SMESH::SMESH_Mesh_ptr aMesh){}
+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;
+}

 
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Update(){
-  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView()){
-    SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection());
-    if(Sel->IObjectCount() == 0){
-      vtkRenderer* aRenderer = aViewFrame->getRenderer();
-      vtkActorCollection *aCollection = aRenderer->GetActors();
-      aCollection->InitTraversal();
-      while(vtkActor *anAct = aCollection->GetNextActor()){
-       if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
-         if(anActor->hasIO()){
-           Update(anActor->getIO());
-         }
-       }
-      }
-    }else{
-      SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-      for(; It.More(); It.Next()){
-       Handle(SALOME_InteractiveObject) IO = It.Value();
-       Update(IO);
-      }
+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;

     }
     }

-    ::RepaintCurrentView();

   }
 }
 
   }
 }
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Update(const Handle(SALOME_InteractiveObject) & theIO){
-  CORBA::Long anId = smeshGUI->myStudy->StudyId();
-  TVisualObjPtr aVisualObj = ::GetVisualObj(anId,theIO->getEntry());
-  aVisualObj->Update();
-  ::UpdateView(eDisplay,theIO->getEntry());
+LightApp_Selection* SMESHGUI::createSelection() const
+{
+  return new SMESHGUI_Selection();

 }
 
 }
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-vtkActor *SMESHGUI::SimulationMoveNode(SMESH_Actor * Mactor, int idnode)
+void SMESHGUI::windows( QMap<int, int>& aMap ) const

 {
 {

-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return NULL;
-
-       mySimulationActors = vtkActorCollection::New();
-       vtkRenderer *theRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-
-       vtkUnstructuredGrid *ugrid =
-               vtkUnstructuredGrid::SafeDownCast(Mactor->GetUnstructuredGrid());
-       vtkIdList *IdCells = vtkIdList::New();
-       ugrid->GetPointCells(idnode, IdCells);
-
-       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);
-       }
-
-       vtkProperty *prop = vtkProperty::New();
-       prop->SetColor(1., 0., 0.);
-       prop->SetRepresentationToWireframe();
-
-       int Edgewidth = (int)Mactor->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();
-
-       return ac;
+  aMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
+  aMap.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );

 }
 
 }
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplaySimulationNode(SMESH::SMESH_Mesh_ptr aMesh, float x,
-       float y, float z)
+void SMESHGUI::viewManagers( QStringList& list ) const

 {
 {

-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       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)
-       {
-               vtkUnstructuredGrid *ugrid =
-                       vtkUnstructuredGrid::SafeDownCast(ac->GetUnstructuredGrid());
-               vtkUnstructuredGrid *newugrid = vtkUnstructuredGrid::New();
-
-               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));
-               }
-
-               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.);
-                       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);
-
-               node->VisibilityOn();
-
-               mySimulationActors->AddItem(node);
-               theRenderer->AddActor(node);
-       }
-
-       vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-       renWin->Render();
+  list.append( SVTK_Viewer::Type() );

 }
 
 }
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplaySimulationMoveNode(vtkActor * ac, int idnode, float x,
-       float y, float z)
+void SMESHGUI::onViewManagerActivated( SUIT_ViewManager* mgr )

 {
 {

-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
+  if ( dynamic_cast<SVTK_ViewManager*>( mgr ) )
+    SMESH::UpdateSelectionProp( this );
+}

 
 

-       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;
+void SMESHGUI::createPreferences()
+{
+  // General tab ------------------------------------------------------------------------
+  int genTab = addPreference( tr( "PREF_TAB_GENERAL" ) );
+
+  int updateGroup = addPreference( tr( "PREF_GROUP_UPDATE" ), genTab );
+  addPreference( tr( "PREF_AUTO_UPDATE" ), updateGroup, LightApp_Preferences::Bool, "SMESH", "auto_update" );
+
+  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 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( "Wireframe" );
+  modes.append( "Shading" );
+  modes.append( "Nodes" );
+  modes.append( "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("Lines");
+  quadraticModes.append("Arcs");
+  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 );
+  
+  

 
 

-       ac->GetMapper()->ImmediateModeRenderingOn();
-       ac->GetProperty()->SetRepresentationToWireframe();
+  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( "Never" );
+  modes.append( "Errors only" );
+  modes.append( "Always" );
+  indices.clear();
+  indices.append( 0 );
+  indices.append( 1 );
+  indices.append( 2 );
+  setPreferenceProperty( notifyMode, "strings", modes );
+  setPreferenceProperty( notifyMode, "indexes", indices );
+
+  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 );

 
 

-       vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
+  // Mesh tab ------------------------------------------------------------------------
+  int meshTab = addPreference( tr( "PREF_TAB_MESH" ) );
+  int nodeGroup = addPreference( tr( "PREF_GROUP_NODES" ), meshTab );
+  setPreferenceProperty( nodeGroup, "columns", 2 );
+
+  addPreference( tr( "PREF_COLOR" ), nodeGroup, LightApp_Preferences::Color, "SMESH", "node_color" );
+  int nodeSz = addPreference( tr( "PREF_SIZE" ), nodeGroup, LightApp_Preferences::IntSpin, "SMESH", "node_size" );

 
 

-       renWin->Render();
+  setPreferenceProperty( nodeSz, "min", 1 );
+  setPreferenceProperty( nodeSz, "max", 5 );
+
+  int elemGroup = addPreference( tr( "PREF_GROUP_ELEMENTS" ), meshTab );
+  setPreferenceProperty( elemGroup, "columns", 2 );
+
+  addPreference( tr( "PREF_FILL"     ), elemGroup, LightApp_Preferences::Color, "SMESH", "fill_color" );
+  addPreference( tr( "PREF_OUTLINE"  ), elemGroup, LightApp_Preferences::Color, "SMESH", "outline_color" );
+  addPreference( tr( "PREF_BACKFACE" ), elemGroup, LightApp_Preferences::Color, "SMESH", "backface_color" );
+  addPreference( tr( "PREF_COLOR_0D" ), elemGroup, LightApp_Preferences::Color, "SMESH", "elem0d_color" );
+
+  //int sp = addPreference( "", elemGroup, LightApp_Preferences::Space );
+  //setPreferenceProperty( sp, "hstretch", 0 );
+  //setPreferenceProperty( sp, "vstretch", 0 );
+
+  int size0d = addPreference(tr("PREF_SIZE_0D"), elemGroup,
+                             LightApp_Preferences::IntSpin, "SMESH", "elem0d_size");
+  int sp = addPreference( "", elemGroup, LightApp_Preferences::Space );
+  int elemW  = addPreference(tr("PREF_WIDTH"), elemGroup,
+                             LightApp_Preferences::IntSpin, "SMESH", "element_width");
+  int shrink = addPreference(tr("PREF_SHRINK_COEFF"), elemGroup,
+                             LightApp_Preferences::IntSpin, "SMESH", "shrink_coeff");
+
+  setPreferenceProperty( size0d, "min", 1 );
+  setPreferenceProperty( size0d, "max", 10 );
+
+  setPreferenceProperty( sp, "hstretch", 0 );
+  setPreferenceProperty( sp, "vstretch", 0 );
+
+  setPreferenceProperty( elemW, "min", 1 );
+  setPreferenceProperty( elemW, "max", 5 );
+
+  setPreferenceProperty( shrink, "min", 0 );
+  setPreferenceProperty( shrink, "max", 100 );
+
+  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 selW = addPreference( tr( "PREF_WIDTH" ), selGroup, LightApp_Preferences::IntSpin, "SMESH", "selection_width" );
+
+  setPreferenceProperty( selW, "min", 1 );
+  setPreferenceProperty( selW, "max", 5 );
+
+  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 preW = addPreference( tr( "PREF_WIDTH" ), preGroup, LightApp_Preferences::IntSpin, "SMESH", "highlight_width" );
+
+  setPreferenceProperty( preW, "min", 1 );
+  setPreferenceProperty( preW, "max", 5 );
+
+  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 );

 }
 
 }
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::MoveNode(SMESH::SMESH_Mesh_ptr aMesh, int idnode, float x,
-       float y, float z)
+void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )

 {
 {

-       Standard_Boolean result;
-
-       SMESH_Actor *MeshActor = FindActor(aMesh, result, true);
-       if (result)
-       {
-       }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::ScalarVisibilityOff(){
-  if(vtkRenderer *aRenderer = ::GetCurrentRenderer()){
-    vtkActorCollection *actorList = aRenderer->GetActors();
-    actorList->InitTraversal();
-    while(vtkActor *ac = actorList->GetNextActor()){
-      if(SMESH_Actor *anActor = SMESH_Actor::SafeDownCast(ac)){
-       anActor->GetMapper()->ScalarVisibilityOff();
+  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=="selection_width" || name=="highlight_color" || name=="highlight_width" ||
+        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);

       }
     }
       }
     }

-    ::RepaintCurrentView();
+    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 );
+    }
+
+    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::DisplaySimulationEdge(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
+ * \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;
-
-       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++;
-               }
-
-               Ids->InsertId(0, idNodes[0]);
-               pts[0] = idNodes[0];
-               Ids->InsertId(1, idNodes[1]);
-               pts[1] = idNodes[1];
-
-               vtkUnstructuredGrid *ugrid =
-                       vtkUnstructuredGrid::SafeDownCast(ac->GetUnstructuredGrid());
-               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();
+  if ( flags & UF_Viewer | flags & UF_Forced )
+    SMESH::UpdateView();
+  else
+    SalomeApp_Module::update( flags );

 }
 
 }
 

-//=============================================================================
+//================================================================================

 /*!
 /*!

- *
- */
-//=============================================================================
-void SMESHGUI::DisplaySimulationTriangle(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex, bool reverse)
+ * \brief Set default selection mode
+*
+* SLOT called when operation commited. Sets default selection mode
+*/
+//================================================================================
+void SMESHGUI::onOperationCommited( SUIT_Operation* )

 {
 {

-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       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->GetUnstructuredGrid());
-               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);
-       }
-
-       vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-       renWin->Render();
+  SVTK_ViewWindow* vtkWnd =
+    dynamic_cast<SVTK_ViewWindow*>( application()->desktop()->activeWindow() );
+  if ( vtkWnd )
+    vtkWnd->SetSelectionMode( ActorSelection );

 }
 
 }
 

-//=============================================================================
+//================================================================================

 /*!
 /*!

- *
- */
-//=============================================================================
-void SMESHGUI::DisplaySimulationQuadrangle(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex, bool reverse)
+ * \brief Set default selection mode
+*
+* SLOT called when operation aborted. Sets default selection mode
+*/
+//================================================================================
+void SMESHGUI::onOperationAborted( SUIT_Operation* )

 {
 {

-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       EraseSimulationActors();
-       mySimulationActors = vtkActorCollection::New();
-       vtkRenderer *theRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-       Standard_Boolean result;
-       SMESH_Actor *ac = FindActor(aMesh, result, true);
-
-       vtkUnstructuredGrid *ugrid =
-               vtkUnstructuredGrid::SafeDownCast(ac->GetUnstructuredGrid());
-
-       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;
-                       }
-               }
-
-               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->GetUnstructuredGrid() );
-               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);
-       }
-       vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-       renWin->Render();
+  SVTK_ViewWindow* vtkWnd =
+    dynamic_cast<SVTK_ViewWindow*>( application()->desktop()->activeWindow() );
+  if ( vtkWnd )
+    vtkWnd->SetSelectionMode( ActorSelection );

 }
 
 }
 

-//=============================================================================
+//================================================================================

 /*!
 /*!

- *
- */
-//=============================================================================
-void SMESHGUI::DisplaySimulationTetra(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
+ * \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

 {
 {

-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       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->GetUnstructuredGrid());
-               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();
+  LightApp_Operation* op = 0;
+  // to do : create operation here
+  switch( id )
+  {
+    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 806: // Create group on geom
+      op = new SMESHGUI_GroupOnShapeOp();
+      break;
+    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 4067: // make mesh pass through point
+      op = new SMESHGUI_MakeNodeAtPointOp();
+      break;
+    default:
+    break;
+  }
+
+  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::DisplaySimulationHexa(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
+//================================================================================
+
+void SMESHGUI::switchToOperation(int id)

 {
 {

-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       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->GetUnstructuredGrid());
-               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();
+  if ( _PTR(Study) aStudy = SMESH::GetActiveStudyDocument() )
+    activeStudy()->abortAllOperations();
+  startOperation( id );

 }
 
 }
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddFace(SMESH::SMESH_Mesh_ptr theMesh,
-                      const TColStd_MapOfInteger & MapIndex, 
-                      bool reverse)
+LightApp_Displayer* SMESHGUI::displayer()

 {
 {

-  QAD_WaitCursor wc;
-  try{
-    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
-    CORBA::String_var anEntry = aSobj->GetID();
-    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
-      SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
-      anArrayOfIdeces->length(MapIndex.Extent());
-      TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-      for(int i = 0; ite.More(); ite.Next(), i++){
-       anArrayOfIdeces[i] = anActor->GetNodeObjId(ite.Key());
-      }
-      int tmp;
-      if(MapIndex.Extent() == 4){
-       int idNodes[4];
-       TColStd_MapIteratorOfMapOfInteger ite1(MapIndex);
-       for(int i = 0; ite1.More(); ite1.Next(), i++){
-         idNodes[i] = ite1.Key();
-       }
-       vtkUnstructuredGrid *ugrid = anActor->GetUnstructuredGrid();
-       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;
-         }
-       }
-      }
-      if(reverse){
-       for(int i = 0; i < (MapIndex.Extent() / 2); i++){
-         tmp = anArrayOfIdeces[i];
-         anArrayOfIdeces[i] = anArrayOfIdeces[MapIndex.Extent() - i - 1];
-         anArrayOfIdeces[MapIndex.Extent() - i - 1] = tmp;
-       }
-      }
-      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
-      aMeshEditor->AddFace(anArrayOfIdeces);
-      if(myAutomaticUpdate){
-       CORBA::Long anId = smeshGUI->myStudy->StudyId();
-       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
-         aVisualObj->Update(true);
-       }
-       AddActorInSelection(anActor);
-      }
-    }
-  }catch(SALOME::SALOME_Exception& exc) {
-    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
-  }catch(const std::exception& exc){
-    INFOS("Follow exception was cought:\n\t"<<exc.what());
-  }catch(...){
-    INFOS("Unknown exception was cought !!!");
-  }
+  if( !myDisplayer )
+    myDisplayer = new SMESHGUI_Displayer( getApp() );
+  return myDisplayer;

 }
 
 }
 

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddVolume(SMESH::SMESH_Mesh_ptr theMesh,
-                        const TColStd_MapOfInteger & MapIndex)
+SALOMEDS::Color SMESHGUI::getUniqueColor( const QList<SALOMEDS::Color>& theReservedColors )

 {
 {

-  QAD_WaitCursor wc;
-  try{
-    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
-    CORBA::String_var anEntry = aSobj->GetID();
-    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
-      SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
-      anArrayOfIdeces->length(MapIndex.Extent());
-      TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-      for(int i = 0; ite.More(); ite.Next(), i++){
-       anArrayOfIdeces[i] = anActor->GetNodeObjId(ite.Key());
-      }
-      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
-      aMeshEditor->AddVolume(anArrayOfIdeces);
-      if(myAutomaticUpdate){
-       CORBA::Long anId = smeshGUI->myStudy->StudyId();
-       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
-         aVisualObj->Update(true);
-       }
+  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;
+    }
+    //cout << "Iteration N" << anIterations << " (tolerance=" << aTolerance << ")"<< endl;
+
+    aHue = (int)( 360.0 * rand() / RAND_MAX );
+    //cout << "Hue = " << aHue << endl;
+
+    //cout << "Auto colors : ";
+    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 );
+      //cout << h << " ";
+      if( abs( h - aHue ) < aTolerance )
+      {
+        ok = false;
+        //cout << "break (diff = " << abs( h - aHue ) << ")";
+        break;

       }
     }
       }
     }

-  }catch(SALOME::SALOME_Exception& exc) {
-    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
-  }catch(const std::exception& exc){
-    INFOS("Follow exception was cought:\n\t"<<exc.what());
-  }catch(...){
-    INFOS("Unknown exception was cought !!!");
+    //cout << endl;
+
+    if( ok )
+      break;

   }
   }

+
+  //cout << "Hue of the returned color = " << aHue << endl;
+  QColor aColor;
+  aColor.setHsv( aHue, 255, 255 );
+
+  SALOMEDS::Color aSColor;
+  aSColor.R = (double)aColor.red() / 255.0;
+  aSColor.G = (double)aColor.green() / 255.0;
+  aSColor.B = (double)aColor.blue() / 255.0;
+
+  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)
+

 /*!
 /*!

+ * \brief Store visual parameters

  *
  *

+ * This method is called just before the study document is saved.
+ * Store visual parameters in AttributeParameter attribue(s)

  */
  */

-//=============================================================================
-void SMESHGUI::AddEdge(SMESH::SMESH_Mesh_ptr theMesh,
-                      const TColStd_MapOfInteger & MapIndex)
+void SMESHGUI::storeVisualParameters (int savePoint)

 {
 {

-  QAD_WaitCursor wc;
-  try{
-    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
-    CORBA::String_var anEntry = aSobj->GetID();
-    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
-      SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
-      anArrayOfIdeces->length(MapIndex.Extent());
-      TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-      for(int i = 0; ite.More(); ite.Next(), i++){
-       anArrayOfIdeces[i] = anActor->GetNodeObjId(ite.Key());
-      }
-      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
-      aMeshEditor->AddEdge(anArrayOfIdeces);
-      if(myAutomaticUpdate){
-       CORBA::Long anId = smeshGUI->myStudy->StudyId();
-       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
-         aVisualObj->Update(true);
-       }
-      }
-    }
-  }catch(SALOME::SALOME_Exception& exc) {
-    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
-  }catch(const std::exception& exc){
-    INFOS("Follow exception was cought:\n\t"<<exc.what());
-  }catch(...){
-    INFOS("Unknown exception was cought !!!");
-  }
+  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);
+
+  // 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())
+    {
+      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;
+
+                  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);
+
+                  param = vtkParam + "Entities";
+                  ip->setParameter(entry, param, modeStr.toLatin1().data());
+
+                  // Colors (surface:edge:)
+                  vtkFloatingPointType r, g, b;
+
+                  aSmeshActor->GetSufaceColor(r, g, b);
+                  QString colorStr ("surface");
+                  colorStr += gDigitsSep; colorStr += QString::number(r);
+                  colorStr += gDigitsSep; colorStr += QString::number(g);
+                  colorStr += gDigitsSep; colorStr += QString::number(b);
+
+                  aSmeshActor->GetBackSufaceColor(r, g, b);
+                  colorStr += gDigitsSep; colorStr += "backsurface";
+                  colorStr += gDigitsSep; colorStr += QString::number(r);
+                  colorStr += gDigitsSep; colorStr += QString::number(g);
+                  colorStr += gDigitsSep; colorStr += QString::number(b);
+
+                  aSmeshActor->GetEdgeColor(r, g, b);
+                  colorStr += gDigitsSep; colorStr += "edge";
+                  colorStr += gDigitsSep; colorStr += QString::number(r);
+                  colorStr += gDigitsSep; colorStr += QString::number(g);
+                  colorStr += gDigitsSep; colorStr += QString::number(b);
+
+                  aSmeshActor->GetNodeColor(r, g, b);
+                  colorStr += gDigitsSep; colorStr += "node";
+                  colorStr += gDigitsSep; colorStr += QString::number(r);
+                  colorStr += gDigitsSep; colorStr += QString::number(g);
+                  colorStr += gDigitsSep; colorStr += QString::number(b);
+
+                  param = vtkParam + "Colors";
+                  ip->setParameter(entry, param, colorStr.toLatin1().data());
+
+                  // Sizes of lines and points
+                  QString sizeStr ("line");
+                  sizeStr += gDigitsSep; sizeStr += QString::number((int)aSmeshActor->GetLineWidth());
+                  sizeStr += gDigitsSep; sizeStr += "node";
+                  sizeStr += gDigitsSep; sizeStr += QString::number((int)aSmeshActor->GetNodeSize());
+                  sizeStr += gDigitsSep; sizeStr += "shrink";
+                  sizeStr += gDigitsSep; sizeStr += QString::number(aSmeshActor->GetShrinkFactor());
+
+                  param = vtkParam + "Sizes";
+                  ip->setParameter(entry, param, sizeStr.toLatin1().data());
+
+                  // Opacity
+                  param = vtkParam + "Opacity";
+                  ip->setParameter(entry, param,
+                                   QString::number(aSmeshActor->GetOpacity()).toLatin1().data());
+
+                  // Clipping
+                  param = vtkParam + "ClippingPlane";
+                  int nPlanes = aSmeshActor->GetNumberOfClippingPlanes();
+                  if (!nPlanes)
+                    ip->setParameter(entry, param, "Off");
+                  for (int ipl = 0; ipl < nPlanes; ipl++) {
+                    //vtkPlane* plane = aSmeshActor->GetClippingPlane(ipl);
+                    SMESH::Orientation anOrientation;
+                    double aDistance;
+                    vtkFloatingPointType anAngle[2];
+                    SMESHGUI_ClippingDlg::GetPlaneParam(aSmeshActor, ipl, anOrientation, aDistance, anAngle);
+                    std::string planeValue = QString::number((int)anOrientation).toLatin1().data();
+                    planeValue += gDigitsSep; planeValue += QString::number(aDistance).toLatin1().data();
+                    planeValue += gDigitsSep; planeValue += QString::number(anAngle[0]).toLatin1().data();
+                    planeValue += gDigitsSep; planeValue += QString::number(anAngle[1]).toLatin1().data();
+
+                    ip->setParameter(entry, param + QString::number(ipl+1).toLatin1().data(), planeValue);
+                  }
+                } // if (io->hasEntry())
+              } // SMESH_Actor && hasIO
+            } // isVisible
+          } // while.. actors traversal
+        } // if (vtkView)
+      } // for (views)
+      vtkViewers++;
+    } // if (SVTK view model)
+  } // for (viewManagers)

 }
 }

-//=============================================================================
+

 /*!
 /*!

+ * \brief Restore visual parameters

  *
  *

+ * This method is called after the study document is opened.
+ * Restore visual parameters from AttributeParameter attribue(s)

  */
  */

-//=============================================================================
-void SMESHGUI::AddNode(SMESH::SMESH_Mesh_ptr theMesh, 
-                      float x, float y, float z)
+void SMESHGUI::restoreVisualParameters (int savePoint)

 {
 {

-  QAD_WaitCursor wc;
-  try{
-    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
-    CORBA::String_var anEntry = aSobj->GetID();
-    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
-      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
-      aMeshEditor->AddNode(x, y, z);
-      if(myAutomaticUpdate){
-       CORBA::Long anId = smeshGUI->myStudy->StudyId();
-       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
-         aVisualObj->Update(true);
-       }
+  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("GEOM");
+  //if (!aSComponent) return;
+
+  // IParameters
+  _PTR(AttributeParameter) ap = studyDS->GetModuleParameters("Interface Applicative",
+                                                             componentName.c_str(),
+                                                             savePoint);
+  _PTR(IParameters) ip = ClientFactory::getIParameters(ap);
+
+  std::vector<std::string> entries = ip->getEntries();
+
+  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
+
+    std::vector<std::string> paramNames = ip->getAllParameterNames( *entIt );
+    std::vector<std::string> paramValues = ip->getAllParameterValues( *entIt );
+
+    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;
+
+    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);
+
+        if (paramNameStr == "Visibility")
+        {
+          if (!aSmeshActor && displayer())
+          {
+            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);
+              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);
+              if (mode.count() == 6) {
+                if (mode[0] != "e" || mode[2]  != "f" || mode[4] != "v") {
+                  MESSAGE("Invalid order of data in Entities, must be: "
+                          "e:0/1:f:0/1:v:0/1");
+                }
+                else {
+                  unsigned int aMode = aSmeshActor->GetEntityMode();
+                  unsigned int aNewMode =
+                    (int(SMESH_Actor::eEdges  ) * mode[1].toInt()) |
+                    (int(SMESH_Actor::eFaces  ) * mode[3].toInt()) |
+                    (int(SMESH_Actor::eVolumes) * mode[5].toInt());
+                  if (aNewMode != aMode)
+                    aSmeshActor->SetEntityMode(aNewMode);
+                }
+              }
+            }
+            // Colors
+            else if (paramNameStr == "Colors") {
+              QStringList colors = val.split(gDigitsSep, QString::SkipEmptyParts);
+              if (colors.count() == 16) {
+                if (colors[0] != "surface" || colors[4]  != "backsurface" ||
+                    colors[8] != "edge"    || colors[12] != "node") {
+                  MESSAGE("Invalid order of data in Colors, must be: "
+                          "surface:r:g:b:backsurface:r:g:b:edge:r:g:b:node:r:g:b");
+                }
+                else {
+                  aSmeshActor->SetSufaceColor(colors[1].toFloat(), colors[2].toFloat(), colors[3].toFloat());
+                  aSmeshActor->SetBackSufaceColor(colors[5].toFloat(), colors[6].toFloat(), colors[7].toFloat());
+                  aSmeshActor->SetEdgeColor(colors[9].toFloat(), colors[10].toFloat(), colors[11].toFloat());
+                  aSmeshActor->SetNodeColor(colors[13].toFloat(), colors[14].toFloat(), colors[15].toFloat());
+                }
+              }
+            }
+            // Sizes of lines and points
+            else if (paramNameStr == "Sizes") {
+              QStringList sizes = val.split(gDigitsSep, QString::SkipEmptyParts);
+              if (sizes.count() == 6) {
+                if (sizes[0] != "line" || sizes[2]  != "node" || sizes[4] != "shrink") {
+                  MESSAGE("Invalid order of data in Sizes, must be: "
+                          "line:int:node:int:shrink:float");
+                }
+                else {
+                  aSmeshActor->SetLineWidth(sizes[1].toInt());
+                  aSmeshActor->SetNodeSize(sizes[3].toInt());
+                  aSmeshActor->SetShrinkFactor(sizes[5].toFloat());
+                }
+              }
+            }
+            // Opacity
+            else if (paramNameStr == "Opacity") {
+              aSmeshActor->SetOpacity(val.toFloat());
+            }
+            // Clipping
+            else if (paramNameStr.startsWith("ClippingPlane")) {
+              cout << "$$$ ClippingPlane 1" << endl;
+              if (paramNameStr == "ClippingPlane1" || val == "Off")
+                aSmeshActor->RemoveAllClippingPlanes();
+              if (val != "Off") {
+                cout << "$$$ ClippingPlane 2" << endl;
+                QStringList vals = val.split(gDigitsSep, QString::SkipEmptyParts);
+                if (vals.count() == 4) { // format check: 4 values
+                  cout << "$$$ ClippingPlane 3" << endl;
+                  SMESH::Orientation anOrientation = (SMESH::Orientation)vals[0].toInt();
+                  double aDistance = vals[1].toFloat();
+                  vtkFloatingPointType 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_ClippingDlg::AddPlane(aSmeshActor, vtkView,
+                                                   anOrientation, aDistance, anAngle);
+                  }
+                }
+              }
+            }
+          } // if (aSmeshActor)
+        } // other parameters than Visibility

       }
       }

+    } // for names/parameters iterator
+  } // for entries iterator
+
+  // 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();

     }
     }

-  }catch(SALOME::SALOME_Exception& exc) {
-    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
-  }catch(const std::exception& exc){
-    INFOS("Follow exception was cought:\n\t"<<exc.what());
-  }catch(...){
-    INFOS("Unknown exception was cought !!!");

   }
 }
   }
 }

-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DisplayEdgesConnectivityLegendBox(vtkActor * ac)
-{
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       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();
-}

 
 

-//===============================================================================
-// function : OnEditDelete()
-// purpose  :
-//===============================================================================
-void SMESHGUI::OnEditDelete()
+/*!
+  \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 )

 {
 {

-  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;
-
-  int nbSf = myActiveStudy->getStudyFramesCount();
-
-  Standard_Boolean found;
-  SALOMEDS::Study_var aStudy = myActiveStudy->getStudyDocument();
-  SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
-  SALOMEDS::GenericAttribute_var anAttr;
-  SALOMEDS::AttributeIOR_var anIOR;
-
-  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);
-           CORBA::String_var anEntry = CSO->GetID();
-           if(SMESH_Actor* anActor = ::FindActorByEntry(sf,anEntry.in())){
-             RemoveActor(sf,anActor);
-           }
-          }
-        }
-      }
+  int tfont = addPreference( label, pId, LightApp_Preferences::Font, "VISU", param );
+  
+  setPreferenceProperty( tfont, "mode", QtxFontEdit::Custom );

 
 

-      /* Erase main graphical object */
-      for(int i = 0; i < nbSf; i++){
-       QAD_StudyFrame *sf = myActiveStudy->getStudyFrame(i);
-       if(SMESH_Actor* anActor = ::FindActorByEntry(sf,IObject->getEntry())){
-         RemoveActor(sf,anActor);
-       }
-      }
+  QStringList fam;
+  fam.append( tr( "SMESH_FONT_ARIAL" ) );
+  fam.append( tr( "SMESH_FONT_COURIER" ) );
+  fam.append( tr( "SMESH_FONT_TIMES" ) );

 
 

-      // Remove object(s) from data structures
-      SALOMEDS::SObject_var obj = myStudy->FindObjectID(IObject->getEntry());
-      if(!obj->_is_nil()){
-       SMESH::SMESH_Group_var     aGroup = SMESH::SMESH_Group  ::_narrow(obj->GetObject());
-       SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(obj->GetObject());
-
-       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 );
-       }
-       else {// default action: remove SObject from the study
-         // san - it's no use opening a transaction here until UNDO/REDO is provided in SMESH
-         //QAD_Operation *op = new SALOMEGUI_ImportOperation(myActiveStudy);
-         //op->start();
-         aStudyBuilder->RemoveObjectWithChildren( obj );
-         //op->finish();
-       }
-      }
+  setPreferenceProperty( tfont, "fonts", fam );

 
 

-    } /* IObject->hasEntry() */
-  } /* more/next */
+  int f = QtxFontEdit::Family | QtxFontEdit::Bold | QtxFontEdit::Italic | QtxFontEdit::Shadow;
+  setPreferenceProperty( tfont, "features", f );

 
 

-  /* Clear any previous selection */
-  Sel->ClearIObjects();
-  myActiveStudy->updateObjBrowser();
+  return tfont;

 }
 
 }
 

-//=======================================================================
-// name    : SMESHGUI::GetFilterMgr
-// Purpose : Get filter manager
-//=======================================================================
-SMESH::FilterManager_ptr SMESHGUI::GetFilterMgr()
+/*!
+  \brief Actions after hypothesis edition
+  Updates object browser after hypothesis edition
+*/
+void SMESHGUI::onHypothesisEdit( int result )

 {
 {

-   return myFilterMgr;
+  updateObjBrowser( true );

 }
 }