Salome HOME
Cosmetics
authorjrt <jrt>
Wed, 10 Dec 2003 16:05:04 +0000 (16:05 +0000)
committerjrt <jrt>
Wed, 10 Dec 2003 16:05:04 +0000 (16:05 +0000)
src/SMESHGUI/SMESHGUI.cxx

index 861630a..529ede7 100644 (file)
@@ -66,7 +66,7 @@ using namespace std;
 #include "QAD_Config.h"
 #include "QAD_Settings.h"
 #include "QAD_RightFrame.h"
-#include "QAD_MessageBox.h"   
+#include "QAD_MessageBox.h"
 #include "QAD_Resource.h"
 #include "QAD_FileDlg.h"
 #include "SALOMEGUI_Desktop.h"
@@ -121,9 +121,9 @@ using namespace std;
 #include <qmessagebox.h>
 #include <qspinbox.h>
 #include <qlist.h>
-#include <qwidget.h> 
-#include <qevent.h> 
-#include <qradiobutton.h> 
+#include <qwidget.h>
+#include <qevent.h>
+#include <qradiobutton.h>
 
 // VTK Includes
 #include "VTKViewer_Common.h"
@@ -132,41 +132,45 @@ using namespace std;
 #include <vtkFeatureEdges.h>
 #include <vtkDoubleArray.h>
 
-
 // Open CASCADE Includes
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 
-static GEOM_Client      ShapeReader;
-static SMESHGUI*        smeshGUI = 0;
-static CORBA::ORB_var   _orb;
-
+static GEOM_Client ShapeReader;
+static SMESHGUI *smeshGUI = 0;
+static CORBA::ORB_var _orb;
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-class CustomItem : public QCustomMenuItem
+class CustomItem:public QCustomMenuItem
 {
-public:
-  CustomItem( const QString& s, const QFont& f )
-    : string( s ), font( f ){};
-  ~CustomItem(){}
-  
-  void paint( QPainter* p, const QColorGroup& /*cg*/, bool /*act*/, bool /*enabled*/, int x, int y, int w, int h )
-  {
-    p->setFont ( font );
-    p->drawText( x, y, w, h, AlignHCenter | AlignVCenter | ShowPrefix | DontClip, string );
-  }
-  
-  QSize sizeHint()
-  {
-    return QFontMetrics( font ).size( AlignHCenter | AlignVCenter | ShowPrefix | DontClip,  string );
-  }
-private:
-  QString string;
-  QFont font;
+  public:
+       CustomItem(const QString & s, const QFont & f):string(s), font(f)
+       {
+       };
+       ~CustomItem()
+       {
+       }
+
+       void paint(QPainter * p, const QColorGroup & /*cg */ , bool /*act */ ,
+               bool /*enabled */ , int x, int y, int w, int h)
+       {
+               p->setFont(font);
+               p->drawText(x, y, w, h,
+                       AlignHCenter | AlignVCenter | ShowPrefix | DontClip, string);
+       }
+
+       QSize sizeHint()
+       {
+               return QFontMetrics(font).
+                       size(AlignHCenter | AlignVCenter | ShowPrefix | DontClip, string);
+       }
+  private:
+       QString string;
+       QFont font;
 };
 
 //=============================================================================
@@ -174,8 +178,8 @@ private:
  *
  */
 //=============================================================================
-SMESHGUI::SMESHGUI() :
-  QObject()
+SMESHGUI::SMESHGUI():
+QObject()
 {
 }
 
@@ -188,15 +192,14 @@ SMESHGUI::~SMESHGUI()
 {
 }
 
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-SMESHGUI* SMESHGUI::GetSMESHGUI( )
+SMESHGUI *SMESHGUI::GetSMESHGUI()
 {
-  return smeshGUI;
+       return smeshGUI;
 }
 
 //=============================================================================
@@ -204,49 +207,55 @@ SMESHGUI* SMESHGUI::GetSMESHGUI( )
  *
  */
 //=============================================================================
-SMESHGUI* SMESHGUI::GetOrCreateSMESHGUI( QAD_Desktop* desktop )
+SMESHGUI *SMESHGUI::GetOrCreateSMESHGUI(QAD_Desktop * desktop)
 {
-  if( smeshGUI == 0 ) {
-    setOrb();
-    smeshGUI = new SMESHGUI;
-    smeshGUI->myActiveDialogBox = 0 ;
-    smeshGUI->myState = -1 ;
-    smeshGUI->myDesktop = desktop ; 
-    smeshGUI->myActiveStudy = desktop->getActiveStudy();
-
-    Engines::Component_var comp = desktop->getEngine("FactoryServer", "SMESH");
-    smeshGUI->myComponentMesh = SMESH::SMESH_Gen::_narrow(comp);
-    
-    Engines::Component_var comp1 = desktop->getEngine("FactoryServer", "GEOM");    
-    smeshGUI->myComponentGeom = GEOM::GEOM_Gen::_narrow(comp1);
-      
-    /* GetCurrentStudy */
-    smeshGUI->myStudyId = smeshGUI->myActiveStudy->getStudyId();
-    
-    smeshGUI->myComponentGeom->GetCurrentStudy( smeshGUI->myStudyId );
-    //    smeshGUI->myComponentGeom->NbLabels();
-    
-    smeshGUI->myStudy = smeshGUI->myActiveStudy->getStudyDocument();
-    
-    smeshGUI->myStudyAPI = SMESHGUI_StudyAPI(smeshGUI->myStudy, smeshGUI->myComponentMesh);
-
-    smeshGUI->myDocument = new SMESHDS_Document(1);//NBU
-
-    smeshGUI->mySimulationActors = vtkActorCollection::New();
-    smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
-  } else {
-    /* study may have changed */
-    smeshGUI->myActiveStudy = desktop->getActiveStudy();
-    smeshGUI->myStudyAPI.Update(smeshGUI->myComponentMesh);
-  }
-  
-  /* Automatic Update */
-  if ( desktop->menuBar()->isItemChecked(1001) )
-    smeshGUI->myAutomaticUpdate = true;
-  else 
-    smeshGUI->myAutomaticUpdate = false;
-
-  return smeshGUI;
+       if (smeshGUI == 0)
+       {
+               setOrb();
+               smeshGUI = new SMESHGUI;
+               smeshGUI->myActiveDialogBox = 0;
+               smeshGUI->myState = -1;
+               smeshGUI->myDesktop = desktop;
+               smeshGUI->myActiveStudy = desktop->getActiveStudy();
+
+               Engines::Component_var comp =
+                       desktop->getEngine("FactoryServer", "SMESH");
+               smeshGUI->myComponentMesh = SMESH::SMESH_Gen::_narrow(comp);
+
+               Engines::Component_var comp1 =
+                       desktop->getEngine("FactoryServer", "GEOM");
+               smeshGUI->myComponentGeom = GEOM::GEOM_Gen::_narrow(comp1);
+
+               /* GetCurrentStudy */
+               smeshGUI->myStudyId = smeshGUI->myActiveStudy->getStudyId();
+
+               smeshGUI->myComponentGeom->GetCurrentStudy(smeshGUI->myStudyId);
+               //    smeshGUI->myComponentGeom->NbLabels();
+
+               smeshGUI->myStudy = smeshGUI->myActiveStudy->getStudyDocument();
+
+               smeshGUI->myStudyAPI =
+                       SMESHGUI_StudyAPI(smeshGUI->myStudy, smeshGUI->myComponentMesh);
+
+               smeshGUI->myDocument = new SMESHDS_Document(1); //NBU
+
+               smeshGUI->mySimulationActors = vtkActorCollection::New();
+               smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
+       }
+       else
+       {
+               /* study may have changed */
+               smeshGUI->myActiveStudy = desktop->getActiveStudy();
+               smeshGUI->myStudyAPI.Update(smeshGUI->myComponentMesh);
+       }
+
+       /* Automatic Update */
+       if (desktop->menuBar()->isItemChecked(1001))
+               smeshGUI->myAutomaticUpdate = true;
+       else
+               smeshGUI->myAutomaticUpdate = false;
+
+       return smeshGUI;
 }
 
 //=============================================================================
@@ -254,9 +263,11 @@ SMESHGUI* SMESHGUI::GetOrCreateSMESHGUI( QAD_Desktop* desktop )
  *
  */
 //=============================================================================
-void SMESHGUI::SetState(int aState )
-{  this->myState = aState ;  return ; }
-
+void SMESHGUI::SetState(int aState)
+{
+       this->myState = aState;
+       return;
+}
 
 //=============================================================================
 /*!
@@ -264,8 +275,10 @@ void SMESHGUI::SetState(int aState )
  */
 //=============================================================================
 void SMESHGUI::ResetState()
-{  this->myState = -1 ;  return ; }
-
+{
+       this->myState = -1;
+       return;
+}
 
 //=============================================================================
 /*!
@@ -274,8 +287,8 @@ void SMESHGUI::ResetState()
 //=============================================================================
 void SMESHGUI::EmitSignalDeactivateDialog()
 {
-  emit this->SignalDeactivateActiveDialog() ;
-  return ;
+       emit this->SignalDeactivateActiveDialog();
+       return;
 }
 
 //=============================================================================
@@ -285,19 +298,18 @@ void SMESHGUI::EmitSignalDeactivateDialog()
 //=============================================================================
 void SMESHGUI::EmitSignalCloseAllDialogs()
 {
-  emit this->SignalCloseAllDialogs() ;
-  return ;
+       emit this->SignalCloseAllDialogs();
+       return;
 }
 
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-QDialogSMESHGUI::GetActiveDialogBox()
+QDialog *SMESHGUI::GetActiveDialogBox()
 {
-  return this->myActiveDialogBox ;
+       return this->myActiveDialogBox;
 }
 
 //=============================================================================
@@ -305,24 +317,22 @@ QDialog* SMESHGUI::GetActiveDialogBox()
  *
  */
 //=============================================================================
-void SMESHGUI::SetActiveDialogBox(QDialog* aDlg)
+void SMESHGUI::SetActiveDialogBox(QDialog * aDlg)
 {
-  this->myActiveDialogBox = (QDialog*)aDlg ;
-  return ;
+       this->myActiveDialogBox = (QDialog *) aDlg;
+       return;
 }
 
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-QAD_StudySMESHGUI::GetActiveStudy()
+QAD_Study *SMESHGUI::GetActiveStudy()
 {
-  return this->myActiveStudy ;
+       return this->myActiveStudy;
 }
 
-
 //=============================================================================
 /*!
  *
@@ -330,7 +340,7 @@ QAD_Study* SMESHGUI::GetActiveStudy()
 //=============================================================================
 SALOMEDS::Study_ptr SMESHGUI::GetStudy()
 {
-  return SALOMEDS::Study::_narrow( myStudy );
+       return SALOMEDS::Study::_narrow(myStudy);
 }
 
 //=============================================================================
@@ -340,7 +350,7 @@ SALOMEDS::Study_ptr SMESHGUI::GetStudy()
 //=============================================================================
 SMESHGUI_StudyAPI SMESHGUI::GetStudyAPI()
 {
-  return myStudyAPI;
+       return myStudyAPI;
 }
 
 //=============================================================================
@@ -348,9 +358,9 @@ SMESHGUI_StudyAPI SMESHGUI::GetStudyAPI()
  *
  */
 //=============================================================================
-QAD_DesktopSMESHGUI::GetDesktop()
+QAD_Desktop *SMESHGUI::GetDesktop()
 {
-  return this->myDesktop ;
+       return this->myDesktop;
 }
 
 //=============================================================================
@@ -358,18 +368,21 @@ QAD_Desktop* SMESHGUI::GetDesktop()
  *
  */
 //=============================================================================
-vtkScalarBarActorSMESHGUI::GetScalarBar()
+vtkScalarBarActor *SMESHGUI::GetScalarBar()
 {
-  vtkRenderer* aRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  vtkActor2DCollection* actor2DList = aRenderer->GetActors2D();
-  actor2DList->InitTraversal();
-  vtkActor2D* aActor2d =  actor2DList->GetNextActor2D();
-  while (aActor2d != NULL) {
-    if (aActor2d->IsA("vtkScalarBarActor"))
-      return vtkScalarBarActor::SafeDownCast(aActor2d);
-    actor2DList->GetNextActor2D();
-  }
-  return NULL;
+       vtkRenderer *aRenderer =
+               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
+               getRightFrame()->getViewFrame())->getRenderer();
+       vtkActor2DCollection *actor2DList = aRenderer->GetActors2D();
+       actor2DList->InitTraversal();
+       vtkActor2D *aActor2d = actor2DList->GetNextActor2D();
+       while (aActor2d != NULL)
+       {
+               if (aActor2d->IsA("vtkScalarBarActor"))
+                       return vtkScalarBarActor::SafeDownCast(aActor2d);
+               actor2DList->GetNextActor2D();
+       }
+       return NULL;
 }
 
 //=============================================================================
@@ -377,20 +390,20 @@ vtkScalarBarActor* SMESHGUI::GetScalarBar()
  *
  */
 //=============================================================================
-void SMESHGUI::activeStudyChanged( QAD_Desktop* parent )
+void SMESHGUI::activeStudyChanged(QAD_Desktop * parent)
 {
-  MESSAGE ("SMESHGUI::activeStudyChanged init.")
-  /* Create or retrieve an object SMESHGUI */
-  SMESHGUI::GetOrCreateSMESHGUI(parent); 
-  if(smeshGUI != 0) {  
-    smeshGUI->EmitSignalCloseAllDialogs() ;
-    MESSAGE( "Active study changed : SMESHGUI nullified" << endl ) ;
-    smeshGUI = 0 ;
-  }
-
-  //smeshGUI->SetSettings( parent ); //DCQ : Pb. Multi-Etudes
-  MESSAGE ("SMESHGUI::activeStudyChanged done.")
-  return ;
+       MESSAGE("SMESHGUI::activeStudyChanged init.")
+               /* Create or retrieve an object SMESHGUI */
+               SMESHGUI::GetOrCreateSMESHGUI(parent);
+       if (smeshGUI != 0)
+       {
+               smeshGUI->EmitSignalCloseAllDialogs();
+               MESSAGE("Active study changed : SMESHGUI nullified" << endl);
+               smeshGUI = 0;
+       }
+
+       //smeshGUI->SetSettings( parent ); //DCQ : Pb. Multi-Etudes
+       MESSAGE("SMESHGUI::activeStudyChanged done.") return;
 }
 
 //=============================================================================
@@ -398,17 +411,16 @@ void SMESHGUI::activeStudyChanged( QAD_Desktop* parent )
  *
  */
 //=============================================================================
-bool SMESHGUI::DefineDlgPosition(QWidget* aDlg, int& x, int& y)
+bool SMESHGUI::DefineDlgPosition(QWidget * aDlg, int &x, int &y)
 {
-  /* Here the position is on the bottom right corner - 10 */
+       /* Here the position is on the bottom right corner - 10 */
        aDlg->resize(QSize().expandedTo(aDlg->minimumSizeHint()));
-  QAD_Desktop* PP = QAD_Application::getDesktop() ;
-  x = abs ( PP->x() + PP->size().width()  - aDlg->size().width()  - 10 ) ;
-  y = abs ( PP->y() + PP->size().height() - aDlg->size().height() - 10 ) ;
-  return true ;  
+       QAD_Desktop *PP = QAD_Application::getDesktop();
+       x = abs(PP->x() + PP->size().width() - aDlg->size().width() - 10);
+       y = abs(PP->y() + PP->size().height() - aDlg->size().height() - 10);
+       return true;
 }
 
-
 //=============================================================================
 /*!
  *
@@ -416,31 +428,38 @@ 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();
-    }
-    renWin->Render();
-  }
+       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();
+               }
+               renWin->Render();
+       }
 }
 
 //=============================================================================
@@ -448,32 +467,40 @@ void SMESHGUI::EraseSimulationActors()
  *
  */
 //=============================================================================
-SMESH::SMESH_Mesh_ptr SMESHGUI::InitMesh( GEOM::GEOM_Shape_ptr aShape, QString NameMesh )
+SMESH::SMESH_Mesh_ptr SMESHGUI::InitMesh(GEOM::GEOM_Shape_ptr aShape,
+       QString NameMesh)
 {
-  try {
-    if ( !myComponentMesh->_is_nil() && !aShape->_is_nil() ) {
-      SMESH::SMESH_Mesh_var aMesh = myComponentMesh->Init( myComponentGeom, myStudyId, aShape);
-
-      if ( !aMesh->_is_nil() ) {
-       SALOMEDS::SObject_var SM = myStudyAPI.AddNewMesh ( aMesh );
-       myStudyAPI.SetName( SM, NameMesh );
-         
-       // GEOM::GEOM_Shape has non-empty StudyShapeId only after AddInStudy operation,
-       // not after loading from file, so let's use more reliable way to retrieve SObject
-       Standard_CString ShapeIOR = _orb->object_to_string(aShape);
-       SALOMEDS::SObject_var SObject = myStudy->FindObjectIOR(ShapeIOR);
-       if ( !SObject->_is_nil() && !SM->_is_nil() ) {
-         myStudyAPI.SetShape( SM, SObject );
-       }
-       return SMESH::SMESH_Mesh::_narrow(aMesh);
-      }
-    }
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  }
-  myActiveStudy->updateObjBrowser(true);
-  return SMESH::SMESH_Mesh::_nil();
+       try
+       {
+               if (!myComponentMesh->_is_nil() && !aShape->_is_nil())
+               {
+                       SMESH::SMESH_Mesh_var aMesh =
+                               myComponentMesh->Init(myComponentGeom, myStudyId, aShape);
+
+                       if (!aMesh->_is_nil())
+                       {
+                               SALOMEDS::SObject_var SM = myStudyAPI.AddNewMesh(aMesh);
+                               myStudyAPI.SetName(SM, NameMesh);
+
+                               // GEOM::GEOM_Shape has non-empty StudyShapeId only after AddInStudy operation,
+                               // not after loading from file, so let's use more reliable way to retrieve SObject
+                               Standard_CString ShapeIOR = _orb->object_to_string(aShape);
+                               SALOMEDS::SObject_var SObject =
+                                       myStudy->FindObjectIOR(ShapeIOR);
+                               if (!SObject->_is_nil() && !SM->_is_nil())
+                               {
+                                       myStudyAPI.SetShape(SM, SObject);
+                               }
+                               return SMESH::SMESH_Mesh::_narrow(aMesh);
+                       }
+               }
+       }
+       catch(const SALOME::SALOME_Exception & S_ex)
+       {
+               QtCatchCorbaException(S_ex);
+       }
+       myActiveStudy->updateObjBrowser(true);
+       return SMESH::SMESH_Mesh::_nil();
 }
 
 //=============================================================================
@@ -481,57 +508,66 @@ SMESH::SMESH_Mesh_ptr SMESHGUI::InitMesh( GEOM::GEOM_Shape_ptr aShape, QString N
  *
  */
 //=============================================================================
-SMESH::SMESH_subMesh_ptr SMESHGUI::AddSubMesh( SMESH::SMESH_Mesh_ptr aMesh, GEOM::GEOM_Shape_ptr aShape, QString NameMesh )
+SMESH::SMESH_subMesh_ptr SMESHGUI::AddSubMesh(SMESH::SMESH_Mesh_ptr aMesh,
+       GEOM::GEOM_Shape_ptr aShape, QString NameMesh)
 {
-  try {
-    SMESH::SMESH_subMesh_var aSubMesh = aMesh->GetElementsOnShape(aShape);
-    SALOMEDS::SObject_var SO_Mesh = myStudyAPI.FindMesh(aMesh);
-    Standard_CString ShapeIOR = _orb->object_to_string(aShape);
-    SALOMEDS::SObject_var SO_GeomShape = myStudy->FindObjectIOR(ShapeIOR);
-    
-    if ( !SO_GeomShape->_is_nil() && !SO_Mesh->_is_nil() && !aSubMesh->_is_nil() && !aMesh->_is_nil() ) {
-      SALOMEDS::SObject_var SO = myStudyAPI.AddSubMeshOnShape(SO_Mesh, SO_GeomShape, aSubMesh, aShape->ShapeType() );
-      myStudyAPI.SetName(SO, NameMesh);
-    
-      SMESH_Actor* amesh = SMESH_Actor::New();
-      Handle(SALOME_InteractiveObject) IO = new SALOME_InteractiveObject(SO->GetID(),
-                                                                        "MESH",
-                                                                        strdup(NameMesh));
-      amesh->setIO( IO );
-      amesh->setName( strdup(NameMesh) );
-      DisplayActor(amesh, false);
-      return SMESH::SMESH_subMesh::_narrow( aSubMesh );
-    }
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  }
-  myActiveStudy->updateObjBrowser(true);
-  return SMESH::SMESH_subMesh::_nil();
+       try
+       {
+               SMESH::SMESH_subMesh_var aSubMesh = aMesh->GetElementsOnShape(aShape);
+               SALOMEDS::SObject_var SO_Mesh = myStudyAPI.FindMesh(aMesh);
+               Standard_CString ShapeIOR = _orb->object_to_string(aShape);
+               SALOMEDS::SObject_var SO_GeomShape = myStudy->FindObjectIOR(ShapeIOR);
+
+               if (!SO_GeomShape->_is_nil() && !SO_Mesh->_is_nil() &&
+                       !aSubMesh->_is_nil() && !aMesh->_is_nil())
+               {
+                       SALOMEDS::SObject_var SO =
+                               myStudyAPI.AddSubMeshOnShape(SO_Mesh, SO_GeomShape, aSubMesh,
+                               aShape->ShapeType());
+                       myStudyAPI.SetName(SO, NameMesh);
+
+                       SMESH_Actor *amesh = SMESH_Actor::New();
+                       Handle(SALOME_InteractiveObject) IO =
+                               new SALOME_InteractiveObject(SO->GetID(), "MESH",
+                               strdup(NameMesh));
+                       amesh->setIO(IO);
+                       amesh->setName(strdup(NameMesh));
+                       DisplayActor(amesh, false);
+                       return SMESH::SMESH_subMesh::_narrow(aSubMesh);
+               }
+       }
+       catch(const SALOME::SALOME_Exception & S_ex)
+       {
+               QtCatchCorbaException(S_ex);
+       }
+       myActiveStudy->updateObjBrowser(true);
+       return SMESH::SMESH_subMesh::_nil();
 }
 
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-SMESH::SMESH_Hypothesis_ptr SMESHGUI::CreateHypothesis( QString TypeHypothesis, 
-                                                       QString NameHypothesis )
+SMESH::SMESH_Hypothesis_ptr SMESHGUI::CreateHypothesis(QString TypeHypothesis,
+       QString NameHypothesis)
 {
-  SMESH::SMESH_Hypothesis_var Hyp;
-  try {
-    Hyp = myComponentMesh->CreateHypothesis( TypeHypothesis, myStudyId );
-    if ( !Hyp->_is_nil() ) {
-      SALOMEDS::SObject_var SHyp = myStudyAPI.AddNewHypothesis( Hyp );
-      myStudyAPI.SetName( SHyp, NameHypothesis);
-    }
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  }
-
-  return SMESH::SMESH_Hypothesis::_narrow( Hyp );
+       SMESH::SMESH_Hypothesis_var Hyp;
+       try
+       {
+               Hyp = myComponentMesh->CreateHypothesis(TypeHypothesis, myStudyId);
+               if (!Hyp->_is_nil())
+               {
+                       SALOMEDS::SObject_var SHyp = myStudyAPI.AddNewHypothesis(Hyp);
+                       myStudyAPI.SetName(SHyp, NameHypothesis);
+               }
+       }
+       catch(const SALOME::SALOME_Exception & S_ex)
+       {
+               QtCatchCorbaException(S_ex);
+       }
+
+       return SMESH::SMESH_Hypothesis::_narrow(Hyp);
 }
 
 //=============================================================================
@@ -539,33 +575,44 @@ SMESH::SMESH_Hypothesis_ptr SMESHGUI::CreateHypothesis( QString TypeHypothesis,
  *
  */
 //=============================================================================
-void SMESHGUI::AddHypothesisOnMesh( SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hypothesis_ptr aHyp )
+void SMESHGUI::AddHypothesisOnMesh(SMESH::SMESH_Mesh_ptr aMesh,
+       SMESH::SMESH_Hypothesis_ptr aHyp)
 {
-  if ( !aMesh->_is_nil() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    SALOMEDS::SObject_var SM = myStudyAPI.FindMesh( aMesh );
-    GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SM );
-    try {
-      bool res = aMesh->AddHypothesis( aShape, aHyp );
-      if (res) {
-       SALOMEDS::SObject_var SH = myStudyAPI.FindHypothesisOrAlgorithms( aHyp );
-       if ( !SM->_is_nil() && !SH->_is_nil() ) {
-         myStudyAPI.SetHypothesis( SM, SH );
-         myStudyAPI.ModifiedMesh( SM, false );
+       if (!aMesh->_is_nil())
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               SALOMEDS::SObject_var SM = myStudyAPI.FindMesh(aMesh);
+               GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh(SM);
+               try
+               {
+                       bool res = aMesh->AddHypothesis(aShape, aHyp);
+                       if (res)
+                       {
+                               SALOMEDS::SObject_var SH =
+                                       myStudyAPI.FindHypothesisOrAlgorithms(aHyp);
+                               if (!SM->_is_nil() && !SH->_is_nil())
+                               {
+                                       myStudyAPI.SetHypothesis(SM, SH);
+                                       myStudyAPI.ModifiedMesh(SM, false);
+                               }
+                               QApplication::restoreOverrideCursor();
+                       }
+                       else
+                       {
+                               QApplication::restoreOverrideCursor();
+                               QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                                       tr("SMESH_WRN_WARNING"),
+                                       tr("SMESH_WRN_HYPOTHESIS_ALREADYEXIST"),
+                                       tr("SMESH_BUT_YES"));
+                       }
+               }
+               catch(const SALOME::SALOME_Exception & S_ex)
+               {
+                       QtCatchCorbaException(S_ex);
+               }
        }
+       myActiveStudy->updateObjBrowser(true);
        QApplication::restoreOverrideCursor();
-      } else {
-       QApplication::restoreOverrideCursor();
-       QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                               tr ("SMESH_WRN_HYPOTHESIS_ALREADYEXIST"), tr ("SMESH_BUT_YES") );
-      }
-    }
-    catch  (const SALOME::SALOME_Exception& S_ex) {
-      QtCatchCorbaException(S_ex);
-    }
-  }
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -573,72 +620,109 @@ void SMESHGUI::AddHypothesisOnMesh( SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hy
  *
  */
 //=============================================================================
-void SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh( const Handle(SALOME_InteractiveObject)& IObject )
+void SMESHGUI::
+RemoveHypothesisOrAlgorithmOnMesh(const Handle(SALOME_InteractiveObject) &
+       IObject)
 {
-  if ( IObject->hasReference() ) {
-    SMESH::SMESH_Hypothesis_var anHyp;
-    SALOMEDS::SObject_var SO_Hypothesis = smeshGUI->myStudy->FindObjectID(IObject->getEntry() );
-    SALOMEDS::GenericAttribute_var anAttr;
-    SALOMEDS::AttributeIOR_var     anIOR;
-
-    if ( !SO_Hypothesis->_is_nil() ) {
-      QApplication::setOverrideCursor( Qt::waitCursor );
-      if (SO_Hypothesis->FindAttribute(anAttr, "AttributeIOR")) {
-        anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-       anHyp = SMESH::SMESH_Hypothesis::_narrow( _orb->string_to_object(anIOR->Value()) );
-      }
-
-      SALOMEDS::SObject_var SO_Applied_Hypothesis = smeshGUI->myStudy->FindObjectID(IObject->getReference());
-      if ( !SO_Applied_Hypothesis->_is_nil() ) {
-       SALOMEDS::SObject_var MorSM = smeshGUI->myStudyAPI.GetMeshOrSubmesh( SO_Applied_Hypothesis );
-       if ( !MorSM->_is_nil() ) {
-         smeshGUI->myStudyAPI.ModifiedMesh( MorSM, false );
-
-         GEOM::GEOM_Shape_var aShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh( MorSM );
-         if ( !aShape->_is_nil() ) {
-           if (MorSM->FindAttribute(anAttr, "AttributeIOR")) {
-              anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-             SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-             SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-             if ( !aMesh->_is_nil() ) {
-               bool res = aMesh->RemoveHypothesis( aShape, anHyp );
-               if ( !res ) {
-                 QApplication::restoreOverrideCursor();
-                 QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                         tr ("SMESH_WRN_HYPOTHESIS_NOTEXIST"), tr ("SMESH_BUT_YES") );
-               }
-             } else if ( !aSubMesh->_is_nil() ) {
-               aMesh = aSubMesh->GetFather();
-               if ( !aMesh->_is_nil() ) {
-                 bool res = aMesh->RemoveHypothesis( aShape, anHyp );
-                 if ( !res ) {
-                   QApplication::restoreOverrideCursor();
-                   QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                           tr ("SMESH_WRN_HYPOTHESIS_NOTEXIST"), tr ("SMESH_BUT_YES") );
-                 }
-               }
-             }
-             if ( myAutomaticUpdate ) {
-               SMESH_Actor* Mesh = smeshGUI->ReadScript(aMesh);
-               if ( Mesh != NULL ) {
+       if (IObject->hasReference())
+       {
+               SMESH::SMESH_Hypothesis_var anHyp;
+               SALOMEDS::SObject_var SO_Hypothesis =
+                       smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+               SALOMEDS::GenericAttribute_var anAttr;
+               SALOMEDS::AttributeIOR_var anIOR;
+
+               if (!SO_Hypothesis->_is_nil())
+               {
+                       QApplication::setOverrideCursor(Qt::waitCursor);
+                       if (SO_Hypothesis->FindAttribute(anAttr, "AttributeIOR"))
+                       {
+                               anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+                               anHyp =
+                                       SMESH::SMESH_Hypothesis::_narrow(_orb->
+                                       string_to_object(anIOR->Value()));
+                       }
+
+                       SALOMEDS::SObject_var SO_Applied_Hypothesis =
+                               smeshGUI->myStudy->FindObjectID(IObject->getReference());
+                       if (!SO_Applied_Hypothesis->_is_nil())
+                       {
+                               SALOMEDS::SObject_var MorSM =
+                                       smeshGUI->myStudyAPI.
+                                       GetMeshOrSubmesh(SO_Applied_Hypothesis);
+                               if (!MorSM->_is_nil())
+                               {
+                                       smeshGUI->myStudyAPI.ModifiedMesh(MorSM, false);
+
+                                       GEOM::GEOM_Shape_var aShape =
+                                               smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(MorSM);
+                                       if (!aShape->_is_nil())
+                                       {
+                                               if (MorSM->FindAttribute(anAttr, "AttributeIOR"))
+                                               {
+                                                       anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+                                                       SMESH::SMESH_Mesh_var aMesh =
+                                                               SMESH::SMESH_Mesh::_narrow(_orb->
+                                                               string_to_object(anIOR->Value()));
+                                                       SMESH::SMESH_subMesh_var aSubMesh =
+                                                               SMESH::SMESH_subMesh::_narrow(_orb->
+                                                               string_to_object(anIOR->Value()));
+                                                       if (!aMesh->_is_nil())
+                                                       {
+                                                               bool res =
+                                                                       aMesh->RemoveHypothesis(aShape, anHyp);
+                                                               if (!res)
+                                                               {
+                                                                       QApplication::restoreOverrideCursor();
+                                                                       QAD_MessageBox::warn1(QAD_Application::
+                                                                               getDesktop(), tr("SMESH_WRN_WARNING"),
+                                                                               tr("SMESH_WRN_HYPOTHESIS_NOTEXIST"),
+                                                                               tr("SMESH_BUT_YES"));
+                                                               }
+                                                       }
+                                                       else if (!aSubMesh->_is_nil())
+                                                       {
+                                                               aMesh = aSubMesh->GetFather();
+                                                               if (!aMesh->_is_nil())
+                                                               {
+                                                                       bool res =
+                                                                               aMesh->RemoveHypothesis(aShape, anHyp);
+                                                                       if (!res)
+                                                                       {
+                                                                               QApplication::restoreOverrideCursor();
+                                                                               QAD_MessageBox::warn1(QAD_Application::
+                                                                                       getDesktop(),
+                                                                                       tr("SMESH_WRN_WARNING"),
+                                                                                       tr("SMESH_WRN_HYPOTHESIS_NOTEXIST"),
+                                                                                       tr("SMESH_BUT_YES"));
+                                                                       }
+                                                               }
+                                                       }
+                                                       if (myAutomaticUpdate)
+                                                       {
+                                                               SMESH_Actor *Mesh = smeshGUI->ReadScript(aMesh);
+                                                               if (Mesh != NULL)
+                                                               {
 #ifdef TRACE
-                 Dump( Mesh );
+                                                                       Dump(Mesh);
 #endif
-                 DisplayActor( Mesh );
-                 DisplayEdges( Mesh ); 
-                 smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-               }
-             }
-           }
-         }
-       }
-       smeshGUI->myStudyAPI.UnSetHypothesis( SO_Applied_Hypothesis );
-      }
-    }    
-  } else if ( IObject->hasEntry() ) {
-    MESSAGE ( "IObject entry " << IObject->getEntry() )    
-  }
-  QApplication::restoreOverrideCursor();
+                                                                       DisplayActor(Mesh);
+                                                                       DisplayEdges(Mesh);
+                                                                       smeshGUI->ChangeRepresentation(Mesh,
+                                                                               Mesh->getDisplayMode());
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                               smeshGUI->myStudyAPI.UnSetHypothesis(SO_Applied_Hypothesis);
+                       }
+               }
+       }
+       else if (IObject->hasEntry())
+       {
+       MESSAGE("IObject entry " << IObject->getEntry())}
+       QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -646,84 +730,117 @@ void SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh( const Handle(SALOME_Interactiv
  *
  */
 //=============================================================================
-void SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh( SALOMEDS::SObject_ptr MorSM, SMESH::SMESH_Hypothesis_ptr anHyp )
+void SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh(SALOMEDS::SObject_ptr MorSM,
+       SMESH::SMESH_Hypothesis_ptr anHyp)
 {
-  SALOMEDS::SObject_var             AHR, aRef;
-  SALOMEDS::GenericAttribute_var    anAttr;
-  SALOMEDS::AttributeIOR_var        anIOR;
-
-  if ( !MorSM->_is_nil() ) {
-    GEOM::GEOM_Shape_var aShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh( MorSM );
-    if ( !aShape->_is_nil() ) {
-      if (MorSM->FindAttribute(anAttr, "AttributeIOR")) {
-       anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-       SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-       SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-       if ( !aMesh->_is_nil() ) {
-         bool res = aMesh->RemoveHypothesis( aShape, anHyp );
-         if ( !res ) {
-           QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                   tr ("SMESH_WRN_HYPOTHESIS_NOTEXIST"), tr ("SMESH_BUT_YES") );
-         }
-       } else if ( !aSubMesh->_is_nil() ) {
-         aMesh = aSubMesh->GetFather();
-         if ( !aMesh->_is_nil() ) {
-           bool res = aMesh->RemoveHypothesis( aShape, anHyp );
-           if ( !res ) {
-             QApplication::restoreOverrideCursor();
-             QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                     tr ("SMESH_WRN_HYPOTHESIS_NOTEXIST"), tr ("SMESH_BUT_YES") );
-           }
-         }
-       }
-       if ( myAutomaticUpdate ) {
-         SMESH_Actor* Mesh = smeshGUI->ReadScript(aMesh);
-         if ( Mesh != NULL ) {
+       SALOMEDS::SObject_var AHR, aRef;
+       SALOMEDS::GenericAttribute_var anAttr;
+       SALOMEDS::AttributeIOR_var anIOR;
+
+       if (!MorSM->_is_nil())
+       {
+               GEOM::GEOM_Shape_var aShape =
+                       smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(MorSM);
+               if (!aShape->_is_nil())
+               {
+                       if (MorSM->FindAttribute(anAttr, "AttributeIOR"))
+                       {
+                               anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+                               SMESH::SMESH_Mesh_var aMesh =
+                                       SMESH::SMESH_Mesh::_narrow(_orb->string_to_object(anIOR->
+                                               Value()));
+                               SMESH::SMESH_subMesh_var aSubMesh =
+                                       SMESH::SMESH_subMesh::_narrow(_orb->string_to_object(anIOR->
+                                               Value()));
+                               if (!aMesh->_is_nil())
+                               {
+                                       bool res = aMesh->RemoveHypothesis(aShape, anHyp);
+                                       if (!res)
+                                       {
+                                               QApplication::restoreOverrideCursor();
+                                               QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                                                       tr("SMESH_WRN_WARNING"),
+                                                       tr("SMESH_WRN_HYPOTHESIS_NOTEXIST"),
+                                                       tr("SMESH_BUT_YES"));
+                                       }
+                               }
+                               else if (!aSubMesh->_is_nil())
+                               {
+                                       aMesh = aSubMesh->GetFather();
+                                       if (!aMesh->_is_nil())
+                                       {
+                                               bool res = aMesh->RemoveHypothesis(aShape, anHyp);
+                                               if (!res)
+                                               {
+                                                       QApplication::restoreOverrideCursor();
+                                                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                                                               tr("SMESH_WRN_WARNING"),
+                                                               tr("SMESH_WRN_HYPOTHESIS_NOTEXIST"),
+                                                               tr("SMESH_BUT_YES"));
+                                               }
+                                       }
+                               }
+                               if (myAutomaticUpdate)
+                               {
+                                       SMESH_Actor *Mesh = smeshGUI->ReadScript(aMesh);
+                                       if (Mesh != NULL)
+                                       {
 #ifdef TRACE
-           Dump( Mesh );
+                                               Dump(Mesh);
 #endif
-           DisplayActor( Mesh );
-           DisplayEdges( Mesh ); 
-           // smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-         }
-       }
-      }
-    }
-
-    if ( MorSM->FindSubObject (2, AHR)) {
-      SALOMEDS::ChildIterator_var it = myStudy->NewChildIterator(AHR);
-      for (; it->More();it->Next()) {
-       SALOMEDS::SObject_var Obj = it->Value();
-       if ( Obj->ReferencedObject(aRef) ) {
-         if (aRef->FindAttribute(anAttr, "AttributeIOR")) {
-           anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-           if ( strcmp( anIOR->Value(), _orb->object_to_string(anHyp) ) == 0 ) {
-             smeshGUI->myStudyAPI.UnSetHypothesis( Obj );
-             break;
-           }
-         }
-       }
-      }
-    }
-    if ( MorSM->FindSubObject (3, AHR)) {
-      SALOMEDS::ChildIterator_var it = myStudy->NewChildIterator(AHR);
-      for (; it->More();it->Next()) {
-       SALOMEDS::SObject_var Obj = it->Value();
-       if ( Obj->ReferencedObject(aRef) ) {
-         if (aRef->FindAttribute(anAttr, "AttributeIOR")) {
-           anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-           if ( strcmp( anIOR->Value(), _orb->object_to_string(anHyp) ) == 0 ) {
-             smeshGUI->myStudyAPI.UnSetAlgorithm( Obj );
-             break;
-           }
-         }
-       }
-      }
-    }    
-   smeshGUI->myStudyAPI.ModifiedMesh( MorSM, false );
-  } 
-  QApplication::restoreOverrideCursor();
+                                               DisplayActor(Mesh);
+                                               DisplayEdges(Mesh);
+                                               // smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
+                                       }
+                               }
+                       }
+               }
+
+               if (MorSM->FindSubObject(2, AHR))
+               {
+                       SALOMEDS::ChildIterator_var it = myStudy->NewChildIterator(AHR);
+                       for (; it->More(); it->Next())
+                       {
+                               SALOMEDS::SObject_var Obj = it->Value();
+                               if (Obj->ReferencedObject(aRef))
+                               {
+                                       if (aRef->FindAttribute(anAttr, "AttributeIOR"))
+                                       {
+                                               anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+                                               if (strcmp(anIOR->Value(),
+                                                               _orb->object_to_string(anHyp)) == 0)
+                                               {
+                                                       smeshGUI->myStudyAPI.UnSetHypothesis(Obj);
+                                                       break;
+                                               }
+                                       }
+                               }
+                       }
+               }
+               if (MorSM->FindSubObject(3, AHR))
+               {
+                       SALOMEDS::ChildIterator_var it = myStudy->NewChildIterator(AHR);
+                       for (; it->More(); it->Next())
+                       {
+                               SALOMEDS::SObject_var Obj = it->Value();
+                               if (Obj->ReferencedObject(aRef))
+                               {
+                                       if (aRef->FindAttribute(anAttr, "AttributeIOR"))
+                                       {
+                                               anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+                                               if (strcmp(anIOR->Value(),
+                                                               _orb->object_to_string(anHyp)) == 0)
+                                               {
+                                                       smeshGUI->myStudyAPI.UnSetAlgorithm(Obj);
+                                                       break;
+                                               }
+                                       }
+                               }
+                       }
+               }
+               smeshGUI->myStudyAPI.ModifiedMesh(MorSM, false);
+       }
+       QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -731,32 +848,43 @@ void SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh( SALOMEDS::SObject_ptr MorSM, S
  *
  */
 //=============================================================================
-void SMESHGUI::AddAlgorithmOnMesh( SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hypothesis_ptr aHyp )
+void SMESHGUI::AddAlgorithmOnMesh(SMESH::SMESH_Mesh_ptr aMesh,
+       SMESH::SMESH_Hypothesis_ptr aHyp)
 {
-  if ( !aMesh->_is_nil() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    SALOMEDS::SObject_var SM = myStudyAPI.FindMesh( aMesh );
-    GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SM );
-    try {
-      bool res = aMesh->AddHypothesis( aShape, aHyp );
-      if (res) {
-       SALOMEDS::SObject_var SH = myStudyAPI.FindHypothesisOrAlgorithms( aHyp );
-       if ( !SM->_is_nil() && !SH->_is_nil() ) { 
-         myStudyAPI.SetAlgorithms( SM, SH );    
-         myStudyAPI.ModifiedMesh( SM, false );
-       }
-      } else {
+       if (!aMesh->_is_nil())
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               SALOMEDS::SObject_var SM = myStudyAPI.FindMesh(aMesh);
+               GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh(SM);
+               try
+               {
+                       bool res = aMesh->AddHypothesis(aShape, aHyp);
+                       if (res)
+                       {
+                               SALOMEDS::SObject_var SH =
+                                       myStudyAPI.FindHypothesisOrAlgorithms(aHyp);
+                               if (!SM->_is_nil() && !SH->_is_nil())
+                               {
+                                       myStudyAPI.SetAlgorithms(SM, SH);
+                                       myStudyAPI.ModifiedMesh(SM, false);
+                               }
+                       }
+                       else
+                       {
+                               QApplication::restoreOverrideCursor();
+                               QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                                       tr("SMESH_WRN_WARNING"),
+                                       tr("SMESH_WRN_ALGORITHM_ALREADYEXIST"),
+                                       tr("SMESH_BUT_YES"));
+                       }
+               }
+               catch(const SALOME::SALOME_Exception & S_ex)
+               {
+                       QtCatchCorbaException(S_ex);
+               }
+       }
+       myActiveStudy->updateObjBrowser(true);
        QApplication::restoreOverrideCursor();
-       QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                               tr ("SMESH_WRN_ALGORITHM_ALREADYEXIST"), tr ("SMESH_BUT_YES") );
-      }
-    }
-    catch  (const SALOME::SALOME_Exception& S_ex) {
-      QtCatchCorbaException(S_ex);
-    }
-  }
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -764,35 +892,48 @@ void SMESHGUI::AddAlgorithmOnMesh( SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hyp
  *
  */
 //=============================================================================
-void SMESHGUI::AddHypothesisOnSubMesh( SMESH::SMESH_subMesh_ptr aSubMesh, SMESH::SMESH_Hypothesis_ptr aHyp )
+void SMESHGUI::AddHypothesisOnSubMesh(SMESH::SMESH_subMesh_ptr aSubMesh,
+       SMESH::SMESH_Hypothesis_ptr aHyp)
 {
-  if ( !aSubMesh->_is_nil() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    try {
-      SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
-      SALOMEDS::SObject_var SsubM = myStudyAPI.FindSubMesh( aSubMesh );
-      GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SsubM );
-      if ( !aMesh->_is_nil() ) {
-       bool res = aMesh->AddHypothesis( aShape, aHyp );
-       if (res) {      
-         SALOMEDS::SObject_var SH = myStudyAPI.FindHypothesisOrAlgorithms( aHyp );
-         if ( !SsubM->_is_nil() && !SH->_is_nil() ) {
-           myStudyAPI.SetHypothesis( SsubM, SH );
-           myStudyAPI.ModifiedMesh( SsubM, false );
-         }
-       } else {
-         QApplication::restoreOverrideCursor();
-         QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                 tr ("SMESH_WRN_HYPOTHESIS_ALREADYEXIST"), tr ("SMESH_BUT_YES") );
-       }
-      }
-    }
-    catch  (const SALOME::SALOME_Exception& S_ex) {
-      QtCatchCorbaException(S_ex);
-    }
-  }
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
+       if (!aSubMesh->_is_nil())
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               try
+               {
+                       SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
+                       SALOMEDS::SObject_var SsubM = myStudyAPI.FindSubMesh(aSubMesh);
+                       GEOM::GEOM_Shape_var aShape =
+                               myStudyAPI.GetShapeOnMeshOrSubMesh(SsubM);
+                       if (!aMesh->_is_nil())
+                       {
+                               bool res = aMesh->AddHypothesis(aShape, aHyp);
+                               if (res)
+                               {
+                                       SALOMEDS::SObject_var SH =
+                                               myStudyAPI.FindHypothesisOrAlgorithms(aHyp);
+                                       if (!SsubM->_is_nil() && !SH->_is_nil())
+                                       {
+                                               myStudyAPI.SetHypothesis(SsubM, SH);
+                                               myStudyAPI.ModifiedMesh(SsubM, false);
+                                       }
+                               }
+                               else
+                               {
+                                       QApplication::restoreOverrideCursor();
+                                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                                               tr("SMESH_WRN_WARNING"),
+                                               tr("SMESH_WRN_HYPOTHESIS_ALREADYEXIST"),
+                                               tr("SMESH_BUT_YES"));
+                               }
+                       }
+               }
+               catch(const SALOME::SALOME_Exception & S_ex)
+               {
+                       QtCatchCorbaException(S_ex);
+               }
+       }
+       myActiveStudy->updateObjBrowser(true);
+       QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -800,35 +941,48 @@ void SMESHGUI::AddHypothesisOnSubMesh( SMESH::SMESH_subMesh_ptr aSubMesh, SMESH:
  *
  */
 //=============================================================================
-void SMESHGUI::AddAlgorithmOnSubMesh( SMESH::SMESH_subMesh_ptr aSubMesh, SMESH::SMESH_Hypothesis_ptr aHyp )
+void SMESHGUI::AddAlgorithmOnSubMesh(SMESH::SMESH_subMesh_ptr aSubMesh,
+       SMESH::SMESH_Hypothesis_ptr aHyp)
 {
-  if ( !aSubMesh->_is_nil() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    try {
-      SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
-      SALOMEDS::SObject_var SsubM = myStudyAPI.FindSubMesh( aSubMesh );
-      GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SsubM );
-      if ( !aMesh->_is_nil() ) {
-       bool res = aMesh->AddHypothesis( aShape, aHyp );
-       if (res) {
-         SALOMEDS::SObject_var SH = myStudyAPI.FindHypothesisOrAlgorithms( aHyp );
-         if ( !SsubM->_is_nil() && !SH->_is_nil() ) {
-           myStudyAPI.SetAlgorithms( SsubM, SH ); 
-           myStudyAPI.ModifiedMesh( SsubM, false );
-         }
-       } else {
-         QApplication::restoreOverrideCursor();
-         QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                 tr ("SMESH_WRN_ALGORITHM_ALREADYEXIST"), tr ("SMESH_BUT_YES") );
-       }
-      }
-    }
-    catch  (const SALOME::SALOME_Exception& S_ex) {
-      QtCatchCorbaException(S_ex);
-    }
-  }
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
+       if (!aSubMesh->_is_nil())
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               try
+               {
+                       SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
+                       SALOMEDS::SObject_var SsubM = myStudyAPI.FindSubMesh(aSubMesh);
+                       GEOM::GEOM_Shape_var aShape =
+                               myStudyAPI.GetShapeOnMeshOrSubMesh(SsubM);
+                       if (!aMesh->_is_nil())
+                       {
+                               bool res = aMesh->AddHypothesis(aShape, aHyp);
+                               if (res)
+                               {
+                                       SALOMEDS::SObject_var SH =
+                                               myStudyAPI.FindHypothesisOrAlgorithms(aHyp);
+                                       if (!SsubM->_is_nil() && !SH->_is_nil())
+                                       {
+                                               myStudyAPI.SetAlgorithms(SsubM, SH);
+                                               myStudyAPI.ModifiedMesh(SsubM, false);
+                                       }
+                               }
+                               else
+                               {
+                                       QApplication::restoreOverrideCursor();
+                                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                                               tr("SMESH_WRN_WARNING"),
+                                               tr("SMESH_WRN_ALGORITHM_ALREADYEXIST"),
+                                               tr("SMESH_BUT_YES"));
+                               }
+                       }
+               }
+               catch(const SALOME::SALOME_Exception & S_ex)
+               {
+                       QtCatchCorbaException(S_ex);
+               }
+       }
+       myActiveStudy->updateObjBrowser(true);
+       QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -836,52 +990,60 @@ void SMESHGUI::AddAlgorithmOnSubMesh( SMESH::SMESH_subMesh_ptr aSubMesh, SMESH::
  *
  */
 //=============================================================================
-void SMESHGUI::CreateAlgorithm( QString TypeAlgo, QString NameAlgo )
+void SMESHGUI::CreateAlgorithm(QString TypeAlgo, QString NameAlgo)
 {
-  SMESH::SMESH_Hypothesis_var Hyp;
-  try {
-    if ( TypeAlgo.compare("Regular_1D") == 0 )
-      Hyp = myComponentMesh->CreateHypothesis( TypeAlgo, myStudyId );
-    else if ( TypeAlgo.compare("MEFISTO_2D") == 0 )
-      Hyp = myComponentMesh->CreateHypothesis( TypeAlgo, myStudyId );
-    else if ( TypeAlgo.compare("Quadrangle_2D") == 0 )
-      Hyp = myComponentMesh->CreateHypothesis( TypeAlgo, myStudyId );
-    else if ( TypeAlgo.compare("Hexa_3D") == 0 )
-      Hyp = myComponentMesh->CreateHypothesis( TypeAlgo, myStudyId );
-    else if ( TypeAlgo.compare("NETGEN_3D") == 0 )
-      Hyp = myComponentMesh->CreateHypothesis( TypeAlgo, myStudyId );
-    
-    if ( !Hyp->_is_nil() ) {
-      SALOMEDS::SObject_var SHyp = myStudyAPI.AddNewAlgorithms( Hyp );
-      myStudyAPI.SetName( SHyp, NameAlgo);
-    }
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  }
-  myActiveStudy->updateObjBrowser(true);
+       SMESH::SMESH_Hypothesis_var Hyp;
+       try
+       {
+               if (TypeAlgo.compare("Regular_1D") == 0)
+                       Hyp = myComponentMesh->CreateHypothesis(TypeAlgo, myStudyId);
+               else if (TypeAlgo.compare("MEFISTO_2D") == 0)
+                       Hyp = myComponentMesh->CreateHypothesis(TypeAlgo, myStudyId);
+               else if (TypeAlgo.compare("Quadrangle_2D") == 0)
+                       Hyp = myComponentMesh->CreateHypothesis(TypeAlgo, myStudyId);
+               else if (TypeAlgo.compare("Hexa_3D") == 0)
+                       Hyp = myComponentMesh->CreateHypothesis(TypeAlgo, myStudyId);
+               else if (TypeAlgo.compare("NETGEN_3D") == 0)
+                       Hyp = myComponentMesh->CreateHypothesis(TypeAlgo, myStudyId);
+
+               if (!Hyp->_is_nil())
+               {
+                       SALOMEDS::SObject_var SHyp = myStudyAPI.AddNewAlgorithms(Hyp);
+                       myStudyAPI.SetName(SHyp, NameAlgo);
+               }
+       }
+       catch(const SALOME::SALOME_Exception & S_ex)
+       {
+               QtCatchCorbaException(S_ex);
+       }
+       myActiveStudy->updateObjBrowser(true);
 }
 
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::CreateLocalLength( QString TypeHypothesis, QString NameHypothesis, double Length )
+void SMESHGUI::CreateLocalLength(QString TypeHypothesis, QString NameHypothesis,
+       double Length)
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  try {
-    SMESH::SMESH_Hypothesis_var Hyp = SMESH::SMESH_Hypothesis::_narrow( CreateHypothesis( TypeHypothesis, NameHypothesis ) );
-    SMESH::SMESH_LocalLength_var LL = SMESH::SMESH_LocalLength::_narrow( Hyp );
-    if ( !LL->_is_nil() )
-      LL->SetLength( Length );
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  }
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
+       QApplication::setOverrideCursor(Qt::waitCursor);
+       try
+       {
+               SMESH::SMESH_Hypothesis_var Hyp =
+                       SMESH::SMESH_Hypothesis::_narrow(CreateHypothesis(TypeHypothesis,
+                               NameHypothesis));
+               SMESH::SMESH_LocalLength_var LL =
+                       SMESH::SMESH_LocalLength::_narrow(Hyp);
+               if (!LL->_is_nil())
+                       LL->SetLength(Length);
+       }
+       catch(const SALOME::SALOME_Exception & S_ex)
+       {
+               QtCatchCorbaException(S_ex);
+       }
+       myActiveStudy->updateObjBrowser(true);
+       QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -889,21 +1051,27 @@ void SMESHGUI::CreateLocalLength( QString TypeHypothesis, QString NameHypothesis
  *
  */
 //=============================================================================
-void SMESHGUI::CreateMaxElementArea( QString TypeHypothesis, QString NameHypothesis, double MaxArea )
+void SMESHGUI::CreateMaxElementArea(QString TypeHypothesis,
+       QString NameHypothesis, double MaxArea)
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  try {
-    SMESH::SMESH_Hypothesis_var Hyp = SMESH::SMESH_Hypothesis::_narrow( CreateHypothesis( TypeHypothesis, NameHypothesis  ) );
-    SMESH::SMESH_MaxElementArea_var MaxElArea = SMESH::SMESH_MaxElementArea::_narrow( Hyp );
-    if ( !MaxElArea->_is_nil() )
-      MaxElArea->SetMaxElementArea( MaxArea );
-  }
-  catch  (SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  } 
-
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
+       QApplication::setOverrideCursor(Qt::waitCursor);
+       try
+       {
+               SMESH::SMESH_Hypothesis_var Hyp =
+                       SMESH::SMESH_Hypothesis::_narrow(CreateHypothesis(TypeHypothesis,
+                               NameHypothesis));
+               SMESH::SMESH_MaxElementArea_var MaxElArea =
+                       SMESH::SMESH_MaxElementArea::_narrow(Hyp);
+               if (!MaxElArea->_is_nil())
+                       MaxElArea->SetMaxElementArea(MaxArea);
+       }
+       catch(SALOME::SALOME_Exception & S_ex)
+       {
+               QtCatchCorbaException(S_ex);
+       }
+
+       myActiveStudy->updateObjBrowser(true);
+       QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -911,20 +1079,26 @@ void SMESHGUI::CreateMaxElementArea( QString TypeHypothesis, QString NameHypothe
  *
  */
 //=============================================================================
-void SMESHGUI::CreateMaxElementVolume( QString TypeHypothesis, QString NameHypothesis, double MaxVolume )
+void SMESHGUI::CreateMaxElementVolume(QString TypeHypothesis,
+       QString NameHypothesis, double MaxVolume)
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  try {
-    SMESH::SMESH_Hypothesis_var Hyp = SMESH::SMESH_Hypothesis::_narrow( CreateHypothesis( TypeHypothesis, NameHypothesis  ) );
-    SMESH::SMESH_MaxElementVolume_var MaxElVolume = SMESH::SMESH_MaxElementVolume::_narrow( Hyp );
-    if ( !MaxElVolume->_is_nil() )
-      MaxElVolume->SetMaxElementVolume( MaxVolume );
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  } 
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
+       QApplication::setOverrideCursor(Qt::waitCursor);
+       try
+       {
+               SMESH::SMESH_Hypothesis_var Hyp =
+                       SMESH::SMESH_Hypothesis::_narrow(CreateHypothesis(TypeHypothesis,
+                               NameHypothesis));
+               SMESH::SMESH_MaxElementVolume_var MaxElVolume =
+                       SMESH::SMESH_MaxElementVolume::_narrow(Hyp);
+               if (!MaxElVolume->_is_nil())
+                       MaxElVolume->SetMaxElementVolume(MaxVolume);
+       }
+       catch(const SALOME::SALOME_Exception & S_ex)
+       {
+               QtCatchCorbaException(S_ex);
+       }
+       myActiveStudy->updateObjBrowser(true);
+       QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -932,20 +1106,26 @@ void SMESHGUI::CreateMaxElementVolume( QString TypeHypothesis, QString NameHypot
  *
  */
 //=============================================================================
-void SMESHGUI::CreateNbSegments( QString TypeHypothesis, QString NameHypothesis, int nbSegments )
+void SMESHGUI::CreateNbSegments(QString TypeHypothesis, QString NameHypothesis,
+       int nbSegments)
 {
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  try {
-    SMESH::SMESH_Hypothesis_var Hyp = SMESH::SMESH_Hypothesis::_narrow( CreateHypothesis( TypeHypothesis, NameHypothesis  ) );
-    SMESH::SMESH_NumberOfSegments_var NbS = SMESH::SMESH_NumberOfSegments::_narrow( Hyp );
-    if ( !NbS->_is_nil() )
-      NbS->SetNumberOfSegments( nbSegments );
-  }
-  catch  (const SALOME::SALOME_Exception& S_ex) {
-    QtCatchCorbaException(S_ex);
-  } 
-  myActiveStudy->updateObjBrowser(true);
-  QApplication::restoreOverrideCursor();
+       QApplication::setOverrideCursor(Qt::waitCursor);
+       try
+       {
+               SMESH::SMESH_Hypothesis_var Hyp =
+                       SMESH::SMESH_Hypothesis::_narrow(CreateHypothesis(TypeHypothesis,
+                               NameHypothesis));
+               SMESH::SMESH_NumberOfSegments_var NbS =
+                       SMESH::SMESH_NumberOfSegments::_narrow(Hyp);
+               if (!NbS->_is_nil())
+                       NbS->SetNumberOfSegments(nbSegments);
+       }
+       catch(const SALOME::SALOME_Exception & S_ex)
+       {
+               QtCatchCorbaException(S_ex);
+       }
+       myActiveStudy->updateObjBrowser(true);
+       QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -953,16 +1133,19 @@ void SMESHGUI::CreateNbSegments( QString TypeHypothesis, QString NameHypothesis,
  *
  */
 //=============================================================================
-int SMESHGUI::GetNameOfSelectedIObjects( SALOME_Selection* Sel, QString& aName )
+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 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;
 }
 
 //=============================================================================
@@ -970,32 +1153,38 @@ int SMESHGUI::GetNameOfSelectedIObjects( SALOME_Selection* Sel, QString& aName )
  *
  */
 //=============================================================================
-int SMESHGUI::GetNameOfSelectedNodes( SALOME_Selection* Sel, QString& aName )
+int SMESHGUI::GetNameOfSelectedNodes(SALOME_Selection * Sel, QString & aName)
 {
-  int nbNodes = 0;
-  int nbSel = Sel->IObjectCount() ;
-  if ( nbSel == 1 ) {
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    if ( !IObject->hasEntry() )
-      return -1;
-
-    Standard_Boolean res;
-    SMESH_Actor* ac = FindActorByEntry( IObject->getEntry(), res, true );
-    if ( !res )
-      return -1;
-
-    TColStd_MapOfInteger MapIndex;
-    Sel->GetIndex( IObject, MapIndex );
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    aName = " ";
-    nbNodes = MapIndex.Extent();
-    for ( ; ite.More(); ite.Next() ) {
-      aName = aName + QString("%1").arg(ac->GetIdSMESHDSNode(ite.Key())) + " ";
-    }
-  } else {
-    aName = "";
-  }
-  return nbNodes;
+       int nbNodes = 0;
+       int nbSel = Sel->IObjectCount();
+       if (nbSel == 1)
+       {
+               Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+               if (!IObject->hasEntry())
+                       return -1;
+
+               Standard_Boolean res;
+               SMESH_Actor *ac = FindActorByEntry(IObject->getEntry(), res, true);
+               if (!res)
+                       return -1;
+
+               TColStd_MapOfInteger MapIndex;
+               Sel->GetIndex(IObject, MapIndex);
+               TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+               aName = " ";
+               nbNodes = MapIndex.Extent();
+               for (; ite.More(); ite.Next())
+               {
+                       aName =
+                               aName + QString("%1").arg(ac->GetIdSMESHDSNode(ite.Key())) +
+                               " ";
+               }
+       }
+       else
+       {
+               aName = "";
+       }
+       return nbNodes;
 }
 
 //=============================================================================
@@ -1003,115 +1192,132 @@ int SMESHGUI::GetNameOfSelectedNodes( SALOME_Selection* Sel, QString& aName )
  *
  */
 //=============================================================================
-int SMESHGUI::GetNameOfSelectedElements( SALOME_Selection* Sel, QString& aName )
+int SMESHGUI::GetNameOfSelectedElements(SALOME_Selection * Sel, QString & aName)
 {
-  int nbElements = 0;
-  int nbSel = Sel->IObjectCount() ;
-  if ( nbSel == 1 ) {
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    if ( !IObject->hasEntry() )
-      return -1;
-
-    Standard_Boolean res;
-    SMESH_Actor* ac = FindActorByEntry( IObject->getEntry(), res, true );
-    if ( !res )
-      return -1;
-
-    TColStd_MapOfInteger MapIndex;
-    Sel->GetIndex( IObject, MapIndex );
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    aName = " ";
-    nbElements = MapIndex.Extent();
-    MESSAGE("GetNameOfSelectedElements(): number = " << nbElements);
-    for ( ; ite.More(); ite.Next() ) {
-      int idVTK = ite.Key();
-      MESSAGE("GetNameOfSelectedElements(): VTK Id = " << idVTK);
-      aName = aName + QString("%1").arg(ac->GetIdSMESHDSElement(idVTK)) + " ";
-    }
-  } else {
-    aName = "";
-  }
-  return nbElements;
-}
+       int nbElements = 0;
+       int nbSel = Sel->IObjectCount();
+       if (nbSel == 1)
+       {
+               Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+               if (!IObject->hasEntry())
+                       return -1;
 
+               Standard_Boolean res;
+               SMESH_Actor *ac = FindActorByEntry(IObject->getEntry(), res, true);
+               if (!res)
+                       return -1;
+
+               TColStd_MapOfInteger MapIndex;
+               Sel->GetIndex(IObject, MapIndex);
+               TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+               aName = " ";
+               nbElements = MapIndex.Extent();
+               MESSAGE("GetNameOfSelectedElements(): number = " << nbElements);
+               for (; ite.More(); ite.Next())
+               {
+                       int idVTK = ite.Key();
+                       MESSAGE("GetNameOfSelectedElements(): VTK Id = " << idVTK);
+                       aName =
+                               aName + QString("%1").arg(ac->GetIdSMESHDSElement(idVTK)) + " ";
+               }
+       }
+       else
+       {
+               aName = "";
+       }
+       return nbElements;
+}
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-int SMESHGUI::GetNameOfSelectedEdges( SALOME_Selection* Sel, QString& aName )
+int SMESHGUI::GetNameOfSelectedEdges(SALOME_Selection * Sel, QString & aName)
 {
-  int nbElements = 0;
-  int nbSel = Sel->IObjectCount() ;
-  if ( nbSel == 1 ) {
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    if ( !IObject->hasEntry() )
-      return -1;
-
-    Standard_Boolean res;
-    SMESH_Actor* ac = FindActorByEntry( IObject->getEntry(), res, true );
-    if ( !res )
-      return -1;
-
-    TColStd_MapOfInteger MapIndex;
-    Sel->GetIndex( IObject, MapIndex );
-    TColStd_MapIteratorOfMapOfInteger ite( MapIndex );
-    aName = " ";
-    nbElements = MapIndex.Extent();
-    for ( ; ite.More(); ite.Next() ) {
-      aName = aName + QString("%1").arg(ite.Key()) + " ";
-    }
-  } else {
-    aName = "";
-  }
-  return nbElements;
-}
+       int nbElements = 0;
+       int nbSel = Sel->IObjectCount();
+       if (nbSel == 1)
+       {
+               Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+               if (!IObject->hasEntry())
+                       return -1;
 
+               Standard_Boolean res;
+               SMESH_Actor *ac = FindActorByEntry(IObject->getEntry(), res, true);
+               if (!res)
+                       return -1;
+
+               TColStd_MapOfInteger MapIndex;
+               Sel->GetIndex(IObject, MapIndex);
+               TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+               aName = " ";
+               nbElements = MapIndex.Extent();
+               for (; ite.More(); ite.Next())
+               {
+                       aName = aName + QString("%1").arg(ite.Key()) + " ";
+               }
+       }
+       else
+       {
+               aName = "";
+       }
+       return nbElements;
+}
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-SMESH_Actor* SMESHGUI::FindActorByEntry(QString entry, 
-                                       Standard_Boolean& testResult,
-                                       bool onlyInActiveView)
+SMESH_Actor *SMESHGUI::FindActorByEntry(QString entry,
+       Standard_Boolean & testResult, bool onlyInActiveView)
 {
-  int nbSf = myActiveStudy->getStudyFramesCount();
-  for ( int i = 0; i < nbSf; i++ ) {
-    QAD_StudyFrame* sf = myActiveStudy->getStudyFrame(i);
-    if ( sf->getTypeView() == VIEW_VTK ) {
-      vtkRenderer* Renderer = ((VTKViewer_ViewFrame*)sf->getRightFrame()->getViewFrame())->getRenderer();
-      vtkActorCollection* theActors = Renderer->GetActors();
-      theActors->InitTraversal();
-      vtkActor *ac = theActors->GetNextActor();
-      while(!(ac==NULL)) {
-       if ( ac->IsA("SMESH_Actor") ) {
-         SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( ac );
-         if ( anActor->hasIO() ) {
-           Handle(SALOME_InteractiveObject) IO = anActor->getIO();
-           if ( strcmp( IO->getEntry(), entry ) == 0 ) {
-             if ( onlyInActiveView ) {
-               if ( sf == myActiveStudy->getActiveStudyFrame() ) {
-                 testResult = true;
-                 return anActor;
-               }
-             } else {
-               testResult = true;
-               return anActor;
-             }
-           }
-         }
-       }
-       ac = theActors->GetNextActor();
-      }
-    }
-  }
-
-  MESSAGE ( " Actor Not Found " )
-  testResult = false;
-  return SMESH_Actor::New();
+       int nbSf = myActiveStudy->getStudyFramesCount();
+       for (int i = 0; i < nbSf; i++)
+       {
+               QAD_StudyFrame *sf = myActiveStudy->getStudyFrame(i);
+               if (sf->getTypeView() == VIEW_VTK)
+               {
+                       vtkRenderer *Renderer =
+                               ((VTKViewer_ViewFrame *) sf->getRightFrame()->getViewFrame())->
+                               getRenderer();
+                       vtkActorCollection *theActors = Renderer->GetActors();
+                       theActors->InitTraversal();
+                       vtkActor *ac = theActors->GetNextActor();
+                       while (!(ac == NULL))
+                       {
+                               if (ac->IsA("SMESH_Actor"))
+                               {
+                                       SMESH_Actor *anActor = SMESH_Actor::SafeDownCast(ac);
+                                       if (anActor->hasIO())
+                                       {
+                                               Handle(SALOME_InteractiveObject) IO = anActor->getIO();
+                                               if (strcmp(IO->getEntry(), entry) == 0)
+                                               {
+                                                       if (onlyInActiveView)
+                                                       {
+                                                               if (sf == myActiveStudy->getActiveStudyFrame())
+                                                               {
+                                                                       testResult = true;
+                                                                       return anActor;
+                                                               }
+                                                       }
+                                                       else
+                                                       {
+                                                               testResult = true;
+                                                               return anActor;
+                                                       }
+                                               }
+                                       }
+                               }
+                               ac = theActors->GetNextActor();
+                       }
+               }
+       }
+
+       MESSAGE(" Actor Not Found ") testResult = false;
+       return SMESH_Actor::New();
 }
 
 //=============================================================================
@@ -1119,19 +1325,17 @@ SMESH_Actor* SMESHGUI::FindActorByEntry(QString entry,
  *
  */
 //=============================================================================
-SMESH_Actor* SMESHGUI::FindActor(SMESH::SMESH_Mesh_ptr aMesh, 
-                                Standard_Boolean& testResult,
-                                bool onlyInActiveView)
+SMESH_Actor *SMESHGUI::FindActor(SMESH::SMESH_Mesh_ptr aMesh,
+       Standard_Boolean & testResult, bool onlyInActiveView)
 {
-  SALOMEDS::SObject_var SM = myStudyAPI.FindMesh( aMesh );
-  if ( SM->_is_nil() ) {
-    MESSAGE ( " Actor Not Found " )
-    
-    testResult = false;
-    return SMESH_Actor::New();
-  }
-
-  return FindActorByEntry( SM->GetID(), testResult, onlyInActiveView);
+       SALOMEDS::SObject_var SM = myStudyAPI.FindMesh(aMesh);
+       if (SM->_is_nil())
+       {
+               MESSAGE(" Actor Not Found ") testResult = false;
+               return SMESH_Actor::New();
+       }
+
+       return FindActorByEntry(SM->GetID(), testResult, onlyInActiveView);
 }
 
 //=============================================================================
@@ -1139,29 +1343,36 @@ SMESH_Actor* SMESHGUI::FindActor(SMESH::SMESH_Mesh_ptr aMesh,
  *
  */
 //=============================================================================
-SMESH::SMESH_Mesh_ptr SMESHGUI::ConvertIOinMesh(const Handle(SALOME_InteractiveObject)& IO, 
-                                               Standard_Boolean& testResult)
+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_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();
 }
 
 //=============================================================================
@@ -1169,29 +1380,36 @@ SMESH::SMESH_Mesh_ptr SMESHGUI::ConvertIOinMesh(const Handle(SALOME_InteractiveO
  *
  */
 //=============================================================================
-SMESH::SMESH_subMesh_ptr SMESHGUI::ConvertIOinSubMesh(const Handle(SALOME_InteractiveObject)& IO, 
-                                                     Standard_Boolean& testResult)
+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_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();
 }
 
 //=============================================================================
@@ -1199,64 +1417,73 @@ SMESH::SMESH_subMesh_ptr SMESHGUI::ConvertIOinSubMesh(const Handle(SALOME_Intera
  *
  */
 //=============================================================================
-SMESH::SMESH_Hypothesis_ptr SMESHGUI::ConvertIOinSMESHHypothesis( const Handle(SALOME_InteractiveObject)& IO, 
-                                                                 Standard_Boolean& testResult )
+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_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();
 }
 
-
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-GEOM::GEOM_Shape_ptr SMESHGUI::ConvertIOinGEOMShape( const Handle(SALOME_InteractiveObject)& IO, 
-                                              Standard_Boolean& testResult )
+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();
+       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();
 }
 
-
 //=============================================================================
 /*!
  *
@@ -1264,41 +1491,53 @@ GEOM::GEOM_Shape_ptr SMESHGUI::ConvertIOinGEOMShape( const Handle(SALOME_Interac
 //=============================================================================
 void SMESHGUI::SetViewMode(int commandId)
 {
-  SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
-  int nbSel = Sel->IObjectCount();
-  if ( nbSel >= 1 ) {
-    SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-    for ( ; It.More(); It.Next() ) {
-      Handle(SALOME_InteractiveObject) IObject = It.Value();
-      if ( IObject->hasEntry() ) {
-       Standard_Boolean res;
-       SMESH_Actor* ac = FindActorByEntry( IObject->getEntry(), res, true );
-       if ( res ) {
-         switch (commandId) {
-         case 211: {
-           ChangeRepresentation( ac, 0 );
-           break;
-         }
-         case 212: {
-           ChangeRepresentation( ac, 1 );
-           break;
-         }
-         case 213: {
-           ChangeRepresentation( ac, 2 );
-           break;
-         }
-         case 1132: {
-           ChangeRepresentation( ac, 3 );
-           break;
-         }
-         }
-       }
-      }
-    }
-    if ( commandId == 1133 ) {
-      ChangeRepresentation( SMESH_Actor::New(), 4 );
-    }
-  }
+       SALOME_Selection *Sel =
+               SALOME_Selection::Selection(myActiveStudy->getSelection());
+       int nbSel = Sel->IObjectCount();
+       if (nbSel >= 1)
+       {
+               SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+               for (; It.More(); It.Next())
+               {
+                       Handle(SALOME_InteractiveObject) IObject = It.Value();
+                       if (IObject->hasEntry())
+                       {
+                               Standard_Boolean res;
+                               SMESH_Actor *ac =
+                                       FindActorByEntry(IObject->getEntry(), res, true);
+                               if (res)
+                               {
+                                       switch (commandId)
+                                       {
+                                       case 211:
+                                       {
+                                               ChangeRepresentation(ac, 0);
+                                               break;
+                                       }
+                                       case 212:
+                                       {
+                                               ChangeRepresentation(ac, 1);
+                                               break;
+                                       }
+                                       case 213:
+                                       {
+                                               ChangeRepresentation(ac, 2);
+                                               break;
+                                       }
+                                       case 1132:
+                                       {
+                                               ChangeRepresentation(ac, 3);
+                                               break;
+                                       }
+                                       }
+                               }
+                       }
+               }
+               if (commandId == 1133)
+               {
+                       ChangeRepresentation(SMESH_Actor::New(), 4);
+               }
+       }
 }
 
 //=============================================================================
@@ -1306,180 +1545,207 @@ void SMESHGUI::SetViewMode(int commandId)
  *
  */
 //=============================================================================
-void SMESHGUI::ChangeRepresentation( SMESH_Actor* ac, int type )
+void SMESHGUI::ChangeRepresentation(SMESH_Actor * ac, int type)
 {
-  if (ac->DataSource == NULL && type != 4 )
-    return;
-
-  if ( type != 4 ) {
-    if ( ac->getMapper() == NULL ) {
-      return;
-    }
-  }
-  switch (type) {
-  case 0 : {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    if (ac->getDisplayMode()==2) {
-      bool isColored = ac->getMapper()->GetScalarVisibility(); //SAL3899
-      vtkDataSetMapper* meshMapper = (vtkDataSetMapper*) (ac->getMapper());
-      meshMapper->SetInput(ac->DataSource);
-      meshMapper->SetScalarVisibility(isColored); //SAL3899
-    }
-    ac->setDisplayMode(0);
-    ac->GetProperty()->SetRepresentationToWireframe();
-    //    ac->SetActorProperty( ac->GetProperty() );
-    QApplication::restoreOverrideCursor();
-    break;
-  }
-  case 1 : {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    if (ac->getDisplayMode()==2) {
-      bool isColored = ac->getMapper()->GetScalarVisibility(); //SAL3899
-      vtkDataSetMapper* meshMapper = (vtkDataSetMapper*) (ac->getMapper());
-      meshMapper->SetInput(ac->DataSource);
-      meshMapper->SetScalarVisibility(isColored); //SAL3899
-    }
-    ac->setDisplayMode(1);
-    ac->GetProperty()->SetRepresentationToSurface();
-    QApplication::restoreOverrideCursor();
-    //    ac->SetActorProperty( ac->GetProperty() );
-    break;
-  }
-  case 2 : {
-    //    if (!(ac->getDisplayMode()==2)) {
-    //    ChangeRepresentation(ac, 1);
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    ac->setDisplayMode(2);
-    bool isColored = ac->getMapper()->GetScalarVisibility(); //SAL3899
-    vtkDataSetMapper* meshMapper = (vtkDataSetMapper*) (ac->getMapper());
-    vtkShrinkFilter *shrink = vtkShrinkFilter::New();
-    shrink->SetInput(ac->DataSource);
-    shrink->SetShrinkFactor(ac->GetShrinkFactor());
-    
-    meshMapper->SetInput( shrink->GetOutput() );
-    meshMapper->SetScalarVisibility(isColored); //SAL3899
-    ac->SetMapper( meshMapper );
-    QApplication::restoreOverrideCursor();
-    //    }
-    break;
-  }
-  case 3:
-    {
-      float color[3];
-      float edgecolor[3];
-      float backfacecolor[3];
-      float nodecolor[3];
-      ac->GetColor(color[0],color[1],color[2]);
+       if (ac->DataSource == NULL && type != 4)
+               return;
+
+       if (type != 4)
+       {
+               if (ac->getMapper() == NULL)
+               {
+                       return;
+               }
+       }
+       switch (type)
+       {
+       case 0:
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               if (ac->getDisplayMode() == 2)
+               {
+                       bool isColored = ac->getMapper()->GetScalarVisibility();        //SAL3899
+                       vtkDataSetMapper *meshMapper =
+                               (vtkDataSetMapper *) (ac->getMapper());
+                       meshMapper->SetInput(ac->DataSource);
+                       meshMapper->SetScalarVisibility(isColored);     //SAL3899
+               }
+               ac->setDisplayMode(0);
+               ac->GetProperty()->SetRepresentationToWireframe();
+               //    ac->SetActorProperty( ac->GetProperty() );
+               QApplication::restoreOverrideCursor();
+               break;
+       }
+       case 1:
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               if (ac->getDisplayMode() == 2)
+               {
+                       bool isColored = ac->getMapper()->GetScalarVisibility();        //SAL3899
+                       vtkDataSetMapper *meshMapper =
+                               (vtkDataSetMapper *) (ac->getMapper());
+                       meshMapper->SetInput(ac->DataSource);
+                       meshMapper->SetScalarVisibility(isColored);     //SAL3899
+               }
+               ac->setDisplayMode(1);
+               ac->GetProperty()->SetRepresentationToSurface();
+               QApplication::restoreOverrideCursor();
+               //    ac->SetActorProperty( ac->GetProperty() );
+               break;
+       }
+       case 2:
+       {
+               //    if (!(ac->getDisplayMode()==2)) {
+               //    ChangeRepresentation(ac, 1);
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               ac->setDisplayMode(2);
+               bool isColored = ac->getMapper()->GetScalarVisibility();        //SAL3899
+               vtkDataSetMapper *meshMapper = (vtkDataSetMapper *) (ac->getMapper());
+               vtkShrinkFilter *shrink = vtkShrinkFilter::New();
+               shrink->SetInput(ac->DataSource);
+               shrink->SetShrinkFactor(ac->GetShrinkFactor());
+
+               meshMapper->SetInput(shrink->GetOutput());
+               meshMapper->SetScalarVisibility(isColored);     //SAL3899
+               ac->SetMapper(meshMapper);
+               QApplication::restoreOverrideCursor();
+               //    }
+               break;
+       }
+       case 3:
+       {
+               float color[3];
+               float edgecolor[3];
+               float backfacecolor[3];
+               float nodecolor[3];
+               ac->GetColor(color[0], color[1], color[2]);
 //       QColor c(color[0]*255,color[1]*255,color[2]*255);
-      int c0 = int(color[0]*255);
-      int c1 = int(color[1]*255);
-      int c2 = int(color[2]*255);
-      QColor c( c0, c1, c2 );
-      ac->GetEdgeColor(edgecolor[0],edgecolor[1],edgecolor[2]);
+               int c0 = int (color[0] * 255);
+               int c1 = int (color[1] * 255);
+               int c2 = int (color[2] * 255);
+               QColor c(c0, c1, c2);
+               ac->GetEdgeColor(edgecolor[0], edgecolor[1], edgecolor[2]);
 //       QColor e(edgecolor[0]*255,edgecolor[1]*255,edgecolor[2]*255);
-      c0 = int(edgecolor[0]*255);
-      c1 = int(edgecolor[1]*255);
-      c2 = int(edgecolor[2]*255);
-      QColor e( c0, c1, c2 );
-      ac->GetBackfaceProperty()->GetColor(backfacecolor);
+               c0 = int (edgecolor[0] * 255);
+               c1 = int (edgecolor[1] * 255);
+               c2 = int (edgecolor[2] * 255);
+               QColor e(c0, c1, c2);
+               ac->GetBackfaceProperty()->GetColor(backfacecolor);
 //       QColor b(backfacecolor[0]*255,backfacecolor[1]*255,backfacecolor[2]*255);
-      c0 = int(backfacecolor[0]*255);
-      c1 = int(backfacecolor[1]*255);
-      c2 = int(backfacecolor[2]*255);
-      QColor b( c0, c1, c2 );
-      ac->GetNodeColor(nodecolor[0], nodecolor[1], nodecolor[2] ) ;
+               c0 = int (backfacecolor[0] * 255);
+               c1 = int (backfacecolor[1] * 255);
+               c2 = int (backfacecolor[2] * 255);
+               QColor b(c0, c1, c2);
+               ac->GetNodeColor(nodecolor[0], nodecolor[1], nodecolor[2]);
 //       QColor n(nodecolor[0]*255, nodecolor[1]*255, nodecolor[2]*255 ) ;
-      c0 = int(nodecolor[0]*255);
-      c1 = int(nodecolor[1]*255);
-      c2 = int(nodecolor[2]*255);
-      QColor n( c0, c1, c2 ) ;
-
-      int Edgewidth = (int)ac->EdgeDevice->GetProperty()->GetLineWidth();
-      if ( Edgewidth == 0 )
-       Edgewidth = 1;
-      int intValue = ac->GetNodeSize() ;
-      float Shrink = ac->GetShrinkFactor();
-      SMESHGUI_Preferences_ColorDlg *aDlg = new SMESHGUI_Preferences_ColorDlg( QAD_Application::getDesktop(), "" ) ;
-      aDlg->SetColor(1,c);
-      aDlg->SetColor(2,e);
-      aDlg->SetColor(3,n);
-      aDlg->SetColor(4,b);
-      aDlg->SetIntValue(1,Edgewidth);
-      aDlg->SetIntValue(2,intValue);
-      aDlg->SetIntValue(3,int(Shrink*100.));
-
-      if ( aDlg->exec() ) {
-       QApplication::setOverrideCursor( Qt::waitCursor );
-       QColor color = aDlg->GetColor(1);
-       QColor edgecolor = aDlg->GetColor(2);
-       QColor nodecolor = aDlg->GetColor(3);
-       QColor backfacecolor = aDlg->GetColor(4);
-       /* actor color and backface color */
-       ac->GetProperty()->SetColor(float(color.red())/255.,float(color.green())/255.,float(color.blue())/255.);
-       ac->SetColor(float(color.red())/255.,float(color.green())/255.,float(color.blue())/255.);
-       ac->GetBackfaceProperty()->SetColor(float(backfacecolor.red())/255.,float(backfacecolor.green())/255.,float(backfacecolor.blue())/255.);
-
-       /* edge color */
-       ac->EdgeDevice->GetProperty()->SetColor(float(edgecolor.red())/255.,
-                                               float(edgecolor.green())/255.,
-                                               float(edgecolor.blue())/255.);
-       ac->EdgeShrinkDevice->GetProperty()->SetColor(float(edgecolor.red())/255.,
-                                                     float(edgecolor.green())/255.,
-                                                     float(edgecolor.blue())/255.);
-       ac->SetEdgeColor(float(edgecolor.red())/255.,
-                        float(edgecolor.green())/255.,
-                        float(edgecolor.blue())/255.);
-
-       /* Shrink factor and size edges */
-       ac->SetShrinkFactor( aDlg->GetIntValue(3)/100. );
-       ac->EdgeDevice->GetProperty()->SetLineWidth( aDlg->GetIntValue(1) );    
-       ac->EdgeShrinkDevice->GetProperty()->SetLineWidth( aDlg->GetIntValue(1) );
-
-       /* Nodes color and size */
-       ac->SetNodeColor(float(nodecolor.red())/255.,
-                        float(nodecolor.green())/255.,
-                        float(nodecolor.blue())/255.);
-       ac->SetNodeSize(aDlg->GetIntValue(2)) ;
-       
-       if (ac->getDisplayMode()==2) {
-         bool isColored = ac->getMapper()->GetScalarVisibility(); //SAL3899
-         vtkDataSetMapper* meshMapper = (vtkDataSetMapper*) (ac->getMapper());
-         meshMapper->SetInput(ac->DataSource);
-         vtkShrinkFilter *shrink = vtkShrinkFilter::New();
-         shrink->SetInput(meshMapper->GetInput());
-         shrink->SetShrinkFactor(ac->GetShrinkFactor());
-         
-         meshMapper->SetInput( shrink->GetOutput() );
-         meshMapper->SetScalarVisibility(isColored); //SAL3899
-         ac->SetMapper( meshMapper );
-       }
-      }
-      delete aDlg;
-      QApplication::restoreOverrideCursor();
-      break;
-    }
-  case 4:
-    {
-      EmitSignalDeactivateDialog() ;
-      SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
-      SMESHGUI_TransparencyDlg *aDlg = new SMESHGUI_TransparencyDlg( QAD_Application::getDesktop(), "", Sel) ;
-      break;
-    }
-  case 5: {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    ac->GetProperty()->SetRepresentationToPoints();
-    QApplication::restoreOverrideCursor();
-    break;
-  }
-  }
-
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  if ( myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-    vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-    theRenderer->Render();
-  }
-  QApplication::restoreOverrideCursor();
+               c0 = int (nodecolor[0] * 255);
+               c1 = int (nodecolor[1] * 255);
+               c2 = int (nodecolor[2] * 255);
+               QColor n(c0, c1, c2);
+
+               int Edgewidth = (int)ac->EdgeDevice->GetProperty()->GetLineWidth();
+               if (Edgewidth == 0)
+                       Edgewidth = 1;
+               int intValue = ac->GetNodeSize();
+               float Shrink = ac->GetShrinkFactor();
+
+               SMESHGUI_Preferences_ColorDlg *aDlg =
+                       new SMESHGUI_Preferences_ColorDlg(QAD_Application::getDesktop(),
+                       "");
+               aDlg->SetColor(1, c);
+               aDlg->SetColor(2, e);
+               aDlg->SetColor(3, n);
+               aDlg->SetColor(4, b);
+               aDlg->SetIntValue(1, Edgewidth);
+               aDlg->SetIntValue(2, intValue);
+               aDlg->SetIntValue(3, int (Shrink * 100.));
+
+               if (aDlg->exec())
+               {
+                       QApplication::setOverrideCursor(Qt::waitCursor);
+                       QColor color = aDlg->GetColor(1);
+                       QColor edgecolor = aDlg->GetColor(2);
+                       QColor nodecolor = aDlg->GetColor(3);
+                       QColor backfacecolor = aDlg->GetColor(4);
+                       /* actor color and backface color */
+                       ac->GetProperty()->SetColor(float (color.red()) / 255.,
+                               float (color.green()) / 255., float (color.blue()) / 255.);
+                       ac->SetColor(float (color.red()) / 255.,
+                               float (color.green()) / 255., float (color.blue()) / 255.);
+                       ac->GetBackfaceProperty()->SetColor(float (backfacecolor.red()) /
+                               255., float (backfacecolor.green()) / 255.,
+                               float (backfacecolor.blue()) / 255.);
+
+                       /* edge color */
+                       ac->EdgeDevice->GetProperty()->SetColor(float (edgecolor.red()) /
+                               255., float (edgecolor.green()) / 255.,
+                               float (edgecolor.blue()) / 255.);
+                       ac->EdgeShrinkDevice->GetProperty()->SetColor(float (edgecolor.
+                                       red()) / 255., float (edgecolor.green()) / 255.,
+                               float (edgecolor.blue()) / 255.);
+                       ac->SetEdgeColor(float (edgecolor.red()) / 255.,
+                               float (edgecolor.green()) / 255.,
+                               float (edgecolor.blue()) / 255.);
+
+                       /* Shrink factor and size edges */
+                       ac->SetShrinkFactor(aDlg->GetIntValue(3) / 100.);
+                       ac->EdgeDevice->GetProperty()->SetLineWidth(aDlg->GetIntValue(1));
+                       ac->EdgeShrinkDevice->GetProperty()->SetLineWidth(aDlg->
+                               GetIntValue(1));
+
+                       /* Nodes color and size */
+                       ac->SetNodeColor(float (nodecolor.red()) / 255.,
+                               float (nodecolor.green()) / 255.,
+                               float (nodecolor.blue()) / 255.);
+                       ac->SetNodeSize(aDlg->GetIntValue(2));
+
+                       if (ac->getDisplayMode() == 2)
+                       {
+                               bool isColored = ac->getMapper()->GetScalarVisibility();        //SAL3899
+                               vtkDataSetMapper *meshMapper =
+                                       (vtkDataSetMapper *) (ac->getMapper());
+                               meshMapper->SetInput(ac->DataSource);
+                               vtkShrinkFilter *shrink = vtkShrinkFilter::New();
+                               shrink->SetInput(meshMapper->GetInput());
+                               shrink->SetShrinkFactor(ac->GetShrinkFactor());
+
+                               meshMapper->SetInput(shrink->GetOutput());
+                               meshMapper->SetScalarVisibility(isColored);     //SAL3899
+                               ac->SetMapper(meshMapper);
+                       }
+               }
+               delete aDlg;
+               QApplication::restoreOverrideCursor();
+               break;
+       }
+       case 4:
+       {
+               EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(myActiveStudy->getSelection());
+               SMESHGUI_TransparencyDlg *aDlg =
+                       new SMESHGUI_TransparencyDlg(QAD_Application::getDesktop(), "",
+                       Sel);
+               break;
+       }
+       case 5:
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               ac->GetProperty()->SetRepresentationToPoints();
+               QApplication::restoreOverrideCursor();
+               break;
+       }
+       }
+
+       QApplication::setOverrideCursor(Qt::waitCursor);
+       if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK)
+       {                                                       //VTK
+               vtkRenderer *theRenderer =
+                       ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
+                       getRightFrame()->getViewFrame())->getRenderer();
+               theRenderer->Render();
+       }
+       QApplication::restoreOverrideCursor();
 }
 
 //=============================================================================
@@ -1489,11 +1755,13 @@ void SMESHGUI::ChangeRepresentation( SMESH_Actor* ac, int type )
 //=============================================================================
 void SMESHGUI::UpdateView()
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
+               return;
 
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  theRenderer->Render();
+       vtkRenderer *theRenderer =
+               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
+               getRightFrame()->getViewFrame())->getRenderer();
+       theRenderer->Render();
 }
 
 //=============================================================================
@@ -1501,69 +1769,91 @@ void SMESHGUI::UpdateView()
  *
  */
 //=============================================================================
-void SMESHGUI::DisplayActor(SMESH_Actor* ac, bool visibility)
+void SMESHGUI::DisplayActor(SMESH_Actor * ac, bool visibility)
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
-
-  MESSAGE("DisplayActor(): DataSource = " << ac->DataSource);
-
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-  vtkActorCollection* theActors = theRenderer->GetActors();
-  theActors->InitTraversal();
-  if ( theActors->IsItemPresent(ac) == 0 ) {
-    vtkProperty* prop = vtkProperty::New();
-    prop->SetColor( QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed").toFloat()/255., 
-                   QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen").toFloat()/255.,
-                   QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue").toFloat()/255. ) ;
-
-    prop->SetPointSize( QAD_CONFIG->getSetting("SMESH:SettingsNodesSize").toInt());
-    prop->SetLineWidth( QAD_CONFIG->getSetting("SMESH:SettingsWidth").toInt() );
-    ac->SetProperty( prop );
-    ac->SetColor( QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed").toFloat()/255., 
-                 QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen").toFloat()/255.,
-                 QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue").toFloat()/255. );
-
-    //    prop->BackfaceCullingOn();
-    vtkProperty* backprop = vtkProperty::New();
-    backprop->SetColor( QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorRed").toFloat()/255., 
-                       QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorGreen").toFloat()/255.,
-                       QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorBlue").toFloat()/255. ) ;
-    ac->SetBackfaceProperty(backprop);
-
-    int intValue = QAD_CONFIG->getSetting("SMESH:SettingsShrinkCoeff").toInt();
-    if (intValue == 0 )
-      intValue = 80;       
-    ac->SetShrinkFactor( intValue/100. );
-
-    ac->GetMapper()->SetResolveCoincidentTopologyToShiftZBuffer();
-    ac->GetMapper()->SetResolveCoincidentTopologyZShift(0.02);
-
-    QString DisplayMode = QAD_CONFIG->getSetting("SMESH:DisplayMode");
-    if ( DisplayMode.compare("Wireframe") == 0 ){
-      ac->setDisplayMode(0);
-      ChangeRepresentation( ac, 0 );
-    } else if ( DisplayMode.compare("Shading") == 0 ){
-      ac->setDisplayMode(1);
-      ChangeRepresentation( ac, 1 );
-    } else if ( DisplayMode.compare("Shrink") == 0 ) {
-      ac->setDisplayMode(2);
-      ChangeRepresentation( ac, 2 );
-    }
-    theRenderer->AddActor(ac);
-  } else {
-    if (ac->GetMapper())
-      ac->GetMapper()->Update();
-  }
+       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
+               return;
+
+       MESSAGE("DisplayActor(): DataSource = " << ac->DataSource);
+
+       vtkRenderer *theRenderer =
+               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
+               getRightFrame()->getViewFrame())->getRenderer();
+       vtkActorCollection *theActors = theRenderer->GetActors();
+       theActors->InitTraversal();
+       if (theActors->IsItemPresent(ac) == 0)
+       {
+               vtkProperty *prop = vtkProperty::New();
+               prop->SetColor(QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed").
+                       toFloat() / 255.,
+                       QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen").toFloat() /
+                       255.,
+                       QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue").toFloat() /
+                       255.);
+
+               prop->SetPointSize(QAD_CONFIG->getSetting("SMESH:SettingsNodesSize").
+                       toInt());
+               prop->SetLineWidth(QAD_CONFIG->getSetting("SMESH:SettingsWidth").
+                       toInt());
+               ac->SetProperty(prop);
+               ac->SetColor(QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed").
+                       toFloat() / 255.,
+                       QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen").toFloat() /
+                       255.,
+                       QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue").toFloat() /
+                       255.);
+
+               //    prop->BackfaceCullingOn();
+               vtkProperty *backprop = vtkProperty::New();
+               backprop->SetColor(QAD_CONFIG->
+                       getSetting("SMESH:SettingsBackFaceColorRed").toFloat() / 255.,
+                       QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorGreen").
+                       toFloat() / 255.,
+                       QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorBlue").
+                       toFloat() / 255.);
+               ac->SetBackfaceProperty(backprop);
+
+               int intValue =
+                       QAD_CONFIG->getSetting("SMESH:SettingsShrinkCoeff").toInt();
+               if (intValue == 0)
+                       intValue = 80;
+               ac->SetShrinkFactor(intValue / 100.);
+
+               ac->GetMapper()->SetResolveCoincidentTopologyToShiftZBuffer();
+               ac->GetMapper()->SetResolveCoincidentTopologyZShift(0.02);
+
+               QString DisplayMode = QAD_CONFIG->getSetting("SMESH:DisplayMode");
+               if (DisplayMode.compare("Wireframe") == 0)
+               {
+                       ac->setDisplayMode(0);
+                       ChangeRepresentation(ac, 0);
+               }
+               else if (DisplayMode.compare("Shading") == 0)
+               {
+                       ac->setDisplayMode(1);
+                       ChangeRepresentation(ac, 1);
+               }
+               else if (DisplayMode.compare("Shrink") == 0)
+               {
+                       ac->setDisplayMode(2);
+                       ChangeRepresentation(ac, 2);
+               }
+               theRenderer->AddActor(ac);
+       }
+       else
+       {
+               if (ac->GetMapper())
+                       ac->GetMapper()->Update();
+       }
+
 //  if ( visibility )
-  ac->SetVisibility(visibility);
+       ac->SetVisibility(visibility);
 //    ac->VisibilityOn();
 //  else
 //    ac->VisibilityOff();
 
-  vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-  renWin->Render();
+       vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
+       renWin->Render();
 }
 
 //=============================================================================
@@ -1571,20 +1861,22 @@ void SMESHGUI::DisplayActor(SMESH_Actor* ac, bool visibility)
  *
  */
 //=============================================================================
-void SMESHGUI::EraseActor(SMESH_Actor* ac)
+void SMESHGUI::EraseActor(SMESH_Actor * ac)
 {
-  if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) 
-    return;
+       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
+               return;
 
-  vtkRenderer *theRenderer = ((VTKViewer_ViewFrame*)myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
+       vtkRenderer *theRenderer =
+               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
+               getRightFrame()->getViewFrame())->getRenderer();
 
-  //NRI- : 02/12/2002 : Fixed bugId 882
-  //  ac->EdgeDevice->VisibilityOff();
-  //  ac->EdgeShrinkDevice->VisibilityOff();
-  //  ac->VisibilityOff();
-  ac->SetVisibility( false );
+       //NRI- : 02/12/2002 : Fixed bugId 882
+       //  ac->EdgeDevice->VisibilityOff();
+       //  ac->EdgeShrinkDevice->VisibilityOff();
+       //  ac->VisibilityOff();
+       ac->SetVisibility(false);
 
-  theRenderer->Render();
+       theRenderer->Render();
 }
 
 //=============================================================================
@@ -1592,14 +1884,15 @@ void SMESHGUI::EraseActor(SMESH_Actor* ac)
  *
  */
 //=============================================================================
-bool SMESHGUI::AddActorInSelection(SMESH_Actor* ac)
+bool SMESHGUI::AddActorInSelection(SMESH_Actor * ac)
 {
-  SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
-  Sel->ClearIObjects();
-  if ( ac->hasIO() )
-    return Sel->AddIObject( ac->getIO() );
-  else
-    return -1;
+       SALOME_Selection *Sel =
+               SALOME_Selection::Selection(myActiveStudy->getSelection());
+       Sel->ClearIObjects();
+       if (ac->hasIO())
+               return Sel->AddIObject(ac->getIO());
+       else
+               return -1;
 }
 
 //=============================================================================
@@ -1609,129 +1902,37 @@ bool SMESHGUI::AddActorInSelection(SMESH_Actor* ac)
 //=============================================================================
 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;
-}
+       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 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) aMeshOrSubMeshFilter = new SMESH_TypeFilter( MESHorSUBMESH );
-  Handle(SMESH_TypeFilter) aSubMeshVextexFilter = new SMESH_TypeFilter( SUBMESH_VERTEX );
-  Handle(SMESH_TypeFilter) aSubMeshEdgeFilter = new SMESH_TypeFilter( SUBMESH_EDGE );
-  Handle(SMESH_TypeFilter) aSubMeshFaceFilter = new SMESH_TypeFilter( SUBMESH_FACE );
-  Handle(SMESH_TypeFilter) aSubMeshSolidFilter = new SMESH_TypeFilter( SUBMESH_SOLID );
-  Handle(SMESH_TypeFilter) aSubMeshCompoundFilter = new SMESH_TypeFilter( SUBMESH_COMPOUND );
-  
-  Sel->AddFilter(aHypFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "Hypothesis";
-  } 
-
-  Sel->ClearFilters();
-  Sel->AddFilter(anAlgoFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "Algorithm";
-  } 
-
-  Sel->ClearFilters();
-  Sel->AddFilter(aMeshFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "Mesh";
-  } 
-
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "SubMesh";
-  } 
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshVextexFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "SubMeshVertex";
-  } 
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshEdgeFilter);
-  if ( Sel->AddIObject( IO ) != -1 ){
-    Sel->ClearFilters();
-    return "SubMeshEdge";
-  } 
-  
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshFaceFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "SubMeshFace";
-  } 
-  
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshSolidFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "SubMeshSolid";
-  } 
-  
-  Sel->ClearFilters();
-  Sel->AddFilter(aSubMeshCompoundFilter);
-  if ( Sel->AddIObject( IO ) != -1 ) {
-    Sel->ClearFilters();
-    return "SubMeshCompound";
-  } 
-  
-  Sel->ClearFilters();
-  Sel->AddIObject( IO );
-  return "NoType";
+       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;
 }
 
 //=============================================================================
@@ -1739,1416 +1940,1865 @@ QString SMESHGUI::CheckTypeObject(const Handle(SALOME_InteractiveObject)& IO)
  *
  */
 //=============================================================================
-bool SMESHGUI::OnGUIEvent(int theCommandID,    QAD_Desktop* parent)
+QString SMESHGUI::CheckTypeObject(const Handle(SALOME_InteractiveObject) & IO)
 {
-  /* Create or retrieve an object SMESHGUI */
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-  // NRI : Temporary added
-  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
-    return false;
-  }
-  //NRI
-
-  //  QAD_Viewer3d* v3d;
-  OCCViewer_Viewer3d* v3d;
-  
-  Handle(AIS_InteractiveContext) ic;
-  vtkRenderer* Renderer;
-  vtkRenderWindow* RenWin;
-
-  if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC ) {
-    v3d =((OCCViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); 
-    ic = v3d->getAISContext();
-  } else if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) {
-    Renderer = ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
-    RenWin = Renderer->GetRenderWindow();
-  }
-
-  switch (theCommandID)
-    {
-    case 33: // DELETE
-      smeshGUI->OnEditDelete();
-      break;
-
-    case 113: // IMPORT
-    case 112:
-    case 111: 
-      {
-       Import_Document(parent,theCommandID);//NBU
-       //Import_Mesh(parent,theCommandID);
-       break;
-      }
-
-    case 122: // EXPORT MED
-    case 121:
-    case 123:
-      {
-       Export_Mesh(parent, theCommandID);
-       break;
-      }
-
-    case 200: // SCALAR BAR
-      {
-       smeshGUI->DisplayScalarBar(false);
-       break;
-      }
-    case 201:
-      {
-       SMESHGUI_EditScalarBarDlg *aDlg = new SMESHGUI_EditScalarBarDlg( parent, "", false ) ;
-       aDlg->show();
-       break;
-      }
-    case 202:
-      {
-       smeshGUI->DisplayScalarBar( true );
-       break;
-      }      
-
-    case 1133: // DISPLAY MODE : WireFrame, Surface, Shrink
-    case 1132:
-    case 213:
-    case 212:
-    case 211:
-      {
-       smeshGUI->SetViewMode(theCommandID);
-       break;
-      }
-      
-    case 214 : // UPDATE
-      {
-       smeshGUI->Update();
-       break;
-      }
-    case 300 : // ERASE
-      {
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-         // VTK
-         SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-         for(;It.More();It.Next()) {
-           Handle(SALOME_InteractiveObject) IOS = It.Value();
-           if ( IOS->hasEntry() ) {
-             Standard_Boolean res;
-             SMESH_Actor *ac = smeshGUI->FindActorByEntry(IOS->getEntry(), res, true );
-             if ( res ) smeshGUI->EraseActor( ac );
-           }
-         }
-       }
-       Sel->ClearIObjects();
-       smeshGUI->myActiveStudy->updateObjBrowser( true );
-      }
-     
-    case 301 : // DISPLAY
-      {
-       if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-         // VTK
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         SALOMEDS::SObject_var fatherSF = 
-           smeshGUI->myStudy->FindObjectID(smeshGUI->myActiveStudy->getActiveStudyFrame()->entry());
-
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-         
-         for(;It.More();It.Next()) {
-           Handle(SALOME_InteractiveObject) IObject = It.Value();
-           if ( IObject->hasEntry() ) {
-             Standard_Boolean res;
-             SMESH_Actor *ac = smeshGUI->FindActorByEntry(IObject->getEntry(), res, true );
-             if ( res ) {
-               smeshGUI->DisplayActor( ac, true );
-               smeshGUI->DisplayEdges( ac ); 
-               smeshGUI->ChangeRepresentation( ac, ac->getDisplayMode() );
-             }
-           }
-         }
-         QApplication::restoreOverrideCursor();
-       }
-       break;
-      }
-
-    case 302 : // DISPLAY ONLY
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         vtkActorCollection* theActors = Renderer->GetActors();
-         theActors->InitTraversal();
-         vtkActor *ac = theActors->GetNextActor();
-         while(!(ac==NULL)) {
-           if ( ac->IsA("SMESH_Actor") ) {
-             SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( ac );
-             if(!anActor->isHighlighted()) {
-               //anActor->VisibilityOff();
-               //NRI- : 02/12/2002 : Fixed bugId 882
-               //              anActor->EdgeDevice->VisibilityOff();
-               //              anActor->EdgeShrinkDevice->VisibilityOff();
-               anActor->SetVisibility( false );
-             }
-           }
-           ac = theActors->GetNextActor();
-         }
-
-         // Display selection
-         SALOMEDS::SObject_var fatherSF = smeshGUI->myStudy->FindObjectID(smeshGUI->myActiveStudy->getActiveStudyFrame()->entry());
-         
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-         
-         for(;It.More();It.Next()) {
-           Handle(SALOME_InteractiveObject) IObject = It.Value();
-           SALOMEDS::SObject_var obj = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-           
-           VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
-           //      vtkQGLRenderWindowInteractor* myRenderInter= smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getVTKView()->getRWInteractor();
-           
-           if(myRenderInter->isInViewer(IObject)) {
-             if ( IObject->hasEntry() ) {
-               Standard_Boolean res;
-               SMESH_Actor *ac = smeshGUI->FindActorByEntry(IObject->getEntry(), res, true );
-               if ( res ) {
-                 smeshGUI->DisplayActor( ac, true );
-                 smeshGUI->DisplayEdges( ac ); 
-                 smeshGUI->ChangeRepresentation( ac, ac->getDisplayMode() );
-               }
-             }
-           }
-         }
-         smeshGUI->myActiveStudy->updateObjBrowser( true );
-         QApplication::restoreOverrideCursor();
-       }
-       break;
-      }
-
-    case 400: // NODES
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_NodesDlg *aDlg = new SMESHGUI_NodesDlg( parent, "", Sel ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
-      }
-
-    case 405: // MOVE NODE
-      {
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         SMESHGUI_MoveNodesDlg *aDlg = new SMESHGUI_MoveNodesDlg( parent, "", Sel ) ;
-         break;
-      }
-
-    case 701: // COMPUTE MESH 
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         int nbSel = Sel->IObjectCount();
-         if ( nbSel != 1 ) {
-           QApplication::restoreOverrideCursor();
-           break;
-         }
-
-         SMESH::SMESH_Mesh_var aM;
-         SMESH::SMESH_subMesh_var aSubM;
-         Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-         if ( IObject->hasEntry() ) {
-           SALOMEDS::SObject_var aMorSM = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-            SALOMEDS::GenericAttribute_var anAttr;
-            SALOMEDS::AttributeIOR_var     anIOR;
-           if ( !aMorSM->_is_nil() ) {
-             if (aMorSM->FindAttribute(anAttr, "AttributeIOR") ) {
-                anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-               MESSAGE( "SMESHGUI::OnGUIEvent - Compute mesh : IOR = " << anIOR->Value() )
-               CORBA::Object_var cobj;
-               try {
-                 cobj = _orb->string_to_object(anIOR->Value());
-                 if ( CORBA::is_nil(cobj) ) {
-                   MESSAGE( "SMESHGUI::OnGUIEvent - Compute mesh : nil object" )
-                 }
-               }
-               catch(CORBA::COMM_FAILURE& ex) {
-                 MESSAGE( "SMESHGUI::OnGUIEvent - Compute mesh : exception (1)" )
-               }
-               aM = SMESH::SMESH_Mesh::_narrow(cobj);
-               //aM = SMESH::SMESH_Mesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-               aSubM = SMESH::SMESH_subMesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-               if ( !aM->_is_nil() ) {
-                 GEOM::GEOM_Shape_var refShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(aMorSM);
-                 if ( !refShape->_is_nil() ) {
-                   bool compute = smeshGUI->myComponentMesh->IsReadyToCompute(aM, refShape);
-                   if ( !compute ) {
-                     QApplication::restoreOverrideCursor();
-                     QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                             tr ("SMESH_WRN_MISSING_PARAMETERS"), tr ("SMESH_BUT_YES") );
-                     break;
-                   }
-                   try {
-                     smeshGUI->myComponentMesh->Compute( aM, refShape);
-                     smeshGUI->myStudyAPI.ModifiedMesh( aMorSM, true );
-                     // TO Do : change icon of all submeshes
-                   }
-                   catch  (const SALOME::SALOME_Exception& S_ex) {
-                     QtCatchCorbaException(S_ex);
-                   }
-                 }
-               } else if ( !aSubM->_is_nil() ) {
-                 aM = aSubM->GetFather();
-                 GEOM::GEOM_Shape_var refShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(aMorSM);
-                 if ( !refShape->_is_nil() ) {
-                   bool compute = smeshGUI->myComponentMesh->IsReadyToCompute(aM, refShape);
-                   if ( !compute ) {
-                     QApplication::restoreOverrideCursor();
-                     QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                             tr ("SMESH_WRN_MISSING_PARAMETERS"), tr ("SMESH_BUT_YES") );
-                     break;
-                   }
-                   try {
-                     smeshGUI->myComponentMesh->Compute( aM, refShape);
-                     smeshGUI->myStudyAPI.ModifiedMesh( aMorSM, true );
-                     // TO Do : change icon of all submeshes
-                   }
-                   catch  (const SALOME::SALOME_Exception& S_ex) {
-                     QtCatchCorbaException(S_ex);
-                   }
-                 }
-               }
-             }
-           }
-         }
-
-         // Check whether the actor for the mesh exists at least in one view
-         Standard_Boolean res;
-         SMESH_Actor* ac = smeshGUI->FindActorByEntry(IObject->getEntry(), res, false);
-         if (!res)
-           smeshGUI->InitActor( aM );
-         else {
-           // Check whether the actor belongs to the active view
-           VTKViewer_RenderWindowInteractor* rwInter = 
-             ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
-
-           // The actor belongs to inactive view -> create a copy and add it in the active view
-           if (!rwInter->isInViewer(IObject)) {
-             SMESH_Actor* acCopy = SMESH_Actor::New();
-             acCopy->ShallowCopy(ac);
-
-             smeshGUI->DisplayActor( acCopy, false );
-           }
-         }
-
-         if ( smeshGUI->myAutomaticUpdate ) {
-           SMESH_Actor* Mesh = smeshGUI->ReadScript(aM);
-           if ( Mesh != NULL ) {
-#ifdef TRACE
-             Dump( Mesh );
-#endif
-             smeshGUI->DisplayActor( Mesh, true );
-             smeshGUI->DisplayEdges( Mesh, true );    
-             smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-           }
-         }
-       } else {
-         QApplication::restoreOverrideCursor();
-         QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                 tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       QApplication::restoreOverrideCursor();
-       break;
-      }
-
-    case 702: // ADD SUB MESH 
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         SMESHGUI_AddSubMeshDlg *aDlg = new SMESHGUI_AddSubMeshDlg( parent, "", Sel ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-         QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
-      }
-    
-    case 703: // INIT MESH 
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_InitMeshDlg *aDlg = new SMESHGUI_InitMeshDlg( parent, "", Sel ) ;
-       break;
-      }
-
-    case 704: // EDIT Hypothesis 
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg( parent, "", Sel ) ;
-       break;
-      }
-
-    case 705: //  EDIT Global Hypothesis
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg( parent, "", Sel ) ;
-       break;
-      }
-
-    case 706: //  EDIT Local Hypothesis
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg( parent, "", Sel ) ;
-       break;
-      }
-
-    case 806: // ORIENTATION ELEMENTS
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       smeshGUI->myDesktop->SetSelectionMode(3, true);
-       SMESHGUI_OrientationElementsDlg *aDlg = new SMESHGUI_OrientationElementsDlg( parent, "", Sel ) ;
-       break;
-      }
-
-    case 807: // DIAGONAL INVERSION
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       Sel->ClearIObjects();
-       smeshGUI->myDesktop->SetSelectionMode(2, true);
-       SMESHGUI_DiagonalInversionDlg *aDlg = new SMESHGUI_DiagonalInversionDlg( parent, "", Sel ) ;
-       break;
-      }
-     
-    case 900: // MESH INFOS
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_MeshInfosDlg *aDlg = new SMESHGUI_MeshInfosDlg( parent, "", Sel ) ;
-       break;
-      }
-      
-    case 1001: // AUTOMATIC UPDATE PREFERENCES
-      {
-       parent->menuBar()->setItemChecked(1001, !parent->menuBar()->isItemChecked(1001) );
-       if ( parent->menuBar()->isItemChecked(1001) ) {
-         QAD_CONFIG->addSetting("SMESH:AutomaticUpdate","true");
-         smeshGUI->myAutomaticUpdate = true;     
-       } else {
-         QAD_CONFIG->addSetting("SMESH:AutomaticUpdate","false");
-         smeshGUI->myAutomaticUpdate = false;
-       }
-       break;
-      }
-       
-    case 1003: // MESH PREFERENCES
-      {
-       smeshGUI->SetDisplaySettings();
-       break;
-      }
-      
-    case 1005:
-      {
-       QString Bold = QAD_CONFIG->getSetting("ScalarBar:Bold");
-       QString Italic = QAD_CONFIG->getSetting("ScalarBar:Italic");
-       QString Shadow = QAD_CONFIG->getSetting("ScalarBar:Shadow");    
-       QString FontFamily = QAD_CONFIG->getSetting("ScalarBar:FontFamily");
-       QString Orientation = QAD_CONFIG->getSetting("ScalarBar:Orientation");
-       float Width = QAD_CONFIG->getSetting("ScalarBar:Width").toFloat();  
-       float Height = QAD_CONFIG->getSetting("ScalarBar:Height").toFloat();
-       int NumberOfLabels = QAD_CONFIG->getSetting("ScalarBar:NumberOfLabels").toInt();
-       int NumberOfColors = QAD_CONFIG->getSetting("ScalarBar:NumberOfColors").toInt();
-
-       if ( Width == 0 ) Width = 0.17;
-       if ( Height == 0 ) Height = 0.8;
-       if ( NumberOfLabels == 0 ) NumberOfLabels = 5;
-       if ( NumberOfColors == 0) NumberOfColors = 64;
-
-       SMESHGUI_Preferences_ScalarBarDlg *aDlg = new SMESHGUI_Preferences_ScalarBarDlg( parent, "", true) ;
-
-       if ( Bold.compare("true") == 0 ) 
-         aDlg->Bold->setChecked(true); else aDlg->Bold->setChecked(false);
-       if ( Italic.compare("true") == 0 ) 
-         aDlg->Italic->setChecked(true); else aDlg->Italic->setChecked(false);
-       if ( Shadow.compare("true") == 0 ) 
-         aDlg->Shadow->setChecked(true); else aDlg->Shadow->setChecked(false);
-
-       if ( Orientation.compare("Horizontal") == 0 ) 
-         aDlg->RadioHoriz->setChecked(true); else aDlg->RadioVert->setChecked(true);
-
-       int NbItems = aDlg->ComboBox1->count();
-       int i = 0;
-       aDlg->ComboBox1->setCurrentItem( i );
-       while ( i < NbItems ) {
-         if ( FontFamily.compare( aDlg->ComboBox1->text( i ) ) == 0 )
-           aDlg->ComboBox1->setCurrentItem( i );
-         i++;
-       }
-       
-       aDlg->LineEditWidth->setText( QString("%1").arg(Width) );
-       aDlg->LineEditHeight->setText( QString("%1").arg(Height) );
-
-       aDlg->SpinBoxLabels->setValue( NumberOfLabels );
-       aDlg->SpinBoxColors->setValue( NumberOfColors );
-       
-       aDlg->show();
-       if ( aDlg->result() ) {
-         if ( aDlg->RadioHoriz->isChecked() )
-           Orientation = "Horizontal"; else Orientation = "Vertical";
-         if ( aDlg->Bold->isChecked() )
-           Bold = "true"; else Bold = "false";
-         if ( aDlg->Italic->isChecked() )
-           Italic = "true"; else Italic = "false";
-         if ( aDlg->Shadow->isChecked() )
-           Shadow = "true"; else Shadow = "false";
-                       
-         FontFamily = aDlg->ComboBox1->currentText();
-         Width = aDlg->LineEditWidth->text().toFloat();
-         Height = aDlg->LineEditHeight->text().toFloat();
-         NumberOfColors = aDlg->SpinBoxColors->text().toInt();
-         NumberOfLabels = aDlg->SpinBoxLabels->text().toInt();
-
-         
-         vtkScalarBarActor* aScalarBar = smeshGUI->GetScalarBar();
-         if ( aScalarBar != NULL ) {
-           smeshGUI->SetSettingsScalarBar(aScalarBar, Bold, Italic, Shadow, 
-                                          FontFamily, Orientation,
-                                          Width, Height, NumberOfColors, NumberOfLabels);
-         }
-         
-         QAD_CONFIG->addSetting("ScalarBar:Bold", Bold);
-         QAD_CONFIG->addSetting("ScalarBar:Italic", Italic);
-         QAD_CONFIG->addSetting("ScalarBar:Shadow", Shadow);    
-         QAD_CONFIG->addSetting("ScalarBar:FontFamily", FontFamily);
-         QAD_CONFIG->addSetting("ScalarBar:Orientation", Orientation);
-         QAD_CONFIG->addSetting("ScalarBar:Width", Width);
-         QAD_CONFIG->addSetting("ScalarBar:Height", Height);
-         QAD_CONFIG->addSetting("ScalarBar:NumberOfLabels", NumberOfLabels);
-         QAD_CONFIG->addSetting("ScalarBar:NumberOfColors", NumberOfColors);
-       }
-       break;
-      }
-      
-    case 1100: // EDIT HYPOTHESIS
-      {
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       int nbSel = Sel->IObjectCount() ;
-
-       if ( nbSel == 1 ) {
-         Standard_Boolean res;
-         SMESH::SMESH_Hypothesis_var Hyp = smeshGUI->ConvertIOinSMESHHypothesis( Sel->firstIObject(), res );
-
-         /* Look for all mesh objects that have this hupothesis affected in order to flag as ModifiedMesh */
-         /* At end below '...->updateObjBrowser(true)' will change icon of mesh objects                   */
-         /* Warning : however by internal mechanism all subMeshes icons are changed !                     */
-         SALOMEDS::Study::ListOfSObject_var listSOmesh = smeshGUI->GetMeshesUsingAlgoOrHypothesis( Hyp) ;
-
-         if ( res ) {
-           QString Name = Hyp->GetName();
-           
-           if ( Name.compare("LocalLength") == 0 ) {
-             SMESH::SMESH_LocalLength_var LL = SMESH::SMESH_LocalLength::_narrow( Hyp );
-             double beforeLength = LL->GetLength() ;
-             double Length = smeshGUI->Parameter( res, 
-                                                  beforeLength,
-                                                  tr("SMESH_LOCAL_LENGTH_HYPOTHESIS"), 
-                                                  tr("SMESH_VALUE"), 
-                                                  1.0E-5, 1E6, 6 ) ;
-             if ( res && Length != beforeLength ) {
-               LL->SetLength( Length );
-               for( int i=0; i<listSOmesh->length(); i++ ) {
-                 smeshGUI->GetStudyAPI().ModifiedMesh( listSOmesh[i], false ) ;
-               }
-               break;
-             }
-             
-           } else if ( Name.compare("NumberOfSegments") == 0 ) {
-             SMESH::SMESH_NumberOfSegments_var NOS = SMESH::SMESH_NumberOfSegments::_narrow( Hyp );
-             int beforeNbSeg = NOS->GetNumberOfSegments() ;
-             int NbSeg = smeshGUI->Parameter( res,
-                                              beforeNbSeg, 
-                                              tr("SMESH_NB_SEGMENTS_HYPOTHESIS"), 
-                                              tr("SMESH_VALUE"), 
-                                              1, 1000000 ) ;
-
-             if ( res && NbSeg != beforeNbSeg ) {
-               NOS->SetNumberOfSegments( NbSeg );
-               for( int i=0; i<listSOmesh->length(); i++ ) {             
-                 SALOMEDS::SObject_var SO = listSOmesh[i] ;
-                 smeshGUI->GetStudyAPI().ModifiedMesh( listSOmesh[i], false ) ;
+       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";
                }
-               break;
-             }
-             
-           } else if ( Name.compare("MaxElementArea") == 0 ) {
-             SMESH::SMESH_MaxElementArea_var MEA = SMESH::SMESH_MaxElementArea::_narrow( Hyp );
-             double beforeMaxArea = MEA->GetMaxElementArea() ;
-             double MaxArea = smeshGUI->Parameter( res,
-                                                   beforeMaxArea,
-                                                   tr("SMESH_MAX_ELEMENT_AREA_HYPOTHESIS"), 
-                                                   tr("SMESH_VALUE"), 
-                                                   1.0E-5, 1E6, 6 ) ;
-             if ( res && MaxArea != beforeMaxArea ) {
-               MEA->SetMaxElementArea( MaxArea );
-               for( int i=0; i<listSOmesh->length(); i++ ) {
-                 smeshGUI->GetStudyAPI().ModifiedMesh( listSOmesh[i], false ) ;
-               }
-               break;
-             }
-             
-           }  else if ( Name.compare("MaxElementVolume") == 0 ) {
-             SMESH::SMESH_MaxElementVolume_var MEV = SMESH::SMESH_MaxElementVolume::_narrow( Hyp );
-             double beforeMaxVolume = MEV->GetMaxElementVolume() ;
-             double MaxVolume = smeshGUI->Parameter( res, 
-                                                     beforeMaxVolume,
-                                                     tr("SMESH_MAX_ELEMENT_VOLUME_HYPOTHESIS"), 
-                                                     tr("SMESH_VALUE"), 
-                                                     1.0E-5, 1E6, 6 ) ;
-             if ( res && MaxVolume != beforeMaxVolume ) {
-               MEV->SetMaxElementVolume( MaxVolume );
-               for( int i=0; i<listSOmesh->length(); i++ ) {
-                 smeshGUI->GetStudyAPI().ModifiedMesh( listSOmesh[i], false ) ;
-               }
-               break;
-             }
-             
-           } else if ( Name.compare("Regular_1D") == 0 ) {
-           } else if ( Name.compare("MEFISTO_2D") == 0 ) {
-           } else {
-           }
-           
-         }
-       }
-       break;
-      }
-      
-    case 1101: // RENAME
-      {
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-       for ( ; It.More(); It.Next() ) {
-         Handle(SALOME_InteractiveObject) IObject = It.Value();
-
-         SALOMEDS::SObject_var obj = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-          SALOMEDS::GenericAttribute_var anAttr;
-          SALOMEDS::AttributeName_var    aName;
-         if ( !obj->_is_nil() ) {
-           if (obj->FindAttribute(anAttr, "AttributeName")) {
-              aName = SALOMEDS::AttributeName::_narrow(anAttr);
-             QString newName = QString( aName->Value() );
-             newName = SALOMEGUI_NameDlg::getName( QAD_Application::getDesktop(), newName);
-             if ( !newName.isEmpty() ) {
-               QApplication::setOverrideCursor( Qt::waitCursor );
-               smeshGUI->myActiveStudy->renameIObject( IObject, newName );
-             }
-             QApplication::restoreOverrideCursor();
-           }
-         }
-       }
-       break;
-      }  
-
-    case 1102: // REMOVE HYPOTHESIS / ALGORITHMS
-      {
-       QApplication::setOverrideCursor( Qt::waitCursor );
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-       for ( int i=0; It.More(); It.Next(), i++ ) {
-         Handle(SALOME_InteractiveObject) IObject = It.Value();
-         smeshGUI->RemoveHypothesisOrAlgorithmOnMesh( IObject );
        }
+
+       SALOME_Selection *Sel =
+               SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
        Sel->ClearIObjects();
-       smeshGUI->myActiveStudy->updateObjBrowser( true );
-       QApplication::restoreOverrideCursor();
-       break;
-      }
-    case 401: // GEOM::EDGE
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_AddEdgeDlg *aDlg = new SMESHGUI_AddEdgeDlg( parent, "", Sel ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
-      }
-    case 4021: // TRIANGLE
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_AddFaceDlg *aDlg = new SMESHGUI_AddFaceDlg( parent, "", Sel, 3 ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
-      }
-    case 4022: // QUAD
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_AddFaceDlg *aDlg = new SMESHGUI_AddFaceDlg( parent, "", Sel, 4 ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
-      }
-    case 4031: // TETRA
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_AddVolumeDlg *aDlg = new SMESHGUI_AddVolumeDlg( parent, "", Sel, 4 ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
-      }
-    case 4032: // HEXA
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_AddVolumeDlg *aDlg = new SMESHGUI_AddVolumeDlg( parent, "", Sel, 8 ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
-      }
-
-    case 4041: // REMOVES NODES
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(1, true);
-         parent->menuBar()->setItemChecked(9010, false );
-         parent->menuBar()->setItemChecked(9011, false );
-         smeshGUI->ViewNodes();
-         SMESHGUI_RemoveNodesDlg *aDlg = new SMESHGUI_RemoveNodesDlg( parent, "", Sel ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
-      }
-    case 4042: // REMOVES ELEMENTS
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         smeshGUI->EmitSignalDeactivateDialog() ;
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         Sel->ClearIObjects();
-         smeshGUI->myDesktop->SetSelectionMode(3, true);
-         SMESHGUI_RemoveElementsDlg *aDlg = new SMESHGUI_RemoveElementsDlg( parent, "", Sel ) ;        
-       } else {
-         QApplication::restoreOverrideCursor();
-           QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                  tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-       break;
-      }
-
-    case 5000: // HYPOTHESIS - ALGO
-      {
-       smeshGUI->CreateAlgorithm("Regular_1D","Wire Discretisation");  
-       break;
-      }
-    case 5010: 
-      {
-       smeshGUI->CreateAlgorithm("MEFISTO_2D","Triangle (Mefisto)");
-       break;
-      }
-    case 5011: 
-      {
-       smeshGUI->CreateAlgorithm("Quadrangle_2D","Quadrangle (Mapping)");      
-       break;
-      }
-    case 5020: 
-      {
-       smeshGUI->CreateAlgorithm("Hexa_3D","Hexahedron (i,j,k)");      
-       break;
-      }
-    case 5021: 
-      {
-       smeshGUI->CreateAlgorithm("NETGEN_3D","Tetrahedron (Netgen)");  
-       break;
-      }
-
-    case 5030: // HYPOTHESIS - LOCAL LENGTH
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_LocalLengthDlg *aDlg = new SMESHGUI_LocalLengthDlg( parent, "" ) ;
-       break;
-      }
-    case 5031: // HYPOTHESIS - NB SEGMENTS
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_NbSegmentsDlg *aDlg = new SMESHGUI_NbSegmentsDlg( parent, "" ) ;
-       break;
-      }
-
-    case 5032: // HYPOTHESIS - MAX ELEMENT AREA
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_MaxElementAreaDlg *aDlg = new SMESHGUI_MaxElementAreaDlg( parent, "" ) ;
-       break;
-      }
-
-    case 5033: // HYPOTHESIS - MAX ELEMENT VOLUME
-      {
-       smeshGUI->EmitSignalDeactivateDialog() ;
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       SMESHGUI_MaxElementVolumeDlg *aDlg = new SMESHGUI_MaxElementVolumeDlg( parent, "" ) ;
-       break;
-      }
-
-    case 6016: // CONTROLS 
-    case 6015:
-    case 6014:
-    case 6013:
-    case 6012:
-    case 6011:
-    case 6001:
-      {
-       SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-       int nbSel = Sel->IObjectCount();
-       if ( nbSel != 1 )
-         break;
-       smeshGUI->Control(theCommandID);
-       break;
-      }
-      
-    case 6002:
-      {
-       if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { //VTK
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         SMESHGUI_EdgesConnectivityDlg *Dlg = new SMESHGUI_EdgesConnectivityDlg( parent, "", Sel ) ;
-       } else {
-         QApplication::restoreOverrideCursor();
-         QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("SMESH_WRN_WARNING"),
-                                tr ("SMESH_WRN_VIEWER_VTK"), tr ("SMESH_BUT_YES") );
-       }
-               break;
-      }
-
-    case 9010:
-      {
-       if ( !parent->menuBar()->isItemChecked(9010) ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         parent->menuBar()->setItemChecked(9011, false );
-         
-         smeshGUI->EraseSimulationActors();
-         smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
-
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         int nbSel = Sel->IObjectCount() ;
-         if ( nbSel == 1 ) {
-           Standard_Boolean res;
-           SMESH_Actor* MeshActor = smeshGUI->FindActorByEntry(Sel->firstIObject()->getEntry(), res, true);
-           if ( res ) {
-             parent->menuBar()->setItemChecked(9010, !parent->menuBar()->isItemChecked(9010) );
-
-             // It's necessary to display SMDS IDs instead of VTK ones, so 
-             // vtkIdFilter is unacceptable here. We have to do it manually :(
-             vtkUnstructuredGrid* ptGrid = vtkUnstructuredGrid::New();
-             ptGrid->CopyStructure(MeshActor->DataSource);
-
-             int numPts = MeshActor->DataSource->GetNumberOfPoints();
-
-             // Loop over points and generate ids
-             vtkIntArray *ptIds = vtkIntArray::New();
-             ptIds->SetNumberOfValues(numPts);
-
-             for (int id=0; id < numPts; id++) {
-               int idSMDS = MeshActor->GetIdSMESHDSNode(id);
-               ptIds->SetValue(id, idSMDS);
-             }
 
-// mpv porting vtk4.2.2
-             //              vtkScalars* newScalars = vtkScalars::New();
-             //              newScalars->SetData(ptIds);
-             //              ptGrid->GetPointData()->SetScalars(newScalars);
-             ptGrid->GetPointData()->SetScalars(ptIds);
-             //              newScalars->Delete();
-// mpv
-             ptIds->Delete();
-             
-             vtkMaskPoints* mask = vtkMaskPoints::New();
-             mask->SetInput(ptGrid);
-             mask->SetOnRatio( 1 );
-             //            mask->SetMaximumNumberOfPoints( 50 );
-             //            mask->RandomModeOn();
-             
-             vtkSelectVisiblePoints* visPts = vtkSelectVisiblePoints::New();
-             visPts->SetInput(mask->GetOutput());
-             visPts->SetRenderer(((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer());
-             //visPts->SetSelectInvisible(1);
-             visPts->SelectInvisibleOff();
-             visPts->SetTolerance(0.1);
-           
-             vtkLabeledDataMapper* ldm = vtkLabeledDataMapper::New();
-             ldm->SetInput(visPts->GetOutput());
-             ldm->SetLabelFormat("%g");
-             ldm->SetLabelModeToLabelScalars();
-             //ldm->SetLabelModeToLabelFieldData();
-             
-             ldm->SetFontFamilyToTimes();
-             ldm->SetFontSize(6 * parent->font().pointSize() / 5);
-             ldm->SetBold(1);
-             ldm->SetItalic(0);
-             ldm->SetShadow(0);
-             
-             vtkActor2D* pointLabels = vtkActor2D::New();
-             pointLabels->SetMapper(ldm);
-             pointLabels->GetProperty()->SetColor(0,1,0);
-             
-             visPts->Delete();
-             ldm->Delete();
-             smeshGUI->mySimulationActors2D->AddItem( pointLabels );
-             ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer()->AddActor2D( pointLabels );
-           }
-         } 
-       } else {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         parent->menuBar()->setItemChecked(9010, !parent->menuBar()->isItemChecked(9010) );
-         smeshGUI->EraseSimulationActors();
-         smeshGUI->ScalarVisibilityOff();
+       Handle(SMESH_TypeFilter) aHypFilter = new SMESH_TypeFilter(HYPOTHESIS);
+       Handle(SMESH_TypeFilter) anAlgoFilter = new SMESH_TypeFilter(ALGORITHM);
+       Handle(SMESH_TypeFilter) aMeshFilter = new SMESH_TypeFilter(MESH);
+       Handle(SMESH_TypeFilter) aSubMeshFilter = new SMESH_TypeFilter(SUBMESH);
+       Handle(SMESH_TypeFilter) aMeshOrSubMeshFilter =
+               new SMESH_TypeFilter(MESHorSUBMESH);
+       Handle(SMESH_TypeFilter) aSubMeshVextexFilter =
+               new SMESH_TypeFilter(SUBMESH_VERTEX);
+       Handle(SMESH_TypeFilter) aSubMeshEdgeFilter =
+               new SMESH_TypeFilter(SUBMESH_EDGE);
+       Handle(SMESH_TypeFilter) aSubMeshFaceFilter =
+               new SMESH_TypeFilter(SUBMESH_FACE);
+       Handle(SMESH_TypeFilter) aSubMeshSolidFilter =
+               new SMESH_TypeFilter(SUBMESH_SOLID);
+       Handle(SMESH_TypeFilter) aSubMeshCompoundFilter =
+               new SMESH_TypeFilter(SUBMESH_COMPOUND);
+
+       Sel->AddFilter(aHypFilter);
+       if (Sel->AddIObject(IO) != -1)
+       {
+               Sel->ClearFilters();
+               return "Hypothesis";
        }
-       QApplication::restoreOverrideCursor();
-       break;
-      }
-    case 9011:
-      { 
-       if ( !parent->menuBar()->isItemChecked(9011) ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         parent->menuBar()->setItemChecked(9010, false );
-
-         smeshGUI->EraseSimulationActors();
-         smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
-
-         SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-         int nbSel = Sel->IObjectCount() ;
-         if ( nbSel == 1 ) {
-           Standard_Boolean res;
-           SMESH_Actor* MeshActor = smeshGUI->FindActorByEntry(Sel->firstIObject()->getEntry(), res, true);
-           if ( res ) {
-             parent->menuBar()->setItemChecked(9011, !parent->menuBar()->isItemChecked(9011) );
-
-             // It's necessary to display SMDS IDs instead of VTK ones, so 
-             // vtkIdFilter is unacceptable here. We have to do it manually :(
-             vtkUnstructuredGrid* elGrid = vtkUnstructuredGrid::New();
-             elGrid->CopyStructure(MeshActor->DataSource);
-
-             int numCells = MeshActor->DataSource->GetNumberOfCells();
-
-             // Loop over points and generate ids
-             vtkIntArray *cellIds = vtkIntArray::New();
-             cellIds->SetNumberOfValues(numCells);
-
-             for (int id=0; id < numCells; id++) {
-               int idSMDS = MeshActor->GetIdSMESHDSElement(id);
-               cellIds->SetValue(id, idSMDS);
-             }
-
-// mpv porting vk4.2.2
-             //              vtkScalars* newScalars = vtkScalars::New();
-             //              newScalars->SetData(cellIds);
-             elGrid->GetCellData()->SetScalars(cellIds);
-             //              elGrid->GetCellData()->SetScalars(newScalars);
-             //              newScalars->Delete();
-//mpv
 
-             cellIds->Delete();
-           
-             vtkCellCenters* cc = vtkCellCenters::New();
-             cc->SetInput(elGrid);
-
-             vtkSelectVisiblePoints* visCells = vtkSelectVisiblePoints::New();
-             visCells->SetInput(cc->GetOutput());
-             visCells->SetRenderer(((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer());
-             visCells->SelectInvisibleOff();
-             visCells->SetTolerance(0.1);
-             //            visCells->SetSelectInvisible(1);
-           
-             vtkLabeledDataMapper* ldm = vtkLabeledDataMapper::New();
-             ldm->SetInput(visCells->GetOutput());
-             ldm->SetLabelFormat("%g");
-             ldm->SetLabelModeToLabelScalars();
-           
-             ldm->SetFontFamilyToTimes();
-             ldm->SetFontSize(6 * parent->font().pointSize() / 5);
-             ldm->SetBold(1);
-             ldm->SetItalic(0);
-             ldm->SetShadow(0);
-           
-             vtkActor2D* cellLabels = vtkActor2D::New();
-             cellLabels->SetMapper(ldm);
-             cellLabels->GetProperty()->SetColor(1,0,0);
-           
-             cc->Delete();
-             visCells->Delete();
-             ldm->Delete();
-             smeshGUI->mySimulationActors2D->AddItem( cellLabels );
-             ((VTKViewer_ViewFrame*)smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer()->AddActor2D( cellLabels );
-           }
-         } 
-       } else {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         parent->menuBar()->setItemChecked(9011, !parent->menuBar()->isItemChecked(9011) );
-         smeshGUI->EraseSimulationActors();
-         smeshGUI->ScalarVisibilityOff();
+       Sel->ClearFilters();
+       Sel->AddFilter(anAlgoFilter);
+       if (Sel->AddIObject(IO) != -1)
+       {
+               Sel->ClearFilters();
+               return "Algorithm";
        }
-       QApplication::restoreOverrideCursor();
-       break;
-      }
-
-    case 10001: // DISPLAY MODE PREFERENCE
-      {
-       parent->menuBar()->setItemChecked(10001, !parent->menuBar()->isItemChecked(10001) );
-       parent->menuBar()->setItemChecked(10002, false );
-       parent->menuBar()->setItemChecked(10003, false );
-       QAD_CONFIG->addSetting("SMESH:DisplayMode", "Wireframe");
-       break;
-      }
-    case 10002:
-      {
-       parent->menuBar()->setItemChecked(10002, !parent->menuBar()->isItemChecked(10002) );
-       parent->menuBar()->setItemChecked(10001, false );
-       parent->menuBar()->setItemChecked(10003, false );
-       QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading");
-       break;
-      }
-    case 10003:
-      {
-       parent->menuBar()->setItemChecked(10003, !parent->menuBar()->isItemChecked(10003) );
-       parent->menuBar()->setItemChecked(10002, false );
-       parent->menuBar()->setItemChecked(10001, false );
-       QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shrink");
-       break;
-      }
-
-    }
-  
-  smeshGUI->myActiveStudy->updateObjBrowser(true);
-  return true ;
-}
 
+       Sel->ClearFilters();
+       Sel->AddFilter(aMeshFilter);
+       if (Sel->AddIObject(IO) != -1)
+       {
+               Sel->ClearFilters();
+               return "Mesh";
+       }
 
-//=============================================================================
-/*! function : GetMeshesUsingAlgoOrHypothesis()
- *  purpose  : return a list of Study objects (mesh kind) that have 'AlgoOrHyp' affected.
- *           : However is supposed here that father of father of an hypothesis is a Mesh Object.
- */
-//=============================================================================      
-SALOMEDS::Study::ListOfSObject* SMESHGUI::GetMeshesUsingAlgoOrHypothesis( SMESH::SMESH_Hypothesis_ptr AlgoOrHyp ) 
-{
-  SALOMEDS::Study::ListOfSObject_var listSOmesh = new SALOMEDS::Study::ListOfSObject ;
-  listSOmesh->length(0) ;
-  unsigned int index = 0 ;
-  if( !AlgoOrHyp->_is_nil() ) {
-    SALOMEDS::SObject_var SO_Hypothesis = smeshGUI->GetStudyAPI().FindHypothesisOrAlgorithms( AlgoOrHyp );
-    if( !SO_Hypothesis->_is_nil() ) {
-      SALOMEDS::Study::ListOfSObject_var listSO = smeshGUI->myStudy->FindDependances(SO_Hypothesis) ;
-      for( unsigned int i=0; i<listSO->length(); i++ ) {
-       SALOMEDS::SObject_var SO = listSO[i] ;
-       if( !SO->_is_nil() ) {
-         SALOMEDS::SObject_var SOfatherFather = SO->GetFather()->GetFather() ;
-         if( !SOfatherFather->_is_nil() ) {
-           index++ ;
-           listSOmesh->length(index) ;
-           listSOmesh[index-1] = SOfatherFather ;
-         }
-       }
-      }
-    }
-  }
-  return listSOmesh._retn() ;
-}
+       Sel->ClearFilters();
+       Sel->AddFilter(aSubMeshFilter);
+       if (Sel->AddIObject(IO) != -1)
+       {
+               Sel->ClearFilters();
+               return "SubMesh";
+       }
 
+       Sel->ClearFilters();
+       Sel->AddFilter(aSubMeshVextexFilter);
+       if (Sel->AddIObject(IO) != -1)
+       {
+               Sel->ClearFilters();
+               return "SubMeshVertex";
+       }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Import_Mesh(QAD_Desktop* parent, int theCommandID)
-{
-  QString filter;
-  string myExtension;
-  Mesh_Reader* myReader;
-  
-  if (theCommandID==113) {
-    filter = tr("MED files (*.med)");
-    myExtension = string("MED");
-    myReader = new DriverMED_R_SMESHDS_Mesh;
-  }
-  else if (theCommandID==112) {
-    filter = tr("IDEAS files (*.unv)");
-    myExtension = string("UNV");
-  }
-  else if (theCommandID==111) {
-    filter = tr("DAT files (*.dat)");
-    myExtension = string("MED");
-    myReader = new DriverDAT_R_SMESHDS_Mesh;
-  }
-
-  QString filename = QAD_FileDlg::getFileName(parent,
-                                             "",
-                                             filter,
-                                             tr("Import mesh"),
-                                             true);
-  if ( !filename.isEmpty() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    string myClass = string("SMESHDS_Mesh");
-//    Mesh_Reader* myReader = SMESHDriver::GetMeshReader(myExtension, myClass);
-    
-    int myMeshId = (smeshGUI->myDocument)->NewMesh();
-    SMDS_Mesh* myMesh = (smeshGUI->myDocument)->GetMesh(myMeshId);
+       Sel->ClearFilters();
+       Sel->AddFilter(aSubMeshEdgeFilter);
+       if (Sel->AddIObject(IO) != -1)
+       {
+               Sel->ClearFilters();
+               return "SubMeshEdge";
+       }
 
-    myReader->SetFile(string(filename.latin1()));
-    myReader->SetMesh(myMesh);
-    myReader->SetMeshId(myMeshId);
-    myReader->Read();
+       Sel->ClearFilters();
+       Sel->AddFilter(aSubMeshFaceFilter);
+       if (Sel->AddIObject(IO) != -1)
+       {
+               Sel->ClearFilters();
+               return "SubMeshFace";
+       }
 
-    QApplication::restoreOverrideCursor();
-  }
-}
-  
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Export_Mesh(QAD_Desktop* parent, int theCommandID)
-{
-  SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-  int nbSel = Sel->IObjectCount() ;
-  if ( nbSel == 1 ) {
-    Standard_Boolean res;
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    SMESH::SMESH_Mesh_var aMesh = smeshGUI->ConvertIOinMesh( IObject, res );
-    if ( res ) {
-      if (theCommandID==122) { // EXPORT MED
-       QString filename = QAD_FileDlg::getFileName(parent,
-                                                   "",
-                                                   tr("MED files (*.med)"),
-                                                   tr("Export mesh"),
-                                                   false);
-       if ( !filename.isEmpty() ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         aMesh->ExportMED( filename.latin1() );
-         QApplication::restoreOverrideCursor();
-       }
-      }
-      else if (theCommandID==121) { // EXPORT DAT
-       QString filename = QAD_FileDlg::getFileName(parent,
-                                                   "",
-                                                   tr("DAT files (*.dat)"),
-                                                   tr("Export mesh"),
-                                                   false);
-       if ( !filename.isEmpty() ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         aMesh->ExportDAT( filename.latin1() );
-         QApplication::restoreOverrideCursor();
-       }
-      }
-      else if (theCommandID==123) { // EXPORT UNV
-       QString filename = QAD_FileDlg::getFileName(parent,
-                                                   "",
-                                                   tr("IDEAS files (*.unv)"),
-                                                   tr("Export mesh"),
-                                                   false);
-       if ( !filename.isEmpty() ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         aMesh->ExportUNV( filename.latin1() );
-         QApplication::restoreOverrideCursor();
-       }
-        else 
-         aMesh->ExportDAT( filename.latin1() );
+       Sel->ClearFilters();
+       Sel->AddFilter(aSubMeshSolidFilter);
+       if (Sel->AddIObject(IO) != -1)
+       {
+               Sel->ClearFilters();
+               return "SubMeshSolid";
+       }
 
-       QApplication::restoreOverrideCursor();
+       Sel->ClearFilters();
+       Sel->AddFilter(aSubMeshCompoundFilter);
+       if (Sel->AddIObject(IO) != -1)
+       {
+               Sel->ClearFilters();
+               return "SubMeshCompound";
+       }
 
-       if ( IObject->hasEntry() )
-         {
-       MESSAGE("---");
-           SALOMEDS::SObject_var SO = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-           SALOMEDS::GenericAttribute_var anAttr;
-           SALOMEDS::AttributeComment_var    aFileName;
-           SALOMEDS::StudyBuilder_var aStudyBuilder = smeshGUI->myStudy->NewBuilder();
-           anAttr = aStudyBuilder->FindOrCreateAttribute(SO, "AttributeComment");
-           aFileName = SALOMEDS::AttributeComment::_narrow(anAttr);
-           aFileName->SetValue(filename.latin1());
-         }
-      }
-    }
-  }
+       Sel->ClearFilters();
+       Sel->AddIObject(IO);
+       return "NoType";
 }
-  
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Import_Document(QAD_Desktop* parent, int theCommandID)
-{
-  QString filter;
-  string myExtension;
-  Document_Reader* myReader;
-
-  if (theCommandID==113) {
-    filter = tr("MED files (*.med)");
-    myExtension = string("MED");
-    myReader = new DriverMED_R_SMESHDS_Document;
-  }
-  else if (theCommandID==112) {
-    filter = tr("IDEAS files (*.unv)");
-    myExtension = string("UNV");
-    myReader = new DriverUNV_R_SMESHDS_Document;
-  }
-  else if (theCommandID==111) {
-    filter = tr("DAT files (*.dat)");
-    myExtension = string("DAT");
-    myReader = new DriverDAT_R_SMESHDS_Document;
-  }
-
-  QString filename = QAD_FileDlg::getFileName(parent,
-                                             "",
-                                             filter,
-                                             tr("Import document"),
-                                             true);
-  if ( !filename.isEmpty() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    string myClass = string("SMESHDS_Document");
-//    Document_Reader* myReader = SMESHDriver::GetDocumentReader(myExtension, myClass);
-       SMESHDS_Document* newDocument = new SMESHDS_Document(1);
 
-    myReader->SetFile(string(filename.latin1()));
-    myReader->SetDocument(smeshGUI->myDocument);
-    myReader->Read();
-    QApplication::restoreOverrideCursor();
-  }
-}
-  
-void SMESHGUI::Export_Document(QAD_Desktop* parent, int theCommandID)
-{
-  QString filter;
-  Document_Writer* myWriter;
-  string myExtension;
-
-  if (theCommandID==122) {
-    filter = tr("MED files (*.med)");
-    myExtension = string("MED");
-    myWriter = new DriverMED_W_SMESHDS_Document;
-  }
-  else if (theCommandID==121) {
-    filter = tr("DAT files (*.dat)");
-    myExtension = string("DAT");
-    myWriter = new DriverDAT_W_SMESHDS_Document;
-  } else if (theCommandID==123) {
-    filter = tr("IDEAS files (*.unv)");
-    myExtension = string("UNV");
-    myWriter = new DriverUNV_W_SMESHDS_Document;
-  }
-
-  QString filename = QAD_FileDlg::getFileName(parent,
-                                             "",
-                                             filter,
-                                             tr("Export document"),
-                                             false);
-  if ( !filename.isEmpty() ) {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    string myClass = string("SMESHDS_Document");
-    //Document_Writer* myWriter = SMESHDriver::GetDocumentWriter(myExtension, myClass);
-
-    myWriter->SetFile(string(filename.latin1()));
-    myWriter->SetDocument(smeshGUI->myDocument);
-
-    //StudyContextStruct* myStudyContext = _impl.GetStudyContext(myStudyId);
-    //Handle(SMESHDS_Document) myDocument = myStudyContext->myDocument;
-    //myWriter->SetDocument(myDocument);
-
-    myWriter->Write();
-    QApplication::restoreOverrideCursor();
-  }
-}
-  
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-bool SMESHGUI::OnMousePress(QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
+bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent)
 {
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-  return false ;
-}
+       /* Create or retrieve an object SMESHGUI */
+       SMESHGUI::GetOrCreateSMESHGUI(parent);
 
+       // NRI : Temporary added
+       if (smeshGUI->myStudy->GetProperties()->IsLocked())
+       {
+               return false;
+       }
+       //NRI
+
+       //  QAD_Viewer3d* v3d;
+       OCCViewer_Viewer3d *v3d;
+
+       Handle(AIS_InteractiveContext) ic;
+       vtkRenderer *Renderer;
+       vtkRenderWindow *RenWin;
+
+       if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+               VIEW_OCC)
+       {
+               v3d =
+                       ((OCCViewer_ViewFrame *) smeshGUI->myActiveStudy->
+                       getActiveStudyFrame()->getRightFrame()->getViewFrame())->
+                       getViewer();
+               ic = v3d->getAISContext();
+       }
+       else if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+               VIEW_VTK)
+       {
+               Renderer =
+                       ((VTKViewer_ViewFrame *) smeshGUI->myActiveStudy->
+                       getActiveStudyFrame()->getRightFrame()->getViewFrame())->
+                       getRenderer();
+               RenWin = Renderer->GetRenderWindow();
+       }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::OnMouseMove (QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
-{
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
+       switch (theCommandID)
+       {
+       case 33:                                        // DELETE
+               smeshGUI->OnEditDelete();
+               break;
 
-  return true;
-}
+       case 113:                                       // IMPORT
+       case 112:
+       case 111:
+       {
+               Import_Document(parent, theCommandID);  //NBU
+               //Import_Mesh(parent,theCommandID);
+               break;
+       }
 
+       case 122:                                       // EXPORT MED
+       case 121:
+       case 123:
+       {
+               Export_Mesh(parent, theCommandID);
+               break;
+       }
+
+       case 200:                                       // SCALAR BAR
+       {
+               smeshGUI->DisplayScalarBar(false);
+               break;
+       }
+       case 201:
+       {
+               SMESHGUI_EditScalarBarDlg *aDlg =
+                       new SMESHGUI_EditScalarBarDlg(parent, "", false);
+               aDlg->show();
+               break;
+       }
+       case 202:
+       {
+               smeshGUI->DisplayScalarBar(true);
+               break;
+       }
+
+       case 1133:                                      // DISPLAY MODE : WireFrame, Surface, Shrink
+       case 1132:
+       case 213:
+       case 212:
+       case 211:
+       {
+               smeshGUI->SetViewMode(theCommandID);
+               break;
+       }
+
+       case 214:                                       // UPDATE
+       {
+               smeshGUI->Update();
+               break;
+       }
+
+       case 300:                                       // ERASE
+       {
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {
+                       // VTK
+                       SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+                       for (; It.More(); It.Next())
+                       {
+                               Handle(SALOME_InteractiveObject) IOS = It.Value();
+                               if (IOS->hasEntry())
+                               {
+                                       Standard_Boolean res;
+                                       SMESH_Actor *ac =
+                                               smeshGUI->FindActorByEntry(IOS->getEntry(), res, true);
+                                       if (res)
+                                               smeshGUI->EraseActor(ac);
+                               }
+                       }
+               }
+               Sel->ClearIObjects();
+               smeshGUI->myActiveStudy->updateObjBrowser(true);
+       }
+
+       case 301:                                       // DISPLAY
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {
+                       // VTK
+                       QApplication::setOverrideCursor(Qt::waitCursor);
+                       SALOMEDS::SObject_var fatherSF =
+                               smeshGUI->myStudy->FindObjectID(smeshGUI->myActiveStudy->
+                               getActiveStudyFrame()->entry());
+
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+
+                       for (; It.More(); It.Next())
+                       {
+                               Handle(SALOME_InteractiveObject) IObject = It.Value();
+                               if (IObject->hasEntry())
+                               {
+                                       Standard_Boolean res;
+                                       SMESH_Actor *ac =
+                                               smeshGUI->FindActorByEntry(IObject->getEntry(), res,
+                                               true);
+                                       if (res)
+                                       {
+                                               smeshGUI->DisplayActor(ac, true);
+                                               smeshGUI->DisplayEdges(ac);
+                                               smeshGUI->ChangeRepresentation(ac,
+                                                       ac->getDisplayMode());
+                                       }
+                               }
+                       }
+                       QApplication::restoreOverrideCursor();
+               }
+               break;
+       }
+
+       case 302:                                       // DISPLAY ONLY
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {
+                       QApplication::setOverrideCursor(Qt::waitCursor);
+                       vtkActorCollection *theActors = Renderer->GetActors();
+                       theActors->InitTraversal();
+                       vtkActor *ac = theActors->GetNextActor();
+                       while (!(ac == NULL))
+                       {
+                               if (ac->IsA("SMESH_Actor"))
+                               {
+                                       SMESH_Actor *anActor = SMESH_Actor::SafeDownCast(ac);
+                                       if (!anActor->isHighlighted())
+                                       {
+                                               //anActor->VisibilityOff();
+                                               //NRI- : 02/12/2002 : Fixed bugId 882
+                                               //      anActor->EdgeDevice->VisibilityOff();
+                                               //      anActor->EdgeShrinkDevice->VisibilityOff();
+                                               anActor->SetVisibility(false);
+                                       }
+                               }
+                               ac = theActors->GetNextActor();
+                       }
+
+                       // Display selection
+                       SALOMEDS::SObject_var fatherSF =
+                               smeshGUI->myStudy->FindObjectID(smeshGUI->myActiveStudy->
+                               getActiveStudyFrame()->entry());
+
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+
+                       for (; It.More(); It.Next())
+                       {
+                               Handle(SALOME_InteractiveObject) IObject = It.Value();
+                               SALOMEDS::SObject_var obj =
+                                       smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+
+                               VTKViewer_RenderWindowInteractor *myRenderInter =
+                                       ((VTKViewer_ViewFrame *) smeshGUI->myActiveStudy->
+                                       getActiveStudyFrame()->getRightFrame()->getViewFrame())->
+                                       getRWInteractor();
+                               //      vtkQGLRenderWindowInteractor* myRenderInter= smeshGUI->myActiveStudy->getActiveStudyFrame()->getRightFrame()->getVTKView()->getRWInteractor();
+
+                               if (myRenderInter->isInViewer(IObject))
+                               {
+                                       if (IObject->hasEntry())
+                                       {
+                                               Standard_Boolean res;
+                                               SMESH_Actor *ac =
+                                                       smeshGUI->FindActorByEntry(IObject->getEntry(), res,
+                                                       true);
+                                               if (res)
+                                               {
+                                                       smeshGUI->DisplayActor(ac, true);
+                                                       smeshGUI->DisplayEdges(ac);
+                                                       smeshGUI->ChangeRepresentation(ac,
+                                                               ac->getDisplayMode());
+                                               }
+                                       }
+                               }
+                       }
+                       smeshGUI->myActiveStudy->updateObjBrowser(true);
+                       QApplication::restoreOverrideCursor();
+               }
+               break;
+       }
+
+       case 400:                                       // NODES
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       smeshGUI->EmitSignalDeactivateDialog();
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       Sel->ClearIObjects();
+                       smeshGUI->myDesktop->SetSelectionMode(1, true);
+                       parent->menuBar()->setItemChecked(9010, false);
+                       parent->menuBar()->setItemChecked(9011, false);
+                       smeshGUI->ViewNodes();
+                       SMESHGUI_NodesDlg *aDlg = new SMESHGUI_NodesDlg(parent, "", Sel);
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               break;
+       }
+
+       case 405:                                       // MOVE NODE
+       {
+               smeshGUI->myDesktop->SetSelectionMode(1, true);
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SMESHGUI_MoveNodesDlg *aDlg =
+                       new SMESHGUI_MoveNodesDlg(parent, "", Sel);
+               break;
+       }
+
+       case 701:                                       // COMPUTE MESH 
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       int nbSel = Sel->IObjectCount();
+                       if (nbSel != 1)
+                       {
+                               QApplication::restoreOverrideCursor();
+                               break;
+                       }
+
+                       SMESH::SMESH_Mesh_var aM;
+                       SMESH::SMESH_subMesh_var aSubM;
+                       Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+                       if (IObject->hasEntry())
+                       {
+                               SALOMEDS::SObject_var aMorSM =
+                                       smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+                               SALOMEDS::GenericAttribute_var anAttr;
+                               SALOMEDS::AttributeIOR_var anIOR;
+                               if (!aMorSM->_is_nil())
+                               {
+                                       if (aMorSM->FindAttribute(anAttr, "AttributeIOR"))
+                                       {
+                                               anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+                                               MESSAGE("SMESHGUI::OnGUIEvent - Compute mesh : IOR = "
+                                                       << anIOR->Value())CORBA::Object_var cobj;
+                                               try
+                                               {
+                                                       cobj = _orb->string_to_object(anIOR->Value());
+                                                       if (CORBA::is_nil(cobj))
+                                                       {
+                                                       MESSAGE
+                                                                       ("SMESHGUI::OnGUIEvent - Compute mesh : nil object")}
+                                               }
+                                               catch(CORBA::COMM_FAILURE & ex)
+                                               {
+                                               MESSAGE
+                                                               ("SMESHGUI::OnGUIEvent - Compute mesh : exception (1)")}
+                                               aM = SMESH::SMESH_Mesh::_narrow(cobj);
+                                               //aM = SMESH::SMESH_Mesh::_narrow( _orb->string_to_object(anIOR->Value()) );
+                                               aSubM =
+                                                       SMESH::SMESH_subMesh::_narrow(_orb->
+                                                       string_to_object(anIOR->Value()));
+                                               if (!aM->_is_nil())
+                                               {
+                                                       GEOM::GEOM_Shape_var refShape =
+                                                               smeshGUI->myStudyAPI.
+                                                               GetShapeOnMeshOrSubMesh(aMorSM);
+                                                       if (!refShape->_is_nil())
+                                                       {
+                                                               bool compute =
+                                                                       smeshGUI->myComponentMesh->
+                                                                       IsReadyToCompute(aM, refShape);
+                                                               if (!compute)
+                                                               {
+                                                                       QApplication::restoreOverrideCursor();
+                                                                       QAD_MessageBox::warn1(QAD_Application::
+                                                                               getDesktop(), tr("SMESH_WRN_WARNING"),
+                                                                               tr("SMESH_WRN_MISSING_PARAMETERS"),
+                                                                               tr("SMESH_BUT_YES"));
+                                                                       break;
+                                                               }
+                                                               try
+                                                               {
+                                                                       smeshGUI->myComponentMesh->Compute(aM,
+                                                                               refShape);
+                                                                       smeshGUI->myStudyAPI.ModifiedMesh(aMorSM,
+                                                                               true);
+                                                                       // TO Do : change icon of all submeshes
+                                                               }
+                                                               catch(const SALOME::SALOME_Exception & S_ex)
+                                                               {
+                                                                       QtCatchCorbaException(S_ex);
+                                                               }
+                                                       }
+                                               }
+                                               else if (!aSubM->_is_nil())
+                                               {
+                                                       aM = aSubM->GetFather();
+                                                       GEOM::GEOM_Shape_var refShape =
+                                                               smeshGUI->myStudyAPI.
+                                                               GetShapeOnMeshOrSubMesh(aMorSM);
+                                                       if (!refShape->_is_nil())
+                                                       {
+                                                               bool compute =
+                                                                       smeshGUI->myComponentMesh->
+                                                                       IsReadyToCompute(aM, refShape);
+                                                               if (!compute)
+                                                               {
+                                                                       QApplication::restoreOverrideCursor();
+                                                                       QAD_MessageBox::warn1(QAD_Application::
+                                                                               getDesktop(), tr("SMESH_WRN_WARNING"),
+                                                                               tr("SMESH_WRN_MISSING_PARAMETERS"),
+                                                                               tr("SMESH_BUT_YES"));
+                                                                       break;
+                                                               }
+                                                               try
+                                                               {
+                                                                       smeshGUI->myComponentMesh->Compute(aM,
+                                                                               refShape);
+                                                                       smeshGUI->myStudyAPI.ModifiedMesh(aMorSM,
+                                                                               true);
+                                                                       // TO Do : change icon of all submeshes
+                                                               }
+                                                               catch(const SALOME::SALOME_Exception & S_ex)
+                                                               {
+                                                                       QtCatchCorbaException(S_ex);
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+
+                       // Check whether the actor for the mesh exists at least in one view
+                       Standard_Boolean res;
+                       SMESH_Actor *ac =
+                               smeshGUI->FindActorByEntry(IObject->getEntry(), res, false);
+                       if (!res)
+                               smeshGUI->InitActor(aM);
+                       else
+                       {
+                               // Check whether the actor belongs to the active view
+                               VTKViewer_RenderWindowInteractor *rwInter =
+                                       ((VTKViewer_ViewFrame *) smeshGUI->myActiveStudy->
+                                       getActiveStudyFrame()->getRightFrame()->getViewFrame())->
+                                       getRWInteractor();
+
+                               // The actor belongs to inactive view -> create a copy and add it in the active view
+                               if (!rwInter->isInViewer(IObject))
+                               {
+                                       SMESH_Actor *acCopy = SMESH_Actor::New();
+                                       acCopy->ShallowCopy(ac);
+
+                                       smeshGUI->DisplayActor(acCopy, false);
+                               }
+                       }
+
+                       if (smeshGUI->myAutomaticUpdate)
+                       {
+                               SMESH_Actor *Mesh = smeshGUI->ReadScript(aM);
+                               if (Mesh != NULL)
+                               {
+#ifdef TRACE
+                                       Dump(Mesh);
+#endif
+                                       smeshGUI->DisplayActor(Mesh, true);
+                                       smeshGUI->DisplayEdges(Mesh, true);
+                                       smeshGUI->ChangeRepresentation(Mesh,
+                                               Mesh->getDisplayMode());
+                               }
+                       }
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               QApplication::restoreOverrideCursor();
+               break;
+       }
+
+       case 702:                                       // ADD SUB MESH 
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       smeshGUI->EmitSignalDeactivateDialog();
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       SMESHGUI_AddSubMeshDlg *aDlg =
+                               new SMESHGUI_AddSubMeshDlg(parent, "", Sel);
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               break;
+       }
+
+       case 703:                                       // INIT MESH 
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SMESHGUI_InitMeshDlg *aDlg = new SMESHGUI_InitMeshDlg(parent, "", Sel);
+               break;
+       }
+
+       case 704:                                       // EDIT Hypothesis 
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SMESHGUI_EditHypothesesDlg *aDlg =
+                       new SMESHGUI_EditHypothesesDlg(parent, "", Sel);
+               break;
+       }
+
+       case 705:                                       //  EDIT Global Hypothesis
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SMESHGUI_EditHypothesesDlg *aDlg =
+                       new SMESHGUI_EditHypothesesDlg(parent, "", Sel);
+               break;
+       }
+
+       case 706:                                       //  EDIT Local Hypothesis
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SMESHGUI_EditHypothesesDlg *aDlg =
+                       new SMESHGUI_EditHypothesesDlg(parent, "", Sel);
+               break;
+       }
+
+       case 806:                                       // ORIENTATION ELEMENTS
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               smeshGUI->myDesktop->SetSelectionMode(3, true);
+               SMESHGUI_OrientationElementsDlg *aDlg =
+                       new SMESHGUI_OrientationElementsDlg(parent, "", Sel);
+               break;
+       }
+
+       case 807:                                       // DIAGONAL INVERSION
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               Sel->ClearIObjects();
+               smeshGUI->myDesktop->SetSelectionMode(2, true);
+               SMESHGUI_DiagonalInversionDlg *aDlg =
+                       new SMESHGUI_DiagonalInversionDlg(parent, "", Sel);
+               break;
+       }
+
+       case 900:                                       // MESH INFOS
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SMESHGUI_MeshInfosDlg *aDlg =
+                       new SMESHGUI_MeshInfosDlg(parent, "", Sel);
+               break;
+       }
+
+       case 1001:                                      // AUTOMATIC UPDATE PREFERENCES
+       {
+               parent->menuBar()->setItemChecked(1001,
+                       !parent->menuBar()->isItemChecked(1001));
+               if (parent->menuBar()->isItemChecked(1001))
+               {
+                       QAD_CONFIG->addSetting("SMESH:AutomaticUpdate", "true");
+                       smeshGUI->myAutomaticUpdate = true;
+               }
+               else
+               {
+                       QAD_CONFIG->addSetting("SMESH:AutomaticUpdate", "false");
+                       smeshGUI->myAutomaticUpdate = false;
+               }
+               break;
+       }
+
+       case 1003:                                      // MESH PREFERENCES
+       {
+               smeshGUI->SetDisplaySettings();
+               break;
+       }
+
+       case 1005:
+       {
+               QString Bold = QAD_CONFIG->getSetting("ScalarBar:Bold");
+               QString Italic = QAD_CONFIG->getSetting("ScalarBar:Italic");
+               QString Shadow = QAD_CONFIG->getSetting("ScalarBar:Shadow");
+               QString FontFamily = QAD_CONFIG->getSetting("ScalarBar:FontFamily");
+               QString Orientation = QAD_CONFIG->getSetting("ScalarBar:Orientation");
+               float Width = QAD_CONFIG->getSetting("ScalarBar:Width").toFloat();
+               float Height = QAD_CONFIG->getSetting("ScalarBar:Height").toFloat();
+               int NumberOfLabels =
+                       QAD_CONFIG->getSetting("ScalarBar:NumberOfLabels").toInt();
+               int NumberOfColors =
+                       QAD_CONFIG->getSetting("ScalarBar:NumberOfColors").toInt();
+
+               if (Width == 0)
+                       Width = 0.17;
+               if (Height == 0)
+                       Height = 0.8;
+               if (NumberOfLabels == 0)
+                       NumberOfLabels = 5;
+               if (NumberOfColors == 0)
+                       NumberOfColors = 64;
+
+               SMESHGUI_Preferences_ScalarBarDlg *aDlg =
+                       new SMESHGUI_Preferences_ScalarBarDlg(parent, "", true);
+
+               if (Bold.compare("true") == 0)
+                       aDlg->Bold->setChecked(true);
+               else
+                       aDlg->Bold->setChecked(false);
+               if (Italic.compare("true") == 0)
+                       aDlg->Italic->setChecked(true);
+               else
+                       aDlg->Italic->setChecked(false);
+               if (Shadow.compare("true") == 0)
+                       aDlg->Shadow->setChecked(true);
+               else
+                       aDlg->Shadow->setChecked(false);
+
+               if (Orientation.compare("Horizontal") == 0)
+                       aDlg->RadioHoriz->setChecked(true);
+               else
+                       aDlg->RadioVert->setChecked(true);
+
+               int NbItems = aDlg->ComboBox1->count();
+               int i = 0;
+               aDlg->ComboBox1->setCurrentItem(i);
+               while (i < NbItems)
+               {
+                       if (FontFamily.compare(aDlg->ComboBox1->text(i)) == 0)
+                               aDlg->ComboBox1->setCurrentItem(i);
+                       i++;
+               }
+
+               aDlg->LineEditWidth->setText(QString("%1").arg(Width));
+               aDlg->LineEditHeight->setText(QString("%1").arg(Height));
+
+               aDlg->SpinBoxLabels->setValue(NumberOfLabels);
+               aDlg->SpinBoxColors->setValue(NumberOfColors);
+
+               aDlg->show();
+               if (aDlg->result())
+               {
+                       if (aDlg->RadioHoriz->isChecked())
+                               Orientation = "Horizontal";
+                       else
+                               Orientation = "Vertical";
+                       if (aDlg->Bold->isChecked())
+                               Bold = "true";
+                       else
+                               Bold = "false";
+                       if (aDlg->Italic->isChecked())
+                               Italic = "true";
+                       else
+                               Italic = "false";
+                       if (aDlg->Shadow->isChecked())
+                               Shadow = "true";
+                       else
+                               Shadow = "false";
+
+                       FontFamily = aDlg->ComboBox1->currentText();
+                       Width = aDlg->LineEditWidth->text().toFloat();
+                       Height = aDlg->LineEditHeight->text().toFloat();
+                       NumberOfColors = aDlg->SpinBoxColors->text().toInt();
+                       NumberOfLabels = aDlg->SpinBoxLabels->text().toInt();
+
+                       vtkScalarBarActor *aScalarBar = smeshGUI->GetScalarBar();
+                       if (aScalarBar != NULL)
+                       {
+                               smeshGUI->SetSettingsScalarBar(aScalarBar, Bold, Italic, Shadow,
+                                       FontFamily, Orientation,
+                                       Width, Height, NumberOfColors, NumberOfLabels);
+                       }
+
+                       QAD_CONFIG->addSetting("ScalarBar:Bold", Bold);
+                       QAD_CONFIG->addSetting("ScalarBar:Italic", Italic);
+                       QAD_CONFIG->addSetting("ScalarBar:Shadow", Shadow);
+                       QAD_CONFIG->addSetting("ScalarBar:FontFamily", FontFamily);
+                       QAD_CONFIG->addSetting("ScalarBar:Orientation", Orientation);
+                       QAD_CONFIG->addSetting("ScalarBar:Width", Width);
+                       QAD_CONFIG->addSetting("ScalarBar:Height", Height);
+                       QAD_CONFIG->addSetting("ScalarBar:NumberOfLabels", NumberOfLabels);
+                       QAD_CONFIG->addSetting("ScalarBar:NumberOfColors", NumberOfColors);
+               }
+               break;
+       }
+
+       case 1100:                                      // EDIT HYPOTHESIS
+       {
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               int nbSel = Sel->IObjectCount();
+
+               if (nbSel == 1)
+               {
+                       Standard_Boolean res;
+                       SMESH::SMESH_Hypothesis_var Hyp =
+                               smeshGUI->ConvertIOinSMESHHypothesis(Sel->firstIObject(), res);
+
+                       /* Look for all mesh objects that have this hupothesis affected in order to flag as ModifiedMesh */
+                       /* At end below '...->updateObjBrowser(true)' will change icon of mesh objects                   */
+                       /* Warning : however by internal mechanism all subMeshes icons are changed !                     */
+                       SALOMEDS::Study::ListOfSObject_var listSOmesh =
+                               smeshGUI->GetMeshesUsingAlgoOrHypothesis(Hyp);
+
+                       if (res)
+                       {
+                               QString Name = Hyp->GetName();
+
+                               if (Name.compare("LocalLength") == 0)
+                               {
+                                       SMESH::SMESH_LocalLength_var LL =
+                                               SMESH::SMESH_LocalLength::_narrow(Hyp);
+                                       double beforeLength = LL->GetLength();
+                                       double Length = smeshGUI->Parameter(res,
+                                               beforeLength,
+                                               tr("SMESH_LOCAL_LENGTH_HYPOTHESIS"),
+                                               tr("SMESH_VALUE"),
+                                               1.0E-5, 1E6, 6);
+                                       if (res && Length != beforeLength)
+                                       {
+                                               LL->SetLength(Length);
+                                               for (int i = 0; i < listSOmesh->length(); i++)
+                                               {
+                                                       smeshGUI->GetStudyAPI().ModifiedMesh(listSOmesh[i],
+                                                               false);
+                                               }
+                                               break;
+                                       }
+
+                               }
+                               else if (Name.compare("NumberOfSegments") == 0)
+                               {
+                                       SMESH::SMESH_NumberOfSegments_var NOS =
+                                               SMESH::SMESH_NumberOfSegments::_narrow(Hyp);
+                                       int beforeNbSeg = NOS->GetNumberOfSegments();
+                                       int NbSeg = smeshGUI->Parameter(res,
+                                               beforeNbSeg,
+                                               tr("SMESH_NB_SEGMENTS_HYPOTHESIS"),
+                                               tr("SMESH_VALUE"),
+                                               1, 1000000);
+
+                                       if (res && NbSeg != beforeNbSeg)
+                                       {
+                                               NOS->SetNumberOfSegments(NbSeg);
+                                               for (int i = 0; i < listSOmesh->length(); i++)
+                                               {
+                                                       SALOMEDS::SObject_var SO = listSOmesh[i];
+                                                       smeshGUI->GetStudyAPI().ModifiedMesh(listSOmesh[i],
+                                                               false);
+                                               }
+                                               break;
+                                       }
+
+                               }
+                               else if (Name.compare("MaxElementArea") == 0)
+                               {
+                                       SMESH::SMESH_MaxElementArea_var MEA =
+                                               SMESH::SMESH_MaxElementArea::_narrow(Hyp);
+                                       double beforeMaxArea = MEA->GetMaxElementArea();
+                                       double MaxArea = smeshGUI->Parameter(res,
+                                               beforeMaxArea,
+                                               tr("SMESH_MAX_ELEMENT_AREA_HYPOTHESIS"),
+                                               tr("SMESH_VALUE"),
+                                               1.0E-5, 1E6, 6);
+                                       if (res && MaxArea != beforeMaxArea)
+                                       {
+                                               MEA->SetMaxElementArea(MaxArea);
+                                               for (int i = 0; i < listSOmesh->length(); i++)
+                                               {
+                                                       smeshGUI->GetStudyAPI().ModifiedMesh(listSOmesh[i],
+                                                               false);
+                                               }
+                                               break;
+                                       }
+
+                               }
+                               else if (Name.compare("MaxElementVolume") == 0)
+                               {
+                                       SMESH::SMESH_MaxElementVolume_var MEV =
+                                               SMESH::SMESH_MaxElementVolume::_narrow(Hyp);
+                                       double beforeMaxVolume = MEV->GetMaxElementVolume();
+                                       double MaxVolume = smeshGUI->Parameter(res,
+                                               beforeMaxVolume,
+                                               tr("SMESH_MAX_ELEMENT_VOLUME_HYPOTHESIS"),
+                                               tr("SMESH_VALUE"),
+                                               1.0E-5, 1E6, 6);
+                                       if (res && MaxVolume != beforeMaxVolume)
+                                       {
+                                               MEV->SetMaxElementVolume(MaxVolume);
+                                               for (int i = 0; i < listSOmesh->length(); i++)
+                                               {
+                                                       smeshGUI->GetStudyAPI().ModifiedMesh(listSOmesh[i],
+                                                               false);
+                                               }
+                                               break;
+                                       }
+
+                               }
+                               else if (Name.compare("Regular_1D") == 0)
+                               {
+                               }
+                               else if (Name.compare("MEFISTO_2D") == 0)
+                               {
+                               }
+                               else
+                               {
+                               }
+
+                       }
+               }
+               break;
+       }
+
+       case 1101:                                      // RENAME
+       {
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+               for (; It.More(); It.Next())
+               {
+                       Handle(SALOME_InteractiveObject) IObject = It.Value();
+
+                       SALOMEDS::SObject_var obj =
+                               smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+                       SALOMEDS::GenericAttribute_var anAttr;
+                       SALOMEDS::AttributeName_var aName;
+                       if (!obj->_is_nil())
+                       {
+                               if (obj->FindAttribute(anAttr, "AttributeName"))
+                               {
+                                       aName = SALOMEDS::AttributeName::_narrow(anAttr);
+                                       QString newName = QString(aName->Value());
+                                       newName =
+                                               SALOMEGUI_NameDlg::getName(QAD_Application::
+                                               getDesktop(), newName);
+                                       if (!newName.isEmpty())
+                                       {
+                                               QApplication::setOverrideCursor(Qt::waitCursor);
+                                               smeshGUI->myActiveStudy->renameIObject(IObject,
+                                                       newName);
+                                       }
+                                       QApplication::restoreOverrideCursor();
+                               }
+                       }
+               }
+               break;
+       }
+
+       case 1102:                                      // REMOVE HYPOTHESIS / ALGORITHMS
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+               for (int i = 0; It.More(); It.Next(), i++)
+               {
+                       Handle(SALOME_InteractiveObject) IObject = It.Value();
+                       smeshGUI->RemoveHypothesisOrAlgorithmOnMesh(IObject);
+               }
+               Sel->ClearIObjects();
+               smeshGUI->myActiveStudy->updateObjBrowser(true);
+               QApplication::restoreOverrideCursor();
+               break;
+       }
+
+       case 401:                                       // GEOM::EDGE
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       smeshGUI->EmitSignalDeactivateDialog();
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       Sel->ClearIObjects();
+                       smeshGUI->myDesktop->SetSelectionMode(1, true);
+                       parent->menuBar()->setItemChecked(9010, false);
+                       parent->menuBar()->setItemChecked(9011, false);
+                       smeshGUI->ViewNodes();
+                       SMESHGUI_AddEdgeDlg *aDlg =
+                               new SMESHGUI_AddEdgeDlg(parent, "", Sel);
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               break;
+       }
+       case 4021:                                      // TRIANGLE
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       smeshGUI->EmitSignalDeactivateDialog();
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       Sel->ClearIObjects();
+                       smeshGUI->myDesktop->SetSelectionMode(1, true);
+                       parent->menuBar()->setItemChecked(9010, false);
+                       parent->menuBar()->setItemChecked(9011, false);
+                       smeshGUI->ViewNodes();
+                       SMESHGUI_AddFaceDlg *aDlg =
+                               new SMESHGUI_AddFaceDlg(parent, "", Sel, 3);
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               break;
+       }
+       case 4022:                                      // QUAD
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       smeshGUI->EmitSignalDeactivateDialog();
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       Sel->ClearIObjects();
+                       smeshGUI->myDesktop->SetSelectionMode(1, true);
+                       parent->menuBar()->setItemChecked(9010, false);
+                       parent->menuBar()->setItemChecked(9011, false);
+                       smeshGUI->ViewNodes();
+                       SMESHGUI_AddFaceDlg *aDlg =
+                               new SMESHGUI_AddFaceDlg(parent, "", Sel, 4);
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               break;
+       }
+       case 4031:                                      // TETRA
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       smeshGUI->EmitSignalDeactivateDialog();
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       Sel->ClearIObjects();
+                       smeshGUI->myDesktop->SetSelectionMode(1, true);
+                       parent->menuBar()->setItemChecked(9010, false);
+                       parent->menuBar()->setItemChecked(9011, false);
+                       smeshGUI->ViewNodes();
+                       SMESHGUI_AddVolumeDlg *aDlg =
+                               new SMESHGUI_AddVolumeDlg(parent, "", Sel, 4);
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               break;
+       }
+       case 4032:                                      // HEXA
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       smeshGUI->EmitSignalDeactivateDialog();
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       Sel->ClearIObjects();
+                       smeshGUI->myDesktop->SetSelectionMode(1, true);
+                       parent->menuBar()->setItemChecked(9010, false);
+                       parent->menuBar()->setItemChecked(9011, false);
+                       smeshGUI->ViewNodes();
+                       SMESHGUI_AddVolumeDlg *aDlg =
+                               new SMESHGUI_AddVolumeDlg(parent, "", Sel, 8);
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               break;
+       }
+
+       case 4041:                                      // REMOVES NODES
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       smeshGUI->EmitSignalDeactivateDialog();
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       Sel->ClearIObjects();
+                       smeshGUI->myDesktop->SetSelectionMode(1, true);
+                       parent->menuBar()->setItemChecked(9010, false);
+                       parent->menuBar()->setItemChecked(9011, false);
+                       smeshGUI->ViewNodes();
+                       SMESHGUI_RemoveNodesDlg *aDlg =
+                               new SMESHGUI_RemoveNodesDlg(parent, "", Sel);
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               break;
+       }
+       case 4042:                                      // REMOVES ELEMENTS
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       smeshGUI->EmitSignalDeactivateDialog();
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       Sel->ClearIObjects();
+                       smeshGUI->myDesktop->SetSelectionMode(3, true);
+                       SMESHGUI_RemoveElementsDlg *aDlg =
+                               new SMESHGUI_RemoveElementsDlg(parent, "", Sel);
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               break;
+       }
+
+       case 5000:                                      // HYPOTHESIS - ALGO
+       {
+               smeshGUI->CreateAlgorithm("Regular_1D", "Wire Discretisation");
+               break;
+       }
+       case 5010:
+       {
+               smeshGUI->CreateAlgorithm("MEFISTO_2D", "Triangle (Mefisto)");
+               break;
+       }
+       case 5011:
+       {
+               smeshGUI->CreateAlgorithm("Quadrangle_2D", "Quadrangle (Mapping)");
+               break;
+       }
+       case 5020:
+       {
+               smeshGUI->CreateAlgorithm("Hexa_3D", "Hexahedron (i,j,k)");
+               break;
+       }
+       case 5021:
+       {
+               smeshGUI->CreateAlgorithm("NETGEN_3D", "Tetrahedron (Netgen)");
+               break;
+       }
+
+       case 5030:                                      // HYPOTHESIS - LOCAL LENGTH
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SMESHGUI_LocalLengthDlg *aDlg = new SMESHGUI_LocalLengthDlg(parent, "");
+               break;
+       }
+       case 5031:                                      // HYPOTHESIS - NB SEGMENTS
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SMESHGUI_NbSegmentsDlg *aDlg = new SMESHGUI_NbSegmentsDlg(parent, "");
+               break;
+       }
+
+       case 5032:                                      // HYPOTHESIS - MAX ELEMENT AREA
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SMESHGUI_MaxElementAreaDlg *aDlg =
+                       new SMESHGUI_MaxElementAreaDlg(parent, "");
+               break;
+       }
+
+       case 5033:                                      // HYPOTHESIS - MAX ELEMENT VOLUME
+       {
+               smeshGUI->EmitSignalDeactivateDialog();
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               SMESHGUI_MaxElementVolumeDlg *aDlg =
+                       new SMESHGUI_MaxElementVolumeDlg(parent, "");
+               break;
+       }
+
+       case 6016:                                      // CONTROLS 
+       case 6015:
+       case 6014:
+       case 6013:
+       case 6012:
+       case 6011:
+       case 6001:
+       {
+               SALOME_Selection *Sel =
+                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                       getSelection());
+               int nbSel = Sel->IObjectCount();
+               if (nbSel != 1)
+                       break;
+               smeshGUI->Control(theCommandID);
+               break;
+       }
+
+       case 6002:
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {                                               //VTK
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       SMESHGUI_EdgesConnectivityDlg *Dlg =
+                               new SMESHGUI_EdgesConnectivityDlg(parent, "", Sel);
+               }
+               else
+               {
+                       QApplication::restoreOverrideCursor();
+                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_YES"));
+               }
+               break;
+       }
+
+       case 9010:
+       {
+               if (!parent->menuBar()->isItemChecked(9010))
+               {
+                       QApplication::setOverrideCursor(Qt::waitCursor);
+                       parent->menuBar()->setItemChecked(9011, false);
+
+                       smeshGUI->EraseSimulationActors();
+                       smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
+
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       int nbSel = Sel->IObjectCount();
+                       if (nbSel == 1)
+                       {
+                               Standard_Boolean res;
+                               SMESH_Actor *MeshActor =
+                                       smeshGUI->FindActorByEntry(Sel->firstIObject()->getEntry(),
+                                       res, true);
+                               if (res)
+                               {
+                                       parent->menuBar()->setItemChecked(9010,
+                                               !parent->menuBar()->isItemChecked(9010));
+
+                                       // It's necessary to display SMDS IDs instead of VTK ones, so 
+                                       // vtkIdFilter is unacceptable here. We have to do it manually :(
+                                       vtkUnstructuredGrid *ptGrid = vtkUnstructuredGrid::New();
+                                       ptGrid->CopyStructure(MeshActor->DataSource);
+
+                                       int numPts = MeshActor->DataSource->GetNumberOfPoints();
+
+                                       // Loop over points and generate ids
+                                       vtkIntArray *ptIds = vtkIntArray::New();
+                                       ptIds->SetNumberOfValues(numPts);
+
+                                       for (int id = 0; id < numPts; id++)
+                                       {
+                                               int idSMDS = MeshActor->GetIdSMESHDSNode(id);
+                                               ptIds->SetValue(id, idSMDS);
+                                       }
+
+// mpv porting vtk4.2.2
+                                       //          vtkScalars* newScalars = vtkScalars::New();
+                                       //          newScalars->SetData(ptIds);
+                                       //          ptGrid->GetPointData()->SetScalars(newScalars);
+                                       ptGrid->GetPointData()->SetScalars(ptIds);
+                                       //          newScalars->Delete();
+// mpv
+                                       ptIds->Delete();
+
+                                       vtkMaskPoints *mask = vtkMaskPoints::New();
+                                       mask->SetInput(ptGrid);
+                                       mask->SetOnRatio(1);
+                                       //        mask->SetMaximumNumberOfPoints( 50 );
+                                       //        mask->RandomModeOn();
+
+                                       vtkSelectVisiblePoints *visPts =
+                                               vtkSelectVisiblePoints::New();
+                                       visPts->SetInput(mask->GetOutput());
+                                       visPts->SetRenderer(((VTKViewer_ViewFrame *) smeshGUI->
+                                                       myActiveStudy->getActiveStudyFrame()->
+                                                       getRightFrame()->getViewFrame())->getRenderer());
+                                       //visPts->SetSelectInvisible(1);
+                                       visPts->SelectInvisibleOff();
+                                       visPts->SetTolerance(0.1);
+
+                                       vtkLabeledDataMapper *ldm = vtkLabeledDataMapper::New();
+                                       ldm->SetInput(visPts->GetOutput());
+                                       ldm->SetLabelFormat("%g");
+                                       ldm->SetLabelModeToLabelScalars();
+                                       //ldm->SetLabelModeToLabelFieldData();
+
+                                       ldm->SetFontFamilyToTimes();
+                                       ldm->SetFontSize(6 * parent->font().pointSize() / 5);
+                                       ldm->SetBold(1);
+                                       ldm->SetItalic(0);
+                                       ldm->SetShadow(0);
+
+                                       vtkActor2D *pointLabels = vtkActor2D::New();
+                                       pointLabels->SetMapper(ldm);
+                                       pointLabels->GetProperty()->SetColor(0, 1, 0);
+
+                                       visPts->Delete();
+                                       ldm->Delete();
+                                       smeshGUI->mySimulationActors2D->AddItem(pointLabels);
+                                       ((VTKViewer_ViewFrame *) smeshGUI->myActiveStudy->
+                                               getActiveStudyFrame()->getRightFrame()->
+                                               getViewFrame())->getRenderer()->AddActor2D(pointLabels);
+                               }
+                       }
+               }
+               else
+               {
+                       QApplication::setOverrideCursor(Qt::waitCursor);
+                       parent->menuBar()->setItemChecked(9010,
+                               !parent->menuBar()->isItemChecked(9010));
+                       smeshGUI->EraseSimulationActors();
+                       smeshGUI->ScalarVisibilityOff();
+               }
+               QApplication::restoreOverrideCursor();
+               break;
+       }
+       case 9011:
+       {
+               if (!parent->menuBar()->isItemChecked(9011))
+               {
+                       QApplication::setOverrideCursor(Qt::waitCursor);
+                       parent->menuBar()->setItemChecked(9010, false);
+
+                       smeshGUI->EraseSimulationActors();
+                       smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
+
+                       SALOME_Selection *Sel =
+                               SALOME_Selection::Selection(smeshGUI->myActiveStudy->
+                               getSelection());
+                       int nbSel = Sel->IObjectCount();
+                       if (nbSel == 1)
+                       {
+                               Standard_Boolean res;
+                               SMESH_Actor *MeshActor =
+                                       smeshGUI->FindActorByEntry(Sel->firstIObject()->getEntry(),
+                                       res, true);
+                               if (res)
+                               {
+                                       parent->menuBar()->setItemChecked(9011,
+                                               !parent->menuBar()->isItemChecked(9011));
+
+                                       // It's necessary to display SMDS IDs instead of VTK ones, so 
+                                       // vtkIdFilter is unacceptable here. We have to do it manually :(
+                                       vtkUnstructuredGrid *elGrid = vtkUnstructuredGrid::New();
+                                       elGrid->CopyStructure(MeshActor->DataSource);
+
+                                       int numCells = MeshActor->DataSource->GetNumberOfCells();
+
+                                       // Loop over points and generate ids
+                                       vtkIntArray *cellIds = vtkIntArray::New();
+                                       cellIds->SetNumberOfValues(numCells);
+
+                                       for (int id = 0; id < numCells; id++)
+                                       {
+                                               int idSMDS = MeshActor->GetIdSMESHDSElement(id);
+                                               cellIds->SetValue(id, idSMDS);
+                                       }
+
+// mpv porting vk4.2.2
+                                       //          vtkScalars* newScalars = vtkScalars::New();
+                                       //          newScalars->SetData(cellIds);
+                                       elGrid->GetCellData()->SetScalars(cellIds);
+                                       //          elGrid->GetCellData()->SetScalars(newScalars);
+                                       //          newScalars->Delete();
+//mpv
+
+                                       cellIds->Delete();
+
+                                       vtkCellCenters *cc = vtkCellCenters::New();
+                                       cc->SetInput(elGrid);
+
+                                       vtkSelectVisiblePoints *visCells =
+                                               vtkSelectVisiblePoints::New();
+                                       visCells->SetInput(cc->GetOutput());
+                                       visCells->SetRenderer(((VTKViewer_ViewFrame *) smeshGUI->
+                                                       myActiveStudy->getActiveStudyFrame()->
+                                                       getRightFrame()->getViewFrame())->getRenderer());
+                                       visCells->SelectInvisibleOff();
+                                       visCells->SetTolerance(0.1);
+                                       //        visCells->SetSelectInvisible(1);
+
+                                       vtkLabeledDataMapper *ldm = vtkLabeledDataMapper::New();
+                                       ldm->SetInput(visCells->GetOutput());
+                                       ldm->SetLabelFormat("%g");
+                                       ldm->SetLabelModeToLabelScalars();
+
+                                       ldm->SetFontFamilyToTimes();
+                                       ldm->SetFontSize(6 * parent->font().pointSize() / 5);
+                                       ldm->SetBold(1);
+                                       ldm->SetItalic(0);
+                                       ldm->SetShadow(0);
+
+                                       vtkActor2D *cellLabels = vtkActor2D::New();
+                                       cellLabels->SetMapper(ldm);
+                                       cellLabels->GetProperty()->SetColor(1, 0, 0);
+
+                                       cc->Delete();
+                                       visCells->Delete();
+                                       ldm->Delete();
+                                       smeshGUI->mySimulationActors2D->AddItem(cellLabels);
+                                       ((VTKViewer_ViewFrame *) smeshGUI->myActiveStudy->
+                                               getActiveStudyFrame()->getRightFrame()->
+                                               getViewFrame())->getRenderer()->AddActor2D(cellLabels);
+                               }
+                       }
+               }
+               else
+               {
+                       QApplication::setOverrideCursor(Qt::waitCursor);
+                       parent->menuBar()->setItemChecked(9011,
+                               !parent->menuBar()->isItemChecked(9011));
+                       smeshGUI->EraseSimulationActors();
+                       smeshGUI->ScalarVisibilityOff();
+               }
+               QApplication::restoreOverrideCursor();
+               break;
+       }
+
+       case 10001:                             // DISPLAY MODE PREFERENCE
+       {
+               parent->menuBar()->setItemChecked(10001,
+                       !parent->menuBar()->isItemChecked(10001));
+               parent->menuBar()->setItemChecked(10002, false);
+               parent->menuBar()->setItemChecked(10003, false);
+               QAD_CONFIG->addSetting("SMESH:DisplayMode", "Wireframe");
+               break;
+       }
+       case 10002:
+       {
+               parent->menuBar()->setItemChecked(10002,
+                       !parent->menuBar()->isItemChecked(10002));
+               parent->menuBar()->setItemChecked(10001, false);
+               parent->menuBar()->setItemChecked(10003, false);
+               QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading");
+               break;
+       }
+       case 10003:
+       {
+               parent->menuBar()->setItemChecked(10003,
+                       !parent->menuBar()->isItemChecked(10003));
+               parent->menuBar()->setItemChecked(10002, false);
+               parent->menuBar()->setItemChecked(10001, false);
+               QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shrink");
+               break;
+       }
+
+       }
+
+       smeshGUI->myActiveStudy->updateObjBrowser(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().FindHypothesisOrAlgorithms(AlgoOrHyp);
+               if (!SO_Hypothesis->_is_nil())
+               {
+                       SALOMEDS::Study::ListOfSObject_var listSO =
+                               smeshGUI->myStudy->FindDependances(SO_Hypothesis);
+                       for (unsigned int i = 0; i < listSO->length(); i++)
+                       {
+                               SALOMEDS::SObject_var SO = listSO[i];
+                               if (!SO->_is_nil())
+                               {
+                                       SALOMEDS::SObject_var SOfatherFather =
+                                               SO->GetFather()->GetFather();
+                                       if (!SOfatherFather->_is_nil())
+                                       {
+                                               index++;
+                                               listSOmesh->length(index);
+                                               listSOmesh[index - 1] = SOfatherFather;
+                                       }
+                               }
+                       }
+               }
+       }
+       return listSOmesh._retn();
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+void SMESHGUI::Import_Mesh(QAD_Desktop * parent, int theCommandID)
+{
+       QString filter;
+       string myExtension;
+       Mesh_Reader *myReader;
+
+       if (theCommandID == 113)
+       {
+               filter = tr("MED files (*.med)");
+               myExtension = string("MED");
+               myReader = new DriverMED_R_SMESHDS_Mesh;
+       }
+       else if (theCommandID == 112)
+       {
+               filter = tr("IDEAS files (*.unv)");
+               myExtension = string("UNV");
+       }
+       else if (theCommandID == 111)
+       {
+               filter = tr("DAT files (*.dat)");
+               myExtension = string("MED");
+               myReader = new DriverDAT_R_SMESHDS_Mesh;
+       }
+
+       QString filename = QAD_FileDlg::getFileName(parent,
+               "",
+               filter,
+               tr("Import mesh"),
+               true);
+       if (!filename.isEmpty())
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               string myClass = string("SMESHDS_Mesh");
+//    Mesh_Reader* myReader = SMESHDriver::GetMeshReader(myExtension, myClass);
+
+               int myMeshId = (smeshGUI->myDocument)->NewMesh();
+               SMDS_Mesh *myMesh = (smeshGUI->myDocument)->GetMesh(myMeshId);
+
+               myReader->SetFile(string(filename.latin1()));
+               myReader->SetMesh(myMesh);
+               myReader->SetMeshId(myMeshId);
+               myReader->Read();
+
+               QApplication::restoreOverrideCursor();
+       }
+}
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-bool SMESHGUI::OnKeyPress (QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame)
+void SMESHGUI::Export_Mesh(QAD_Desktop * parent, int theCommandID)
 {
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
+       SALOME_Selection *Sel =
+               SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       int nbSel = Sel->IObjectCount();
+       if (nbSel == 1)
+       {
+               Standard_Boolean res;
+               Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+               SMESH::SMESH_Mesh_var aMesh = smeshGUI->ConvertIOinMesh(IObject, res);
+               if (res)
+               {
+                       if (theCommandID == 122)
+                       {                                       // EXPORT MED
+                               QString filename = QAD_FileDlg::getFileName(parent,
+                                       "",
+                                       tr("MED files (*.med)"),
+                                       tr("Export mesh"),
+                                       false);
+                               if (!filename.isEmpty())
+                               {
+                                       QApplication::setOverrideCursor(Qt::waitCursor);
+                                       aMesh->ExportMED(filename.latin1());
+                                       QApplication::restoreOverrideCursor();
+                               }
+                       }
+                       else if (theCommandID == 121)
+                       {                                       // EXPORT DAT
+                               QString filename = QAD_FileDlg::getFileName(parent,
+                                       "",
+                                       tr("DAT files (*.dat)"),
+                                       tr("Export mesh"),
+                                       false);
+                               if (!filename.isEmpty())
+                               {
+                                       QApplication::setOverrideCursor(Qt::waitCursor);
+                                       aMesh->ExportDAT(filename.latin1());
+                                       QApplication::restoreOverrideCursor();
+                               }
+                       }
+                       else if (theCommandID == 123)
+                       {                                       // EXPORT UNV
+                               QString filename = QAD_FileDlg::getFileName(parent,
+                                       "",
+                                       tr("IDEAS files (*.unv)"),
+                                       tr("Export mesh"),
+                                       false);
+                               if (!filename.isEmpty())
+                               {
+                                       QApplication::setOverrideCursor(Qt::waitCursor);
+                                       aMesh->ExportUNV(filename.latin1());
+                                       QApplication::restoreOverrideCursor();
+                               }
+                               else
+                                       aMesh->ExportDAT(filename.latin1());
+
+                               QApplication::restoreOverrideCursor();
+
+                               if (IObject->hasEntry())
+                               {
+                                       MESSAGE("---");
+                                       SALOMEDS::SObject_var SO =
+                                               smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+                                       SALOMEDS::GenericAttribute_var anAttr;
+                                       SALOMEDS::AttributeComment_var aFileName;
+                                       SALOMEDS::StudyBuilder_var aStudyBuilder =
+                                               smeshGUI->myStudy->NewBuilder();
+                                       anAttr =
+                                               aStudyBuilder->FindOrCreateAttribute(SO,
+                                               "AttributeComment");
+                                       aFileName = SALOMEDS::AttributeComment::_narrow(anAttr);
+                                       aFileName->SetValue(filename.latin1());
+                               }
+                       }
+               }
+       }
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+void SMESHGUI::Import_Document(QAD_Desktop * parent, int theCommandID)
+{
+       QString filter;
+       string myExtension;
+       Document_Reader *myReader;
+
+       if (theCommandID == 113)
+       {
+               filter = tr("MED files (*.med)");
+               myExtension = string("MED");
+               myReader = new DriverMED_R_SMESHDS_Document;
+       }
+       else if (theCommandID == 112)
+       {
+               filter = tr("IDEAS files (*.unv)");
+               myExtension = string("UNV");
+               myReader = new DriverUNV_R_SMESHDS_Document;
+       }
+       else if (theCommandID == 111)
+       {
+               filter = tr("DAT files (*.dat)");
+               myExtension = string("DAT");
+               myReader = new DriverDAT_R_SMESHDS_Document;
+       }
+
+       QString filename = QAD_FileDlg::getFileName(parent,
+               "",
+               filter,
+               tr("Import document"),
+               true);
+       if (!filename.isEmpty())
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               string myClass = string("SMESHDS_Document");
+//    Document_Reader* myReader = SMESHDriver::GetDocumentReader(myExtension, myClass);
+               SMESHDS_Document *newDocument = new SMESHDS_Document(1);
+
+               myReader->SetFile(string(filename.latin1()));
+               myReader->SetDocument(smeshGUI->myDocument);
+               myReader->Read();
+               QApplication::restoreOverrideCursor();
+       }
+}
+
+void SMESHGUI::Export_Document(QAD_Desktop * parent, int theCommandID)
+{
+       QString filter;
+       Document_Writer *myWriter;
+       string myExtension;
+
+       if (theCommandID == 122)
+       {
+               filter = tr("MED files (*.med)");
+               myExtension = string("MED");
+               myWriter = new DriverMED_W_SMESHDS_Document;
+       }
+       else if (theCommandID == 121)
+       {
+               filter = tr("DAT files (*.dat)");
+               myExtension = string("DAT");
+               myWriter = new DriverDAT_W_SMESHDS_Document;
+       }
+       else if (theCommandID == 123)
+       {
+               filter = tr("IDEAS files (*.unv)");
+               myExtension = string("UNV");
+               myWriter = new DriverUNV_W_SMESHDS_Document;
+       }
 
-  return true ;
+       QString filename = QAD_FileDlg::getFileName(parent,
+               "",
+               filter,
+               tr("Export document"),
+               false);
+       if (!filename.isEmpty())
+       {
+               QApplication::setOverrideCursor(Qt::waitCursor);
+               string myClass = string("SMESHDS_Document");
+               //Document_Writer* myWriter = SMESHDriver::GetDocumentWriter(myExtension, myClass);
+
+               myWriter->SetFile(string(filename.latin1()));
+               myWriter->SetDocument(smeshGUI->myDocument);
+
+               //StudyContextStruct* myStudyContext = _impl.GetStudyContext(myStudyId);
+               //Handle(SMESHDS_Document) myDocument = myStudyContext->myDocument;
+               //myWriter->SetDocument(myDocument);
+
+               myWriter->Write();
+               QApplication::restoreOverrideCursor();
+       }
 }
 
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+bool SMESHGUI::OnMousePress(QMouseEvent * pe, QAD_Desktop * parent,
+       QAD_StudyFrame * studyFrame)
+{
+       SMESHGUI::GetOrCreateSMESHGUI(parent);
+       return false;
+}
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-bool SMESHGUI::SetSettings( QAD_Desktop* parent )
+bool SMESHGUI::OnMouseMove(QMouseEvent * pe, QAD_Desktop * parent,
+       QAD_StudyFrame * studyFrame)
 {
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-  /* Display mode */
-  QString DisplayMode = QAD_CONFIG->getSetting("SMESH:DisplayMode");
-  if ( DisplayMode.compare("") == 0 ) {
-    DisplayMode = "Shading";
-    QAD_CONFIG->addSetting("SMESH:DisplayMode","Shading");
-  }
-
-  if ( DisplayMode.compare("Wireframe") == 0 ){
-    parent->menuBar()->setItemChecked(10003, false );
-    parent->menuBar()->setItemChecked(10002, false );
-    parent->menuBar()->setItemChecked(10001, true );
-  } else if ( DisplayMode.compare("Shading") == 0 ){
-    parent->menuBar()->setItemChecked(10003, false );
-    parent->menuBar()->setItemChecked(10002, true );
-    parent->menuBar()->setItemChecked(10001, false );
-  } else if ( DisplayMode.compare("Shrink") == 0 ) {
-    parent->menuBar()->setItemChecked(10003, true );
-    parent->menuBar()->setItemChecked(10002, false );
-    parent->menuBar()->setItemChecked(10001, false );
-  }
-
-  /* Automatic Update */
-  QString AutoUpdate = QAD_CONFIG->getSetting("SMESH:AutomaticUpdate");
-  if ( AutoUpdate.compare("true") == 0 ) {
-    parent->menuBar()->setItemChecked(1001, true );
-    smeshGUI->myAutomaticUpdate = true;
-  } else {
-    parent->menuBar()->setItemChecked(1001, false );
-    smeshGUI->myAutomaticUpdate = false;
-  }
-
-  /* menus disable */
-  parent->menuBar()->setItemEnabled( 11, false); // IMPORT
-   
-  return true;
+       SMESHGUI::GetOrCreateSMESHGUI(parent);
+
+       return true;
 }
 
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+bool SMESHGUI::OnKeyPress(QKeyEvent * pe, QAD_Desktop * parent,
+       QAD_StudyFrame * studyFrame)
+{
+       SMESHGUI::GetOrCreateSMESHGUI(parent);
+
+       return true;
+}
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::DefinePopup( QString & theContext, QString & theParent, QString & theObject )
+bool SMESHGUI::SetSettings(QAD_Desktop * parent)
 {
-  /* Create or retrieve an object SMESHGUI */
-  SMESHGUI::GetOrCreateSMESHGUI(QAD_Application::getDesktop());
-
-  // NRI : Temporary added
-  //  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
-  //    theObject = "NothingSelected";
-  //    theContext = "NothingSelected";
-  //  }
-  // NRI
-
-  SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-  int nbSel = Sel->IObjectCount();
-  if (nbSel == 0) {
-    if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-      vtkScalarBarActor* aScalarBar = smeshGUI->GetScalarBar();
-      if ((aScalarBar != NULL) && (aScalarBar->GetVisibility() == 1) ) {
-       theObject = "ScalarBar";
-       theContext = "";
-      } else {
-       theObject = "NothingSelected";
-       theContext = "NothingSelected";
-      }
-    } else {
-      theObject = "NothingSelected";
-      theContext = "NothingSelected";
-    }
-  } else if (nbSel == 1 ) {
-    theObject = smeshGUI->CheckTypeObject( Sel->firstIObject() ); 
-    theContext = "";
-  } else {
-    theObject = smeshGUI->CheckHomogeneousSelection();
-    theContext = "";
-  }
+       SMESHGUI::GetOrCreateSMESHGUI(parent);
+
+       /* Display mode */
+       QString DisplayMode = QAD_CONFIG->getSetting("SMESH:DisplayMode");
+       if (DisplayMode.compare("") == 0)
+       {
+               DisplayMode = "Shading";
+               QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading");
+       }
+
+       if (DisplayMode.compare("Wireframe") == 0)
+       {
+               parent->menuBar()->setItemChecked(10003, false);
+               parent->menuBar()->setItemChecked(10002, false);
+               parent->menuBar()->setItemChecked(10001, true);
+       }
+       else if (DisplayMode.compare("Shading") == 0)
+       {
+               parent->menuBar()->setItemChecked(10003, false);
+               parent->menuBar()->setItemChecked(10002, true);
+               parent->menuBar()->setItemChecked(10001, false);
+       }
+       else if (DisplayMode.compare("Shrink") == 0)
+       {
+               parent->menuBar()->setItemChecked(10003, true);
+               parent->menuBar()->setItemChecked(10002, false);
+               parent->menuBar()->setItemChecked(10001, false);
+       }
+
+       /* Automatic Update */
+       QString AutoUpdate = QAD_CONFIG->getSetting("SMESH:AutomaticUpdate");
+       if (AutoUpdate.compare("true") == 0)
+       {
+               parent->menuBar()->setItemChecked(1001, true);
+               smeshGUI->myAutomaticUpdate = true;
+       }
+       else
+       {
+               parent->menuBar()->setItemChecked(1001, false);
+               smeshGUI->myAutomaticUpdate = false;
+       }
+
+       /* menus disable */
+       parent->menuBar()->setItemEnabled(11, false);   // IMPORT
+
+       return true;
 }
 
 //=============================================================================
@@ -3156,168 +3806,274 @@ void SMESHGUI::DefinePopup( QString & theContext, QString & theParent, QString &
  *
  */
 //=============================================================================
-bool SMESHGUI::CustomPopup( QAD_Desktop* parent,
-                          QPopupMenu* popup,
-                          const QString& theContext,
-                          const QString& theParent,
-                          const QString& theObject )
+void SMESHGUI::DefinePopup(QString & theContext, QString & theParent,
+       QString & theObject)
 {
-  // Popup should be customized for any viewer since some meaningless commands may be present in the popup
-  //if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) //Test du type de viewer true=OCC false=VTK
-  //  return false;
-  /* Create or retrieve an object SMESHGUI */
-  SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-  // NRI : Temporary added
-  //  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
-  //    return false;
-  //  }
-  // NRI
-
-  SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
-  QAD_StudyFrame* studyFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
-  int nbSel = Sel->IObjectCount();
-  
-  if (nbSel == 0) { 
-    if (studyFrame->getTypeView() != VIEW_VTK)
-      popup->clear();
-    return false;
-  } else if (nbSel == 1 ) {
-    QString parentComp = ((SALOMEGUI_Desktop*)parent)->getComponentFromSelection();
-    // First check type of active viewer (VTK required)
-    if (/*studyFrame->getTypeView() != VIEW_VTK ||*/ parentComp != parent->getActiveComponent())
-      {
-      //MESSAGE("CustomPopup(): VTK viewer required, removing all SMESH-specific popup menu items")
-      while (1) {
-       int id = popup->idAt(0);
-       if (id <= QAD_TopLabel_Popup_ID)
-         popup->removeItemAt(0);
+       /* Create or retrieve an object SMESHGUI */
+       SMESHGUI::GetOrCreateSMESHGUI(QAD_Application::getDesktop());
+
+       // NRI : Temporary added
+       //  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
+       //    theObject = "NothingSelected";
+       //    theContext = "NothingSelected";
+       //  }
+       // NRI
+
+       SALOME_Selection *Sel =
+               SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       int nbSel = Sel->IObjectCount();
+       if (nbSel == 0)
+       {
+               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
+                       VIEW_VTK)
+               {
+                       vtkScalarBarActor *aScalarBar = smeshGUI->GetScalarBar();
+                       if ((aScalarBar != NULL) && (aScalarBar->GetVisibility() == 1))
+                       {
+                               theObject = "ScalarBar";
+                               theContext = "";
+                       }
+                       else
+                       {
+                               theObject = "NothingSelected";
+                               theContext = "NothingSelected";
+                       }
+               }
+               else
+               {
+                       theObject = "NothingSelected";
+                       theContext = "NothingSelected";
+               }
+       }
+       else if (nbSel == 1)
+       {
+               theObject = smeshGUI->CheckTypeObject(Sel->firstIObject());
+               theContext = "";
+       }
        else
-         break;
-      }
-      if (theObject.compare("Component") == 0) {
-       popup->removeItem(QAD_DisplayOnly_Popup_ID);
-      }
-      return false;
-    }
-
-    // Remove common popup items for Submesh, Hypothesis and Algorithm
-    if (theObject.compare("SubMesh") == 0 ||
-       theObject.compare("Hypothesis") == 0 ||
-       theObject.compare("Algorithm") == 0 ) {
-      popup->removeItem(QAD_Display_Popup_ID);
-      popup->removeItem(QAD_DisplayOnly_Popup_ID);
-      popup->removeItem(QAD_Erase_Popup_ID);
-      int id = popup->idAt(popup->count()-1); // last item
-      if (id < 0 && id != -1) popup->removeItem(id); // separator
-    }
-
-    if (theObject.compare("Component") == 0) {
-      popup->removeItem(QAD_DisplayOnly_Popup_ID);
-      return true;
-    }
-
-    int id = QAD_TopLabel_Popup_ID;//popup->idAt(0);
-    QFont f = QApplication::font();
-    f.setBold( TRUE );
-       
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-    
-    if ( theParent.compare("Viewer")==0 ) {
-      if (popup->idAt(0) == id) {
-       popup->removeItem(id);
-       popup->insertItem( new CustomItem ( QString(IObject->getName()), f ), id, 0 );
-      }
-      
-      Standard_Boolean res;
-      SMESH_Actor* ac = smeshGUI->FindActorByEntry( IObject->getEntry(), res, false );
-      if ( res && studyFrame->getTypeView() == VIEW_VTK) {
-       VTKViewer_RenderWindowInteractor* myRenderInter= 
-         ((VTKViewer_ViewFrame*)studyFrame->getRightFrame()->getViewFrame())->getRWInteractor();
-       if ( myRenderInter->isVisible( IObject ) ) {
-         popup->removeItem(QAD_Display_Popup_ID);
-       } else {
-         popup->removeItem(QAD_Erase_Popup_ID);
-       }
-      } else {
-       popup->removeItem(QAD_Erase_Popup_ID);
-       if (!res) {// mesh not computed -> can't display it
-         popup->removeItem(QAD_Display_Popup_ID);
-         popup->removeItem(QAD_DisplayOnly_Popup_ID);
-         popup->removeItemAt(popup->count() - 1);//separator
-       }
-      }
-    } else if ( theParent.compare("ObjectBrowser")==0 ) {
-      if (theObject.compare("Mesh") == 0 ||
-         theObject.compare("SubMesh") == 0 ||
-         theObject.compare("Hypothesis") == 0 ||
-         theObject.compare("Algorithm") == 0 ) {
-       popup->removeItemAt(0); 
-      } else {
-       if (popup->idAt(0) == id) {
-         popup->removeItem(id);
-         popup->removeItemAt(0);//separator
-       }
-      }
-
-      Standard_Boolean res;
-      SMESH_Actor* ac = smeshGUI->FindActorByEntry( IObject->getEntry(), res, false );
-      if ( res && studyFrame->getTypeView() == VIEW_VTK ) {
-       VTKViewer_RenderWindowInteractor* myRenderInter= 
-         ((VTKViewer_ViewFrame*)studyFrame->getRightFrame()->getViewFrame())->getRWInteractor();
-       if ( myRenderInter->isVisible( IObject ) ) {
-         popup->removeItem(QAD_Display_Popup_ID);
-       } else {
-         popup->removeItem(QAD_Erase_Popup_ID);
-       }
-      } else {
-       if (theObject.compare("Mesh") == 0 ||
-           theObject.compare("SubMesh") == 0 ||
-           theObject.compare("Hypothesis") == 0 ||
-           theObject.compare("Algorithm") == 0 ) {
-       } else {
-         popup->removeItem(QAD_Erase_Popup_ID);
-         if (!res) {// mesh not computed -> can't display it
-           popup->removeItem(QAD_Display_Popup_ID);
-           popup->removeItem(QAD_DisplayOnly_Popup_ID);
-           popup->removeItemAt(popup->count() - 1);//separator
-         }
-       }
-      }
-    }
-  } else {
-    QString parentComp = ((SALOMEGUI_Desktop*)parent)->getComponentFromSelection();
-    QAD_StudyFrame* studyFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
-    if (/*studyFrame->getTypeView() != VIEW_VTK ||*/ parentComp != parent->getActiveComponent())
-    {
-      //MESSAGE("CustomPopup(): VTK viewer required, removing all SMESH-specific popup menu items")
-      while (1) {
-       int id = popup->idAt(0);
-       if (id <= QAD_TopLabel_Popup_ID && id != -1)
-         popup->removeItemAt(0);
+       {
+               theObject = smeshGUI->CheckHomogeneousSelection();
+               theContext = "";
+       }
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+bool SMESHGUI::CustomPopup(QAD_Desktop * parent,
+       QPopupMenu * popup,
+       const QString & theContext,
+       const QString & theParent, const QString & theObject)
+{
+       // Popup should be customized for any viewer since some meaningless commands may be present in the popup
+       //if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) //Test du type de viewer true=OCC false=VTK
+       //  return false;
+       /* Create or retrieve an object SMESHGUI */
+       SMESHGUI::GetOrCreateSMESHGUI(parent);
+
+       // NRI : Temporary added
+       //  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
+       //    return false;
+       //  }
+       // NRI
+
+       SALOME_Selection *Sel =
+               SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       QAD_StudyFrame *studyFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
+       int nbSel = Sel->IObjectCount();
+
+       if (nbSel == 0)
+       {
+               if (studyFrame->getTypeView() != VIEW_VTK)
+                       popup->clear();
+               return false;
+       }
+       else if (nbSel == 1)
+       {
+               QString parentComp =
+                       ((SALOMEGUI_Desktop *) parent)->getComponentFromSelection();
+               // First check type of active viewer (VTK required)
+               if ( /*studyFrame->getTypeView() != VIEW_VTK || */ parentComp !=
+                       parent->getActiveComponent())
+               {
+                       //MESSAGE("CustomPopup(): VTK viewer required, removing all SMESH-specific popup menu items")
+                       while (1)
+                       {
+                               int id = popup->idAt(0);
+                               if (id <= QAD_TopLabel_Popup_ID)
+                                       popup->removeItemAt(0);
+                               else
+                                       break;
+                       }
+                       if (theObject.compare("Component") == 0)
+                       {
+                               popup->removeItem(QAD_DisplayOnly_Popup_ID);
+                       }
+                       return false;
+               }
+
+               // Remove common popup items for Submesh, Hypothesis and Algorithm
+               if (theObject.compare("SubMesh") == 0 ||
+                       theObject.compare("Hypothesis") == 0 ||
+                       theObject.compare("Algorithm") == 0)
+               {
+                       popup->removeItem(QAD_Display_Popup_ID);
+                       popup->removeItem(QAD_DisplayOnly_Popup_ID);
+                       popup->removeItem(QAD_Erase_Popup_ID);
+                       int id = popup->idAt(popup->count() - 1);       // last item
+                       if (id < 0 && id != -1)
+                               popup->removeItem(id);  // separator
+               }
+
+               if (theObject.compare("Component") == 0)
+               {
+                       popup->removeItem(QAD_DisplayOnly_Popup_ID);
+                       return true;
+               }
+
+               int id = QAD_TopLabel_Popup_ID; //popup->idAt(0);
+               QFont f = QApplication::font();
+               f.setBold(TRUE);
+
+               Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+
+               if (theParent.compare("Viewer") == 0)
+               {
+                       if (popup->idAt(0) == id)
+                       {
+                               popup->removeItem(id);
+                               popup->insertItem(new CustomItem(QString(IObject->getName()),
+                                               f), id, 0);
+                       }
+
+                       Standard_Boolean res;
+                       SMESH_Actor *ac =
+                               smeshGUI->FindActorByEntry(IObject->getEntry(), res, false);
+                       if (res && studyFrame->getTypeView() == VIEW_VTK)
+                       {
+                               VTKViewer_RenderWindowInteractor *myRenderInter =
+                                       ((VTKViewer_ViewFrame *) studyFrame->getRightFrame()->
+                                       getViewFrame())->getRWInteractor();
+                               if (myRenderInter->isVisible(IObject))
+                               {
+                                       popup->removeItem(QAD_Display_Popup_ID);
+                               }
+                               else
+                               {
+                                       popup->removeItem(QAD_Erase_Popup_ID);
+                               }
+                       }
+                       else
+                       {
+                               popup->removeItem(QAD_Erase_Popup_ID);
+                               if (!res)
+                               {                               // mesh not computed -> can't display it
+                                       popup->removeItem(QAD_Display_Popup_ID);
+                                       popup->removeItem(QAD_DisplayOnly_Popup_ID);
+                                       popup->removeItemAt(popup->count() - 1);        //separator
+                               }
+                       }
+               }
+               else if (theParent.compare("ObjectBrowser") == 0)
+               {
+                       if (theObject.compare("Mesh") == 0 ||
+                               theObject.compare("SubMesh") == 0 ||
+                               theObject.compare("Hypothesis") == 0 ||
+                               theObject.compare("Algorithm") == 0)
+                       {
+                               popup->removeItemAt(0);
+                       }
+                       else
+                       {
+                               if (popup->idAt(0) == id)
+                               {
+                                       popup->removeItem(id);
+                                       popup->removeItemAt(0); //separator
+                               }
+                       }
+
+                       Standard_Boolean res;
+                       SMESH_Actor *ac =
+                               smeshGUI->FindActorByEntry(IObject->getEntry(), res, false);
+                       if (res && studyFrame->getTypeView() == VIEW_VTK)
+                       {
+                               VTKViewer_RenderWindowInteractor *myRenderInter =
+                                       ((VTKViewer_ViewFrame *) studyFrame->getRightFrame()->
+                                       getViewFrame())->getRWInteractor();
+                               if (myRenderInter->isVisible(IObject))
+                               {
+                                       popup->removeItem(QAD_Display_Popup_ID);
+                               }
+                               else
+                               {
+                                       popup->removeItem(QAD_Erase_Popup_ID);
+                               }
+                       }
+                       else
+                       {
+                               if (theObject.compare("Mesh") == 0 ||
+                                       theObject.compare("SubMesh") == 0 ||
+                                       theObject.compare("Hypothesis") == 0 ||
+                                       theObject.compare("Algorithm") == 0)
+                               {
+                               }
+                               else
+                               {
+                                       popup->removeItem(QAD_Erase_Popup_ID);
+                                       if (!res)
+                                       {                       // mesh not computed -> can't display it
+                                               popup->removeItem(QAD_Display_Popup_ID);
+                                               popup->removeItem(QAD_DisplayOnly_Popup_ID);
+                                               popup->removeItemAt(popup->count() - 1);        //separator
+                                       }
+                               }
+                       }
+               }
+       }
        else
-         break;
-      }
-      if (parentComp.isNull()) { // objects from several components are selected
-       popup->removeItem(QAD_DisplayOnly_Popup_ID);    
-       popup->removeItem(QAD_Display_Popup_ID);
-       popup->removeItem(QAD_Erase_Popup_ID);
-       int id = popup->idAt(popup->count()-1); // last item
-       if (id < 0 && id != -1) popup->removeItem(id); // separator
-      }
-      return false;
-    }
-
-    QString type =  smeshGUI->CheckHomogeneousSelection();
-    if ( type.compare("Heterogeneous Selection") != 0 ) {
-      int id = QAD_TopLabel_Popup_ID;//popup->idAt(0);
-      QFont f = QApplication::font();
-      f.setBold( TRUE );
-      popup->removeItem(id);
-      popup->insertItem( new CustomItem ( QString("%1 ").arg(nbSel) + type + " (s) ", f), id, 0  );
-    }
-  }
-  return false;
+       {
+               QString parentComp =
+                       ((SALOMEGUI_Desktop *) parent)->getComponentFromSelection();
+               QAD_StudyFrame *studyFrame =
+                       smeshGUI->myActiveStudy->getActiveStudyFrame();
+               if ( /*studyFrame->getTypeView() != VIEW_VTK || */ parentComp !=
+                       parent->getActiveComponent())
+               {
+                       //MESSAGE("CustomPopup(): VTK viewer required, removing all SMESH-specific popup menu items")
+                       while (1)
+                       {
+                               int id = popup->idAt(0);
+                               if (id <= QAD_TopLabel_Popup_ID && id != -1)
+                                       popup->removeItemAt(0);
+                               else
+                                       break;
+                       }
+                       if (parentComp.isNull())
+                       {                                       // objects from several components are selected
+                               popup->removeItem(QAD_DisplayOnly_Popup_ID);
+                   &nb