Salome HOME
DCQ:prepare 2.0.0
[modules/smesh.git] / src / SMESHGUI / SMESHGUI.cxx
index 529ede7b55e7faaa2c6e82d27b355d26f9daaa87..4d94be4c84f429ea20aa10f5a1af09b54a8ece4a 100644 (file)
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-//
-//
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 //
 //  File   : SMESHGUI.cxx
 //  Author : Nicolas REJNERI
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "SMESHGUI.h"
 #include "SMESHGUI_AddHypothesisDlg.h"
 #include "SMESHGUI_AddAlgorithmDlg.h"
 #include "SMESHGUI_InitMeshDlg.h"
-#include "SMESHGUI_LocalLengthDlg.h"
-#include "SMESHGUI_NbSegmentsDlg.h"
 #include "SMESHGUI_AddSubMeshDlg.h"
 #include "SMESHGUI_NodesDlg.h"
 #include "SMESHGUI_TransparencyDlg.h"
+#include "SMESHGUI_GroupDlg.h"
 #include "SMESHGUI_RemoveNodesDlg.h"
 #include "SMESHGUI_RemoveElementsDlg.h"
 #include "SMESHGUI_MeshInfosDlg.h"
 #include "SMESHGUI_Preferences_ColorDlg.h"
-#include "SMESHGUI_MaxElementAreaDlg.h"
-#include "SMESHGUI_MaxElementVolumeDlg.h"
 #include "SMESHGUI_Preferences_ScalarBarDlg.h"
-#include "SMESHGUI_EditScalarBarDlg.h"
+#include "SMESHGUI_Preferences_SelectionDlg.h"
 #include "SMESHGUI_aParameterDlg.h"
 #include "SMESHGUI_ComputeScalarValue.h"
 #include "SMESHGUI_MoveNodesDlg.h"
 #include "SMESHGUI_OrientationElementsDlg.h"
 #include "SMESHGUI_DiagonalInversionDlg.h"
-#include "SMESHGUI_EdgesConnectivityDlg.h"
 #include "SMESHGUI_AddFaceDlg.h"
 #include "SMESHGUI_AddEdgeDlg.h"
 #include "SMESHGUI_AddVolumeDlg.h"
 #include "SMESHGUI_EditHypothesesDlg.h"
+#include "SMESHGUI_CreateHypothesesDlg.h"
+#include "SMESHGUI_FilterDlg.h"
+#include "SMESHGUI_XmlHandler.h"
 
-#include "SMESH_Grid.h"
+#include "SMESH_Actor.h"
+#include "SMESH_Object.h"
 
 // SALOME Includes
 #include "Utils_ORB_INIT.hxx"
@@ -69,23 +66,27 @@ using namespace std;
 #include "QAD_MessageBox.h"
 #include "QAD_Resource.h"
 #include "QAD_FileDlg.h"
-#include "SALOMEGUI_Desktop.h"
-#include "SALOMEGUI_NameDlg.h"
+#include "QAD_Desktop.h"
+#include "QAD_ResourceMgr.h"
+#include "QAD_WaitCursor.h"
 
 #include "OCCViewer_ViewPort.h"
 #include "OCCViewer_ViewPort3d.h"
 #include "OCCViewer_Viewer3d.h"
 
-#include "GEOM_Client.hxx"
 #include "GEOM_InteractiveObject.hxx"
 
 #include "SALOME_NamingService.hxx"
 #include "SALOME_ListIteratorOfListIO.hxx"
 #include "SALOME_InteractiveObject.hxx"
 
+#include "SALOMEGUI_Desktop.h"
+#include "SALOMEGUI_NameDlg.h"
 #include "SALOMEGUI_ImportOperation.h"
 #include "SALOMEGUI_QtCatchCorbaException.hxx"
+
 #include "utilities.h"
+#include <dlfcn.h>
 
 #include "SMDS_Mesh.hxx"
 #include "SMESHDS_Document.hxx"
@@ -118,7 +119,6 @@ using namespace std;
 #include <qstring.h>
 #include <qcheckbox.h>
 #include <qcolordialog.h>
-#include <qmessagebox.h>
 #include <qspinbox.h>
 #include <qlist.h>
 #include <qwidget.h>
@@ -128,18 +128,367 @@ using namespace std;
 // VTK Includes
 #include "VTKViewer_Common.h"
 #include "VTKViewer_ViewFrame.h"
+#include "VTKViewer_InteractorStyleSALOME.h"
+
+#include <vtkScalarBarActor.h>
 #include <vtkLegendBoxActor.h>
 #include <vtkFeatureEdges.h>
 #include <vtkDoubleArray.h>
+#include <vtkTextProperty.h>
 
 // Open CASCADE Includes
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 
-static GEOM_Client ShapeReader;
+#include <boost/shared_ptr.hpp>
+
 static SMESHGUI *smeshGUI = 0;
 static CORBA::ORB_var _orb;
 
+using namespace std;
+
+typedef pair<int,string> TKeyOfVisualObj;
+typedef boost::shared_ptr<SMESH_VisualObj> TVisualObjPtr;
+typedef map<TKeyOfVisualObj,TVisualObjPtr> TVisualObjCont;
+static TVisualObjCont VISUALOBJCONT;
+
+
+TVisualObjPtr GetVisualObj(int theStudyId, const char* theEntry){
+  TVisualObjPtr aVisualObj;
+  try{
+    TVisualObjCont::key_type aKey(theStudyId,theEntry);
+    TVisualObjCont::iterator anIter = VISUALOBJCONT.find(aKey);
+    if(anIter != VISUALOBJCONT.end()){
+      aVisualObj = anIter->second;
+    }else{
+      SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
+      SALOMEDS::SObject_var aSObj = aStudy->FindObjectID(theEntry);
+      if(!CORBA::is_nil(aSObj)){
+       SALOMEDS::GenericAttribute_var anAttr;
+       if(aSObj->FindAttribute(anAttr,"AttributeIOR")){
+         SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+         CORBA::String_var aVal = anIOR->Value();
+         CORBA::Object_var anObj =_orb->string_to_object(aVal.in());
+         if(!CORBA::is_nil(anObj)){
+           //Try narrow to SMESH_Mesh interafce
+           SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(anObj);
+           if(!aMesh->_is_nil()){
+             aVisualObj.reset(new SMESH_MeshObj(aMesh));
+             aVisualObj->Update();
+             TVisualObjCont::value_type aValue(aKey,aVisualObj); 
+             VISUALOBJCONT.insert(aValue);
+             return aVisualObj;
+           }
+           //Try narrow to SMESH_Group interafce
+           SMESH::SMESH_Group_var aGroup = SMESH::SMESH_Group::_narrow(anObj);
+           if(!aGroup->_is_nil()){
+             SALOMEDS::SObject_var aFatherSObj = aSObj->GetFather();
+             if(aFatherSObj->_is_nil()) return aVisualObj;
+             aFatherSObj = aFatherSObj->GetFather();
+             if(aFatherSObj->_is_nil()) return aVisualObj;
+             CORBA::String_var anEntry = aFatherSObj->GetID();
+             TVisualObjPtr aVisObj = GetVisualObj(theStudyId,anEntry.in());
+             if(SMESH_MeshObj* aMeshObj = dynamic_cast<SMESH_MeshObj*>(aVisObj.get())){
+               aVisualObj.reset(new SMESH_GroupObj(aGroup,aMeshObj));
+               aVisualObj->Update();
+               TVisualObjCont::value_type aValue(aKey,aVisualObj); 
+               VISUALOBJCONT.insert(aValue);
+               return aVisualObj;
+             }
+           }
+           //Try narrow to SMESH_subMesh interafce
+           SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(anObj);
+           if(!aSubMesh->_is_nil()){
+             SALOMEDS::SObject_var aFatherSObj = aSObj->GetFather();
+             if(aFatherSObj->_is_nil()) return aVisualObj;
+             aFatherSObj = aFatherSObj->GetFather();
+             if(aFatherSObj->_is_nil()) return aVisualObj;
+             CORBA::String_var anEntry = aFatherSObj->GetID();
+             TVisualObjPtr aVisObj = GetVisualObj(theStudyId,anEntry.in());
+             if(SMESH_MeshObj* aMeshObj = dynamic_cast<SMESH_MeshObj*>(aVisObj.get())){
+               aVisualObj.reset(new SMESH_subMeshObj(aSubMesh,aMeshObj));
+               aVisualObj->Update();
+               TVisualObjCont::value_type aValue(aKey,aVisualObj); 
+               VISUALOBJCONT.insert(aValue);
+               return aVisualObj;
+             }
+           }
+         }
+       }
+      }
+    }
+  }catch(...){
+    INFOS("GetMeshObj - There is no SMESH_Mesh object for the SALOMEDS::Strudy and Entry!!!");
+  }
+  return aVisualObj;
+}
+
+
+VTKViewer_ViewFrame* GetVtkViewFrame(QAD_StudyFrame* theStudyFrame){
+  QAD_ViewFrame* aViewFrame = theStudyFrame->getRightFrame()->getViewFrame();
+  return dynamic_cast<VTKViewer_ViewFrame*>(aViewFrame);
+}
+
+void UpdateSelectionProp() {
+  QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy();
+  QList<QAD_StudyFrame> aFrameList = aStudy->getStudyFrames();
+
+  QString SCr, SCg, SCb;
+  SCr = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorRed");
+  SCg = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorGreen");
+  SCb = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorBlue");
+  QColor aHiColor = Qt::white;
+  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
+    aHiColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
+
+  SCr = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorRed");
+  SCg = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorGreen");
+  SCb = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorBlue");
+  QColor aSelColor = Qt::yellow;
+  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
+    aSelColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
+  QString SW = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectWidth");
+  if (SW.isEmpty()) SW = "5";
+
+  SCr = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorRed");
+  SCg = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorGreen");
+  SCb = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorBlue");
+  QColor aPreColor = Qt::cyan;
+  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
+    aPreColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
+  QString PW = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectWidth");
+  if (PW.isEmpty()) PW = "5";
+
+  QString SP1 = QAD_CONFIG->getSetting("SMESH:SettingsNodeSelectTol");
+  if (SP1.isEmpty()) SP1 = "0.025";
+  QString SP2 = QAD_CONFIG->getSetting("SMESH:SettingsElementsSelectTol");
+  if (SP2.isEmpty()) SP2 = "0.001";
+
+  for (QAD_StudyFrame* aStudyFrame = aFrameList.first(); aStudyFrame; aStudyFrame = aFrameList.next()) {
+    if (aStudyFrame->getTypeView() == VIEW_VTK) {
+      VTKViewer_ViewFrame* aVtkViewFrame = GetVtkViewFrame(aStudyFrame);
+      if (!aVtkViewFrame) continue;
+      // update VTK viewer properties
+      VTKViewer_RenderWindowInteractor* anInteractor = aVtkViewFrame->getRWInteractor();
+      if (anInteractor) {
+       // mesh element selection
+       anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255., 
+                                      aSelColor.blue()/255., SW.toInt());
+         
+       // tolerances
+       anInteractor->SetSelectionTolerance(SP1.toDouble(), SP2.toDouble());
+         
+       // pre-selection
+       VTKViewer_InteractorStyleSALOME* aStyle = anInteractor->GetInteractorStyleSALOME();
+       if (aStyle) {
+         aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255., 
+                                     aPreColor.blue()/255., PW.toInt());
+       }
+      }
+      // update actors
+      vtkRenderer* aRenderer = aVtkViewFrame->getRenderer();
+      vtkActorCollection *aCollection = aRenderer->GetActors();
+      aCollection->InitTraversal();
+      while(vtkActor *anAct = aCollection->GetNextActor()){
+       if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+         anActor->SetHighlightColor(aHiColor.red()/255., aHiColor.green()/255., 
+                                    aHiColor.blue()/255.);
+         anActor->SetPreHighlightColor(aPreColor.red()/255., aPreColor.green()/255., 
+                                       aPreColor.blue()/255.);
+       }
+      }
+    }
+  }
+}
+
+VTKViewer_ViewFrame* GetCurrentVtkView(){
+  QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy();
+  QAD_StudyFrame *aStudyFrame = aStudy->getActiveStudyFrame();
+  return GetVtkViewFrame(aStudyFrame);
+}
+
+
+SMESH_Actor* FindActorByEntry(QAD_StudyFrame *theStudyFrame, 
+                             const char* theEntry)
+{
+  if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
+    vtkRenderer *aRenderer = aViewFrame->getRenderer();
+    vtkActorCollection *aCollection = aRenderer->GetActors();
+    aCollection->InitTraversal();
+    while(vtkActor *anAct = aCollection->GetNextActor()){
+      if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+       if(anActor->hasIO()){
+         Handle(SALOME_InteractiveObject) anIO = anActor->getIO();
+         if(anIO->hasEntry() && strcmp(anIO->getEntry(),theEntry) == 0){
+           return anActor;
+         }
+       }
+      }
+    }
+  }
+  return NULL;
+}
+
+
+SMESH_Actor* FindActorByEntry(const char* theEntry){
+  QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy();
+  QAD_StudyFrame *aStudyFrame = aStudy->getActiveStudyFrame();
+  return FindActorByEntry(aStudyFrame,theEntry);
+}
+
+
+SMESH_Actor* CreateActor(SALOMEDS::Study_ptr theStudy,
+                        const char* theEntry,
+                        int theIsClear = false)
+{
+  SMESH_Actor *anActor = NULL;
+  CORBA::Long anId = theStudy->StudyId();
+  if(TVisualObjPtr aVisualObj = GetVisualObj(anId,theEntry)){
+    SALOMEDS::SObject_var aSObj = theStudy->FindObjectID(theEntry);
+    if(!aSObj->_is_nil()){
+      SALOMEDS::GenericAttribute_var anAttr;
+      if(aSObj->FindAttribute(anAttr,"AttributeName")){
+       SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
+       CORBA::String_var aVal = aName->Value();
+       string aNameVal = aVal.in();
+       SMESH::FilterManager_ptr aFilterMgr = smeshGUI->GetFilterMgr();
+       anActor = SMESH_Actor::New(aVisualObj,aFilterMgr,theEntry,aNameVal.c_str(),theIsClear);
+      }
+    }
+  }
+  return anActor;
+}
+
+
+void DisplayActor(QAD_StudyFrame *theStudyFrame, SMESH_Actor* theActor){
+  if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
+    aViewFrame->AddActor(theActor);
+    aViewFrame->Repaint();
+  }
+}
+
+
+void RemoveActor(QAD_StudyFrame *theStudyFrame, SMESH_Actor* theActor){
+  if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
+    aViewFrame->RemoveActor(theActor);
+    aViewFrame->Repaint();
+  }
+}
+
+
+void FitAll(){
+  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView()){
+    aViewFrame->onViewFitAll();
+    aViewFrame->Repaint();
+  }
+}
+
+vtkRenderer* GetCurrentRenderer(){
+  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView())
+    return aViewFrame->getRenderer();
+  return NULL;
+}
+
+void RepaintCurrentView(){
+  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView())
+    aViewFrame->Repaint();
+}
+
+
+enum EDisplaing {eDisplayAll, eDisplay, eDisplayOnly, eErase, eEraseAll};
+void UpdateView(QAD_StudyFrame *theStudyFrame, EDisplaing theAction,
+               const char* theEntry = "")
+{
+  if(VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(theStudyFrame)){
+    vtkRenderer *aRenderer = aViewFrame->getRenderer();
+    vtkActorCollection *aCollection = aRenderer->GetActors();
+    aCollection->InitTraversal();
+    switch(theAction){
+      case eDisplayAll: {
+       while(vtkActor *anAct = aCollection->GetNextActor()){
+         if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+           anActor->SetVisibility(true);
+         }
+       }
+       break;
+      }
+      case eDisplayOnly:
+      case eEraseAll: {
+       while(vtkActor *anAct = aCollection->GetNextActor()){
+         if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+           anActor->SetVisibility(false);
+         }
+       }
+      }
+      default: {
+       if(SMESH_Actor *anActor = FindActorByEntry(theStudyFrame,theEntry)){
+         switch(theAction) {
+           case eDisplay:
+           case eDisplayOnly:
+             anActor->SetVisibility(true);
+             break;
+           case eErase:
+             anActor->SetVisibility(false);
+             break;
+           }
+       } else {
+         switch(theAction){
+           case eDisplay:
+           case eDisplayOnly:{
+             QAD_Study* aStudy = theStudyFrame->getStudy();
+             SALOMEDS::Study_var aDocument = aStudy->getStudyDocument();
+             if(anActor = CreateActor(aDocument,theEntry,true)) {
+               DisplayActor(theStudyFrame,anActor);
+               FitAll();
+             }
+             break;
+           }
+         }
+       }
+      }
+    }
+  }
+}
+
+
+void UpdateView(EDisplaing theAction, const char* theEntry = ""){
+  QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy();
+  QAD_StudyFrame *aStudyFrame = aStudy->getActiveStudyFrame();
+  UpdateView(aStudyFrame,theAction,theEntry);
+}
+
+static bool IsReferencedObject( SALOMEDS::SObject_ptr SO ) 
+{
+  if ( !SO->_is_nil() ) {
+    SALOMEDS::GenericAttribute_var anAttr;
+    if ( SO->FindAttribute( anAttr, "AttributeTarget" ) ) {
+      SALOMEDS::AttributeTarget_var aTarget = SALOMEDS::AttributeTarget::_narrow( anAttr );
+      SALOMEDS::Study::ListOfSObject_var aList = aTarget->Get();
+      if ( aList->length() > 0 ) {
+       return true;
+      }
+    }
+  }
+  return false;
+}
+
+void SetPointRepresentation(bool theIsVisible){
+  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView()){
+    vtkRenderer *aRenderer = aViewFrame->getRenderer();
+    vtkActorCollection *aCollection = aRenderer->GetActors();
+    aCollection->InitTraversal();
+    while(vtkActor *anAct = aCollection->GetNextActor()){
+      if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+       if(anActor->GetVisibility()){
+         anActor->SetPointRepresentation(theIsVisible);
+       }
+      }
+    }
+    RepaintCurrentView();
+  }
+}
+
+
 //=============================================================================
 /*!
  *
@@ -147,30 +496,30 @@ static CORBA::ORB_var _orb;
 //=============================================================================
 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;
 };
 
 //=============================================================================
@@ -178,8 +527,8 @@ class CustomItem:public QCustomMenuItem
  *
  */
 //=============================================================================
-SMESHGUI::SMESHGUI():
-QObject()
+SMESHGUI::SMESHGUI( const QString& theName, QObject* theParent ) :
+  SALOMEGUI( theName, theParent )
 {
 }
 
@@ -197,65 +546,78 @@ SMESHGUI::~SMESHGUI()
  *
  */
 //=============================================================================
-SMESHGUI *SMESHGUI::GetSMESHGUI()
+SMESHGUISMESHGUI::GetSMESHGUI()
 {
-       return smeshGUI;
+  if ( !smeshGUI )
+    GetOrCreateSMESHGUI( QAD_Application::getDesktop() );
+  return smeshGUI;
 }
 
+extern "C"
+{
+  Standard_EXPORT SALOMEGUI* GetComponentGUI() {
+    return 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 ) {
+    setOrb();
+    smeshGUI = new SMESHGUI;
+    smeshGUI->myActiveDialogBox = 0 ;
+    smeshGUI->myState = -1 ;
+    smeshGUI->myDesktop = desktop ; 
+
+    /* get smesh engine */
+    Engines::Component_var comp = desktop->getEngine("FactoryServer", "SMESH");
+    smeshGUI->myComponentMesh = SMESH::SMESH_Gen::_narrow(comp);
+    
+    /* get geom engine */
+    Engines::Component_var comp1 = desktop->getEngine("FactoryServer", "GEOM");    
+    smeshGUI->myComponentGeom = GEOM::GEOM_Gen::_narrow(comp1);
+      
+    /* set current study */
+    smeshGUI->myActiveStudy = desktop->getActiveStudy();
+    smeshGUI->myStudyId     = smeshGUI->myActiveStudy->getStudyId();
+    smeshGUI->myStudy       = smeshGUI->myActiveStudy->getStudyDocument();
+    smeshGUI->myComponentGeom->GetCurrentStudy( smeshGUI->myStudyId );
+    smeshGUI->myComponentMesh->SetCurrentStudy( smeshGUI->myStudy );
+    //    smeshGUI->myComponentGeom->NbLabels();
+    
+    /* create service object */
+    smeshGUI->myStudyAPI = SMESHGUI_StudyAPI(smeshGUI->myStudy, smeshGUI->myComponentMesh);
+
+    smeshGUI->myDocument = new SMESHDS_Document(1);//NBU
+
+    smeshGUI->mySimulationActors = vtkActorCollection::New();
+    smeshGUI->mySimulationActors2D = vtkActor2DCollection::New();
+
+    /*filter manager*/
+    smeshGUI->myFilterMgr = smeshGUI->myComponentMesh->CreateFilterManager();
+
+    /* load resources for all available meshers */
+    smeshGUI->InitAvailableHypotheses();
+  } else {
+    /* study may have changed - set current study */
+    smeshGUI->myActiveStudy = desktop->getActiveStudy();
+    smeshGUI->myStudyId     = smeshGUI->myActiveStudy->getStudyId();
+    smeshGUI->myStudy       = smeshGUI->myActiveStudy->getStudyDocument();
+    smeshGUI->myComponentGeom->GetCurrentStudy( smeshGUI->myStudyId );
+    smeshGUI->myComponentMesh->SetCurrentStudy( smeshGUI->myStudy );
+    
+    // Set active study to Study API
+    smeshGUI->myStudyAPI.Update( smeshGUI->myStudy );
+  }
+  
+  /* Automatic Update flag */
+  smeshGUI->myAutomaticUpdate = ( QAD_CONFIG->getSetting( "SMESH:AutomaticUpdate" ).compare( "true" ) == 0 );
+
+  return smeshGUI;
 }
 
 //=============================================================================
@@ -265,8 +627,8 @@ SMESHGUI *SMESHGUI::GetOrCreateSMESHGUI(QAD_Desktop * desktop)
 //=============================================================================
 void SMESHGUI::SetState(int aState)
 {
-       this->myState = aState;
-       return;
+  this->myState = aState;
+  return;
 }
 
 //=============================================================================
@@ -276,8 +638,8 @@ void SMESHGUI::SetState(int aState)
 //=============================================================================
 void SMESHGUI::ResetState()
 {
-       this->myState = -1;
-       return;
+  this->myState = -1;
+  return;
 }
 
 //=============================================================================
@@ -287,8 +649,8 @@ void SMESHGUI::ResetState()
 //=============================================================================
 void SMESHGUI::EmitSignalDeactivateDialog()
 {
-       emit this->SignalDeactivateActiveDialog();
-       return;
+  emit this->SignalDeactivateActiveDialog();
+  return;
 }
 
 //=============================================================================
@@ -298,8 +660,8 @@ void SMESHGUI::EmitSignalDeactivateDialog()
 //=============================================================================
 void SMESHGUI::EmitSignalCloseAllDialogs()
 {
-       emit this->SignalCloseAllDialogs();
-       return;
+  emit SignalCloseAllDialogs();
+  return;
 }
 
 //=============================================================================
@@ -309,7 +671,7 @@ void SMESHGUI::EmitSignalCloseAllDialogs()
 //=============================================================================
 QDialog *SMESHGUI::GetActiveDialogBox()
 {
-       return this->myActiveDialogBox;
+  return this->myActiveDialogBox;
 }
 
 //=============================================================================
@@ -319,8 +681,8 @@ QDialog *SMESHGUI::GetActiveDialogBox()
 //=============================================================================
 void SMESHGUI::SetActiveDialogBox(QDialog * aDlg)
 {
-       this->myActiveDialogBox = (QDialog *) aDlg;
-       return;
+  this->myActiveDialogBox = (QDialog *) aDlg;
+  return;
 }
 
 //=============================================================================
@@ -330,7 +692,7 @@ void SMESHGUI::SetActiveDialogBox(QDialog * aDlg)
 //=============================================================================
 QAD_Study *SMESHGUI::GetActiveStudy()
 {
-       return this->myActiveStudy;
+  return this->myActiveStudy;
 }
 
 //=============================================================================
@@ -340,7 +702,7 @@ QAD_Study *SMESHGUI::GetActiveStudy()
 //=============================================================================
 SALOMEDS::Study_ptr SMESHGUI::GetStudy()
 {
-       return SALOMEDS::Study::_narrow(myStudy);
+  return SALOMEDS::Study::_narrow(myStudy);
 }
 
 //=============================================================================
@@ -350,7 +712,7 @@ SALOMEDS::Study_ptr SMESHGUI::GetStudy()
 //=============================================================================
 SMESHGUI_StudyAPI SMESHGUI::GetStudyAPI()
 {
-       return myStudyAPI;
+  return myStudyAPI;
 }
 
 //=============================================================================
@@ -360,7 +722,7 @@ SMESHGUI_StudyAPI SMESHGUI::GetStudyAPI()
 //=============================================================================
 QAD_Desktop *SMESHGUI::GetDesktop()
 {
-       return this->myDesktop;
+  return this->myDesktop;
 }
 
 //=============================================================================
@@ -368,21 +730,24 @@ QAD_Desktop *SMESHGUI::GetDesktop()
  *
  */
 //=============================================================================
-vtkScalarBarActor *SMESHGUI::GetScalarBar()
+bool SMESHGUI::ActiveStudyChanged(QAD_Desktop* parent)
 {
-       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;
+  MESSAGE("SMESHGUI::activeStudyChanged init.");
+  QAD_Study* prevStudy = 0;
+  if ( smeshGUI )
+    prevStudy = smeshGUI->myActiveStudy;
+  /* Create or retrieve an object SMESHGUI */
+  MESSAGE("Active study changed : prev study =" << prevStudy);
+  SMESHGUI::GetOrCreateSMESHGUI( parent );
+  MESSAGE("Active study changed : active study =" << smeshGUI->myActiveStudy);
+  if ( prevStudy != smeshGUI->myActiveStudy ) {
+    smeshGUI->EmitSignalCloseAllDialogs();
+    MESSAGE("Active study changed : SMESHGUI nullified" << endl);
+    //smeshGUI = 0;
+    ::UpdateSelectionProp();
+  }
+  MESSAGE("SMESHGUI::activeStudyChanged done.");
+  return true;
 }
 
 //=============================================================================
@@ -390,20 +755,15 @@ vtkScalarBarActor *SMESHGUI::GetScalarBar()
  *
  */
 //=============================================================================
-void SMESHGUI::activeStudyChanged(QAD_Desktop * parent)
+bool SMESHGUI::DefineDlgPosition(QWidget * aDlg, int &x, int &y)
 {
-       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;
+  /* Here the position is on the bottom right corner - 10 */
+  // aDlg->resize(QSize().expandedTo(aDlg->minimumSizeHint()));
+  aDlg->adjustSize();
+  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;
 }
 
 //=============================================================================
@@ -411,14 +771,39 @@ void SMESHGUI::activeStudyChanged(QAD_Desktop * parent)
  *
  */
 //=============================================================================
-bool SMESHGUI::DefineDlgPosition(QWidget * aDlg, int &x, int &y)
+void SMESHGUI::EraseSimulationActors()
 {
-       /* Here the position is on the bottom right corner - 10 */
-       aDlg->resize(QSize().expandedTo(aDlg->minimumSizeHint()));
-       QAD_Desktop *PP = QAD_Application::getDesktop();
-       x = abs(PP->x() + PP->size().width() - aDlg->size().width() - 10);
-       y = abs(PP->y() + PP->size().height() - aDlg->size().height() - 10);
-       return true;
+  if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK)
+  {                                                    //VTK
+    vtkRenderer *theRenderer =
+      ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
+       getRightFrame()->getViewFrame())->getRenderer();
+    vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
+
+    if (mySimulationActors != NULL)
+    {
+      mySimulationActors->InitTraversal();
+      vtkActor *ac = mySimulationActors->GetNextActor();
+      while (!(ac == NULL))
+      {
+        theRenderer->RemoveActor(ac);
+        ac = mySimulationActors->GetNextActor();
+      }
+      mySimulationActors->RemoveAllItems();
+    }
+    if (mySimulationActors2D != NULL)
+    {
+      mySimulationActors2D->InitTraversal();
+      vtkActor2D *ac = mySimulationActors2D->GetNextActor2D();
+      while (!(ac == NULL))
+      {
+        theRenderer->RemoveActor2D(ac);
+        ac = mySimulationActors2D->GetNextActor2D();
+      }
+      mySimulationActors2D->RemoveAllItems();
+    }
+    SetPointRepresentation(false);
+  }
 }
 
 //=============================================================================
@@ -426,40 +811,23 @@ bool SMESHGUI::DefineDlgPosition(QWidget * aDlg, int &x, int &y)
  *
  */
 //=============================================================================
-void SMESHGUI::EraseSimulationActors()
+SMESH::SMESH_Mesh_ptr SMESHGUI::InitMesh( GEOM::GEOM_Shape_ptr aShape,
+                                         QString              NameMesh )
 {
-       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();
-       }
+  try {
+    if ( !myComponentMesh->_is_nil() && !aShape->_is_nil() ) {
+      SMESH::SMESH_Mesh_var aMesh = myComponentMesh->CreateMesh( aShape );
+      if ( !aMesh->_is_nil() ) {
+       SALOMEDS::SObject_var SM = smeshGUI->myStudy->FindObjectIOR( _orb->object_to_string( aMesh ) );
+       myStudyAPI.SetName( SM, NameMesh );
+       return SMESH::SMESH_Mesh::_narrow(aMesh);
+      }
+    }
+  }
+  catch( const SALOME::SALOME_Exception& S_ex ) {
+    QtCatchCorbaException( S_ex );
+  }
+  return SMESH::SMESH_Mesh::_nil();
 }
 
 //=============================================================================
@@ -467,40 +835,21 @@ void SMESHGUI::EraseSimulationActors()
  *
  */
 //=============================================================================
-SMESH::SMESH_Mesh_ptr SMESHGUI::InitMesh(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
-       {
-               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();
+  SMESH::SMESH_subMesh_var aSubMesh;
+  try {
+    if ( !aMesh->_is_nil() && !aShape->_is_nil() )
+      // create sub mesh
+      aSubMesh = SMESH::SMESH_subMesh::_duplicate( aMesh->GetSubMesh( aShape, NameMesh.latin1() ) ); //VSR: published automatically
+  }
+  catch( const SALOME::SALOME_Exception& S_ex ) {
+    QtCatchCorbaException( S_ex );
+    aSubMesh = SMESH::SMESH_subMesh::_nil();
+  }
+  return aSubMesh._retn();
 }
 
 //=============================================================================
@@ -508,40 +857,22 @@ SMESH::SMESH_Mesh_ptr SMESHGUI::InitMesh(GEOM::GEOM_Shape_ptr aShape,
  *
  */
 //=============================================================================
-SMESH::SMESH_subMesh_ptr SMESHGUI::AddSubMesh(SMESH::SMESH_Mesh_ptr aMesh,
-       GEOM::GEOM_Shape_ptr aShape, QString NameMesh)
+SMESH::SMESH_Group_ptr SMESHGUI::AddGroup( SMESH::SMESH_Mesh_ptr    aMesh,
+                                          SMESH::ElementType       aType,
+                                          QString                  aName )
 {
-       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_Group_var aGroup;
+  try {
+    if ( !aMesh->_is_nil() )
+      // create group
+      aGroup = SMESH::SMESH_Group::_duplicate( aMesh->CreateGroup( aType, strdup(aName) ) ); //VSR: published automatically
+  }
+  catch( const SALOME::SALOME_Exception& S_ex ) {
+    QtCatchCorbaException( S_ex );
+    aGroup = SMESH::SMESH_Group::_nil();
+  }
+  myActiveStudy->updateObjBrowser( true );
+  return aGroup._retn();
 }
 
 //=============================================================================
@@ -549,342 +880,247 @@ SMESH::SMESH_subMesh_ptr SMESHGUI::AddSubMesh(SMESH::SMESH_Mesh_ptr aMesh,
  *
  */
 //=============================================================================
-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);
+static void addMap( const map<string, HypothesisData*>& theMap,
+                   map<string, HypothesisData*>&       toMap)
+{
+  map<string, HypothesisData*>::const_iterator it;
+  for ( it = theMap.begin(); it != theMap.end(); it++ )
+    toMap.insert( *it );
 }
 
+    
 //=============================================================================
 /*!
- *
+ *  InitAvailableHypotheses (read from resource XML file)
  */
 //=============================================================================
-void SMESHGUI::AddHypothesisOnMesh(SMESH::SMESH_Mesh_ptr aMesh,
-       SMESH::SMESH_Hypothesis_ptr aHyp)
+void SMESHGUI::InitAvailableHypotheses ()
 {
-       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();
+  QAD_WaitCursor wc;
+  if ((myHypothesesMap.begin() == myHypothesesMap.end()) &&
+      (myAlgorithmsMap.begin() == myAlgorithmsMap.end()))
+  {
+    // Resource manager
+    QAD_ResourceMgr* resMgr = QAD_Desktop::createResourceManager();
+    if (!resMgr) return;
+
+    // Find name of a resource XML file ("SMESH_Meshers.xml");
+    QString HypsXml;
+    char* cenv = getenv("SMESH_MeshersList");
+    if (cenv)
+      HypsXml.sprintf("%s", cenv);
+
+    QStringList HypsXmlList = QStringList::split( ":", HypsXml, false );
+    if (HypsXmlList.count() == 0)
+    {
+      QAD_MessageBox::error1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"),
+                             tr("MESHERS_FILE_NO_VARIABLE"),
+                             tr("SMESH_BUT_OK"));
+      return;
+    }
+
+    // loop on files in HypsXml
+    QString aNoAccessFiles;
+    for ( int i = 0; i < HypsXmlList.count(); i++ ) {
+      QString HypsXml = HypsXmlList[ i ];
+
+      // Find full path to the resource XML file
+      QString xmlFile = HypsXml + ".xml";
+      xmlFile = QAD_Tools::addSlash(resMgr->findFile(xmlFile, HypsXml)) + xmlFile;
+
+      QFile file (QAD_Tools::unix2win(xmlFile));
+      if (file.exists() && file.open(IO_ReadOnly))
+      {
+        file.close();
+
+        SMESHGUI_XmlHandler* myXmlHandler = new SMESHGUI_XmlHandler();
+        ASSERT(myXmlHandler);
+
+        QXmlInputSource source (file);
+        QXmlSimpleReader reader;
+        reader.setContentHandler(myXmlHandler);
+        reader.setErrorHandler(myXmlHandler);
+        bool ok = reader.parse(source);
+        file.close();
+        if (ok)
+        {
+          addMap( myXmlHandler->myHypothesesMap, myHypothesesMap );
+          addMap( myXmlHandler->myAlgorithmsMap, myAlgorithmsMap );
+        }
+        else
+        {
+          QAD_MessageBox::error1(myDesktop, 
+                                tr("INF_PARSE_ERROR"),
+                                tr(myXmlHandler->errorProtocol()),
+                                tr("SMESH_BUT_OK"));
+        }
+      }
+      else
+      {
+        if (aNoAccessFiles.isEmpty())
+          aNoAccessFiles = xmlFile;
+        else
+          aNoAccessFiles += ", " + xmlFile;
+      }
+    } // end loop
+
+
+    if (!aNoAccessFiles.isEmpty())
+    {
+      QString aMess = tr("MESHERS_FILE_CANT_OPEN") + " " + aNoAccessFiles + "\n";
+      aMess += tr("MESHERS_FILE_CHECK_VARIABLE");
+      wc.stop();
+      QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                            tr("SMESH_WRN_WARNING"),
+                            aMess,
+                            tr("SMESH_BUT_OK"));
+      wc.start();
+    }
+  }
 }
 
 //=============================================================================
 /*!
- *
+ *  GetAvailableHypotheses (read from resource XML file)
  */
 //=============================================================================
-void SMESHGUI::
-RemoveHypothesisOrAlgorithmOnMesh(const Handle(SALOME_InteractiveObject) &
-       IObject)
+QStringList SMESHGUI::GetAvailableHypotheses (const bool isAlgo)
 {
-       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);
-#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();
+  QStringList aHypList;
+
+  // Init list of available hypotheses, if needed
+  InitAvailableHypotheses();
+
+  // fill list of hypotheses/algorithms
+  map<string, HypothesisData*>::iterator anIter;
+  if (isAlgo)
+  {
+    anIter = myAlgorithmsMap.begin();
+    for (; anIter != myAlgorithmsMap.end(); anIter++)
+    {
+      aHypList.append(((*anIter).first).c_str());
+    }
+  }
+  else
+  {
+    anIter = myHypothesesMap.begin();
+    for (; anIter != myHypothesesMap.end(); anIter++)
+    {
+      aHypList.append(((*anIter).first).c_str());
+    }
+  }
+
+  return aHypList;
 }
 
 //=============================================================================
 /*!
- *
+ *  GetHypothesisData
  */
 //=============================================================================
-void SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh(SALOMEDS::SObject_ptr MorSM,
-       SMESH::SMESH_Hypothesis_ptr anHyp)
+HypothesisData* SMESHGUI::GetHypothesisData (const char* aHypType)
 {
-       SALOMEDS::SObject_var AHR, aRef;
-       SALOMEDS::GenericAttribute_var anAttr;
-       SALOMEDS::AttributeIOR_var anIOR;
-
-       if (!MorSM->_is_nil())
-       {
-               GEOM::GEOM_Shape_var aShape =
-                       smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(MorSM);
-               if (!aShape->_is_nil())
-               {
-                       if (MorSM->FindAttribute(anAttr, "AttributeIOR"))
-                       {
-                               anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-                               SMESH::SMESH_Mesh_var aMesh =
-                                       SMESH::SMESH_Mesh::_narrow(_orb->string_to_object(anIOR->
-                                               Value()));
-                               SMESH::SMESH_subMesh_var aSubMesh =
-                                       SMESH::SMESH_subMesh::_narrow(_orb->string_to_object(anIOR->
-                                               Value()));
-                               if (!aMesh->_is_nil())
-                               {
-                                       bool res = aMesh->RemoveHypothesis(aShape, anHyp);
-                                       if (!res)
-                                       {
-                                               QApplication::restoreOverrideCursor();
-                                               QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                                                       tr("SMESH_WRN_WARNING"),
-                                                       tr("SMESH_WRN_HYPOTHESIS_NOTEXIST"),
-                                                       tr("SMESH_BUT_YES"));
-                                       }
-                               }
-                               else if (!aSubMesh->_is_nil())
-                               {
-                                       aMesh = aSubMesh->GetFather();
-                                       if (!aMesh->_is_nil())
-                                       {
-                                               bool res = aMesh->RemoveHypothesis(aShape, anHyp);
-                                               if (!res)
-                                               {
-                                                       QApplication::restoreOverrideCursor();
-                                                       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
-                                                               tr("SMESH_WRN_WARNING"),
-                                                               tr("SMESH_WRN_HYPOTHESIS_NOTEXIST"),
-                                                               tr("SMESH_BUT_YES"));
-                                               }
-                                       }
-                               }
-                               if (myAutomaticUpdate)
-                               {
-                                       SMESH_Actor *Mesh = smeshGUI->ReadScript(aMesh);
-                                       if (Mesh != NULL)
-                                       {
-#ifdef TRACE
-                                               Dump(Mesh);
-#endif
-                                               DisplayActor(Mesh);
-                                               DisplayEdges(Mesh);
-                                               // smeshGUI->ChangeRepresentation( Mesh, Mesh->getDisplayMode() );
-                                       }
-                               }
-                       }
-               }
-
-               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();
+  HypothesisData* aHypData = 0;
+
+  // Init list of available hypotheses, if needed
+  InitAvailableHypotheses();
+
+  if (myHypothesesMap.find(aHypType) == myHypothesesMap.end())
+  {
+    if (myAlgorithmsMap.find(aHypType) != myAlgorithmsMap.end())
+    {
+      aHypData = myAlgorithmsMap[aHypType];
+    }
+  }
+  else
+  {
+    aHypData = myHypothesesMap[aHypType];
+  }
+  return aHypData;
 }
 
 //=============================================================================
-/*!
- *
+/*! 
+ *  Get a Hypothesis Creator from a Plugin Library
  */
 //=============================================================================
-void SMESHGUI::AddAlgorithmOnMesh(SMESH::SMESH_Mesh_ptr aMesh,
-       SMESH::SMESH_Hypothesis_ptr aHyp)
+SMESHGUI_GenericHypothesisCreator* SMESHGUI::GetHypothesisCreator(const QString& aHypType)
 {
-       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();
+  char* sHypType = (char*)aHypType.latin1();
+  MESSAGE("Get HypothesisCreator for " << sHypType);
+
+  SMESHGUI_GenericHypothesisCreator* aCreator = 0;
+
+  // check, if creator for this hypothesis type already exists
+  if (myHypCreatorMap.find(sHypType) != myHypCreatorMap.end())
+  {
+    aCreator = myHypCreatorMap[sHypType];
+  }
+  else
+  {
+    // 1. Init list of available hypotheses, if needed
+    InitAvailableHypotheses();
+
+    // 2. Get names of plugin libraries
+    HypothesisData* aHypData = GetHypothesisData(sHypType);
+    if (!aHypData)
+    {
+      return aCreator;
+    }
+    QString aClientLibName = aHypData->ClientLibName;
+    QString aServerLibName = aHypData->ServerLibName;
+
+    // 3. Load Client Plugin Library
+    try
+    {
+      // load plugin library
+      MESSAGE("Loading client meshers plugin library ...");
+      void* libHandle = dlopen (aClientLibName, RTLD_LAZY);
+      if (!libHandle)
+      {
+        // report any error, if occured
+        const char* anError = dlerror();
+        MESSAGE(anError);
+      }
+      else
+      {
+        // get method, returning hypothesis creator
+        MESSAGE("Find GetHypothesisCreator() method ...");
+        typedef SMESHGUI_GenericHypothesisCreator* (*GetHypothesisCreator) \
+          (QString aHypType, QString aServerLibName, SMESHGUI* aSMESHGUI);
+        GetHypothesisCreator procHandle =
+          (GetHypothesisCreator)dlsym( libHandle, "GetHypothesisCreator" );
+        if (!procHandle)
+        {
+          MESSAGE("bad hypothesis client plugin library");
+          dlclose(libHandle);
+        }
+        else
+        {
+          // get hypothesis creator
+          MESSAGE("Get Hypothesis Creator for " << aHypType);
+          aCreator = procHandle(aHypType, aServerLibName, smeshGUI);
+          if (!aCreator)
+          {
+            MESSAGE("no such a hypothesis in this plugin");
+          }
+          else
+          {
+            // map hypothesis creator to a hypothesis name
+            myHypCreatorMap[sHypType] = aCreator;
+          }
+        }
+      }
+    }
+    catch (const SALOME::SALOME_Exception& S_ex)
+    {
+      QtCatchCorbaException(S_ex);
+    }
+  }
+
+  return aCreator;
 }
 
 //=============================================================================
@@ -892,48 +1128,39 @@ void SMESHGUI::AddAlgorithmOnMesh(SMESH::SMESH_Mesh_ptr aMesh,
  *
  */
 //=============================================================================
-void SMESHGUI::AddHypothesisOnSubMesh(SMESH::SMESH_subMesh_ptr aSubMesh,
-       SMESH::SMESH_Hypothesis_ptr aHyp)
+SMESH::SMESH_Hypothesis_ptr SMESHGUI::CreateHypothesis (const QString& aHypType,
+                                                       const QString& aHypName,
+                                                        const bool     isAlgo)
 {
-       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();
+  MESSAGE("Create " << aHypType << " with name " << aHypName);
+
+  SMESH::SMESH_Hypothesis_var Hyp;
+
+  HypothesisData* aHypData = GetHypothesisData((char*)aHypType.latin1());
+  QString aServLib = aHypData->ServerLibName;
+
+  try
+  {
+    Hyp = myComponentMesh->CreateHypothesis(aHypType, aServLib);
+    if (!Hyp->_is_nil())
+    {
+      SALOMEDS::SObject_var SHyp =
+        smeshGUI->myStudy->FindObjectIOR( _orb->object_to_string( Hyp ) );
+      if (!SHyp->_is_nil())
+      {
+       if ( !aHypName.isEmpty() )
+         myStudyAPI.SetName( SHyp, aHypName );
+        myActiveStudy->updateObjBrowser(true);
+       return Hyp._retn();
+      }
+    }
+  }
+  catch (const SALOME::SALOME_Exception & S_ex)
+  {
+    QtCatchCorbaException(S_ex);
+  }
+
+  return SMESH::SMESH_Hypothesis::_nil();
 }
 
 //=============================================================================
@@ -941,48 +1168,48 @@ void SMESHGUI::AddHypothesisOnSubMesh(SMESH::SMESH_subMesh_ptr aSubMesh,
  *
  */
 //=============================================================================
-void SMESHGUI::AddAlgorithmOnSubMesh(SMESH::SMESH_subMesh_ptr aSubMesh,
-       SMESH::SMESH_Hypothesis_ptr aHyp)
+bool SMESHGUI::AddHypothesisOnMesh(SMESH::SMESH_Mesh_ptr aMesh,
+                                  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();
+  int res = SMESH::HYP_UNKNOWN_FATAL; 
+  QAD_WaitCursor wc;
+
+  if ( !aMesh->_is_nil() ) {
+    SALOMEDS::SObject_var SM = myStudyAPI.FindObject( aMesh );
+    GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh(SM);
+    try {
+      res = aMesh->AddHypothesis( aShape, aHyp );
+      if ( res < SMESH::HYP_UNKNOWN_FATAL ) {
+       SALOMEDS::SObject_var SH = myStudyAPI.FindObject(aHyp);
+       if ( !SM->_is_nil() && !SH->_is_nil() ) {
+         //myStudyAPI.SetHypothesis(SM, SH); // VSR: published automatically by engine
+         myStudyAPI.ModifiedMesh(SM, false);
+       }
+      }
+      if ( res >= SMESH::HYP_UNKNOWN_FATAL ) {
+       wc.stop();
+       QAD_MessageBox::error1(QAD_Application::getDesktop(),
+                             tr("SMESH_ERROR"),
+                             tr(QString("SMESH_HYP_%1").arg(res)),
+                             tr("SMESH_BUT_OK"));
+       wc.start();
+      }
+      else if ( res > SMESH::HYP_OK ) {
+       wc.stop();
+       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"),
+                             tr(QString("SMESH_HYP_%1").arg(res)),
+                             tr("SMESH_BUT_OK"));
+       wc.start();
+      }
+    }
+    catch( const SALOME::SALOME_Exception& S_ex ) {
+      wc.stop();
+      QtCatchCorbaException( S_ex );
+      res = SMESH::HYP_UNKNOWN_FATAL;
+    }
+  }
+  return res < SMESH::HYP_UNKNOWN_FATAL;
 }
 
 //=============================================================================
@@ -990,33 +1217,76 @@ void SMESHGUI::AddAlgorithmOnSubMesh(SMESH::SMESH_subMesh_ptr aSubMesh,
  *
  */
 //=============================================================================
-void SMESHGUI::CreateAlgorithm(QString TypeAlgo, QString NameAlgo)
+bool SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh
+               (const Handle(SALOME_InteractiveObject)& IObject)
 {
-       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);
+  int res = SMESH::HYP_UNKNOWN_FATAL;
+  QAD_WaitCursor wc;
+
+  if (IObject->hasReference())
+  {
+    try {
+      SMESH::SMESH_Hypothesis_var anHyp;
+      SALOMEDS::SObject_var SO_Hypothesis =
+       smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+      SALOMEDS::GenericAttribute_var anAttr;
+      SALOMEDS::AttributeIOR_var anIOR;
+
+      if (!SO_Hypothesis->_is_nil()) {
+       if (SO_Hypothesis->FindAttribute(anAttr, "AttributeIOR")) {
+         anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+         anHyp = SMESH::SMESH_Hypothesis::_narrow
+           (_orb->string_to_object(anIOR->Value()));
+       }
+
+       SALOMEDS::SObject_var SO_Applied_Hypothesis =
+         smeshGUI->myStudy->FindObjectID(IObject->getReference());
+       if (!SO_Applied_Hypothesis->_is_nil()) {
+         SALOMEDS::SObject_var MorSM =
+           smeshGUI->myStudyAPI.GetMeshOrSubmesh(SO_Applied_Hypothesis);
+         if (!MorSM->_is_nil()) {
+           GEOM::GEOM_Shape_var aShape =
+             smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(MorSM);
+           if (!aShape->_is_nil() && MorSM->FindAttribute(anAttr, "AttributeIOR")) {
+              anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+              SMESH::SMESH_Mesh_var aMesh =
+                SMESH::SMESH_Mesh::_narrow(_orb->string_to_object(anIOR->Value()));
+              SMESH::SMESH_subMesh_var aSubMesh =
+                SMESH::SMESH_subMesh::_narrow(_orb->string_to_object(anIOR->Value()));
+
+             if (!aSubMesh->_is_nil())
+                aMesh = aSubMesh->GetFather();
+
+              if (!aMesh->_is_nil())
+              {
+                res = aMesh->RemoveHypothesis(aShape, anHyp);
+               if ( res < SMESH::HYP_UNKNOWN_FATAL )
+                 smeshGUI->myStudyAPI.ModifiedMesh(MorSM, false);
+                if ( res > SMESH::HYP_OK ) {
+                 wc.stop();
+                  QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                                        tr("SMESH_WRN_WARNING"),
+                                        tr(QString("SMESH_HYP_%1").arg(res)),
+                                        tr("SMESH_BUT_OK"));
+                 wc.start();
+               }
+              }
+            }
+          }
+        }
+      }
+    }
+    catch( const SALOME::SALOME_Exception& S_ex ) {
+      wc.stop();
+      QtCatchCorbaException( S_ex );
+      res = SMESH::HYP_UNKNOWN_FATAL;
+    }
+  }
+  else if (IObject->hasEntry())
+  {
+    MESSAGE("IObject entry " << IObject->getEntry());
+  }
+  return res < SMESH::HYP_UNKNOWN_FATAL;
 }
 
 //=============================================================================
@@ -1024,26 +1294,52 @@ void SMESHGUI::CreateAlgorithm(QString TypeAlgo, QString NameAlgo)
  *
  */
 //=============================================================================
-void SMESHGUI::CreateLocalLength(QString TypeHypothesis, QString NameHypothesis,
-       double Length)
+bool SMESHGUI::RemoveHypothesisOrAlgorithmOnMesh(SALOMEDS::SObject_ptr MorSM,
+       SMESH::SMESH_Hypothesis_ptr anHyp)
 {
-       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();
+  SALOMEDS::SObject_var AHR, aRef;
+  SALOMEDS::GenericAttribute_var anAttr;
+  SALOMEDS::AttributeIOR_var anIOR;
+  int res = SMESH::HYP_UNKNOWN_FATAL;
+  QAD_WaitCursor wc;
+
+  if (!MorSM->_is_nil()) {
+    try {
+      GEOM::GEOM_Shape_var aShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(MorSM);
+      if (!aShape->_is_nil()) {
+       if (MorSM->FindAttribute(anAttr, "AttributeIOR")) {
+         anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+         SMESH::SMESH_Mesh_var aMesh =
+           SMESH::SMESH_Mesh::_narrow(_orb->string_to_object(anIOR->Value()));
+         SMESH::SMESH_subMesh_var aSubMesh =
+           SMESH::SMESH_subMesh::_narrow(_orb->string_to_object(anIOR->Value()));
+         
+         if ( !aSubMesh->_is_nil() )
+           aMesh = aSubMesh->GetFather();
+         
+         if (!aMesh->_is_nil()) {
+           res = aMesh->RemoveHypothesis(aShape, anHyp);
+           if ( res < SMESH::HYP_UNKNOWN_FATAL )
+             smeshGUI->myStudyAPI.ModifiedMesh(MorSM, false);
+           if ( res > SMESH::HYP_OK ) {
+             wc.stop();
+             QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                                   tr("SMESH_WRN_WARNING"),
+                                   tr(QString("SMESH_HYP_%1").arg(res)),
+                                   tr("SMESH_BUT_OK"));
+             wc.start();
+           }
+         }
+       }
+      }
+    }
+    catch( const SALOME::SALOME_Exception& S_ex ) {
+      wc.stop();
+      QtCatchCorbaException( S_ex );
+      res = SMESH::HYP_UNKNOWN_FATAL;
+    }
+  }
+  return res < SMESH::HYP_UNKNOWN_FATAL;
 }
 
 //=============================================================================
@@ -1051,27 +1347,48 @@ void SMESHGUI::CreateLocalLength(QString TypeHypothesis, QString NameHypothesis,
  *
  */
 //=============================================================================
-void SMESHGUI::CreateMaxElementArea(QString TypeHypothesis,
-       QString NameHypothesis, double MaxArea)
+bool SMESHGUI::AddAlgorithmOnMesh( SMESH::SMESH_Mesh_ptr       aMesh,
+                                  SMESH::SMESH_Hypothesis_ptr aHyp )
 {
-       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();
+  int res = SMESH::HYP_UNKNOWN_FATAL;
+  QAD_WaitCursor wc;
+
+  if ( !aMesh->_is_nil() ) {
+    SALOMEDS::SObject_var SM = myStudyAPI.FindObject( aMesh );
+    GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SM );
+    try {
+      res = aMesh->AddHypothesis( aShape, aHyp );
+      if ( res < SMESH::HYP_UNKNOWN_FATAL ) {
+       //SALOMEDS::SObject_var SH = myStudyAPI.FindObject( aHyp );
+       //if ( !SM->_is_nil() && !SH->_is_nil() ) {
+         //myStudyAPI.SetAlgorithms(SM, SH);
+       myStudyAPI.ModifiedMesh( SM, false );
+       //}
+      }
+      if ( res >= SMESH::HYP_UNKNOWN_FATAL ) {
+       wc.stop();
+       QAD_MessageBox::error1(QAD_Application::getDesktop(),
+                             tr("SMESH_ERROR"),
+                             tr(QString("SMESH_HYP_%1").arg(res)),
+                             tr("SMESH_BUT_OK"));
+       wc.start();
+      }
+      else if ( res > SMESH::HYP_OK ) {
+       wc.stop();
+       QAD_MessageBox::warn1( QAD_Application::getDesktop(),
+                              tr( "SMESH_WRN_WARNING" ),
+                              tr(QString("SMESH_HYP_%1").arg(res)),
+                              tr( "SMESH_BUT_OK" ) );
+       wc.start();
+      }
+    }
+    catch( const SALOME::SALOME_Exception& S_ex ) {
+      wc.stop();
+      QtCatchCorbaException( S_ex );
+      res = SMESH::HYP_UNKNOWN_FATAL;
+    }
+  }
+  return res < SMESH::HYP_UNKNOWN_FATAL;
 }
 
 //=============================================================================
@@ -1079,26 +1396,52 @@ void SMESHGUI::CreateMaxElementArea(QString TypeHypothesis,
  *
  */
 //=============================================================================
-void SMESHGUI::CreateMaxElementVolume(QString TypeHypothesis,
-       QString NameHypothesis, double MaxVolume)
+bool SMESHGUI::AddHypothesisOnSubMesh( SMESH::SMESH_subMesh_ptr    aSubMesh,
+                                      SMESH::SMESH_Hypothesis_ptr aHyp )
 {
-       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();
+  int res = SMESH::HYP_UNKNOWN_FATAL;
+  QAD_WaitCursor wc;
+
+  if ( !aSubMesh->_is_nil() ) {
+    try {
+      SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
+      SALOMEDS::SObject_var SsubM = myStudyAPI.FindObject( aSubMesh );
+      GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh( SsubM );
+      if ( !aMesh->_is_nil() && !SsubM->_is_nil() && !aShape->_is_nil() ) {
+       res = aMesh->AddHypothesis( aShape, aHyp );
+       if ( res < SMESH::HYP_UNKNOWN_FATAL )  {
+         //SALOMEDS::SObject_var SH = myStudyAPI.FindObject(aHyp);
+         //                    if (!SsubM->_is_nil() && !SH->_is_nil())
+         //                    {
+         //                            myStudyAPI.SetHypothesis(SsubM, SH);
+         myStudyAPI.ModifiedMesh( SsubM, false );
+         //                    }
+       }
+       if ( res >= SMESH::HYP_UNKNOWN_FATAL ) {
+         wc.stop();
+         QAD_MessageBox::error1(QAD_Application::getDesktop(),
+                                tr("SMESH_ERROR"),
+                                tr(QString("SMESH_HYP_%1").arg(res)),
+                                tr("SMESH_BUT_OK"));
+         wc.start();
+       }
+       else if ( res > SMESH::HYP_OK ) {
+         wc.stop();
+         QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr( "SMESH_WRN_WARNING" ),
+                               tr(QString("SMESH_HYP_%1").arg(res)),
+                               tr( "SMESH_BUT_OK" ) );
+         wc.start();
+       }
+      }
+    }
+    catch( const SALOME::SALOME_Exception& S_ex ) {
+      wc.stop();
+      QtCatchCorbaException( S_ex );
+      res = SMESH::HYP_UNKNOWN_FATAL;
+    }
+  }
+  return res < SMESH::HYP_UNKNOWN_FATAL;
 }
 
 //=============================================================================
@@ -1106,26 +1449,51 @@ void SMESHGUI::CreateMaxElementVolume(QString TypeHypothesis,
  *
  */
 //=============================================================================
-void SMESHGUI::CreateNbSegments(QString TypeHypothesis, QString NameHypothesis,
-       int nbSegments)
+bool SMESHGUI::AddAlgorithmOnSubMesh( SMESH::SMESH_subMesh_ptr    aSubMesh,
+                                     SMESH::SMESH_Hypothesis_ptr aHyp )
 {
-       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();
+  int res = SMESH::HYP_UNKNOWN_FATAL;
+  QAD_WaitCursor wc;
+
+  if ( !aSubMesh->_is_nil() ) {
+    try {
+      SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
+      SALOMEDS::SObject_var SsubM = myStudyAPI.FindObject(aSubMesh);
+      GEOM::GEOM_Shape_var aShape = myStudyAPI.GetShapeOnMeshOrSubMesh(SsubM);
+      if ( !aMesh->_is_nil() && !SsubM->_is_nil() && !aShape->_is_nil() ) {
+       res = aMesh->AddHypothesis( aShape, aHyp );
+       if ( res < SMESH::HYP_UNKNOWN_FATAL )  {
+         //SALOMEDS::SObject_var SH = myStudyAPI.FindObject(aHyp);
+         //if (!SsubM->_is_nil() && !SH->_is_nil()) {
+         //myStudyAPI.SetAlgorithms(SsubM, SH);
+         myStudyAPI.ModifiedMesh( SsubM, false );
+         //}
+       }
+       if ( res >= SMESH::HYP_UNKNOWN_FATAL ) {
+         wc.stop();
+         QAD_MessageBox::error1(QAD_Application::getDesktop(),
+                                tr("SMESH_ERROR"),
+                                tr(QString("SMESH_HYP_%1").arg(res)),
+                                tr("SMESH_BUT_OK"));
+         wc.start();
+       }
+       else if ( res > SMESH::HYP_OK ) {
+         wc.stop();
+         QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr( "SMESH_WRN_WARNING" ),
+                               tr(QString("SMESH_HYP_%1").arg(res)),
+                               tr( "SMESH_BUT_OK" ) );
+         wc.start();
+       }
+      }
+    }
+    catch( const SALOME::SALOME_Exception& S_ex ) {
+      wc.stop();
+      QtCatchCorbaException( S_ex );
+      res = SMESH::HYP_UNKNOWN_FATAL;
+    }
+  }
+  return res < SMESH::HYP_UNKNOWN_FATAL;
 }
 
 //=============================================================================
@@ -1153,116 +1521,102 @@ int SMESHGUI::GetNameOfSelectedIObjects(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 SMESHGUI::GetNameOfSelectedNodes(SALOME_Selection * Sel, QString & aName){
+  aName = "";
+  if(Sel->IObjectCount() == 1){
+    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+    if(IObject->hasEntry()){
+      if(SMESH_Actor *anActor = ::FindActorByEntry(IObject->getEntry())){
+       TColStd_MapOfInteger MapIndex;
+       Sel->GetIndex(IObject, MapIndex);
+       TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+       for(; ite.More(); ite.Next()){
+         aName += QString(" %1").arg(anActor->GetNodeObjId(ite.Key()));
+       }
+       return MapIndex.Extent();
+      }
+    }
+  }
+  return -1;
+}
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-int SMESHGUI::GetNameOfSelectedElements(SALOME_Selection * Sel, QString & aName)
-{
-       int nbElements = 0;
-       int nbSel = Sel->IObjectCount();
-       if (nbSel == 1)
-       {
-               Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-               if (!IObject->hasEntry())
-                       return -1;
+int SMESHGUI::GetNameOfSelectedElements(SALOME_Selection * Sel, QString & aName){
+  aName = "";
+  if(Sel->IObjectCount() == 1){
+    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+    if(IObject->hasEntry()){
+      if(SMESH_Actor *anActor = ::FindActorByEntry(IObject->getEntry())){
+       TColStd_MapOfInteger MapIndex;
+       Sel->GetIndex(IObject, MapIndex);
+       TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+       std::vector<int> aList;
+       for(; ite.More(); ite.Next()){
+         int aVtkId = ite.Key();
+         int anObjId = anActor->GetElemObjId(aVtkId);
+         std::vector<int>::iterator found = find(aList.begin(), aList.end(), anObjId);
+         //      MESSAGE("GetNameOfSelectedElements(): VTK Id = " << aVtkId << ", OBJECT Id = " << anObjId);
+         if (found == aList.end()) {
+           aList.push_back(anObjId);
+           aName += QString(" %1").arg(anObjId);
+         }
+       }
+       return aList.size();
+      }
+    }
+  }
+  return -1;
+}
 
-               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){
+  aName = "";
+  if(Sel->IObjectCount() == 1){
+    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+    if(IObject->hasEntry()){
+      if(SMESH_Actor *anActor = ::FindActorByEntry(IObject->getEntry())){
+       TColStd_MapOfInteger MapIndex;
+       Sel->GetIndex(IObject, MapIndex);
+       TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+       for(; ite.More(); ite.Next()){
+         aName += QString(" %1").arg(ite.Key());
+       }
+       return MapIndex.Extent();
+      }
+    }
+  }
+  return -1;
 }
 
+
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-int SMESHGUI::GetNameOfSelectedEdges(SALOME_Selection * Sel, QString & aName)
+SMESH_Actor *SMESHGUI::FindActorByEntry(QString theEntry,
+                                       Standard_Boolean & theResult, 
+                                       bool onlyInActiveView)
 {
-       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;
+  theResult = false;
+  int aNbStudyFrames = myActiveStudy->getStudyFramesCount();
+  for (int i = 0; i < aNbStudyFrames; i++){
+    QAD_StudyFrame *aStudyFrame = myActiveStudy->getStudyFrame(i);
+    if(SMESH_Actor *anActor = ::FindActorByEntry(aStudyFrame,theEntry.latin1())){
+      theResult = true;
+      return anActor;
+    }
+  }
+  return NULL;
 }
 
 //=============================================================================
@@ -1270,54 +1624,20 @@ int SMESHGUI::GetNameOfSelectedEdges(SALOME_Selection * Sel, QString & aName)
  *
  */
 //=============================================================================
-SMESH_Actor *SMESHGUI::FindActorByEntry(QString entry,
-       Standard_Boolean & testResult, bool onlyInActiveView)
+SMESH_Actor* SMESHGUI::FindActor(CORBA::Object_ptr theObj,
+                                Standard_Boolean & theResult, 
+                                bool theOnlyInActiveView)
 {
-       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();
+  theResult = false;
+  SMESH_Actor* aRes = NULL;
+  if ( !CORBA::is_nil( theObj ) ) {
+    SALOMEDS::SObject_var aSObject = SALOMEDS::SObject::_narrow( myStudy->FindObjectIOR( _orb->object_to_string( theObj ) ) );
+    if( !aSObject->_is_nil()) {
+      CORBA::String_var anEntry = aSObject->GetID();
+      aRes = FindActorByEntry( anEntry.in(), theResult, theOnlyInActiveView );
+    }
+  }
+  return aRes;
 }
 
 //=============================================================================
@@ -1325,17 +1645,34 @@ SMESH_Actor *SMESHGUI::FindActorByEntry(QString entry,
  *
  */
 //=============================================================================
-SMESH_Actor *SMESHGUI::FindActor(SMESH::SMESH_Mesh_ptr aMesh,
-       Standard_Boolean & testResult, bool onlyInActiveView)
+SMESH::SMESH_Mesh_ptr SMESHGUI::ConvertIOinMesh(const Handle(SALOME_InteractiveObject) & IO,
+                                               Standard_Boolean & testResult)
 {
-       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);
+  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();
 }
 
 //=============================================================================
@@ -1343,36 +1680,33 @@ 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_subMesh_ptr SMESHGUI::ConvertIOinSubMesh(const Handle(SALOME_InteractiveObject) & IO,
+                                                     Standard_Boolean & testResult)
 {
-       SMESH::SMESH_Mesh_var aMesh;
-       testResult = false;
-
-       /* case SObject */
-       if (IO->hasEntry())
-       {
-               SALOMEDS::SObject_var obj = myStudy->FindObjectID(IO->getEntry());
-               SALOMEDS::GenericAttribute_var anAttr;
-               SALOMEDS::AttributeIOR_var anIOR;
-               if (!obj->_is_nil())
-               {
-                       if (obj->FindAttribute(anAttr, "AttributeIOR"))
-                       {
-                               anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-                               aMesh =
-                                       SMESH::SMESH_Mesh::_narrow(_orb->string_to_object(anIOR->
-                                               Value()));
-                               if (!aMesh->_is_nil())
-                               {
-                                       testResult = true;
-                                       return SMESH::SMESH_Mesh::_duplicate(aMesh);
-                               }
-                       }
-               }
-       }
-       return SMESH::SMESH_Mesh::_nil();
+  SMESH::SMESH_subMesh_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();
 }
 
 //=============================================================================
@@ -1380,36 +1714,33 @@ ConvertIOinMesh(const Handle(SALOME_InteractiveObject) & IO,
  *
  */
 //=============================================================================
-SMESH::SMESH_subMesh_ptr SMESHGUI::
-ConvertIOinSubMesh(const Handle(SALOME_InteractiveObject) & IO,
-       Standard_Boolean & testResult)
+SMESH::SMESH_Hypothesis_ptr SMESHGUI::ConvertIOinSMESHHypothesis(const Handle(SALOME_InteractiveObject) & IO,
+                                                                Standard_Boolean & testResult)
 {
-       SMESH::SMESH_subMesh_var aSubMesh;
-       testResult = false;
-
-       /* case SObject */
-       if (IO->hasEntry())
-       {
-               SALOMEDS::SObject_var obj = myStudy->FindObjectID(IO->getEntry());
-               SALOMEDS::GenericAttribute_var anAttr;
-               SALOMEDS::AttributeIOR_var anIOR;
-               if (!obj->_is_nil())
-               {
-                       if (obj->FindAttribute(anAttr, "AttributeIOR"))
-                       {
-                               anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-                               aSubMesh =
-                                       SMESH::SMESH_subMesh::_narrow(_orb->string_to_object(anIOR->
-                                               Value()));
-                               if (!aSubMesh->_is_nil())
-                               {
-                                       testResult = true;
-                                       return SMESH::SMESH_subMesh::_duplicate(aSubMesh);
-                               }
-                       }
-               }
-       }
-       return SMESH::SMESH_subMesh::_nil();
+  SMESH::SMESH_Hypothesis_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();
 }
 
 //=============================================================================
@@ -1417,36 +1748,29 @@ ConvertIOinSubMesh(const Handle(SALOME_InteractiveObject) & IO,
  *
  */
 //=============================================================================
-SMESH::SMESH_Hypothesis_ptr SMESHGUI::
-ConvertIOinSMESHHypothesis(const Handle(SALOME_InteractiveObject) & IO,
-       Standard_Boolean & testResult)
+SMESH::SMESH_Group_ptr SMESHGUI::ConvertIOinSMESHGroup(const Handle(SALOME_InteractiveObject) & IO,
+                                                      Standard_Boolean & testResult)
 {
-       SMESH::SMESH_Hypothesis_var aHyp;
-       testResult = false;
-
-       /* case SObject */
-       if (IO->hasEntry())
-       {
-               SALOMEDS::SObject_var obj = myStudy->FindObjectID(IO->getEntry());
-               SALOMEDS::GenericAttribute_var anAttr;
-               SALOMEDS::AttributeIOR_var anIOR;
-               if (!obj->_is_nil())
-               {
-                       if (obj->FindAttribute(anAttr, "AttributeIOR"))
-                       {
-                               anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-                               aHyp =
-                                       SMESH::SMESH_Hypothesis::_narrow(_orb->
-                                       string_to_object(anIOR->Value()));
-                               if (!aHyp->_is_nil())
-                               {
-                                       testResult = true;
-                                       return SMESH::SMESH_Hypothesis::_duplicate(aHyp);
-                               }
-                       }
-               }
-       }
-       return SMESH::SMESH_Hypothesis::_nil();
+  SMESH::SMESH_Group_var aGroup;
+  testResult = false;
+
+  /* case SObject */
+  if (IO->hasEntry()) {
+    SALOMEDS::SObject_var obj = myStudy->FindObjectID(IO->getEntry());
+    SALOMEDS::GenericAttribute_var anAttr;
+    SALOMEDS::AttributeIOR_var anIOR;
+    if (!obj->_is_nil()) {
+      if (obj->FindAttribute(anAttr, "AttributeIOR")) {
+        anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+        aGroup = SMESH::SMESH_Group::_narrow(_orb->string_to_object(anIOR->Value()));
+        if (!aGroup->_is_nil()) {
+          testResult = true;
+          return SMESH::SMESH_Group::_duplicate(aGroup);
+        }
+      }
+    }
+  }
+  return SMESH::SMESH_Group::_nil();
 }
 
 //=============================================================================
@@ -1454,34 +1778,29 @@ ConvertIOinSMESHHypothesis(const Handle(SALOME_InteractiveObject) & IO,
  *
  */
 //=============================================================================
-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();
 }
 
 //=============================================================================
@@ -1489,55 +1808,37 @@ ConvertIOinGEOMShape(const Handle(SALOME_InteractiveObject) & IO,
  *
  */
 //=============================================================================
-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);
-               }
-       }
+void SMESHGUI::SetViewMode(int commandId){
+  SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection());
+  if(Sel->IObjectCount() >= 1){
+    SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+    for(; It.More(); It.Next()){
+      Handle(SALOME_InteractiveObject) IObject = It.Value();
+      if(IObject->hasEntry()){
+       if(SMESH_Actor *anActor = ::FindActorByEntry(IObject->getEntry())){
+         switch(commandId){
+         case 211:
+           ChangeRepresentation(anActor,0);
+           break;
+         case 212:
+           ChangeRepresentation(anActor,1);
+           break;
+         case 213:
+           ChangeRepresentation(anActor,2);
+           break;
+         case 215:
+           ChangeRepresentation(anActor,5);
+           break;
+         case 1132:
+           ChangeRepresentation(anActor,3);
+           break;
+         }
+       }
+      }
+    }
+    if(commandId == 1133)
+      ChangeRepresentation(NULL,4);
+  }
 }
 
 //=============================================================================
@@ -1545,207 +1846,110 @@ void SMESHGUI::SetViewMode(int commandId)
  *
  */
 //=============================================================================
-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]);
-//       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]);
-//       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);
-//       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]);
-//       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();
+void SMESHGUI::ChangeRepresentation(SMESH_Actor * theActor, int type){
+  switch (type){
+  case 0:{
+    //theActor->UnShrink();
+    theActor->SetRepresentation(SMESH_Actor::eEdge);
+    break;
+  }
+  case 1:{
+    //theActor->UnShrink();
+    theActor->SetRepresentation(SMESH_Actor::eSurface);
+    break;
+  }
+  case 2:{
+    theActor->IsShrunk() ? theActor->UnShrink() : theActor->SetShrink();
+    //theActor->SetRepresentation(SMESH_Actor::eSurface);
+    break;
+  }
+  case 5:{
+    //theActor->UnShrink();
+    theActor->SetRepresentation(SMESH_Actor::ePoint);
+    break;
+  }
+  case 3:{
+    float color[3];
+    theActor->GetSufaceColor(color[0], color[1], color[2]);
+    int c0 = int (color[0] * 255);
+    int c1 = int (color[1] * 255);
+    int c2 = int (color[2] * 255);
+    QColor c(c0, c1, c2);
+
+    float edgecolor[3];
+    theActor->GetEdgeColor(edgecolor[0], edgecolor[1], edgecolor[2]);
+    c0 = int (edgecolor[0] * 255);
+    c1 = int (edgecolor[1] * 255);
+    c2 = int (edgecolor[2] * 255);
+    QColor e(c0, c1, c2);
+
+    float backfacecolor[3];
+    theActor->GetBackSufaceColor(backfacecolor[0], backfacecolor[1], backfacecolor[2]);
+    c0 = int (backfacecolor[0] * 255);
+    c1 = int (backfacecolor[1] * 255);
+    c2 = int (backfacecolor[2] * 255);
+    QColor b(c0, c1, c2);
+
+    float nodecolor[3];
+    theActor->GetNodeColor(nodecolor[0], nodecolor[1], nodecolor[2]);
+    c0 = int (nodecolor[0] * 255);
+    c1 = int (nodecolor[1] * 255);
+    c2 = int (nodecolor[2] * 255);
+    QColor n(c0, c1, c2);
+
+    int Edgewidth = (int)theActor->GetLineWidth();
+    if(Edgewidth == 0)
+      Edgewidth = 1;
+    int intValue = int(theActor->GetNodeSize());
+    float Shrink = theActor->GetShrinkFactor();
+
+    SMESHGUI_Preferences_ColorDlg *aDlg = new SMESHGUI_Preferences_ColorDlg(QAD_Application::getDesktop(),"");
+    aDlg->SetColor(1, c);
+    aDlg->SetColor(2, e);
+    aDlg->SetColor(3, n);
+    aDlg->SetColor(4, b);
+    aDlg->SetIntValue(1, Edgewidth);
+    aDlg->SetIntValue(2, intValue);
+    aDlg->SetIntValue(3, int(Shrink*100.));
+    if(aDlg->exec()){
+      QColor color = aDlg->GetColor(1);
+      QColor edgecolor = aDlg->GetColor(2);
+      QColor nodecolor = aDlg->GetColor(3);
+      QColor backfacecolor = aDlg->GetColor(4);
+      /* actor color and backface color */
+      theActor->SetSufaceColor(float (color.red()) / 255.,
+                              float (color.green()) / 255., 
+                              float (color.blue()) / 255.);
+      theActor->SetBackSufaceColor(float (backfacecolor.red()) / 255., 
+                                  float (backfacecolor.green()) / 255.,
+                                  float (backfacecolor.blue()) / 255.);
+
+      /* edge color */
+      theActor->SetEdgeColor(float (edgecolor.red()) / 255.,
+                            float (edgecolor.green()) / 255.,
+                            float (edgecolor.blue()) / 255.);
+      
+      /* Shrink factor and size edges */
+      theActor->SetShrinkFactor(aDlg->GetIntValue(3) / 100.);
+      theActor->SetLineWidth(aDlg->GetIntValue(1));
+      
+      /* Nodes color and size */
+      theActor->SetNodeColor(float (nodecolor.red()) / 255.,
+                            float (nodecolor.green()) / 255.,
+                            float (nodecolor.blue()) / 255.);
+      theActor->SetNodeSize(aDlg->GetIntValue(2));
+
+      delete aDlg;
+    }
+    break;
+  }
+  case 4:{
+    EmitSignalDeactivateDialog();
+    SMESHGUI_TransparencyDlg *aDlg = new SMESHGUI_TransparencyDlg(QAD_Application::getDesktop(),"",false);
+    break;
+  }
+  }
+  UpdateView();
 }
 
 //=============================================================================
@@ -1753,15 +1957,8 @@ void SMESHGUI::ChangeRepresentation(SMESH_Actor * ac, int type)
  *
  */
 //=============================================================================
-void SMESHGUI::UpdateView()
-{
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       vtkRenderer *theRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-       theRenderer->Render();
+void SMESHGUI::UpdateView(){
+  ::RepaintCurrentView();
 }
 
 //=============================================================================
@@ -1769,91 +1966,9 @@ void SMESHGUI::UpdateView()
  *
  */
 //=============================================================================
-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 ( visibility )
-       ac->SetVisibility(visibility);
-//    ac->VisibilityOn();
-//  else
-//    ac->VisibilityOff();
-
-       vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-       renWin->Render();
+void SMESHGUI::DisplayActor(SMESH_Actor * theActor, bool theVisibility){
+  theActor->SetVisibility(theVisibility);
+  ::DisplayActor(myActiveStudy->getActiveStudyFrame(),theActor);
 }
 
 //=============================================================================
@@ -1861,22 +1976,8 @@ void SMESHGUI::DisplayActor(SMESH_Actor * ac, bool visibility)
  *
  */
 //=============================================================================
-void SMESHGUI::EraseActor(SMESH_Actor * ac)
-{
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       vtkRenderer *theRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-
-       //NRI- : 02/12/2002 : Fixed bugId 882
-       //  ac->EdgeDevice->VisibilityOff();
-       //  ac->EdgeShrinkDevice->VisibilityOff();
-       //  ac->VisibilityOff();
-       ac->SetVisibility(false);
-
-       theRenderer->Render();
+void SMESHGUI::EraseActor(SMESH_Actor * theActor){
+  theActor->SetVisibility(false);
 }
 
 //=============================================================================
@@ -1942,113 +2043,1124 @@ QString SMESHGUI::CheckHomogeneousSelection()
 //=============================================================================
 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";
-       }
+  SALOMEDS::SObject_var sobj = smeshGUI->myActiveStudy->getStudyDocument()->FindObjectID(IO->getEntry());
+  if (!sobj->_is_nil())        {
+    SALOMEDS::SComponent_var scomp = sobj->GetFatherComponent();
+    if (strcmp(scomp->GetID(), IO->getEntry()) == 0)
+      {                                                // component is selected
+       return "Component";
+      }
+  }
+
+  SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+  Sel->ClearIObjects();
+
+  Handle(SMESH_TypeFilter) aHypFilter = new SMESH_TypeFilter(HYPOTHESIS);
+  Handle(SMESH_TypeFilter) anAlgoFilter = new SMESH_TypeFilter(ALGORITHM);
+  Handle(SMESH_TypeFilter) aMeshFilter = new SMESH_TypeFilter(MESH);
+  Handle(SMESH_TypeFilter) aSubMeshFilter = new SMESH_TypeFilter(SUBMESH);
+  Handle(SMESH_TypeFilter) aGroupFilter = new SMESH_TypeFilter(GROUP);
+  Handle(SMESH_TypeFilter) aMeshOrSubMeshFilter = new SMESH_TypeFilter(MESHorSUBMESH);
+  Handle(SMESH_TypeFilter) aSubMeshVextexFilter = new SMESH_TypeFilter(SUBMESH_VERTEX);
+  Handle(SMESH_TypeFilter) aSubMeshEdgeFilter = new SMESH_TypeFilter(SUBMESH_EDGE);
+  Handle(SMESH_TypeFilter) aSubMeshFaceFilter =        new SMESH_TypeFilter(SUBMESH_FACE);
+  Handle(SMESH_TypeFilter) aSubMeshSolidFilter = new SMESH_TypeFilter(SUBMESH_SOLID);
+  Handle(SMESH_TypeFilter) aSubMeshCompoundFilter = new SMESH_TypeFilter(SUBMESH_COMPOUND);
+
+  Sel->AddFilter(aHypFilter);
+  if (Sel->AddIObject(IO) != -1) {
+    Sel->ClearFilters();
+    return "Hypothesis";
+  }
+
+  Sel->ClearFilters();
+  Sel->AddFilter(anAlgoFilter);
+  if (Sel->AddIObject(IO) != -1) {
+    Sel->ClearFilters();
+    return "Algorithm";
+  }
+
+  Sel->ClearFilters();
+  Sel->AddFilter(aMeshFilter);
+  if (Sel->AddIObject(IO) != -1) {
+    Sel->ClearFilters();
+    return "Mesh";
+  }
+
+  Sel->ClearFilters();
+  Sel->AddFilter(aSubMeshFilter);
+  if (Sel->AddIObject(IO) != -1) {
+    Sel->ClearFilters();
+    return "SubMesh";
+  }
+
+  Sel->ClearFilters();
+  Sel->AddFilter(aGroupFilter);
+  if (Sel->AddIObject(IO) != -1) {
+    Sel->ClearFilters();
+    return "Group";
+  }
+
+  Sel->ClearFilters();
+  Sel->AddFilter(aSubMeshVextexFilter);
+  if (Sel->AddIObject(IO) != -1) {
+    Sel->ClearFilters();
+    return "SubMeshVertex";
+  }
+
+  Sel->ClearFilters();
+  Sel->AddFilter(aSubMeshEdgeFilter);
+  if (Sel->AddIObject(IO) != -1) {
+    Sel->ClearFilters();
+    return "SubMeshEdge";
+  }
+
+  Sel->ClearFilters();
+  Sel->AddFilter(aSubMeshFaceFilter);
+  if (Sel->AddIObject(IO) != -1) {
+    Sel->ClearFilters();
+    return "SubMeshFace";
+  }
+
+  Sel->ClearFilters();
+  Sel->AddFilter(aSubMeshSolidFilter);
+  if (Sel->AddIObject(IO) != -1) {
+    Sel->ClearFilters();
+    return "SubMeshSolid";
+  }
+
+  Sel->ClearFilters();
+  Sel->AddFilter(aSubMeshCompoundFilter);
+  if (Sel->AddIObject(IO) != -1) {
+    Sel->ClearFilters();
+    return "SubMeshCompound";
+  }
+
+  Sel->ClearFilters();
+  Sel->AddIObject(IO);
+  return "NoType";
+}
 
-       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";
-       }
+static int isStudyLocked(const SALOMEDS::Study_var& theStudy){
+  return theStudy->GetProperties()->IsLocked();
+}
 
-       Sel->ClearFilters();
-       Sel->AddFilter(aSubMeshVextexFilter);
-       if (Sel->AddIObject(IO) != -1)
-       {
-               Sel->ClearFilters();
-               return "SubMeshVertex";
-       }
+static int checkLock(const SALOMEDS::Study_var& theStudy) {
+  if (isStudyLocked(theStudy)) {
+    QAD_MessageBox::warn1 ( (QWidget*)QAD_Application::getDesktop(),
+                          QObject::tr("WRN_WARNING"), 
+                          QObject::tr("WRN_STUDY_LOCKED"),
+                          QObject::tr("BUT_OK") );
+    return true;
+  }
+  return false;
+}
 
-       Sel->ClearFilters();
-       Sel->AddFilter(aSubMeshEdgeFilter);
-       if (Sel->AddIObject(IO) != -1)
-       {
-               Sel->ClearFilters();
-               return "SubMeshEdge";
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent)
+{
+  SALOMEDS::Study_var aStudy = smeshGUI->myActiveStudy->getStudyDocument(); //Document OCAF de l'etude active
+  //  QAD_Viewer3d* v3d;
+  OCCViewer_Viewer3d *v3d;
+
+  Handle(AIS_InteractiveContext) ic;
+  vtkRenderer *Renderer;
+  vtkRenderWindow *RenWin;
+
+  if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
+    v3d = ((OCCViewer_ViewFrame *) smeshGUI->myActiveStudy->
+          getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
+    ic = v3d->getAISContext();
+  }
+  else if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+    Renderer = ((VTKViewer_ViewFrame *) smeshGUI->myActiveStudy->
+               getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRenderer();
+    RenWin = Renderer->GetRenderWindow();
+  }
+
+  switch (theCommandID)        {
+  case 33:                                     // DELETE
+    if(checkLock(aStudy)) break;
+    smeshGUI->OnEditDelete();
+    break;
+    
+  case 113:                                    // IMPORT
+  case 112:
+  case 111:
+    {
+      if(checkLock(aStudy)) break;
+      //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
+    {
+      SALOME_Selection *Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
+      if( Sel && Sel->IObjectCount() ) {
+       Handle(SALOME_InteractiveObject) anIO = Sel->firstIObject();
+       if( anIO->hasEntry() ) {
+         if( SMESH_Actor* anActor = ::FindActorByEntry( anIO->getEntry() ) ) {
+           anActor->SetControlMode( SMESH_Actor::eNone );
+         }
+       }
+      }
+      break;
+    }
+  case 201:
+    {
+      SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
+      SMESHGUI_Preferences_ScalarBarDlg::ScalarBarProperties( parent, Sel );
+      break;
+    }
+
+  case 1133:                                   // DISPLAY MODE : WireFrame, Surface, Shrink
+  case 1132:
+  case 215:
+  case 213:
+  case 212:
+  case 211:
+    {
+      smeshGUI->SetViewMode(theCommandID);
+      break;
+    }
+
+  case 214:                                    // UPDATE
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->Update();
+      break;
+    }
+
+  case 300:                                    // ERASE
+  case 301:                                    // DISPLAY
+  case 302:                                    // DISPLAY ONLY
+    {
+      EDisplaing anAction;
+      switch(theCommandID){
+      case 300:        anAction = eErase; break;
+      case 301:        anAction = eDisplay; break;
+      case 302:        anAction = eDisplayOnly; break;
+      }
+      
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+       for (; It.More(); It.Next()) {
+         Handle(SALOME_InteractiveObject) IOS = It.Value();
+         if (IOS->hasEntry()) {
+           ::UpdateView(anAction,IOS->getEntry());
+         }
+       }
+      }
+      Sel->ClearIObjects();
+      break;
+    }
+
+  case 400:                                    // NODES
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       smeshGUI->EmitSignalDeactivateDialog();
+       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       Sel->ClearIObjects();
+       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
+       smeshGUI->ViewNodes();
+       SMESHGUI_NodesDlg *aDlg = new SMESHGUI_NodesDlg(parent, "", Sel);
+      }
+      else {
+       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"), 
+                             tr("SMESH_WRN_VIEWER_VTK"),
+                             tr("SMESH_BUT_OK"));
+      }
+      break;
+    }
+
+  case 2151:  // FILTER
+  {
+    if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK )
+    {
+      smeshGUI->EmitSignalDeactivateDialog();
+      SMESHGUI_FilterDlg *aDlg = new SMESHGUI_FilterDlg( parent, SMESH::EDGE );
+    }
+    break;
+  }
+    
+  case 405:                                    // MOVE NODE
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      SMESHGUI_MoveNodesDlg *aDlg = new SMESHGUI_MoveNodesDlg(parent, "", Sel);
+      break;
+    }
+    
+  case 701:                                    // COMPUTE MESH 
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       int nbSel = Sel->IObjectCount();
+       if (nbSel != 1){
+         break;
        }
 
-       Sel->ClearFilters();
-       Sel->AddFilter(aSubMeshFaceFilter);
-       if (Sel->AddIObject(IO) != -1)
+       SMESH::SMESH_Mesh_var aMesh;
+       SMESH::SMESH_subMesh_var aSubMesh;
+       Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+       if (IObject->hasEntry()){
+         SALOMEDS::SObject_var aMeshSObj = smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+         GEOM::GEOM_Shape_var aShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh( aMeshSObj );
+         if ( aShape->_is_nil() ) {
+           // imported mesh
+           break;
+         }
+         SALOMEDS::GenericAttribute_var anAttr;
+         if(!aMeshSObj->_is_nil() && aMeshSObj->FindAttribute(anAttr, "AttributeIOR")){
+           SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+           MESSAGE("SMESHGUI::OnGUIEvent - Compute mesh : IOR = "<< anIOR->Value());
+           CORBA::Object_var anObj;
+           try{
+             anObj = _orb->string_to_object(anIOR->Value());
+             if (CORBA::is_nil(anObj)){
+               MESSAGE("SMESHGUI::OnGUIEvent - Compute mesh : nil object");
+             }
+           }catch(CORBA::COMM_FAILURE & ex){
+             INFOS("SMESHGUI::OnGUIEvent - Compute mesh : exception (1)");
+           }
+           aMesh = SMESH::SMESH_Mesh::_narrow(anObj);
+           aSubMesh = SMESH::SMESH_subMesh::_narrow(anObj);
+           if (!aMesh->_is_nil()){
+             GEOM::GEOM_Shape_var refShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(aMeshSObj);
+             if (!refShape->_is_nil()) {
+               if(!smeshGUI->myComponentMesh->IsReadyToCompute(aMesh,refShape)){
+                 QAD_MessageBox::warn1(QAD_Application::getDesktop(), 
+                                       tr("SMESH_WRN_WARNING"),
+                                       tr("SMESH_WRN_MISSING_PARAMETERS"),
+                                       tr("SMESH_BUT_OK"));
+                 break;
+               }
+               try{
+                 if (smeshGUI->myComponentMesh->Compute(aMesh,refShape))
+                    smeshGUI->myStudyAPI.ModifiedMesh(aMeshSObj,true);
+                 // TO Do : change icon of all submeshes
+               }
+               catch(const SALOME::SALOME_Exception & S_ex){
+                 QtCatchCorbaException(S_ex);
+               }
+             }
+           }else if(!aSubMesh->_is_nil()){
+             aMesh = aSubMesh->GetFather();
+             GEOM::GEOM_Shape_var refShape = smeshGUI->myStudyAPI.GetShapeOnMeshOrSubMesh(aMeshSObj);
+             if(!refShape->_is_nil()){
+               bool compute = smeshGUI->myComponentMesh->IsReadyToCompute(aMesh,refShape);
+               if(!compute){
+                 QAD_MessageBox::warn1(QAD_Application::getDesktop(), 
+                                       tr("SMESH_WRN_WARNING"),
+                                       tr("SMESH_WRN_MISSING_PARAMETERS"),
+                                       tr("SMESH_BUT_OK"));
+                 break;
+               }
+               try{
+                 if ( smeshGUI->myComponentMesh->Compute(aMesh,refShape) )
+                    smeshGUI->myStudyAPI.ModifiedMesh(aMeshSObj,true);
+                 // TO Do : change icon of all submeshes
+               }catch(const SALOME::SALOME_Exception & S_ex){
+                 QtCatchCorbaException(S_ex);
+               }
+             }
+           }
+         }
+       }
+       CORBA::Long anId = smeshGUI->myStudy->StudyId();
+       TVisualObjPtr aVisualObj = GetVisualObj(anId,IObject->getEntry());
+       if(smeshGUI->myAutomaticUpdate && aVisualObj){
+         aVisualObj->Update();
+         SMESH_Actor* anActor = ::FindActorByEntry(IObject->getEntry());
+         if(!anActor){
+           anActor = ::CreateActor(smeshGUI->myStudy,IObject->getEntry());
+           if(anActor){
+             ::DisplayActor(smeshGUI->myActiveStudy->getActiveStudyFrame(),anActor); //apo
+             ::FitAll();
+           }
+         }
+       }
+      }else{
+       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"), 
+                             tr("SMESH_WRN_VIEWER_VTK"),
+                             tr("SMESH_BUT_OK"));
+      }
+      break;
+    }
+
+  case 702:                                    // ADD SUB MESH 
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       smeshGUI->EmitSignalDeactivateDialog();
+       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       SMESHGUI_AddSubMeshDlg *aDlg = new SMESHGUI_AddSubMeshDlg(parent, "", Sel);
+      }
+      else {
+       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                             tr("SMESH_BUT_OK"));
+      }
+      break;
+    }
+    
+  case 703:                                    // INIT MESH 
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->EmitSignalDeactivateDialog();
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      SMESHGUI_InitMeshDlg *aDlg = new SMESHGUI_InitMeshDlg(parent, "", Sel);
+      break;
+    }
+
+  case 704:                                    // EDIT Hypothesis 
+    {
+      if(checkLock(aStudy)) break;
+      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
+    {
+      if(checkLock(aStudy)) break;
+      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
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->EmitSignalDeactivateDialog();
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      SMESHGUI_EditHypothesesDlg *aDlg = new SMESHGUI_EditHypothesesDlg(parent, "", Sel);
+      break;
+    }
+
+  case 406:                                    // ORIENTATION ELEMENTS
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->EmitSignalDeactivateDialog();
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      smeshGUI->myDesktop->SetSelectionMode(FaceSelection, true);
+      SMESHGUI_OrientationElementsDlg *aDlg = new SMESHGUI_OrientationElementsDlg(parent, "", Sel);
+      break;
+    }
+
+  case 407:                                    // DIAGONAL INVERSION
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->EmitSignalDeactivateDialog();
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      Sel->ClearIObjects();
+      smeshGUI->myDesktop->SetSelectionMode(EdgeOfCellSelection, true);
+      SMESHGUI_DiagonalInversionDlg *aDlg = new SMESHGUI_DiagonalInversionDlg(parent, "", Sel);
+      break;
+    }
+
+  case 801:                                     // CREATE GROUP
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->EmitSignalDeactivateDialog();
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      int nbSel = Sel->IObjectCount();
+      if (nbSel == 1) {
+       // check if mesh is selected
+       Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+       if (IObject->hasEntry()) {
+         SALOMEDS::SObject_var aMeshSObj = smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+         if (!aMeshSObj->_is_nil()) {
+           CORBA::Object_var anObj = aMeshSObj->GetObject();
+           SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(anObj);
+           SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(anObj);
+           if (aMesh->_is_nil() && !aSubMesh->_is_nil()) {
+             aMesh = aSubMesh->GetFather();
+           }
+           if (!aMesh->_is_nil()) {
+             SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg(parent, "", Sel, aMesh);
+             aDlg->show();
+           }
+         }
+       }
+      }
+      break;
+    }
+
+  case 802:                                     // CONSTRUCT GROUP
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->EmitSignalDeactivateDialog();
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      int nbSel = Sel->IObjectCount();
+      if (nbSel == 1) {
+       // check if submesh is selected
+       Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+       if (IObject->hasEntry()) {
+         SALOMEDS::SObject_var aSObj = smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+         if(!aSObj->_is_nil()) {
+           SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(aSObj->GetObject());
+           if (!aSubMesh->_is_nil()) {
+             try {
+               SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
+               // get submesh elements list by types
+               SMESH::long_array_var aNodes = aSubMesh->GetElementsByType(SMESH::NODE);
+               SMESH::long_array_var aEdges = aSubMesh->GetElementsByType(SMESH::EDGE);
+               SMESH::long_array_var aFaces = aSubMesh->GetElementsByType(SMESH::FACE);
+               SMESH::long_array_var aVolumes = aSubMesh->GetElementsByType(SMESH::VOLUME);
+               // create group for each type o elements
+               QString aName = IObject->getName();
+               MESSAGE("SMESHGUI::OnGUIEvent - Construct group on submesh : "<<aName);
+               MESSAGE(" Number of elements : nodes "<<aNodes->length() << ", edges " << aEdges->length()
+                       << ", faces " << aFaces->length() << ", volumes " << aVolumes->length());
+               if (aNodes->length() > 0) {
+                 SMESH::SMESH_Group_var aGroup = smeshGUI->AddGroup(aMesh, SMESH::NODE, aName);
+                 aGroup->Add(aNodes);
+               }
+               if (aEdges->length() > 0) {
+                 SMESH::SMESH_Group_var aGroup = smeshGUI->AddGroup(aMesh, SMESH::EDGE, aName);
+                 aGroup->Add(aEdges);
+               }
+               if (aFaces->length() > 0) {
+                 SMESH::SMESH_Group_var aGroup = smeshGUI->AddGroup(aMesh, SMESH::FACE, aName);
+                 aGroup->Add(aFaces);
+               }
+               if (aVolumes->length() > 0) {
+                 SMESH::SMESH_Group_var aGroup = smeshGUI->AddGroup(aMesh, SMESH::VOLUME, aName);
+                 aGroup->Add(aVolumes);
+               }
+               smeshGUI->myActiveStudy->updateObjBrowser(true);
+             }catch(const SALOME::SALOME_Exception & S_ex){
+               QtCatchCorbaException(S_ex);
+             }
+           }
+         }
+       }
+      }
+      break;
+    }
+
+  case 803:                                     // EDIT GROUP
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->EmitSignalDeactivateDialog();
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      int nbSel = Sel->IObjectCount();
+      if (nbSel == 1) {
+       // check if group is selected
+       Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+       if (IObject->hasEntry()) {
+         SALOMEDS::SObject_var aSObj = smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+         if(!aSObj->_is_nil()) {
+           SMESH::SMESH_Group_var aGroup = SMESH::SMESH_Group::_narrow(aSObj->GetObject());
+           if (!aGroup->_is_nil()) {
+             SMESHGUI_GroupDlg *aDlg = new SMESHGUI_GroupDlg(parent, "", Sel, aGroup);
+             aDlg->show();
+           }
+         }
+       }
+      }
+      break;
+    }
+
+  case 804:                                     // Add elements to group
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myState == 800) {
+       SMESHGUI_GroupDlg *aDlg = (SMESHGUI_GroupDlg*) smeshGUI->myActiveDialogBox;
+       if (aDlg) aDlg->onAdd();
+      }
+      break;
+    }
+
+  case 805:                                     // Remove elements from group
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myState == 800) {
+       SMESHGUI_GroupDlg *aDlg = (SMESHGUI_GroupDlg*) smeshGUI->myActiveDialogBox;
+       if (aDlg) aDlg->onRemove();
+      }
+      break;
+    }
+
+  case 900:                                    // MESH INFOS
+    {
+      smeshGUI->EmitSignalDeactivateDialog();
+      SMESHGUI_MeshInfosDlg *aDlg = new SMESHGUI_MeshInfosDlg(parent, "", false);
+      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:
+    {
+      SMESHGUI_Preferences_ScalarBarDlg::ScalarBarPreferences( parent );
+      break;
+    }
+
+  case 1006: 
+    {
+      SMESHGUI_Preferences_SelectionDlg* aDlg = 
+       new SMESHGUI_Preferences_SelectionDlg(parent);
+
+      QColor aColor;
+      QString SCr, SCg, SCb;
+      SCr = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorRed");
+      SCg = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorGreen");
+      SCb = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectColorBlue");
+      if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
+       aColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
+      else aColor = Qt::cyan;
+      aDlg->SetColor(1, aColor);
+
+      SCr = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorRed");
+      SCg = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorGreen");
+      SCb = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectColorBlue");
+      if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
+       aColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
+      else aColor = Qt::yellow;
+      aDlg->SetColor(2, aColor);
+
+      SCr = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorRed");
+      SCg = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorGreen");
+      SCb = QAD_CONFIG->getSetting("SMESH:SettingsSelectColorBlue");
+      if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
+       aColor = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
+      else aColor = Qt::white;
+      aDlg->SetColor(3, aColor);
+
+      QString SW1 = QAD_CONFIG->getSetting("SMESH:SettingsPreSelectWidth");
+      if (SW1.isEmpty()) SW1 = "5";
+      aDlg->SetWidth(1, SW1.toInt());
+
+      QString SW2 = QAD_CONFIG->getSetting("SMESH:SettingsItemSelectWidth");
+      if (SW2.isEmpty()) SW2 = "5";
+      aDlg->SetWidth(2, SW2.toInt());
+
+      QString SP1 = QAD_CONFIG->getSetting("SMESH:SettingsNodeSelectTol");
+      if (SP1.isEmpty()) SP1 = "0.025";
+      aDlg->SetPrecision(1, SP1.toDouble());
+
+      QString SP2 = QAD_CONFIG->getSetting("SMESH:SettingsElementsSelectTol");
+      if (SP2.isEmpty()) SP2 = "0.001";
+      aDlg->SetPrecision(2, SP2.toDouble());
+
+      if (aDlg->exec()) {
+       QColor aPreColor = aDlg->GetColor(1);
+       QAD_CONFIG->addSetting("SMESH:SettingsPreSelectColorRed", aPreColor.red());
+       QAD_CONFIG->addSetting("SMESH:SettingsPreSelectColorGreen", aPreColor.green());
+       QAD_CONFIG->addSetting("SMESH:SettingsPreSelectColorBlue", aPreColor.blue());
+
+       QColor aSelColor = aDlg->GetColor(2);
+       QAD_CONFIG->addSetting("SMESH:SettingsItemSelectColorRed", aSelColor.red());
+       QAD_CONFIG->addSetting("SMESH:SettingsItemSelectColorGreen", aSelColor.green());
+       QAD_CONFIG->addSetting("SMESH:SettingsItemSelectColorBlue", aSelColor.blue());
+
+       QColor aHiColor = aDlg->GetColor(3);
+       QAD_CONFIG->addSetting("SMESH:SettingsSelectColorRed", aHiColor.red());
+       QAD_CONFIG->addSetting("SMESH:SettingsSelectColorGreen", aHiColor.green());
+       QAD_CONFIG->addSetting("SMESH:SettingsSelectColorBlue", aHiColor.blue());
+
+       int aPreWidth = aDlg->GetWidth(1);
+       QAD_CONFIG->addSetting("SMESH:SettingsPreSelectWidth", aPreWidth);
+       int aSelWidth = aDlg->GetWidth(2);
+       QAD_CONFIG->addSetting("SMESH:SettingsItemSelectWidth", aSelWidth);
+
+       double aTolNodes = aDlg->GetPrecision(1);
+       QAD_CONFIG->addSetting("SMESH:SettingsNodeSelectTol", aTolNodes);
+       double aTolItems = aDlg->GetPrecision(2);
+       QAD_CONFIG->addSetting("SMESH:SettingsElementsSelectTol", aTolItems);
+
+       // update current study settings
+       ::UpdateSelectionProp();
+
+       QAD_StudyFrame* studyFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
+       if (studyFrame->getTypeView() == VIEW_VTK) {
+         VTKViewer_ViewFrame* aViewFrame = GetVtkViewFrame(studyFrame);
+         // update VTK viewer properties
+         VTKViewer_RenderWindowInteractor* anInteractor = aViewFrame->getRWInteractor();
+         if (anInteractor) {
+           anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255., 
+                                          aSelColor.blue()/255., aSelWidth);
+           anInteractor->SetSelectionTolerance(aTolNodes, aTolItems);
+           VTKViewer_InteractorStyleSALOME* aStyle = anInteractor->GetInteractorStyleSALOME();
+           if (aStyle)
+             aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255., 
+                                         aPreColor.blue()/255., aPreWidth);
+         }
+         // update actors
+         vtkRenderer* aRenderer = aViewFrame->getRenderer();
+         vtkActorCollection *aCollection = aRenderer->GetActors();
+         aCollection->InitTraversal();
+         while(vtkActor *anAct = aCollection->GetNextActor()){
+           if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+             anActor->SetHighlightColor(aHiColor.red()/255., aHiColor.green()/255., 
+                                        aHiColor.blue()/255.);
+             anActor->SetPreHighlightColor(aPreColor.red()/255., aPreColor.green()/255., 
+                                           aPreColor.blue()/255.);
+           }
+         }
+       }
+      }
+
+      break;
+    }
+
+  case 1100:                                   // EDIT HYPOTHESIS
+    {
+      if(checkLock(aStudy)) break;
+      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 hypothesis affected in order to flag as ModifiedMesh */
+        /* At end below '...->updateObjBrowser(true)' will change icon of mesh objects                   */
+        /* Warning : however by internal mechanism all subMeshes icons are changed !                     */
+        if ( res )
+        {
+          char* sName = Hyp->GetName();
+          SMESHGUI_GenericHypothesisCreator* aCreator = smeshGUI->GetHypothesisCreator(sName);
+          if (aCreator)
+          {
+            aCreator->EditHypothesis(Hyp);
+          }
+          else
+          {
+            // report error
+          }
+        }
+      }
+      break;
+    }
+
+  case 1101:                                   // RENAME
+    {
+      if(checkLock(aStudy)) break;
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+      for (; It.More(); It.Next()) {
+       Handle(SALOME_InteractiveObject) IObject = It.Value();
+
+       SALOMEDS::SObject_var obj = smeshGUI->myStudy->FindObjectID(IObject->getEntry());
+       SALOMEDS::GenericAttribute_var anAttr;
+       SALOMEDS::AttributeName_var aName;
+       if (!obj->_is_nil()) {
+         if (obj->FindAttribute(anAttr, "AttributeName")) {
+           aName = SALOMEDS::AttributeName::_narrow(anAttr);
+           QString newName = QString(aName->Value());
+           newName = SALOMEGUI_NameDlg::getName(QAD_Application::getDesktop(), newName);
+           if (!newName.isEmpty()) {
+             smeshGUI->myActiveStudy->renameIObject(IObject, newName);
+           }
+         }
+       }
+      }
+      break;
+    }
+    
+  case 1102:                                   // REMOVE HYPOTHESIS / ALGORITHMS
+    {
+      if(checkLock(aStudy)) break;
+      QAD_WaitCursor wc;
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+      for (int i = 0; It.More(); It.Next(), i++) {
+       Handle(SALOME_InteractiveObject) IObject = It.Value();
+       smeshGUI->RemoveHypothesisOrAlgorithmOnMesh(IObject);
+      }
+      Sel->ClearIObjects();
+      smeshGUI->myActiveStudy->updateObjBrowser(true);
+      break;
+    }
+
+  case 401:                                    // GEOM::EDGE
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       smeshGUI->EmitSignalDeactivateDialog();
+       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       Sel->ClearIObjects();
+       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
+       smeshGUI->ViewNodes();
+       SMESHGUI_AddEdgeDlg *aDlg = new SMESHGUI_AddEdgeDlg(parent, "", Sel);
+      }
+      else {
+       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                             tr("SMESH_BUT_OK"));
+      }
+      break;
+    }
+  case 4021:                                   // TRIANGLE
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       smeshGUI->EmitSignalDeactivateDialog();
+       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       Sel->ClearIObjects();
+       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
+       smeshGUI->ViewNodes();
+       SMESHGUI_AddFaceDlg *aDlg = new SMESHGUI_AddFaceDlg(parent, "", Sel, 3);
+      }
+      else {
+       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                             tr("SMESH_BUT_OK"));
+      }
+      break;
+    }
+  case 4022:                                   // QUAD
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       smeshGUI->EmitSignalDeactivateDialog();
+       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       Sel->ClearIObjects();
+       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
+       smeshGUI->ViewNodes();
+       SMESHGUI_AddFaceDlg *aDlg = new SMESHGUI_AddFaceDlg(parent, "", Sel, 4);
+      }
+      else
        {
-               Sel->ClearFilters();
-               return "SubMeshFace";
-       }
-
-       Sel->ClearFilters();
-       Sel->AddFilter(aSubMeshSolidFilter);
-       if (Sel->AddIObject(IO) != -1)
+         QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_OK"));
+       }
+      break;
+    }
+  case 4031:                                   // TETRA
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       smeshGUI->EmitSignalDeactivateDialog();
+       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       Sel->ClearIObjects();
+       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
+       smeshGUI->ViewNodes();
+       SMESHGUI_AddVolumeDlg *aDlg = new SMESHGUI_AddVolumeDlg(parent, "", Sel, 4);
+      }
+      else {
+       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                             tr("SMESH_BUT_OK"));
+      }
+      break;
+    }
+  case 4032:                                   // HEXA
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       smeshGUI->EmitSignalDeactivateDialog();
+       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       Sel->ClearIObjects();
+       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
+       smeshGUI->ViewNodes();
+       SMESHGUI_AddVolumeDlg *aDlg = new SMESHGUI_AddVolumeDlg(parent, "", Sel, 8);
+      }
+      else {
+       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                             tr("SMESH_BUT_OK"));
+      }
+      break;
+    }
+
+  case 4041:                                   // REMOVES NODES
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       smeshGUI->EmitSignalDeactivateDialog();
+       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       Sel->ClearIObjects();
+       smeshGUI->myDesktop->SetSelectionMode(NodeSelection, true);
+       smeshGUI->ViewNodes();
+       SMESHGUI_RemoveNodesDlg *aDlg = new SMESHGUI_RemoveNodesDlg(parent, "", Sel);
+      }
+      else {
+       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                             tr("SMESH_BUT_OK"));
+      }
+      break;
+    }
+  case 4042:                                   // REMOVES ELEMENTS
+    {
+      if(checkLock(aStudy)) break;
+      if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
+       smeshGUI->EmitSignalDeactivateDialog();
+       SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+       Sel->ClearIObjects();
+       smeshGUI->myDesktop->SetSelectionMode(CellSelection, true);
+       SMESHGUI_RemoveElementsDlg *aDlg = new SMESHGUI_RemoveElementsDlg(parent, "", Sel);
+      }
+      else
        {
-               Sel->ClearFilters();
-               return "SubMeshSolid";
-       }
+         QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                               tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),
+                               tr("SMESH_BUT_OK"));
+       }
+      break;
+    }
+
+  case 5000: // HYPOTHESIS
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->EmitSignalDeactivateDialog();
+      SMESHGUI_CreateHypothesesDlg *aDlg =
+        new SMESHGUI_CreateHypothesesDlg (parent, "", FALSE, false);
+      break;
+    }
+  case 5010: // ALGO
+    {
+      if(checkLock(aStudy)) break;
+      smeshGUI->EmitSignalDeactivateDialog();
+      SMESHGUI_CreateHypothesesDlg *aDlg =
+        new SMESHGUI_CreateHypothesesDlg (parent, "", FALSE, true);
+      break;
+    }
+
+  case 6016:                                   // CONTROLS 
+  case 6015:
+  case 6014:
+  case 6013:
+  case 6012:
+  case 6011:
+  case 6001:
+  case 6003:
+  case 6004:    
+    if ( smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) {
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      if ( Sel->IObjectCount() == 1 && Sel->firstIObject()->hasEntry() ) {
+       SALOMEDS::SObject_var SO = smeshGUI->myStudy->FindObjectID( Sel->firstIObject()->getEntry() );
+       if ( !SO->_is_nil() ) {
+         CORBA::Object_var aObject = SO->GetObject();
+         SMESH::SMESH_Mesh_var    aMesh    = SMESH::SMESH_Mesh::_narrow( aObject );
+         SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( aObject );
+         SMESH::SMESH_Group_var   aGroup   = SMESH::SMESH_Group::_narrow( aObject );
+         if ( !aMesh->_is_nil() || !aSubMesh->_is_nil() || !aGroup->_is_nil() ) {
+           smeshGUI->Control( theCommandID );
+           break;
+         }
+       }
+      }
+      QAD_MessageBox::warn1(smeshGUI->GetDesktop(), 
+                           tr( "SMESH_WRN_WARNING" ),
+                           tr( "SMESH_BAD_SELECTION" ), 
+                           tr( "SMESH_BUT_OK" ) );
+      break;
+    }
+    else {
+      QAD_MessageBox::warn1(smeshGUI->GetDesktop(), 
+                           tr( "SMESH_WRN_WARNING" ),
+                           tr( "NOT_A_VTK_VIEWER" ), 
+                           tr( "SMESH_BUT_OK" ) );
+    }
+    break;
+  case 9010:
+    {
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      if (Sel->IObjectCount() == 1)    {
+       Handle(SALOME_InteractiveObject) anIObject = Sel->firstIObject();
+       if(anIObject->hasEntry())
+         if(SMESH_Actor *anActor = ::FindActorByEntry(anIObject->getEntry())){
+           anActor->SetPointsLabeled( !anActor->GetPointsLabeled() );
+         }
+      }
+      break;
+    }
+  case 9011:
+    {
+      SALOME_Selection *Sel = SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+      if (Sel->IObjectCount() == 1)    {
+       Handle(SALOME_InteractiveObject) anIObject = Sel->firstIObject();
+       if(anIObject->hasEntry())
+         if(SMESH_Actor *anActor = ::FindActorByEntry(anIObject->getEntry())){
+           anActor->SetCellsLabeled( !anActor->GetCellsLabeled() );
+         }
+      }
+      break;
+    }
+  case 10001:                          // DISPLAY MODE PREFERENCE
+    {
+      // Wireframe
+      parent->menuBar()->setItemChecked(10001, true);
+      parent->menuBar()->setItemChecked(10002, false);
+      parent->menuBar()->setItemChecked(10004, false);
+      parent->menuBar()->setItemEnabled(10003, true);
+      QAD_CONFIG->addSetting("SMESH:DisplayMode", "Wireframe");
+      break;
+    }
+  case 10002:
+    {
+      parent->menuBar()->setItemChecked(10002, true);
+      parent->menuBar()->setItemChecked(10001, false);
+      parent->menuBar()->setItemChecked(10004, false);
+      parent->menuBar()->setItemEnabled(10003, true);
+      QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading");
+      break;
+    }
+  case 10003:
+    {
+      parent->menuBar()->setItemChecked(10003,!parent->menuBar()->isItemChecked(10003));
+      QAD_CONFIG->addSetting("SMESH:Shrink", parent->menuBar()->isItemChecked(10003) ? "yes" : "no");
+      break;
+    }
+  case 10004:
+    {
+      parent->menuBar()->setItemChecked(10001, false);
+      parent->menuBar()->setItemChecked(10004, true);
+      parent->menuBar()->setItemChecked(10002, false);
+      parent->menuBar()->setItemEnabled(10003, false);
+      QAD_CONFIG->addSetting("SMESH:DisplayMode", "Nodes");
+      break;
+    }
+    
+  }
+
+  smeshGUI->myActiveStudy->updateObjBrowser(true);
+  return true;
+}
 
-       Sel->ClearFilters();
-       Sel->AddFilter(aSubMeshCompoundFilter);
-       if (Sel->AddIObject(IO) != -1)
-       {
-               Sel->ClearFilters();
-               return "SubMeshCompound";
-       }
+//=============================================================================
+/*! function : GetMeshesUsingAlgoOrHypothesis()
+ *  purpose  : return a list of Study objects (mesh kind) that have 'AlgoOrHyp' affected.
+ *           : However is supposed here that father of father of an hypothesis is a Mesh Object.
+ */
+//=============================================================================      
+SALOMEDS::Study::ListOfSObject *
+       SMESHGUI::GetMeshesUsingAlgoOrHypothesis(SMESH::
+       SMESH_Hypothesis_ptr AlgoOrHyp)
+{
+  SALOMEDS::Study::ListOfSObject_var listSOmesh =
+    new SALOMEDS::Study::ListOfSObject;
+  listSOmesh->length(0);
+  unsigned int index = 0;
+  if (!AlgoOrHyp->_is_nil()) {
+    SALOMEDS::SObject_var SO_Hypothesis =
+      smeshGUI->GetStudyAPI().FindObject(AlgoOrHyp);
+    if (!SO_Hypothesis->_is_nil()) {
+      SALOMEDS::Study::ListOfSObject_var listSO =
+       smeshGUI->myStudy->FindDependances(SO_Hypothesis);
+      MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency number ="<<listSO->length());
+      for (unsigned int i = 0; i < listSO->length(); i++) {
+       SALOMEDS::SObject_ptr SO = listSO[i];
+       if (!SO->_is_nil()) { 
+         SALOMEDS::SObject_var aFather = SO->GetFather();
+         if (!aFather->_is_nil()) {
+           SALOMEDS::SObject_var SOfatherFather = aFather->GetFather();
+           if (!SOfatherFather->_is_nil()) {
+             MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency added to list");
+             index++;
+             listSOmesh->length(index);
+             listSOmesh[index - 1] = SOfatherFather;
+           }
+         }
+       }
+      }
+    }
+  }
+  MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): completed");
+  return listSOmesh._retn();
+}
 
-       Sel->ClearFilters();
-       Sel->AddIObject(IO);
-       return "NoType";
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+void SMESHGUI::Import_Mesh(QAD_Desktop * parent, int theCommandID){
+  QString filter;
+  string myExtension;
+  
+  if(theCommandID == 113){
+    filter = tr("MED files (*.med)");
+  }else if (theCommandID == 112){
+    filter = tr("IDEAS files (*.unv)");
+  }else if (theCommandID == 111){
+    filter = tr("DAT files (*.dat)");
+  }
+  QString filename = QAD_FileDlg::getFileName(parent,
+                                             "",
+                                             filter,
+                                             tr("Import mesh"),
+                                             true);
+  if(!filename.isEmpty()){
+    QAD_WaitCursor wc;
+    SMESH::mesh_array_var aMeshes;
+    try {
+      SMESH::DriverMED_ReadStatus res;
+      aMeshes = smeshGUI->myComponentMesh->CreateMeshesFromMED(filename.latin1(),
+                                                               res);
+      if ( res > SMESH::DRS_OK ) {
+       wc.stop();
+       QAD_MessageBox::warn1(QAD_Application::getDesktop(),
+                             tr("SMESH_WRN_WARNING"),
+                             tr(QString("SMESH_DRS_%1").arg(res)),
+                             tr("SMESH_BUT_OK"));
+       wc.start();
+
+      }
+    }
+    catch (const SALOME::SALOME_Exception& S_ex)
+    {
+      wc.stop();
+      QtCatchCorbaException(S_ex);
+      wc.start();
+    }
+    for ( int i = 0, n = aMeshes->length(); i < n; i++ ) {
+      SALOMEDS::SObject_var aMeshSO = smeshGUI->myStudyAPI.FindObject( aMeshes[i] );
+      if ( !aMeshSO->_is_nil() ) {
+       SALOMEDS::StudyBuilder_var aBuilder = smeshGUI->myStudy->NewBuilder();
+       SALOMEDS::AttributePixMap_var aPixmap = SALOMEDS::AttributePixMap::_narrow( aBuilder->FindOrCreateAttribute( aMeshSO, "AttributePixMap" ) );
+       aPixmap->SetPixMap( "ICON_SMESH_TREE_MESH_IMPORTED" );
+      }
+    }
+  }
 }
 
 //=============================================================================
@@ -2056,2748 +3168,72 @@ QString SMESHGUI::CheckTypeObject(const Handle(SALOME_InteractiveObject) & IO)
  *
  */
 //=============================================================================
-bool SMESHGUI::OnGUIEvent(int theCommandID, QAD_Desktop * parent)
+void SMESHGUI::Export_Mesh(QAD_Desktop * parent, int theCommandID)
 {
-       /* 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);
-                                               }
-                                               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();
-       }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-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());
-
-                               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;
-       }
-
-       QString filename = QAD_FileDlg::getFileName(parent,
-               "",
-               filter,
-               tr("Export document"),
-               false);
-       if (!filename.isEmpty())
-       {
-               QApplication::setOverrideCursor(Qt::waitCursor);
-               string myClass = string("SMESHDS_Document");
-               //Document_Writer* myWriter = SMESHDriver::GetDocumentWriter(myExtension, myClass);
-
-               myWriter->SetFile(string(filename.latin1()));
-               myWriter->SetDocument(smeshGUI->myDocument);
-
-               //StudyContextStruct* myStudyContext = _impl.GetStudyContext(myStudyId);
-               //Handle(SMESHDS_Document) myDocument = myStudyContext->myDocument;
-               //myWriter->SetDocument(myDocument);
-
-               myWriter->Write();
-               QApplication::restoreOverrideCursor();
-       }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::OnMousePress(QMouseEvent * pe, QAD_Desktop * parent,
-       QAD_StudyFrame * studyFrame)
-{
-       SMESHGUI::GetOrCreateSMESHGUI(parent);
-       return false;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::OnMouseMove(QMouseEvent * pe, QAD_Desktop * parent,
-       QAD_StudyFrame * studyFrame)
-{
-       SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-       return true;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::OnKeyPress(QKeyEvent * pe, QAD_Desktop * parent,
-       QAD_StudyFrame * studyFrame)
-{
-       SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-       return true;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::SetSettings(QAD_Desktop * parent)
-{
-       SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-       /* Display mode */
-       QString DisplayMode = QAD_CONFIG->getSetting("SMESH:DisplayMode");
-       if (DisplayMode.compare("") == 0)
-       {
-               DisplayMode = "Shading";
-               QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading");
-       }
-
-       if (DisplayMode.compare("Wireframe") == 0)
-       {
-               parent->menuBar()->setItemChecked(10003, false);
-               parent->menuBar()->setItemChecked(10002, false);
-               parent->menuBar()->setItemChecked(10001, true);
-       }
-       else if (DisplayMode.compare("Shading") == 0)
-       {
-               parent->menuBar()->setItemChecked(10003, false);
-               parent->menuBar()->setItemChecked(10002, true);
-               parent->menuBar()->setItemChecked(10001, false);
-       }
-       else if (DisplayMode.compare("Shrink") == 0)
-       {
-               parent->menuBar()->setItemChecked(10003, true);
-               parent->menuBar()->setItemChecked(10002, false);
-               parent->menuBar()->setItemChecked(10001, false);
-       }
-
-       /* Automatic Update */
-       QString AutoUpdate = QAD_CONFIG->getSetting("SMESH:AutomaticUpdate");
-       if (AutoUpdate.compare("true") == 0)
-       {
-               parent->menuBar()->setItemChecked(1001, true);
-               smeshGUI->myAutomaticUpdate = true;
-       }
-       else
-       {
-               parent->menuBar()->setItemChecked(1001, false);
-               smeshGUI->myAutomaticUpdate = false;
-       }
-
-       /* menus disable */
-       parent->menuBar()->setItemEnabled(11, false);   // IMPORT
-
-       return true;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::DefinePopup(QString & theContext, QString & theParent,
-       QString & theObject)
-{
-       /* Create or retrieve an object SMESHGUI */
-       SMESHGUI::GetOrCreateSMESHGUI(QAD_Application::getDesktop());
-
-       // NRI : Temporary added
-       //  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
-       //    theObject = "NothingSelected";
-       //    theContext = "NothingSelected";
-       //  }
-       // NRI
-
-       SALOME_Selection *Sel =
-               SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       int nbSel = Sel->IObjectCount();
-       if (nbSel == 0)
-       {
-               if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() ==
-                       VIEW_VTK)
-               {
-                       vtkScalarBarActor *aScalarBar = smeshGUI->GetScalarBar();
-                       if ((aScalarBar != NULL) && (aScalarBar->GetVisibility() == 1))
-                       {
-                               theObject = "ScalarBar";
-                               theContext = "";
-                       }
-                       else
-                       {
-                               theObject = "NothingSelected";
-                               theContext = "NothingSelected";
-                       }
-               }
-               else
-               {
-                       theObject = "NothingSelected";
-                       theContext = "NothingSelected";
-               }
-       }
-       else if (nbSel == 1)
-       {
-               theObject = smeshGUI->CheckTypeObject(Sel->firstIObject());
-               theContext = "";
-       }
-       else
-       {
-               theObject = smeshGUI->CheckHomogeneousSelection();
-               theContext = "";
-       }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SMESHGUI::CustomPopup(QAD_Desktop * parent,
-       QPopupMenu * popup,
-       const QString & theContext,
-       const QString & theParent, const QString & theObject)
-{
-       // Popup should be customized for any viewer since some meaningless commands may be present in the popup
-       //if (smeshGUI->myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK) //Test du type de viewer true=OCC false=VTK
-       //  return false;
-       /* Create or retrieve an object SMESHGUI */
-       SMESHGUI::GetOrCreateSMESHGUI(parent);
-
-       // NRI : Temporary added
-       //  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
-       //    return false;
-       //  }
-       // NRI
-
-       SALOME_Selection *Sel =
-               SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
-       QAD_StudyFrame *studyFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
-       int nbSel = Sel->IObjectCount();
-
-       if (nbSel == 0)
-       {
-               if (studyFrame->getTypeView() != VIEW_VTK)
-                       popup->clear();
-               return false;
-       }
-       else if (nbSel == 1)
-       {
-               QString parentComp =
-                       ((SALOMEGUI_Desktop *) parent)->getComponentFromSelection();
-               // First check type of active viewer (VTK required)
-               if ( /*studyFrame->getTypeView() != VIEW_VTK || */ parentComp !=
-                       parent->getActiveComponent())
-               {
-                       //MESSAGE("CustomPopup(): VTK viewer required, removing all SMESH-specific popup menu items")
-                       while (1)
-                       {
-                               int id = popup->idAt(0);
-                               if (id <= QAD_TopLabel_Popup_ID)
-                                       popup->removeItemAt(0);
-                               else
-                                       break;
-                       }
-                       if (theObject.compare("Component") == 0)
-                       {
-                               popup->removeItem(QAD_DisplayOnly_Popup_ID);
-                       }
-                       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);
-                               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;
-}
-
-//=============================================================================
-/*! Method:  BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
- *  Purpose: ensures that the actor for the given <theIO> exists in the active VTK view
- */
-//=============================================================================
-void SMESHGUI::BuildPresentation(const Handle(SALOME_InteractiveObject) & theIO)
-{
-       /* Create or retrieve an object SMESHGUI */
-       SMESHGUI::GetOrCreateSMESHGUI(QAD_Application::getDesktop());
-
-       QAD_StudyFrame *activeFrame =
-               smeshGUI->myActiveStudy->getActiveStudyFrame();
-       if (activeFrame->getTypeView() == VIEW_VTK)
-       {
-               // VTK
-               SALOMEDS::SObject_var fatherSF =
-                       smeshGUI->myStudy->FindObjectID(activeFrame->entry());
-
-               SALOME_Selection *Sel =
-                       SALOME_Selection::Selection(smeshGUI->myActiveStudy->
-                       getSelection());
-               SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-
-//    for(;It.More();It.Next()) {
-//      Handle(SALOME_InteractiveObject) IObject = It.Value();
-               Handle(SALOME_InteractiveObject) IObject = theIO;
-               if (IObject->hasEntry())
-               {
-                       // Look for the actor in all views
-                       Standard_Boolean res;
-                       SMESH_Actor *ac =
-                               smeshGUI->FindActorByEntry(IObject->getEntry(), res, false);
-
-                       // Actor not found at all -> mesh is not computed -> do nothing!!!
-                       if (!res)
-                       {
-                               /*SMESH::SMESH_Mesh_var aM;
-                                * SALOMEDS::SObject_var aMorSM = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
-                                * SALOMEDS::SObject_var father = aMorSM->GetFather();
-                                * SALOMEDS::SObject_var fatherComp = aMorSM->GetFatherComponent();
-                                * 
-                                * // Non-displayable objects (Hypo, Algo) have tags < 3 or have a father different from component
-                                * if (aMorSM->Tag() < 3 || strcmp(father->GetID(), fatherComp->GetID()) != 0)
-                                * continue;
-                                * 
-                                * SALOMEDS::GenericAttribute_var anAttr;
-                                * SALOMEDS::AttributeIOR_var     anIOR;
-                                * if ( !aMorSM->_is_nil() ) {
-                                * if (aMorSM->FindAttribute(anAttr, "AttributeIOR") ) {
-                                * anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-                                * aM = SMESH::SMESH_Mesh::_narrow( _orb->string_to_object(anIOR->Value()) );
-                                * }
-                                * }
-                                * 
-                                * if (!aM->_is_nil()) {
-                                * smeshGUI->InitActor(aM);
-                                * ac = smeshGUI->ReadScript(aM);
-                                * }
-                                * 
-                                * if (ac) {
-                                * smeshGUI->DisplayActor( ac, true );
-                                * smeshGUI->DisplayEdges( ac ); 
-                                * smeshGUI->ChangeRepresentation( ac, ac->getDisplayMode() );
-                                * } */
-//    continue;
-                       }
-                       else
-                       {                                       // The actor exists in some view
-                               // Check whether the actor belongs to the active view
-                               VTKViewer_RenderWindowInteractor *rwInter =
-                                       ((VTKViewer_ViewFrame *) activeFrame->getRightFrame()->
-                                       getViewFrame())->getRWInteractor();
-
-                               // The actor belongs to inactive view -> create a copy and display it in the active view
-                               if (!rwInter->isInViewer(IObject))
-                               {
-                                       SMESH_Actor *acCopy = SMESH_Actor::New();
-                                       acCopy->ShallowCopy(ac);
-                                       ac = acCopy;
-                               }
-                               smeshGUI->DisplayActor(ac, false);
-                               smeshGUI->DisplayEdges(ac);
-                               smeshGUI->ChangeRepresentation(ac, ac->getDisplayMode());
-                       }
-               }
-//    }
-       }
-       else
-       {
-       MESSAGE
-                       ("BuildPresentation() must not be called while non-VTK view is active")}
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::setOrb()
-{
-       try
-       {
-               ORB_INIT & init = *SINGLETON_ < ORB_INIT >::Instance();
-               ASSERT(SINGLETON_ < ORB_INIT >::IsAlreadyExisting());
-               _orb = init(0, 0);
-       } catch(...)
-       {
-               INFOS("internal error : orb not found");
-               _orb = 0;
-       }
-       ASSERT(!CORBA::is_nil(_orb));
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-SMESH_Actor *SMESHGUI::ReadScript(SMESH::SMESH_Mesh_ptr aMesh)
-{
-       SMESH_Actor *MeshActor;
-       if (!aMesh->_is_nil())
-       {
-               Standard_Boolean result;
-               MeshActor = FindActor(aMesh, result, true);
-               if (result)
-               {
-                       SMESH::log_array_var aSeq = aMesh->GetLog(true);
-
-                       if (aSeq->length() == 0)
-                       {
-                               MESSAGE("ReadScript(): log is empty") return MeshActor;
-                       }
-
-                       for (unsigned int ind = 0; ind < aSeq->length(); ind++)
-                       {
-                               switch (aSeq[ind].commandType)
-                               {
-                               case SMESH::ADD_NODE:
-                               {
-                                       AddNodes(MeshActor, aSeq[ind].number, aSeq[ind].coords,
-                                               aSeq[ind].indexes);
-                                       break;
-                               }
-                               case SMESH::ADD_EDGE:
-                               {
-                                       //          AddEdges( MeshActor, aSeq[ind].number, aSeq[ind].coords, aSeq[ind].indexes );
-                                       break;
-                               }
-                               case SMESH::ADD_TRIANGLE:
-                               {
-                                       AddTriangles(MeshActor, aSeq[ind].number, aSeq[ind].coords,
-                                               aSeq[ind].indexes);
-                                       break;
-                               }
-                               case SMESH::ADD_QUADRANGLE:
-                               {
-                                       AddQuadrangles(MeshActor, aSeq[ind].number,
-                                               aSeq[ind].coords, aSeq[ind].indexes);
-                                       break;
-                               }
-                               case SMESH::ADD_TETRAHEDRON:
-                               {
-                                       AddTetras(MeshActor, aSeq[ind].number, aSeq[ind].coords,
-                                               aSeq[ind].indexes);
-                                       break;
-                               }
-                               case SMESH::ADD_PYRAMID:
-                               {
-                                       break;
-                               }
-                               case SMESH::ADD_PRISM:
-                               {
-                                       break;
-                               }
-                               case SMESH::ADD_HEXAHEDRON:
-                               {
-                                       AddHexaedres(MeshActor, aSeq[ind].number, aSeq[ind].coords,
-                                               aSeq[ind].indexes);
-                                       break;
-                               }
-                               case SMESH::REMOVE_NODE:
-                               {
-                                       RemoveNodes(MeshActor, aSeq[ind].number, aSeq[ind].coords,
-                                               aSeq[ind].indexes);
-                                       break;
-                               }
-                               case SMESH::REMOVE_ELEMENT:
-                               {
-                                       RemoveElements(MeshActor, aSeq[ind].number,
-                                               aSeq[ind].coords, aSeq[ind].indexes);
-                                       break;
-                               }
-                               }
-                       }
-                       return MeshActor;
-               }
-       }
-       return NULL;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::Dump(SMESH_Actor * Mactor)
-{
-       vtkUnstructuredGrid *ugrid =
-               vtkUnstructuredGrid::SafeDownCast(Mactor->DataSource);
-       vtkPoints *Pts = ugrid->GetPoints();
-       int nbPts = Pts->GetNumberOfPoints();
-       int nbCells = ugrid->GetNumberOfCells();
-
-       FILE *In;
-       int i, j;
-       In = fopen("/tmp/dumpMesh", "w+");
-       fprintf(In, "%d %d\n", nbPts, nbCells);
-       for (int i = 0; i < nbPts; i++)
-       {
-               float *p = ugrid->GetPoint(i);
-               fprintf(In, "%d %e %e %e\n", i, p[0], p[1], p[2]);
-       }
-
-       for (int i = 0; i < nbCells; i++)
-       {
-               fprintf(In, "%d %d", i, ugrid->GetCell(i)->GetCellType());
-               vtkIdList *Id = ugrid->GetCell(i)->GetPointIds();
-               for (j = 0; j < Id->GetNumberOfIds(); j++)
-               {
-                       fprintf(In, " %d", Id->GetId(j));
-               }
-               fprintf(In, "\n");
-       }
-       fclose(In);
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddNodes(SMESH_Actor * Mactor, int number,
-       const SMESH::double_array & coords, const SMESH::long_array & indexes)
-{
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       if (Mactor->GetMapper() == NULL)
-       {
-               vtkPoints *Pts = vtkPoints::New();
-               SMESH_Grid *ugrid = SMESH_Grid::New();
-               ugrid->Allocate();
-
-               int i = 1;
-               int j = 1;
-               while (i <= number)
-               {
-                       int idVTK =
-                               Pts->InsertNextPoint(coords[j - 1], coords[j], coords[j + 1]);
-                       //Mactor->AddNode( indexes[i-1], idVTK );
-                       ugrid->AddNode(indexes[i - 1], idVTK);
-                       i++;
-                       j = j + 3;
-               }
-               //vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::New();
-               ugrid->SetPoints(Pts);
-               vtkDataSetMapper *PtsMapper = vtkDataSetMapper::New();
-               PtsMapper->SetInput(ugrid);
-               Mactor->DataSource = PtsMapper->GetInput();
-               Mactor->SetMapper(PtsMapper);
-       }
-       else
-       {
-               //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-               SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-               int i = 1;
-               int j = 1;
-               while (i <= number)
-               {
-                       int idVTK =
-                               ugrid->GetPoints()->InsertNextPoint(coords[j - 1], coords[j],
-                               coords[j + 1]);
-                       ugrid->AddNode(indexes[i - 1], idVTK);
-                       i++;
-                       j = j + 3;
-               }
-               vtkDataSetMapper *PtsMapper = vtkDataSetMapper::New();
-               PtsMapper->SetInput(ugrid);
-               Mactor->DataSource = PtsMapper->GetInput();
-               Mactor->SetMapper(PtsMapper);
-       }
-       QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddNode(SMESH_Actor * Mactor, int idnode, float x, float y,
-       float z)
-{
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       MESSAGE("SMESHGUI::AddNode " << idnode << " : " << x << ";" << y << ";" <<
-               z) if (Mactor->GetMapper() == NULL)
-       {
-               vtkPoints *Pts = vtkPoints::New();
-               int idVTK = Pts->InsertNextPoint(x, y, z);
-               //Mactor->AddNode( idnode, idVTK );
-               //vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::New();
-               SMESH_Grid *ugrid = SMESH_Grid::New();
-               ugrid->Allocate();
-               ugrid->AddNode(idnode, idVTK);
-               ugrid->SetPoints(Pts);
-               vtkDataSetMapper *PtsMapper = vtkDataSetMapper::New();
-               PtsMapper->SetInput(ugrid);
-               Mactor->DataSource = PtsMapper->GetInput();
-               Mactor->SetMapper(PtsMapper);
-       }
-       else
-       {
-               //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-               SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-               int idVTK = ugrid->GetPoints()->InsertNextPoint(x, y, z);
-               //Mactor->AddNode( idnode, idVTK );
-               ugrid->AddNode(idnode, idVTK);
-               vtkDataSetMapper *PtsMapper = vtkDataSetMapper::New();
-               PtsMapper->SetInput(ugrid);
-               Mactor->DataSource = PtsMapper->GetInput();
-               Mactor->SetMapper(PtsMapper);
-       }
-       QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveNode(SMESH_Actor * Mactor, int idnode)
-{
-       MESSAGE(" OLD RemoveNode method ")
-//   int id = Mactor->GetIdVTKNode( idnode );
-//    MESSAGE ( " RemoveNode id VTK " << id )
-//    if ( Mactor->GetMapper() != NULL ) {
-//      vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-//      vtkUnstructuredGrid* newUgrid = vtkUnstructuredGrid::New();
-//      vtkPoints *Pts = ugrid->GetPoints();
-//      vtkPoints *newPts = vtkPoints::New();
-//      int nbPts = Pts->GetNumberOfPoints();
-//      bool findPt = false;
-//      for ( int i = 0; i < nbPts; i++ ) {
-//        if ( id != i ) {
-//      if ( !findPt)
-//        newPts->InsertPoint(i, Pts->GetPoint(i) );
-//      else
-//        newPts->InsertPoint(i-1, Pts->GetPoint(i) );
-//        } else {
-//      findPt = true;
-//      Mactor->RemoveNode( idnode );
-//        }
-//      }
-//      newUgrid->SetPoints(newPts);
-//      int nbCells = ugrid->GetNumberOfCells();
-//      for ( int i = 0; i < nbCells; i++ ) {
-//        vtkIdList *Ids = ugrid->GetCell(i)->GetPointIds();
-//        vtkIdList *newIds = vtkIdList::New();
-//        int nbIds = Ids->GetNumberOfIds();
-//        newIds->SetNumberOfIds(nbIds);
-//        for ( int j = 0; j < nbIds; j++ ) {
-//      int theid = Ids->GetId(j);
-//      if ( theid > id ) {
-//        newIds->SetId( j, theid-1 );
-//      } else
-//        newIds->SetId( j, theid );
-//        }
-//        int idSMDSel = Mactor->GetIdSMESHDSElement( i );
-//        Mactor->RemoveElement( idSMDSel, false );
-//        int idVTKel = newUgrid->InsertNextCell( ugrid->GetCell(i)->GetCellType(), newIds );
-//        Mactor->AddElement( idSMDSel, idVTKel );
-//      }
-//      vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-//      Mapper->SetInput( newUgrid );
-//      Mactor->DataSource = Mapper->GetInput();
-//      Mactor->SetMapper(Mapper);
-//      UpdateView();
-//    }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveNodes(SMESH_Actor * Mactor, int number,
-       const SMESH::double_array & coords, const SMESH::long_array & indexes)
-{
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       int i = 1;
-       while (i <= number)
-       {
-               Mactor->RemoveNode(indexes[i - 1]);
-               i++;
-       }
-
-       TColStd_DataMapOfIntegerInteger newMapVTKNodes;
-       TColStd_DataMapOfIntegerInteger newMapSMESHDSNodes;
-       TColStd_DataMapOfIntegerInteger MapOldNodesToNewNodes;
-
-       if (Mactor->GetMapper() != NULL)
-       {
-               SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-               SMESH_Grid *newUgrid = SMESH_Grid::New();
-               newUgrid->CopyMaps(ugrid);
-
-               vtkPoints *Pts = ugrid->GetPoints();
-               vtkPoints *newPts = vtkPoints::New();
-               int nbPts = Pts->GetNumberOfPoints();
-               int j = 0;
-               for (int i = 0; i < nbPts; i++)
-               {
-                       int idSMESHDSNode = Mactor->GetIdSMESHDSNode(i);
-                       if (idSMESHDSNode != -1)
-                       {
-                               newPts->InsertPoint(j, Pts->GetPoint(i));
-
-                               newMapVTKNodes.Bind(j, idSMESHDSNode);
-                               newMapSMESHDSNodes.Bind(idSMESHDSNode, j);
-
-                               MapOldNodesToNewNodes.Bind(i, j);
-                               j++;
-                       }
-               }
-
-               newUgrid->SetIdsVTKNode(newMapVTKNodes);
-               newUgrid->SetIdsSMESHDSNode(newMapSMESHDSNodes);
-               newUgrid->SetPoints(newPts);
-
-               TColStd_DataMapOfIntegerInteger newMapElementSMDStoVTK;
-               TColStd_DataMapOfIntegerInteger newMapElementVTKtoSMDS;
-
-               int nbCells = ugrid->GetNumberOfCells();
-               for (int i = 0; i < nbCells; i++)
-               {
-                       vtkIdList *Ids = ugrid->GetCell(i)->GetPointIds();
-                       vtkIdList *newIds = vtkIdList::New();
-                       int nbIds = Ids->GetNumberOfIds();
-                       newIds->SetNumberOfIds(nbIds);
-                       bool isGood = true;
-                       for (int j = 0; j < nbIds; j++)
-                       {
-                               int theid = Ids->GetId(j);
-                               if (MapOldNodesToNewNodes.IsBound(theid))
-                               {
-                                       newIds->SetId(j, MapOldNodesToNewNodes.Find(theid));
-                               }
-                               else
-                               {
-                                       isGood = false;
-                                       break;
-                               }
-                       }
-
-                       // Filtering out cells based on non-existing nodes
-                       if (isGood)
-                       {
-                               int idSMDSel = Mactor->GetIdSMESHDSElement(i);
-                               int idVTKel =
-                                       newUgrid->InsertNextCell(ugrid->GetCell(i)->GetCellType(),
-                                       newIds);
-
-                               newMapElementSMDStoVTK.Bind(idSMDSel, idVTKel);
-                               newMapElementVTKtoSMDS.Bind(idVTKel, idSMDSel);
-                       }
-               }
-
-               newUgrid->SetIdsVTKElement(newMapElementVTKtoSMDS);
-               newUgrid->SetIdsSMESHDSElement(newMapElementSMDStoVTK);
-
-               // Copy new data to the old DatSource: keep the single DataSource for all actors
-               ugrid->DeepCopy(newUgrid);
-
-               vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-               Mapper->SetInput(ugrid);
-               Mactor->SetMapper(Mapper);
-
-               // Commented to avoid multiple viewer updates when called by ReadScript()
-               //UpdateView();
-
-       }
-       QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveNodes(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
-{
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       Standard_Boolean result;
-       SMESH_Actor *ac = FindActor(aMesh, result, true);
-       if (result)
-       {
-               SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
-               anArrayOfIdeces->length(MapIndex.Extent());
-               TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-               int i = 0;
-               for (; ite.More(); ite.Next())
-               {
-                       //      MESSAGE ( " RemoveNode : id " << ac->GetIdSMESHDSNode(ite.Key()) )
-                       anArrayOfIdeces[i] = ac->GetIdSMESHDSNode(ite.Key());
-                       i++;
-               }
-               SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-               aMeshEditor->RemoveNodes(anArrayOfIdeces);
-
-       }
-       if (myAutomaticUpdate)
-       {
-               SMESH_Actor *Mesh = smeshGUI->ReadScript(aMesh);
-               if (Mesh != NULL)
-               {
-                       smeshGUI->DisplayActor(Mesh);
-                       smeshGUI->DisplayEdges(Mesh);
-                       smeshGUI->ChangeRepresentation(Mesh, Mesh->getDisplayMode());
-                       AddActorInSelection(Mesh);
-               }
-       }
-       QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveElement(SMESH_Actor * Mactor, int idelement)
-{
-       MESSAGE(" OLD RemoveElement method ")
-//    int id = Mactor->GetIdVTKElement( idelement );
-//    MESSAGE ( " RemoveElement id VTK : " << id )
-//    if ( Mactor->GetMapper() != NULL ) {
-//      vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-//      vtkUnstructuredGrid* newUgrid = vtkUnstructuredGrid::New();
-//      int nbCells = ugrid->GetNumberOfCells();
-//      for ( int i = 0; i < nbCells; i++ ) {
-//        if ( id != i ) {
-//      newUgrid->InsertNextCell( ugrid->GetCell(i)->GetCellType(), 
-//                    ugrid->GetCell(i)->GetPointIds() );
-//        } else
-//      Mactor->RemoveElement( idelement );
-//      }
-//      newUgrid->SetPoints(ugrid->GetPoints());
-//      vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-//      Mapper->SetInput( newUgrid );
-//      Mactor->DataSource = Mapper->GetInput();
-//      Mactor->SetMapper(Mapper);
-//      UpdateView();
-//    }
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveElements(SMESH_Actor * Mactor, int number,
-       const SMESH::double_array & coords, const SMESH::long_array & indexes)
-{
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       int i = 1;
-       while (i <= number)
-       {
-               Mactor->RemoveElement(indexes[i - 1]);
-               i++;
-       }
-       TColStd_DataMapOfIntegerInteger newMapElementSMDStoVTK;
-       TColStd_DataMapOfIntegerInteger newMapElementVTKtoSMDS;
-
-       if (Mactor->GetMapper() != NULL)
-       {
-               SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-               SMESH_Grid *newUgrid = SMESH_Grid::New();
-               newUgrid->CopyMaps(ugrid);
-
-               int nbCells = ugrid->GetNumberOfCells();
-               for (int i = 0; i < nbCells; i++)
-               {
-                       int idSMESHDSElement = Mactor->GetIdSMESHDSElement(i);
-                       if (idSMESHDSElement != -1)
-                       {
-                               int newId =
-                                       newUgrid->InsertNextCell(ugrid->GetCell(i)->GetCellType(),
-                                       ugrid->GetCell(i)->GetPointIds());
-                               newMapElementSMDStoVTK.Bind(idSMESHDSElement, newId);
-                               newMapElementVTKtoSMDS.Bind(newId, idSMESHDSElement);
-                       }
-               }
-
-               newUgrid->SetIdsVTKElement(newMapElementVTKtoSMDS);
-               newUgrid->SetIdsSMESHDSElement(newMapElementSMDStoVTK);
-
-               newUgrid->SetPoints(ugrid->GetPoints());
-
-               // Copy new data to the old DatSource: keep the single DataSource for all actors
-               ugrid->DeepCopy(newUgrid);
-
-               vtkDataSetMapper *Mapper = vtkDataSetMapper::New();
-               Mapper->SetInput(ugrid);
-               Mactor->SetMapper(Mapper);
-
-               // Commented to avoid multiple viewer updates when called by ReadScript()
-               //UpdateView();
-       }
-       QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::RemoveElements(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
-{
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       Standard_Boolean result;
-       SMESH_Actor *ac = FindActor(aMesh, result, true);
-       if (result)
-       {
-               SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
-               anArrayOfIdeces->length(MapIndex.Extent());
-               TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-               int i = 0;
-               for (; ite.More(); ite.Next())
-               {
-                       //      MESSAGE ( " RemoveElement : id " << ite.Key() << "," << ac->GetIdSMESHDSElement(ite.Key()) )
-                       anArrayOfIdeces[i] = ac->GetIdSMESHDSElement(ite.Key());
-                       i++;
-               }
-
-               SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-               aMeshEditor->RemoveElements(anArrayOfIdeces);
-       }
-
-       if (myAutomaticUpdate)
-       {
-               SMESH_Actor *Mesh = smeshGUI->ReadScript(aMesh);
-               if (Mesh != NULL)
-               {
-                       smeshGUI->DisplayActor(Mesh);
-                       smeshGUI->DisplayEdges(Mesh);
-                       smeshGUI->ChangeRepresentation(Mesh, Mesh->getDisplayMode());
-                       AddActorInSelection(Mesh);
-#ifdef TRACE
-                       Dump(Mesh);
-#endif
-               }
-       }
-       QApplication::restoreOverrideCursor();
-}
+  SALOME_Selection *Sel =
+    SALOME_Selection::Selection(smeshGUI->myActiveStudy->getSelection());
+  int nbSel = Sel->IObjectCount();
+  if ( !nbSel )
+    return;
+  Standard_Boolean res;
+  Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+  SMESH::SMESH_Mesh_var aMesh = smeshGUI->ConvertIOinMesh(IObject, res);
+  if ( res && ( nbSel == 1 || theCommandID == 122 ) ) {// MED export supports multiple meshes
+    QString aFilter, aTitle = tr("Export mesh");
+    switch ( theCommandID ) {
+    case 122:
+      aFilter = tr("MED files (*.med)");
+      break;
+    case 121:
+      aFilter = tr("DAT files (*.dat)");
+      break;
+    case 123:
+      aFilter = tr("IDEAS files (*.unv)");
+      break;
+    default:
+      break;
+    }
+    
+    QString filename = QAD_FileDlg::getFileName(parent, "", aFilter, aTitle, false);
+    
+    if ( !filename.isEmpty() ) {
+      // Check whether the file already exists and delete it if yes
+      QFile aFile( filename );
+      if ( aFile.exists() )
+       aFile.remove();
+      
+      QAD_WaitCursor wc;
+      for ( SALOME_ListIteratorOfListIO it( Sel->StoredIObjects() ); it.More(); it.Next() ) {
+       aMesh = smeshGUI->ConvertIOinMesh( it.Value(), res );
+       if ( res ) {
+         switch ( theCommandID ) {
+         case 122:
+           aMesh->ExportMED( filename.latin1(), true ); // currently, automatic groups are always created
+           break;
+         case 121:
+           aMesh->ExportDAT( filename.latin1() );
+           break;
+         case 123:
+           aMesh->ExportUNV( filename.latin1() );
+           break;
+         default:
+           break;
+         }
+       }
+      }
+    }
+  }
+}
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::OrientationElements(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
+bool SMESHGUI::OnMousePress(QMouseEvent * pe, QAD_Desktop * parent,
+                           QAD_StudyFrame * studyFrame)
 {
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       vtkRenderer *theRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-       Standard_Boolean result;
-       SMESH_Actor *ac = FindActor(aMesh, result, true);
-       if (result)
-       {
-               //vtkUnstructuredGrid* UGrid = vtkUnstructuredGrid::New();
-               SMESH_Grid *UGrid = SMESH_Grid::New();
-               SMESH_Grid *oldGrid = SMESH_Grid::SafeDownCast(ac->DataSource);
-               UGrid->CopyMaps(oldGrid);
-
-               vtkGeometryFilter *gf = vtkGeometryFilter::New();
-               gf->SetInput(ac->DataSource);
-
-               vtkPolyDataMapper *Mapper = vtkPolyDataMapper::New();
-               Mapper->SetInput(gf->GetOutput());
-               Mapper->Update();
-
-               TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-               for (; ite.More(); ite.Next())
-               {
-                       Mapper->GetInput()->ReverseCell(ite.Key());
-               }
-
-               UGrid->SetPoints(Mapper->GetInput()->GetPoints());
-               int nbCells = Mapper->GetInput()->GetNumberOfCells();
-               for (int i = 0; i < nbCells; i++)
-               {
-                       UGrid->InsertNextCell(Mapper->GetInput()->GetCellType(i),
-                               Mapper->GetInput()->GetCell(i)->GetPointIds());
-               }
-
-               // Copy new data to the old DatSource: keep the single DataSource for all actors
-               oldGrid->DeepCopy(UGrid);
-
-               vtkDataSetMapper *NewMapper = vtkDataSetMapper::New();
-               //NewMapper->SetInput( UGrid );
-               NewMapper->SetInput(oldGrid);
-               NewMapper->Update();
-
-               //ac->DataSource = NewMapper->GetInput();
-               ac->SetMapper(NewMapper);
-       }
-       vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-       renWin->Render();
-       QApplication::restoreOverrideCursor();
+  return false;
 }
 
 //=============================================================================
@@ -4805,174 +3241,10 @@ void SMESHGUI::OrientationElements(SMESH::SMESH_Mesh_ptr aMesh,
  *
  */
 //=============================================================================
-void SMESHGUI::DiagonalInversion(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
+bool SMESHGUI::OnMouseMove(QMouseEvent * pe, QAD_Desktop * parent,
+                          QAD_StudyFrame * studyFrame)
 {
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       vtkRenderer *theRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-       Standard_Boolean result;
-
-       SMESH_Actor *ac = FindActor(aMesh, result, true);
-       if (result)
-       {
-               //vtkUnstructuredGrid* UGrid = vtkUnstructuredGrid::New();
-               SMESH_Grid *UGrid = SMESH_Grid::New();
-               vtkGeometryFilter *gf = vtkGeometryFilter::New();
-               gf->SetInput(ac->DataSource);
-
-               vtkExtractEdges *edges = vtkExtractEdges::New();
-               edges->SetInput(ac->DataSource);
-
-               vtkPolyDataMapper *Mapper = vtkPolyDataMapper::New();
-               Mapper->SetInput(edges->GetOutput());
-               Mapper->Update();
-
-               int nb = Mapper->GetInput()->GetNumberOfCells();
-               //MESSAGE ( "nb : " << nb )
-
-               TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-               for (; ite.More(); ite.Next())
-               {
-                       vtkCell *StartEdge = Mapper->GetInput()->GetCell(ite.Key());
-                       //MESSAGE( "DCQ : Edge Id = " << ite.Key())
-                       int CellType = StartEdge->GetCellType();
-                       //MESSAGE( "DCQ : Cell Type = " << CellType)
-                       int nbPoints = StartEdge->GetNumberOfPoints();
-
-                       //MESSAGE( "DCQ : Nb Point = " << nbPoints)
-                       if (nbPoints == 2)
-                       {
-                               vtkUnstructuredGrid *StartUGrid =
-                                       vtkUnstructuredGrid::SafeDownCast(ac->DataSource);
-
-                               vtkIdList *IdCells = vtkIdList::New();
-                               vtkIdList *IdPoints = StartEdge->GetPointIds();
-                               float p1[3];
-                               float p2[3];
-
-                               Mapper->GetInput()->GetPoints()->GetPoint(IdPoints->GetId(0),
-                                       p1);
-                               Mapper->GetInput()->GetPoints()->GetPoint(IdPoints->GetId(1),
-                                       p2);
-
-                               int idp1 = StartUGrid->FindPoint(p1);
-                               int idp2 = StartUGrid->FindPoint(p2);
-
-                               StartUGrid->GetPointCells(idp1, IdCells);
-
-                               //MESSAGE ( " pt 0 : " << IdPoints->GetId(0) )
-                               //MESSAGE ( " pt 1 : " << IdPoints->GetId(1) )
-
-                               //MESSAGE ( " pt 0 : " << idp1 )
-                               //MESSAGE ( " pt 1 : " << idp2 )
-
-                               vtkIdList *IdPts = vtkIdList::New();
-                               if (IdCells->GetNumberOfIds() >= 2)
-                               {
-                                       int nbCells = IdCells->GetNumberOfIds();
-                                       //MESSAGE ( " nbCells : " << nbCells )
-                                       for (int j = 0; j < nbCells; j++)
-                                       {
-                                               StartUGrid->GetCellPoints(IdCells->GetId(j), IdPts);
-                                               if (IdPts->IsId(idp2) == -1)
-                                               {
-                                                       IdCells->DeleteId(IdCells->GetId(j));
-                                               }
-                                       }
-
-                                       //MESSAGE ( " IdCells " << IdCells->GetNumberOfIds() )
-
-                                       vtkIdList *IdPts0 = vtkIdList::New();
-                                       vtkIdList *IdPts1 = vtkIdList::New();
-
-                                       if (IdCells->GetNumberOfIds() == 2)
-                                       {
-                                               StartUGrid->GetCellPoints(IdCells->GetId(0), IdPts0);
-                                               StartUGrid->GetCellPoints(IdCells->GetId(1), IdPts1);
-
-                                               //Create new faces
-                                               TColStd_MapOfInteger EndMapIndex;
-                                               for (int j = 0; j < 3; j++)
-                                               {
-                                                       if (IdPts0->GetId(j) != idp1 &&
-                                                               IdPts0->GetId(j) != idp2)
-                                                       {
-                                                               EndMapIndex.Add(IdPts0->GetId(j));
-                                                       }
-                                                       if (IdPts1->GetId(j) != idp1 &&
-                                                               IdPts1->GetId(j) != idp2)
-                                                       {
-                                                               EndMapIndex.Add(IdPts1->GetId(j));
-                                                       }
-                                               }
-
-                                               bool MyAU = myAutomaticUpdate;
-                                               myAutomaticUpdate = false;
-
-                                               EndMapIndex.Add(idp1);
-                                               TColStd_MapIteratorOfMapOfInteger ite1(EndMapIndex);
-                                               int i = 1;
-                                               while (ite1.More())
-                                               {
-                                                       if (ite1.Key() == idp1)
-                                                               break;
-                                                       i++;
-                                                       ite1.Next();
-                                               }
-                                               bool reverse1 = (i == 2);
-                                               this->AddFace(aMesh, EndMapIndex, reverse1);
-
-                                               EndMapIndex.Remove(idp1);
-                                               EndMapIndex.Add(idp2);
-                                               TColStd_MapIteratorOfMapOfInteger ite2(EndMapIndex);
-                                               i = 1;
-                                               while (ite2.More())
-                                               {
-                                                       if (ite2.Key() == idp2)
-                                                               break;
-                                                       i++;
-                                                       ite2.Next();
-                                               }
-                                               bool reverse2 = (i == 2);
-                                               this->AddFace(aMesh, EndMapIndex,
-                                                       !(reverse1 == reverse2));
-
-                                               myAutomaticUpdate = MyAU;
-                                               //MESSAGE ( " myAutomaticUpdate = " << MyAU )
-                                               Mapper->Update();
-                                               //Remove old faces
-                                               TColStd_MapOfInteger StartMapIndex;
-                                               StartMapIndex.Add(IdCells->GetId(0));
-                                               StartMapIndex.Add(IdCells->GetId(1));
-                                               this->RemoveElements(aMesh, StartMapIndex);
-
-                                               Mapper->Update();
-                                       }
-                               }
-                       }
-               }
-
-               //      UGrid->SetPoints( Mapper->GetInput()->GetPoints() );
-               //      int nbCells = Mapper->GetInput()->GetNumberOfCells();
-               //      for ( int i = 0; i < nbCells; i++ ) {
-               //        UGrid->InsertNextCell( Mapper->GetInput()->GetCellType(i), Mapper->GetInput()->GetCell(i)->GetPointIds() );
-               //      }
-
-               //      vtkDataSetMapper *NewMapper = vtkDataSetMapper::New();
-               //      NewMapper->SetInput( UGrid );
-               //      NewMapper->Update();
-
-               //      ac->DataSource = NewMapper->GetInput();
-               //      ac->SetMapper( NewMapper );
-       }
-       vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-       renWin->Render();
-       QApplication::restoreOverrideCursor();
+  return true;
 }
 
 //=============================================================================
@@ -4980,29 +3252,10 @@ void SMESHGUI::DiagonalInversion(SMESH::SMESH_Mesh_ptr aMesh,
  *
  */
 //=============================================================================
-void SMESHGUI::AddEdges(SMESH_Actor * Mactor, int number,
-       const SMESH::double_array & coords, const SMESH::long_array & indexes)
+bool SMESHGUI::OnKeyPress(QKeyEvent * pe, QAD_Desktop * parent,
+                         QAD_StudyFrame * studyFrame)
 {
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-       SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-       int i = 1;
-       int j = 1;
-       while (i <= number)
-       {
-               vtkIdList *Ids = vtkIdList::New();
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 1]));
-               int id = ugrid->InsertNextCell(VTK_LINE, Ids);
-               Mactor->AddElement(indexes[j - 1], id);
-               i++;
-               j = j + 3;
-       }
-       vtkDataSetMapper *EdgeMapper = vtkDataSetMapper::New();
-       EdgeMapper->SetInput(ugrid);
-       Mactor->DataSource = EdgeMapper->GetInput();
-       Mactor->SetMapper(EdgeMapper);
-       QApplication::restoreOverrideCursor();
+  return true;
 }
 
 //=============================================================================
@@ -5010,26 +3263,64 @@ void SMESHGUI::AddEdges(SMESH_Actor * Mactor, int number,
  *
  */
 //=============================================================================
-void SMESHGUI::AddEdge(SMESH_Actor * Mactor, int idedge, int idnode1,
-       int idnode2)
+bool SMESHGUI::SetSettings(QAD_Desktop * parent)
 {
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       MESSAGE("SMESHGUI::AddEdge " << idedge << " : " << idnode1 << ";" <<
-               idnode2) vtkIdList *Ids = vtkIdList::New();
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode1));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode2));
-
-       //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-       SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-       int id = ugrid->InsertNextCell(VTK_LINE, Ids);
-       Mactor->AddElement(idedge, id);
-
-       MESSAGE(" Edge VTK id " << id)
-               vtkDataSetMapper *EdgeMapper = vtkDataSetMapper::New();
-       EdgeMapper->SetInput(ugrid);
-       Mactor->DataSource = EdgeMapper->GetInput();
-       Mactor->SetMapper(EdgeMapper);
-       QApplication::restoreOverrideCursor();
+  MESSAGE("SMESHGUI::SetSettings.");
+  SMESHGUI::GetOrCreateSMESHGUI(parent);
+
+  /* Display mode */
+  QString DisplayMode = "Shading";
+  if ( QAD_CONFIG->hasSetting("SMESH:DisplayMode") )
+    DisplayMode = QAD_CONFIG->getSetting("SMESH:DisplayMode");
+  else
+    QAD_CONFIG->addSetting("SMESH:DisplayMode", "Shading");
+
+  bool Shrink = false;
+  if ( QAD_CONFIG->hasSetting("SMESH:Shrink") )
+    Shrink = QAD_CONFIG->getSetting("SMESH:Shrink") == "yes";
+
+  if (DisplayMode == "Wireframe") {
+    // wireframe
+    parent->menuBar()->setItemChecked(10004, false);
+    parent->menuBar()->setItemChecked(10002, false);
+    parent->menuBar()->setItemChecked(10001, true);
+    parent->menuBar()->setItemEnabled(10003, true);
+  }
+  else if (DisplayMode == "Nodes") {
+    // poins
+    parent->menuBar()->setItemChecked(10004, true);
+    parent->menuBar()->setItemChecked(10002, false);
+    parent->menuBar()->setItemChecked(10001, false);
+    parent->menuBar()->setItemEnabled(10003, false);
+  }
+  else {
+    // default is shading
+    parent->menuBar()->setItemChecked(10004, false);
+    parent->menuBar()->setItemChecked(10002, true);
+    parent->menuBar()->setItemChecked(10001, false);
+    parent->menuBar()->setItemEnabled(10003, true);
+  }
+  parent->menuBar()->setItemChecked(10003, Shrink);
+
+  /* Automatic Update */
+  QString AutoUpdate = QAD_CONFIG->getSetting("SMESH:AutomaticUpdate");
+  if (AutoUpdate.compare("true") == 0) {
+    parent->menuBar()->setItemChecked(1001, true);
+    smeshGUI->myAutomaticUpdate = true;
+  }
+  else {
+    parent->menuBar()->setItemChecked(1001, false);
+    smeshGUI->myAutomaticUpdate = false;
+  }
+
+  /* Selection */
+  ::UpdateSelectionProp();
+
+  /* menus disable */
+  parent->menuBar()->setItemEnabled(111, false);       // IMPORT DAT
+  parent->menuBar()->setItemEnabled(112, false);       // IMPORT UNV
+
+  return true;
 }
 
 //=============================================================================
@@ -5037,50 +3328,33 @@ void SMESHGUI::AddEdge(SMESH_Actor * Mactor, int idedge, int idnode1,
  *
  */
 //=============================================================================
-void SMESHGUI::AddTriangles(SMESH_Actor * Mactor, int number,
-       const SMESH::double_array & coords, const SMESH::long_array & indexes)
+void SMESHGUI::DefinePopup(QString & theContext, QString & theParent, QString & theObject)
 {
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-       SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-       int i = 1;
-       int j = 1;
-       while (i <= number)
-       {
-               vtkIdList *Ids = vtkIdList::New();
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 1]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 2]));
-               int id = ugrid->InsertNextCell(VTK_TRIANGLE, Ids);
-               Mactor->AddElement(indexes[j - 1], id);
-               i++;
-               j = j + 4;
-       }
-       vtkDataSetMapper *TriMapper = vtkDataSetMapper::New();
-       TriMapper->SetInput(ugrid);
-       Mactor->DataSource = TriMapper->GetInput();
-       Mactor->SetMapper(TriMapper);
-       QApplication::restoreOverrideCursor();
-}
-void SMESHGUI::AddTriangle(SMESH_Actor * Mactor, int idtri, int idnode1,
-       int idnode2, int idnode3)
-{
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       vtkIdList *Ids = vtkIdList::New();
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode1));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode2));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode3));
-
-       //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-       SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-       int id = ugrid->InsertNextCell(VTK_TRIANGLE, Ids);
-       Mactor->AddElement(idtri, id);
-
-       vtkDataSetMapper *TriMapper = vtkDataSetMapper::New();
-       TriMapper->SetInput(ugrid);
-       Mactor->DataSource = TriMapper->GetInput();
-       Mactor->SetMapper(TriMapper);
-       QApplication::restoreOverrideCursor();
+  // NRI : Temporary added
+  //  if ( smeshGUI->myStudy->GetProperties()->IsLocked() ) {
+  //    theObject = "NothingSelected";
+  //    theContext = "NothingSelected";
+  //  }
+  // NRI
+
+  SALOME_Selection *Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
+  int nbSel = Sel->IObjectCount();
+  switch ( nbSel ) {
+  case 0:
+    theObject = "NothingSelected";
+    theContext = "NothingSelected";
+    break;
+  case 1:
+    if ( smeshGUI->myState == 800 && Sel->HasIndex( Sel->firstIObject() ) )
+      theObject = "Elements";
+    else
+      theObject = smeshGUI->CheckTypeObject( Sel->firstIObject() );
+    theContext = "";
+    break;
+  default:
+    theObject = smeshGUI->CheckHomogeneousSelection();
+    theContext = "";
+  }
 }
 
 //=============================================================================
@@ -5088,58 +3362,250 @@ void SMESHGUI::AddTriangle(SMESH_Actor * Mactor, int idtri, int idnode1,
  *
  */
 //=============================================================================
-void SMESHGUI::AddQuadrangles(SMESH_Actor * Mactor, int number,
-       const SMESH::double_array & coords, const SMESH::long_array & indexes)
+bool SMESHGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString& theContext,
+                          const QString& theParent, const QString& theObject)
 {
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-       SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-       int i = 1;
-       int j = 1;
-       while (i <= number)
-       {
-               vtkIdList *Ids = vtkIdList::New();
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 1]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 2]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 3]));
-               int id = ugrid->InsertNextCell(VTK_QUAD, Ids);
-               Mactor->AddElement(indexes[j - 1], id);
-               i++;
-               j = j + 5;
-       }
-       vtkDataSetMapper *QuadMapper = vtkDataSetMapper::New();
-       QuadMapper->SetInput(ugrid);
-       Mactor->DataSource = QuadMapper->GetInput();
-       Mactor->SetMapper(QuadMapper);
-       QApplication::restoreOverrideCursor();
+  // get active study frame
+  QAD_StudyFrame* studyFrame = smeshGUI->myActiveStudy->getActiveStudyFrame();
+  
+  // get parent component which selected object(s) belongs to
+  QString parentComp = ( (SALOMEGUI_Desktop*)parent )->getComponentFromSelection();
+
+  // get selection
+  SALOME_Selection* Sel = SALOME_Selection::Selection( smeshGUI->myActiveStudy->getSelection() );
+  int nbSel = Sel->IObjectCount();
+
+  if ( nbSel == 0 ) {
+    popup->clear();
+  }
+  else if ( nbSel == 1 ) {
+    if ( parentComp != parent->getActiveComponent() ) {
+      // object not belongs to SMESH module - remove all commands except common Display/Erase...
+      while ( 1 ) {
+       int id = popup->idAt( 0 );
+       if ( id <= QAD_TopLabel_Popup_ID )
+         popup->removeItemAt( 0 );
+       else
+         break;
+      }
+    }
+    else {
+      // get selected interactive object 
+      Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+      SALOMEDS::SObject_var SO = smeshGUI->myStudy->FindObjectID( IObject->getEntry() );
+      // find popup menu's TopLabel item
+      int topItem = popup->indexOf( QAD_TopLabel_Popup_ID );
+      if ( topItem >= 0 ) {
+       if ( theParent == "Viewer" ) {
+         // set bold font for popup menu's TopLabel item (Viewer popup)
+         QFont fnt = QApplication::font(); fnt.setBold( TRUE );
+         popup->removeItem( QAD_TopLabel_Popup_ID );
+         popup->insertItem( new CustomItem( QString( IObject->getName() ), fnt ), QAD_TopLabel_Popup_ID, topItem );
+       }
+       else if ( theParent == "ObjectBrowser" ) {
+         // remove popup menu's TopLabel item (Object Browser popup)
+         popup->removeItem( QAD_TopLabel_Popup_ID );
+       }
+      }
+
+      // remove "Display only" command for component object
+      if ( theObject.compare( "Component" ) == 0 ) {
+       popup->removeItem( QAD_DisplayOnly_Popup_ID );
+      }
+      else if ( theObject == "Hypothesis" || theObject == "Algorithm" ) {
+       // remove Display/Erase commands
+       popup->removeItem( QAD_Display_Popup_ID );
+       popup->removeItem( QAD_DisplayOnly_Popup_ID );
+       popup->removeItem( QAD_Erase_Popup_ID );
+       // remove "Unassign ..." command if hyp/algo is not assigned
+       if ( SO->_is_nil() || !IObject->hasReference()/* !IsReferencedObject( SO ) */)
+         popup->removeItem( 1102 );
+      }
+      else if ( theObject == "Mesh" || theObject == "SubMesh" || theObject == "Group" ) {
+       // get actor
+       GEOM::GEOM_Shape_var aShape = GetSMESHGUI()->GetStudyAPI().GetShapeOnMeshOrSubMesh( SO );
+       if ( aShape->_is_nil() ) {
+         // imported mesh
+         popup->removeItem( 701 ); // Compute
+         popup->removeItem( 705 ); // Edit hypothesis
+         popup->removeItem( 706 ); // ...
+       }
+       SMESH_Actor* ac = ::FindActorByEntry(IObject->getEntry());
+       // if object has actor
+       if ( ac && studyFrame->getTypeView() == VIEW_VTK ) {
+         VTKViewer_RenderWindowInteractor* myRenderInter =
+           ( ( VTKViewer_ViewFrame* ) studyFrame->getRightFrame()->getViewFrame() )->getRWInteractor();
+         if ( myRenderInter->isVisible( IObject ) ) {
+           popup->removeItem( QAD_Display_Popup_ID );
+           popup->setItemChecked( 9010, ac->GetPointsLabeled() ); // Numbering / Display Nodes #
+           popup->setItemChecked( 9011, ac->GetCellsLabeled() );  // Numbering / Display Elements #
+           TVisualObjPtr aVisualObj = ac->GetObject();
+           int aNbEdges = aVisualObj->GetNbEntities(SMESH::EDGE);
+           int aNbFaces = aVisualObj->GetNbEntities(SMESH::FACE);
+           int aNbVolumes = aVisualObj->GetNbEntities(SMESH::VOLUME);
+           QMenuItem* mi = popup->findItem( 1131 );
+           if ( mi && mi->popup() ) {
+             int  prType = ac->GetRepresentation();
+             // Display Mode / Wireframe
+             if(!aNbFaces && !aNbVolumes && !aNbEdges){
+               mi->popup()->removeItem( 211 );
+             }else{
+               mi->popup()->setItemChecked( 211, prType == SMESH_Actor::eEdge );
+             }
+             // Display Mode / Shading
+             if(!aNbFaces && !aNbVolumes){
+               mi->popup()->removeItem( 212 );
+             }else{
+               mi->popup()->setItemChecked( 212, prType == SMESH_Actor::eSurface );
+             }
+             // Display Mode / Points
+             mi->popup()->setItemChecked( 215, prType == SMESH_Actor::ePoint );  
+             // Display Mode / Shrink
+             bool isShrunk = ac->IsShrunk();
+             bool isShrunkable = ac->IsShrunkable();
+             mi->popup()->setItemChecked( 213, isShrunk );   
+             mi->popup()->setItemEnabled( 213, prType != SMESH_Actor::ePoint && isShrunkable);
+           }
+           // Scalar Bar
+           mi = popup->findItem( 2000 );
+           if ( mi && mi->popup() ) {
+             SMESH_Actor::eControl cMode = ac->GetControlMode();
+             switch ( cMode ) {
+             case SMESH_Actor::eLengthEdges:
+               mi->popup()->setItemChecked( 6001, true ); break;
+             case SMESH_Actor::eFreeBorders:
+               mi->popup()->setItemChecked( 6003, true );
+               mi->popup()->removeItem( 201 );
+               break;
+             case SMESH_Actor::eMultiConnection:
+               mi->popup()->setItemChecked( 6004, true ); break;
+             case SMESH_Actor::eArea:
+               mi->popup()->setItemChecked( 6011, true ); break;
+             case SMESH_Actor::eTaper:
+               mi->popup()->setItemChecked( 6012, true ); break;
+             case SMESH_Actor::eAspectRatio:
+               mi->popup()->setItemChecked( 6013, true ); break;
+             case SMESH_Actor::eMinimumAngle:
+               mi->popup()->setItemChecked( 6014, true ); break;
+             case SMESH_Actor::eWarping:
+               mi->popup()->setItemChecked( 6015, true ); break;
+             case SMESH_Actor::eSkew:
+               mi->popup()->setItemChecked( 6016, true ); break;
+             case SMESH_Actor::eNone:
+             default:
+               mi->popup()->removeItem( 200 );
+               mi->popup()->removeItem( 201 );
+               break;
+             }
+             TVisualObjPtr aVisualObj = ac->GetObject();
+             SMESH::ElementType aType;
+             if(!aNbEdges){
+               mi->popup()->removeItem( 6001 );
+               mi->popup()->removeItem( 6003 );
+               mi->popup()->removeItem( 6004 );
+             }
+             if(!aNbFaces){
+               mi->popup()->removeItem( 6011 );
+               mi->popup()->removeItem( 6012 );
+               mi->popup()->removeItem( 6013 );
+               mi->popup()->removeItem( 6014 );
+               mi->popup()->removeItem( 6015 );
+               mi->popup()->removeItem( 6016 );
+             }
+             if(!aNbFaces && !aNbEdges)
+               popup->removeItem( 2000 );                         // Scalar Bar
+           }
+         }
+         else {
+           popup->removeItem( QAD_Erase_Popup_ID );
+           popup->removeItem( 114 );                              // Numbering popup menu
+           popup->removeItem( 1131 );                             // Display mode
+           popup->removeItem( 1132 );                             // Color / size
+           popup->removeItem( 1133 );                             // Transparency
+           popup->removeItem( 2000 );                             // Scalar Bar
+         }
+       }
+       else {
+         // object doesn't have actor
+         CORBA::Object_var anObject = SO->GetObject();
+         bool bDisplay = false;
+         if ( !CORBA::is_nil( anObject ) ) {
+           SMESH::SMESH_Mesh_var aMeshObj = SMESH::SMESH_Mesh::_narrow( anObject );
+           if ( !aMeshObj->_is_nil() && ( aMeshObj->NbNodes() > 0 || aMeshObj->NbFaces() > 0  || aMeshObj->NbVolumes() > 0 ) )
+             bDisplay = true;
+           SMESH::SMESH_subMesh_var aSubMeshObj = SMESH::SMESH_subMesh::_narrow( anObject );
+           if ( !aSubMeshObj->_is_nil() && ( aSubMeshObj->GetNumberOfNodes() > 0 || aSubMeshObj->GetNumberOfElements() > 0 ) )
+             bDisplay = true;
+           SMESH::SMESH_Group_var aGroupObj = SMESH::SMESH_Group::_narrow( anObject );
+           if ( !aGroupObj->_is_nil() && aGroupObj->Size() > 0 )
+             bDisplay = true;
+         }
+         if ( !bDisplay ) {
+           popup->removeItem( QAD_Display_Popup_ID );
+           popup->removeItem( QAD_DisplayOnly_Popup_ID );
+         }
+         popup->removeItem( QAD_Erase_Popup_ID );
+         popup->removeItem( 114 );                              // Numbering popup menu
+         popup->removeItem( 1131 );                             // Display mode
+         popup->removeItem( 1132 );                             // Color / size
+         popup->removeItem( 1133 );                             // Transparency
+         popup->removeItem( 2000 );                             // Scalar Bar
+       }
+      }
+      else {
+       // another SMESH object
+       popup->removeItem( QAD_Display_Popup_ID );
+       popup->removeItem( QAD_DisplayOnly_Popup_ID );
+       popup->removeItem( QAD_Erase_Popup_ID );
+      }
+    }
+  }
+  else {
+    // multiple selection
+    if ( parentComp != parent->getActiveComponent() ) {
+      // object not belongs to SMESH module - remove all commands except common Display/Erase...
+      while ( 1 )      {
+       int id = popup->idAt( 0 );
+       if ( id <= QAD_TopLabel_Popup_ID )
+         popup->removeItemAt( 0 );
+       else
+         break;
+      }
+      if ( parentComp.isNull() ) {
+       // objects from different components are selected
+       popup->removeItem( QAD_DisplayOnly_Popup_ID );
+       popup->removeItem( QAD_Display_Popup_ID );
+       popup->removeItem( QAD_Erase_Popup_ID );
+      }
+    }
+    else {
+      QString type = smeshGUI->CheckHomogeneousSelection();
+      if ( type != "Heterogeneous Selection" ) {
+       int topItem = popup->indexOf( QAD_TopLabel_Popup_ID );
+       if ( topItem >= 0 ) {
+         // set bold font for popup menu's TopLabel item
+         QFont fnt = QApplication::font(); fnt.setBold( TRUE );
+         popup->removeItem( QAD_TopLabel_Popup_ID );
+         popup->insertItem( new CustomItem( QString("%1 ").arg( nbSel ) + type + "(s) ", fnt ), QAD_TopLabel_Popup_ID, topItem );
+       }
+      }
+    }
+  }
+  return false;
 }
 
 //=============================================================================
-/*!
- *
+/*! Method:  BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
+ *  Purpose: ensures that the actor for the given <theIO> exists in the active VTK view
  */
 //=============================================================================
-void SMESHGUI::AddQuadrangle(SMESH_Actor * Mactor, int idquad, int idnode1,
-       int idnode2, int idnode3, int idnode4)
+void SMESHGUI::BuildPresentation(const Handle(SALOME_InteractiveObject) & theIO)
 {
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       vtkIdList *Ids = vtkIdList::New();
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode1));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode2));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode3));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode4));
-
-       //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-       SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-       int id = ugrid->InsertNextCell(VTK_QUAD, Ids);
-       Mactor->AddElement(idquad, id);
-
-       vtkDataSetMapper *QuadMapper = vtkDataSetMapper::New();
-       QuadMapper->SetInput(ugrid);
-       Mactor->DataSource = QuadMapper->GetInput();
-       Mactor->SetMapper(QuadMapper);
-       QApplication::restoreOverrideCursor();
+  if(theIO->hasEntry()){
+    QAD_Study* aStudy = SMESHGUI::GetSMESHGUI()->GetActiveStudy();
+    QAD_StudyFrame *aStudyFrame = aStudy->getActiveStudyFrame();
+    ::UpdateView(aStudyFrame,eDisplay,theIO->getEntry());
+  }
 }
 
 //=============================================================================
@@ -5147,61 +3613,19 @@ void SMESHGUI::AddQuadrangle(SMESH_Actor * Mactor, int idquad, int idnode1,
  *
  */
 //=============================================================================
-void SMESHGUI::AddTetras(SMESH_Actor * Mactor, int number,
-       const SMESH::double_array & coords, const SMESH::long_array & indexes)
+void SMESHGUI::setOrb()
 {
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-       SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-       int i = 1;
-       int j = 1;
-       while (i <= number)
+       try
        {
-               vtkIdList *Ids = vtkIdList::New();
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 1]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 2]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 3]));
-               int id = ugrid->InsertNextCell(VTK_TETRA, Ids);
-               Mactor->AddElement(indexes[j - 1], id);
-               i++;
-               j = j + 5;
+               ORB_INIT & init = *SINGLETON_ < ORB_INIT >::Instance();
+               ASSERT(SINGLETON_ < ORB_INIT >::IsAlreadyExisting());
+               _orb = init(0, 0);
+       } catch(...)
+       {
+               INFOS("internal error : orb not found");
+               _orb = 0;
        }
-       vtkDataSetMapper *TetraMapper = vtkDataSetMapper::New();
-       TetraMapper->SetInput(ugrid);
-       Mactor->DataSource = TetraMapper->GetInput();
-       Mactor->SetMapper(TetraMapper);
-       QApplication::restoreOverrideCursor();
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-void SMESHGUI::AddTetra(SMESH_Actor * Mactor, int idtetra, int idnode1,
-       int idnode2, int idnode3, int idnode4)
-{
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       MESSAGE("SMESHGUI::AddTetra " << idtetra << " : " << idnode1 << ";" <<
-               idnode2 << ";" << idnode3 << ";" << idnode4) vtkIdList *Ids =
-               vtkIdList::New();
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode1));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode2));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode3));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode4));
-
-       //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-       SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-       int id = ugrid->InsertNextCell(VTK_TETRA, Ids);
-       Mactor->AddElement(idtetra, id);
-
-       MESSAGE(" Tetra VTK id " << id)
-               vtkDataSetMapper *TetraMapper = vtkDataSetMapper::New();
-       TetraMapper->SetInput(ugrid);
-       Mactor->DataSource = TetraMapper->GetInput();
-       Mactor->SetMapper(TetraMapper);
-       QApplication::restoreOverrideCursor();
+       ASSERT(!CORBA::is_nil(_orb));
 }
 
 //=============================================================================
@@ -5209,137 +3633,41 @@ void SMESHGUI::AddTetra(SMESH_Actor * Mactor, int idtetra, int idnode1,
  *
  */
 //=============================================================================
-void SMESHGUI::AddHexaedres(SMESH_Actor * Mactor, int number,
-       const SMESH::double_array & coords, const SMESH::long_array & indexes)
-{
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       //vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-       SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-       int i = 1;
-       int j = 1;
-       while (i <= number)
-       {
-               vtkIdList *Ids = vtkIdList::New();
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 1]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 2]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 3]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 4]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 5]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 6]));
-               Ids->InsertNextId(Mactor->GetIdVTKNode(indexes[j + 7]));
-               int id = ugrid->InsertNextCell(VTK_HEXAHEDRON, Ids);
-               Mactor->AddElement(indexes[j - 1], id);
-               i++;
-               j = j + 9;
-       }
-       vtkDataSetMapper *HexaMapper = vtkDataSetMapper::New();
-       HexaMapper->SetInput(ugrid);
-       Mactor->DataSource = HexaMapper->GetInput();
-       Mactor->SetMapper(HexaMapper);
-       QApplication::restoreOverrideCursor();
-}
+SMESH_Actor *SMESHGUI::ReadScript(SMESH::SMESH_Mesh_ptr theMesh){}
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::AddHexaedre(SMESH_Actor * Mactor, int idhexa, int idnode1,
-       int idnode2, int idnode3, int idnode4, int idnode5, int idnode6,
-       int idnode7, int idnode8)
-{
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       MESSAGE("SMESHGUI::AddHexaedre " << idhexa << " : " << idnode1 << ";" <<
-               idnode2 << ";" << idnode3 << ";" << idnode4 << ";" << idnode5 << ";" <<
-               idnode6 << ";" << idnode7 << ";" << idnode8) vtkIdList *Ids =
-               vtkIdList::New();
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode1));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode2));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode3));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode4));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode5));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode6));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode7));
-       Ids->InsertNextId(Mactor->GetIdVTKNode(idnode8));
-
-       //vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::SafeDownCast( Mactor->DataSource );
-       SMESH_Grid *ugrid = SMESH_Grid::SafeDownCast(Mactor->DataSource);
-       int id = ugrid->InsertNextCell(VTK_HEXAHEDRON, Ids);
-       Mactor->AddElement(idhexa, id);
-
-       MESSAGE(" Hexa VTK id " << id)
-               vtkDataSetMapper *HexaMapper = vtkDataSetMapper::New();
-       HexaMapper->SetInput(ugrid);
-       Mactor->DataSource = HexaMapper->GetInput();
-       Mactor->SetMapper(HexaMapper);
-       QApplication::restoreOverrideCursor();
-}
-
-//=====================================================================================
-// EXPORTED METHODS
-//=====================================================================================
-extern "C"
+void SMESHGUI::Dump(SMESH_Actor * Mactor)
 {
-       bool OnGUIEvent(int theCommandID, QAD_Desktop * parent)
-       {
-               return SMESHGUI::OnGUIEvent(theCommandID, parent);
-       }
-
-       bool OnKeyPress(QKeyEvent * pe, QAD_Desktop * parent,
-               QAD_StudyFrame * studyFrame)
-       {
-               return SMESHGUI::OnKeyPress(pe, parent, studyFrame);
-       }
-
-       bool OnMousePress(QMouseEvent * pe, QAD_Desktop * parent,
-               QAD_StudyFrame * studyFrame)
-       {
-               return SMESHGUI::OnMousePress(pe, parent, studyFrame);
-       }
-
-       bool OnMouseMove(QMouseEvent * pe, QAD_Desktop * parent,
-               QAD_StudyFrame * studyFrame)
-       {
-               return SMESHGUI::OnMouseMove(pe, parent, studyFrame);
-       }
-
-       bool SetSettings(QAD_Desktop * parent)
-       {
-               return SMESHGUI::SetSettings(parent);
-       }
-
-       bool customPopup(QAD_Desktop * parent, QPopupMenu * popup,
-               const QString & theContext, const QString & theParent,
-               const QString & theObject)
-       {
-               return SMESHGUI::CustomPopup(parent, popup, theContext, theParent,
-                       theObject);
-       }
-
-       void definePopup(QString & theContext, QString & theParent,
-               QString & theObject)
-       {
-               SMESHGUI::DefinePopup(theContext, theParent, theObject);
-       }
-
-       bool activeStudyChanged(QAD_Desktop * parent)
-       {
-               SMESHGUI::activeStudyChanged(parent);
-       }
+       vtkUnstructuredGrid *ugrid = Mactor->GetUnstructuredGrid();
+       vtkPoints *Pts = ugrid->GetPoints();
+       int nbPts = Pts->GetNumberOfPoints();
+       int nbCells = ugrid->GetNumberOfCells();
 
-       void buildPresentation(const Handle(SALOME_InteractiveObject) & theIO)
+       FILE *In;
+       int i, j;
+       In = fopen("/tmp/dumpMesh", "w+");
+       fprintf(In, "%d %d\n", nbPts, nbCells);
+       for (int i = 0; i < nbPts; i++)
        {
-               SMESHGUI::BuildPresentation(theIO);
+               float *p = ugrid->GetPoint(i);
+               fprintf(In, "%d %e %e %e\n", i, p[0], p[1], p[2]);
        }
 
-       void supportedViewType(int *buffer, int bufferSize)
+       for (int i = 0; i < nbCells; i++)
        {
-               if (!buffer || !bufferSize)
-                       return;
-               buffer[0] = (int)VIEW_VTK;
+               fprintf(In, "%d %d", i, ugrid->GetCell(i)->GetCellType());
+               vtkIdList *Id = ugrid->GetCell(i)->GetPointIds();
+               for (j = 0; j < Id->GetNumberOfIds(); j++)
+               {
+                       fprintf(In, " %d", Id->GetId(j));
+               }
+               fprintf(In, "\n");
        }
-
+       fclose(In);
 }
 
 //=============================================================================
@@ -5347,57 +3675,36 @@ extern "C"
  *
  */
 //=============================================================================
-void SMESHGUI::ViewNodes()
+void SMESHGUI::RemoveNodes(SMESH::SMESH_Mesh_ptr theMesh,
+                          const TColStd_MapOfInteger & MapIndex)
 {
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       EraseSimulationActors();
-       mySimulationActors = vtkActorCollection::New();
-       vtkRenderer *theRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-       vtkActorCollection *theActors = theRenderer->GetActors();
-       theActors->InitTraversal();
-       vtkActor *ac = theActors->GetNextActor();
-       while (!(ac == NULL))
-       {
-               if (ac->IsA("SMESH_Actor"))
-               {
-                       SMESH_Actor *anActor = SMESH_Actor::SafeDownCast(ac);
-                       if (anActor->GetVisibility() == 1)
-                       {
-                               vtkGeometryFilter *gf = vtkGeometryFilter::New();
-                               gf->SetInput(anActor->DataSource);
-                               vtkMaskPoints *verts = vtkMaskPoints::New();
-                               verts->SetInput(gf->GetOutput());
-                               verts->GenerateVerticesOn();
-                               verts->SetOnRatio(1);
-
-                               vtkPolyDataMapper *vertMapper = vtkPolyDataMapper::New();
-                               vertMapper->SetInput(verts->GetOutput());
-                               vertMapper->ScalarVisibilityOff();
-
-                               vtkActor *vertActor = vtkActor::New();
-                               vertActor->SetMapper(vertMapper);
-
-                               float r, g, b;
-                               anActor->GetNodeColor(r, g, b);
-                               vertActor->GetProperty()->SetColor(r, g, b);
-
-                               vertActor->GetProperty()->SetPointSize(anActor->GetNodeSize());
-
-                               vertActor->PickableOff();
-
-                               mySimulationActors->AddItem(vertActor);
-                               theRenderer->AddActor(vertActor);
-                       }
-               }
-               ac = theActors->GetNextActor();
-       }
-
-       vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-       renWin->Render();
+  QAD_WaitCursor wc;
+  try{
+    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
+    CORBA::String_var anEntry = aSobj->GetID();
+    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
+      SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
+      anArrayOfIdeces->length(MapIndex.Extent());
+      TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+      for(int i = 0; ite.More(); ite.Next(), i++){
+       anArrayOfIdeces[i] = anActor->GetNodeObjId(ite.Key());
+      }
+      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
+      aMeshEditor->RemoveNodes(anArrayOfIdeces);
+      if(myAutomaticUpdate){
+       CORBA::Long anId = smeshGUI->myStudy->StudyId();
+       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
+         aVisualObj->Update(true);
+       }
+      }
+    }
+  }catch(SALOME::SALOME_Exception& exc) {
+    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
+  }catch(const std::exception& exc){
+    INFOS("Follow exception was cought:\n\t"<<exc.what());
+  }catch(...){
+    INFOS("Unknown exception was cought !!!");
+  }
 }
 
 //=============================================================================
@@ -5405,146 +3712,47 @@ void SMESHGUI::ViewNodes()
  *
  */
 //=============================================================================
-void SMESHGUI::Control(int theCommandID)
+void SMESHGUI::RemoveElements(SMESH::SMESH_Mesh_ptr theMesh,
+                             const TColStd_MapOfInteger & MapIndex)
 {
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       DisplayScalarBar(false);
-
-       vtkDoubleArray *scalars = vtkDoubleArray::New();
-       scalars->SetNumberOfComponents(1);
-
-       vtkDataSetMapper *meshMapper = 0;
-       SALOME_Selection *Sel =
-               SALOME_Selection::Selection(myActiveStudy->getSelection());
-       int nbSel = Sel->IObjectCount();
-       Standard_Boolean result;
-       Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-       SMESH_Actor *MeshActor =
-               FindActorByEntry(IObject->getEntry(), result, true);
-
-       // Mesh may be not updated after Compute
-       if (!MeshActor->DataSource || !MeshActor->GetMapper())
-       {
-               QApplication::restoreOverrideCursor();
-               return;
-       }
-
-       vtkDataSet *aDataSet = MeshActor->DataSource;
-       typedef double (*TScalarFun) (vtkCell * theCell);
-       TScalarFun aScalarFun;
-       if (result)
-       {
-               QString type;
-               switch (theCommandID)
-               {
-               case 6001:
-               {
-                       type = tr("SMESH_CONTROL_LENGTH_EDGES");
-                       aDataSet = MeshActor->EdgeDevice->GetMapper()->GetInput();
-                       aScalarFun = &(SMESHGUI_ComputeScalarValue::LengthEdges);
-                       MESSAGE(" init minimum length " << aDataSet->GetNumberOfCells());
-                       if (MeshActor->getDisplayMode() != 0)
-                               ChangeRepresentation(MeshActor, 1);     // limitation; in Wireframe, colored edges are not visible
-                       break;
-               }
-               case 6011:
-               {
-                       type = tr("SMESH_CONTROL_AREA_ELEMENTS");
-                       aScalarFun = &(SMESHGUI_ComputeScalarValue::AreaElements);
-                       if (MeshActor->getDisplayMode() != 1)
-                               ChangeRepresentation(MeshActor, 1);
-                       break;
-               }
-               case 6012:
-               {
-                       type = tr("SMESH_CONTROL_TAPER_ELEMENTS");
-                       aScalarFun = &(SMESHGUI_ComputeScalarValue::Taper);
-                       break;
-               }
-               case 6013:
-               {
-                       type = tr("SMESH_CONTROL_ASPECTRATIO_ELEMENTS");
-                       aScalarFun = &(SMESHGUI_ComputeScalarValue::AspectRatio);
-                       if (MeshActor->getDisplayMode() != 1)
-                               ChangeRepresentation(MeshActor, 1);
-                       break;
-               }
-               case 6014:
-               {
-                       type = tr("SMESH_CONTROL_MINIMUMANGLE_ELEMENTS");
-                       aScalarFun = &(SMESHGUI_ComputeScalarValue::MinimumAngle);
-                       if (MeshActor->getDisplayMode() != 1)
-                               ChangeRepresentation(MeshActor, 1);
-                       break;
-               }
-               case 6015:
-               {
-                       type = tr("SMESH_CONTROL_WARP_ELEMENTS");
-                       aScalarFun = &(SMESHGUI_ComputeScalarValue::Warp);
-                       break;
-               }
-               case 6016:
-               {
-                       type = tr("SMESH_CONTROL_SKEW_ELEMENTS");
-                       aScalarFun = &(SMESHGUI_ComputeScalarValue::Skew);
-                       break;
-               }
-               }
-
-               for (int i = 0, iEnd = aDataSet->GetNumberOfCells(); i < iEnd; i++)
-                       scalars->InsertTuple1(i, aScalarFun(aDataSet->GetCell(i)));
-
-               float range[2];
-               scalars->GetRange(range);
-
-               vtkLookupTable *wat = vtkLookupTable::New();
-               wat->SetRange(range);
-               wat->Build();
-
-               scalars->SetLookupTable(wat);
-
-               if (!meshMapper)
-                       meshMapper = (vtkDataSetMapper *) (MeshActor->getMapper());
-               meshMapper->SetScalarModeToUseCellData();
-               MeshActor->DataSource->GetCellData()->SetScalars(scalars);
-               meshMapper->SetScalarRange(range);
-               meshMapper->ScalarVisibilityOn();
-
-               vtkScalarBarActor *aScalarBar = GetScalarBar();
-               if (aScalarBar == NULL)
-               {
-                       aScalarBar = vtkScalarBarActor::New();
-                       QString Bold = QAD_CONFIG->getSetting("ScalarBar:Bold");
-                       QString Italic = QAD_CONFIG->getSetting("ScalarBar:Italic");
-                       QString Shadow = QAD_CONFIG->getSetting("ScalarBar:Shadow");
-                       QString FontFamily = QAD_CONFIG->getSetting("ScalarBar:FontFamily");
-                       QString Orientation =
-                               QAD_CONFIG->getSetting("ScalarBar:Orientation");
-                       float Width = QAD_CONFIG->getSetting("ScalarBar:Width").toFloat();
-                       float Height = QAD_CONFIG->getSetting("ScalarBar:Height").toFloat();
-                       int NumberOfLabels =
-                               QAD_CONFIG->getSetting("ScalarBar:NumberOfLabels").toInt();
-                       int NumberOfColors =
-                               QAD_CONFIG->getSetting("ScalarBar:NumberOfColors").toInt();
-
-                       SetSettingsScalarBar(aScalarBar, Bold, Italic, Shadow, FontFamily,
-                               Orientation, Width, Height, NumberOfColors, NumberOfLabels);
-                       vtkRenderer *theRenderer =
-                               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-                               getRightFrame()->getViewFrame())->getRenderer();
-                       theRenderer->AddActor2D(aScalarBar);
-               }
-               aScalarBar->SetLookupTable(wat);
-               aScalarBar->SetTitle(type.latin1());
+  QAD_WaitCursor wc;
+  try{
+    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
+    CORBA::String_var anEntry = aSobj->GetID();
+    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
+      SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
+      anArrayOfIdeces->length(MapIndex.Extent());
+      TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+      for(int i = 0; ite.More(); ite.Next(), i++){
+       anArrayOfIdeces[i] = anActor->GetElemObjId(ite.Key());
+      }
+      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
+      aMeshEditor->RemoveElements(anArrayOfIdeces);
+      if(myAutomaticUpdate){
+       CORBA::Long anId = smeshGUI->myStudy->StudyId();
+       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
+         aVisualObj->Update(true);
+       }
+      }
+    }
+  }catch(SALOME::SALOME_Exception& exc) {
+    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
+  }catch(const std::exception& exc){
+    INFOS("Follow exception was cought:\n\t"<<exc.what());
+  }catch(...){
+    INFOS("Unknown exception was cought !!!");
+  }
+}
 
-               scalars->Delete();
-               //    wat->Delete();
-               DisplayScalarBar(true);
-       }
-       QApplication::restoreOverrideCursor();
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+void SMESHGUI::OrientationElements(SMESH::SMESH_Mesh_ptr aMesh,
+       const TColStd_MapOfInteger & MapIndex)
+{
+  MESSAGE("OrientationElements - not implemeted yet!");
 }
 
 //=============================================================================
@@ -5552,105 +3760,116 @@ void SMESHGUI::Control(int theCommandID)
  *
  */
 //=============================================================================
-void SMESHGUI::SetSettingsScalarBar(vtkScalarBarActor * theScalarBar,
-       QString Bold, QString Italic,
-       QString Shadow, QString FontFamily,
-       QString Orientation, float Width, float Height, int NbColors, int NbLabels)
+void SMESHGUI::DiagonalInversion(SMESH::SMESH_Mesh_ptr aMesh,
+       const TColStd_MapOfInteger & MapIndex)
 {
-       if (Bold.isNull() || Bold.isEmpty() || (Bold.compare("true") == 0))
-               theScalarBar->BoldOn();
-       else
-               theScalarBar->BoldOff();
-
-       if (Italic.isNull() || Italic.isEmpty() || (Italic.compare("true") == 0))
-               theScalarBar->ItalicOn();
-       else
-               theScalarBar->ItalicOff();
-
-       if (Shadow.isNull() || Shadow.isEmpty() || (Shadow.compare("true") == 0))
-               theScalarBar->ShadowOn();
-       else
-               theScalarBar->ShadowOff();
-
-       if (FontFamily.compare("Arial") == 0)
-               theScalarBar->SetFontFamilyToArial();
-       else if (FontFamily.compare("Courier") == 0)
-               theScalarBar->SetFontFamilyToCourier();
-       else if (FontFamily.compare("Times") == 0)
-               theScalarBar->SetFontFamilyToTimes();
-       else
-               theScalarBar->SetFontFamilyToArial();
-
-       if (Orientation.isNull() || Orientation.isEmpty() ||
-               (Orientation.compare("Vertical") == 0))
-               theScalarBar->SetOrientationToVertical();
-       else
-               theScalarBar->SetOrientationToHorizontal();
+  MESSAGE("OrientationElements - not implemeted yet!");
+}
 
-       theScalarBar->SetWidth((Width == 0) ? 0.17 : Width);
-       theScalarBar->SetHeight((Height == 0) ? 0.8 : Height);
+//=====================================================================================
+// EXPORTED METHODS
+//=====================================================================================
+void SMESHGUI::SupportedViewType(int *buffer, int bufferSize)
+{
+  if (!buffer || !bufferSize)
+    return;
+  buffer[0] = (int)VIEW_VTK;
+}
 
-       theScalarBar->SetNumberOfLabels((NbLabels == 0) ? 5 : NbLabels);
-       theScalarBar->SetMaximumNumberOfColors((NbColors == 0) ? 64 : NbColors);
+void SMESHGUI::Deactivate()
+{
+  if ( SMESHGUI::GetSMESHGUI() ) {
+    SMESHGUI::GetSMESHGUI()->EmitSignalCloseAllDialogs();
+  }
 }
 
+
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::DisplayScalarBar(bool visibility)
-{
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
+void SMESHGUI::SetPickable(SMESH_Actor* theActor){
+  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView()){
+    int anIsAllPickable = (theActor == NULL);
+    vtkRenderer *aRenderer = aViewFrame->getRenderer();
+    vtkActorCollection *aCollection = aRenderer->GetActors();
+    aCollection->InitTraversal();
+    while(vtkActor *anAct = aCollection->GetNextActor()){
+      if(SALOME_Actor *anActor = dynamic_cast<SALOME_Actor*>(anAct)){
+       if(anActor->GetVisibility()){
+         anActor->SetPickable(anIsAllPickable);
+       }
+      }
+    }
+    if(theActor)
+      theActor->SetPickable(!anIsAllPickable);
+    RepaintCurrentView();
+  }
+}
 
-       vtkRenderer *theRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-       vtkScalarBarActor *aScalarBar = GetScalarBar();
 
-       if (aScalarBar == NULL)
-       {
-               MESSAGE("myScalarBar is NULL");
-               return;
-       }
+void SMESHGUI::ViewNodes(){
+  EraseSimulationActors();
+  ::SetPointRepresentation(true);
+}
 
-       if (visibility)
-               aScalarBar->VisibilityOn();
-       else
-       {
-               aScalarBar->VisibilityOff();
-               //Turn off mesh coloring (influences on all views)
-               vtkActorCollection *actorList = theRenderer->GetActors();
-               actorList->InitTraversal();
-               vtkActor *ac = actorList->GetNextActor();
-               while (ac != NULL)
-               {
-                       if (ac->GetMapper() != NULL)
-                       {
-                               ac->GetMapper()->ScalarVisibilityOff();
-                       }
-                       ac = actorList->GetNextActor();
-               }
-               // Turn off ScalarBar in all views
-               /*QList<QAD_StudyFrame> aFrames = myActiveStudy->getStudyFrames();
-                * for ( QAD_StudyFrame* aFrame = aFrames.first(); aFrame; aFrame = aFrames.next() ) {
-                * if (aFrame->getTypeView() == VIEW_VTK) {
-                * vtkRenderer *aRenderer = ((VTKViewer_ViewFrame*) aFrame->getRightFrame()->getViewFrame())->getRenderer();
-                * vtkActor2DCollection* actor2DList = aRenderer->GetActors2D();
-                * actor2DList->InitTraversal();
-                * vtkActor2D* aActor2d =  actor2DList->GetNextActor2D();
-                * while (aActor2d != NULL) {
-                * if (aActor2d->IsA("vtkScalarBarActor")) {
-                * aActor2d->VisibilityOff();
-                * break;
-                * }
-                * actor2DList->GetNextActor2D();
-                * }
-                * }
-                * } */
-       }
-       myActiveStudy->update3dViewers();
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+void SMESHGUI::Control( int theCommandID ){
+  SALOME_Selection *Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
+  if(Sel){
+    Handle(SALOME_InteractiveObject) anIO = Sel->firstIObject();
+    if(!anIO.IsNull()){
+      QString aTitle;
+      SMESH_Actor::eControl aControl = SMESH_Actor::eNone;
+      if(SMESH_Actor *anActor = ::FindActorByEntry(anIO->getEntry())){
+       switch ( theCommandID ){
+       case 6001:
+         aTitle = tr( "LENGTH_EDGES" );
+         aControl = SMESH_Actor::eLengthEdges;
+         break;
+       case 6003:
+         aTitle = tr( "FREE_BORDERS" );
+         aControl = SMESH_Actor::eFreeBorders;
+         break;
+       case 6004:
+         aTitle = tr( "MULTI_BORDERS" );
+         aControl = SMESH_Actor::eMultiConnection;
+         break;
+       case 6011:
+         aTitle = tr( "AREA_ELEMENTS" );
+         aControl = SMESH_Actor::eArea;
+         break;
+       case 6012:
+         aTitle = tr( "TAPER_ELEMENTS" );
+         aControl = SMESH_Actor::eTaper;
+         break;
+       case 6013:
+         aTitle = tr( "ASPECTRATIO_ELEMENTS" );
+         aControl = SMESH_Actor::eAspectRatio;
+         break;
+       case 6014:
+         aTitle = tr( "MINIMUMANGLE_ELEMENTS" );
+         aControl = SMESH_Actor::eMinimumAngle;
+         break;
+       case 6015:
+         aTitle = tr( "WARP_ELEMENTS" );
+         aControl = SMESH_Actor::eWarping;
+         break;
+       case 6016:
+         aTitle = tr( "SKEW_ELEMENTS" );
+         aControl = SMESH_Actor::eSkew;
+         break;
+       }
+       anActor->SetControlMode(aControl);
+       anActor->GetScalarBarActor()->SetTitle(aTitle.latin1());
+      }
+    }
+  }
 }
 
 //=============================================================================
@@ -5658,39 +3877,52 @@ void SMESHGUI::DisplayScalarBar(bool visibility)
  *
  */
 //=============================================================================
-void SMESHGUI::UpdateScalarBar(float MinRange, float MaxRange)
+void SMESHGUI::SetSettingsScalarBar(vtkScalarBarActor * theScalarBar,
+                                   QString Bold, 
+                                   QString Italic,
+                                   QString Shadow, 
+                                   QString FontFamily,
+                                   QString Orientation, 
+                                   float Width, 
+                                   float Height, 
+                                   int NbColors, 
+                                   int NbLabels)
 {
-       vtkScalarBarActor *aScalarBar = GetScalarBar();
-       if (aScalarBar == NULL)
-       {
-               MESSAGE("myScalarBar is NULL");
-               return;
-       }
-       DisplayScalarBar(false);
-
-       aScalarBar->GetLookupTable()->SetRange(MinRange, MaxRange);
-       vtkRenderer *aRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-       vtkActorCollection *aActorList = aRenderer->GetActors();
-       aActorList->InitTraversal();
-       vtkActor *aActor = aActorList->GetNextActor();
-       while (aActor != NULL)
-       {
-               if (aActor->IsA("SMESH_Actor"))
-               {
-                       SMESH_Actor *aMeshActor = SMESH_Actor::SafeDownCast(aActor);
-                       vtkDataSetMapper *aMeshMapper =
-                               (vtkDataSetMapper *) (aMeshActor->getMapper());
-                       if ((aMeshMapper != NULL))
-                       {
-                               aMeshMapper->SetScalarRange(MinRange, MaxRange);
-                               aMeshMapper->ScalarVisibilityOn();
-                       }
-               }
-               aActor = aActorList->GetNextActor();
-       }
-       DisplayScalarBar(true);
+  if (Bold.isNull() || Bold.isEmpty() || (Bold.compare("true") == 0))
+    theScalarBar->BoldOn();
+  else
+    theScalarBar->BoldOff();
+  
+  if (Italic.isNull() || Italic.isEmpty() || (Italic.compare("true") == 0))
+    theScalarBar->ItalicOn();
+  else
+    theScalarBar->ItalicOff();
+  
+  if (Shadow.isNull() || Shadow.isEmpty() || (Shadow.compare("true") == 0))
+    theScalarBar->ShadowOn();
+  else
+    theScalarBar->ShadowOff();
+  
+  if (FontFamily.compare("Arial") == 0)
+    theScalarBar->SetFontFamilyToArial();
+  else if (FontFamily.compare("Courier") == 0)
+    theScalarBar->SetFontFamilyToCourier();
+  else if (FontFamily.compare("Times") == 0)
+    theScalarBar->SetFontFamilyToTimes();
+  else
+    theScalarBar->SetFontFamilyToArial();
+  
+  if (Orientation.isNull() || Orientation.isEmpty() ||
+      (Orientation.compare("Vertical") == 0))
+    theScalarBar->SetOrientationToVertical();
+  else
+    theScalarBar->SetOrientationToHorizontal();
+  
+  theScalarBar->SetWidth((Width == 0) ? 0.17 : Width);
+  theScalarBar->SetHeight((Height == 0) ? 0.8 : Height);
+  
+  theScalarBar->SetNumberOfLabels((NbLabels == 0) ? 5 : NbLabels);
+  theScalarBar->SetMaximumNumberOfColors((NbColors == 0) ? 64 : NbColors);
 }
 
 //=============================================================================
@@ -5700,82 +3932,86 @@ void SMESHGUI::UpdateScalarBar(float MinRange, float MaxRange)
 //=============================================================================
 void SMESHGUI::SetDisplaySettings()
 {
-       EmitSignalDeactivateDialog();
-       SMESHGUI_Preferences_ColorDlg *aDlg =
-               new SMESHGUI_Preferences_ColorDlg(QAD_Application::getDesktop(), "");
-
-       QString SCr = QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed");
-       QString SCg = QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen");
-       QString SCb = QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue");
-       QColor color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-       aDlg->SetColor(1, color);
-
-       SCr = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed");
-       SCg = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen");
-       SCb = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue");
-       color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-       aDlg->SetColor(2, color);
-
-       SCr = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorRed");
-       SCg = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorGreen");
-       SCb = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorBlue");
-       color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
-       aDlg->SetColor(3, color);
-
-       QString SBr = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorRed");
-       QString SBg = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorGreen");
-       QString SBb = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorBlue");
-       color = QColor(SBr.toInt(), SBg.toInt(), SBb.toInt());
-       aDlg->SetColor(4, color);
-
-       QString intValue = QAD_CONFIG->getSetting("SMESH:SettingsWidth");
-       aDlg->SetIntValue(1, intValue.toInt());
-       intValue = QAD_CONFIG->getSetting("SMESH:SettingsNodesSize");
-       aDlg->SetIntValue(2, intValue.toInt());
-       intValue = QAD_CONFIG->getSetting("SMESH:SettingsShrinkCoeff");
-       aDlg->SetIntValue(3, intValue.toInt());
-
-       if (aDlg->exec())
-       {
-               QColor colorFill = aDlg->GetColor(1);
-               QAD_CONFIG->addSetting("SMESH:SettingsFillColorRed", colorFill.red());
-               QAD_CONFIG->addSetting("SMESH:SettingsFillColorGreen",
-                       colorFill.green());
-               QAD_CONFIG->addSetting("SMESH:SettingsFillColorBlue", colorFill.blue());
-
-               QColor colorOutline = aDlg->GetColor(2);
-               QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorRed",
-                       colorOutline.red());
-               QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorGreen",
-                       colorOutline.green());
-               QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorBlue",
-                       colorOutline.blue());
-
-               QColor colorNode = aDlg->GetColor(3);
-               QAD_CONFIG->addSetting("SMESH:SettingsNodeColorRed", colorNode.red());
-               QAD_CONFIG->addSetting("SMESH:SettingsNodeColorGreen",
-                       colorNode.green());
-               QAD_CONFIG->addSetting("SMESH:SettingsNodeColorBlue", colorNode.blue());
-
-               QColor colorBackFace = aDlg->GetColor(4);
-               QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorRed",
-                       colorBackFace.red());
-               QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorGreen",
-                       colorBackFace.green());
-               QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorBlue",
-                       colorBackFace.blue());
-
-               int width = aDlg->GetIntValue(1);
-               QAD_CONFIG->addSetting("SMESH:SettingsWidth", width);
-
-               int nodes_size = aDlg->GetIntValue(2);
-               QAD_CONFIG->addSetting("SMESH:SettingsNodesSize", nodes_size);
-
-               int shrink_coeff = aDlg->GetIntValue(3);
-               QAD_CONFIG->addSetting("SMESH:SettingsShrinkCoeff", shrink_coeff);
-       }
-
-       delete aDlg;
+  EmitSignalDeactivateDialog();
+  SMESHGUI_Preferences_ColorDlg *aDlg =
+    new SMESHGUI_Preferences_ColorDlg(QAD_Application::getDesktop(), "");
+
+  QColor color;
+  QString SCr, SCg, SCb;
+  SCr = QAD_CONFIG->getSetting("SMESH:SettingsFillColorRed");
+  SCg = QAD_CONFIG->getSetting("SMESH:SettingsFillColorGreen");
+  SCb = QAD_CONFIG->getSetting("SMESH:SettingsFillColorBlue");
+  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
+    color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
+  else color = QColor(0, 170, 255);
+  aDlg->SetColor(1, color);
+
+  SCr = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed");
+  SCg = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen");
+  SCb = QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue");
+  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
+    color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
+  else color = QColor(0, 170, 255);
+  aDlg->SetColor(2, color);
+
+  SCr = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorRed");
+  SCg = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorGreen");
+  SCb = QAD_CONFIG->getSetting("SMESH:SettingsNodeColorBlue");
+  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
+    color = QColor(SCr.toInt(), SCg.toInt(), SCb.toInt());
+  else color = Qt::red;
+  aDlg->SetColor(3, color);
+
+  QString SBr = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorRed");
+  QString SBg = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorGreen");
+  QString SBb = QAD_CONFIG->getSetting("SMESH:SettingsBackFaceColorBlue");
+  if (!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty())
+    color = QColor(SBr.toInt(), SBg.toInt(), SBb.toInt());
+  else color = Qt::blue;
+  aDlg->SetColor(4, color);
+
+  QString intValue = QAD_CONFIG->getSetting("SMESH:SettingsWidth");
+  if (intValue.isEmpty()) intValue = "1";
+  aDlg->SetIntValue(1, intValue.toInt());
+  intValue = QAD_CONFIG->getSetting("SMESH:SettingsNodesSize");
+  if (intValue.isEmpty()) intValue = "3";
+  aDlg->SetIntValue(2, intValue.toInt());
+  intValue = QAD_CONFIG->getSetting("SMESH:SettingsShrinkCoeff");
+  if (intValue.isEmpty()) intValue = "75";
+  aDlg->SetIntValue(3, intValue.toInt());
+
+  if (aDlg->exec()) {
+    QColor colorFill = aDlg->GetColor(1);
+    QAD_CONFIG->addSetting("SMESH:SettingsFillColorRed", colorFill.red());
+    QAD_CONFIG->addSetting("SMESH:SettingsFillColorGreen", colorFill.green());
+    QAD_CONFIG->addSetting("SMESH:SettingsFillColorBlue", colorFill.blue());
+
+    QColor colorOutline = aDlg->GetColor(2);
+    QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorRed", colorOutline.red());
+    QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorGreen", colorOutline.green());
+    QAD_CONFIG->addSetting("SMESH:SettingsOutlineColorBlue", colorOutline.blue());
+
+    QColor colorNode = aDlg->GetColor(3);
+    QAD_CONFIG->addSetting("SMESH:SettingsNodeColorRed", colorNode.red());
+    QAD_CONFIG->addSetting("SMESH:SettingsNodeColorGreen", colorNode.green());
+    QAD_CONFIG->addSetting("SMESH:SettingsNodeColorBlue", colorNode.blue());
+
+    QColor colorBackFace = aDlg->GetColor(4);
+    QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorRed", colorBackFace.red());
+    QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorGreen", colorBackFace.green());
+    QAD_CONFIG->addSetting("SMESH:SettingsBackFaceColorBlue", colorBackFace.blue());
+
+    int width = aDlg->GetIntValue(1);
+    QAD_CONFIG->addSetting("SMESH:SettingsWidth", width);
+
+    int nodes_size = aDlg->GetIntValue(2);
+    QAD_CONFIG->addSetting("SMESH:SettingsNodesSize", nodes_size);
+
+    int shrink_coeff = aDlg->GetIntValue(3);
+    QAD_CONFIG->addSetting("SMESH:SettingsShrinkCoeff", shrink_coeff);
+  }
+
+  delete aDlg;
 }
 
 //=======================================================================
@@ -5842,189 +4078,43 @@ int SMESHGUI::Parameter(Standard_Boolean & res,
  *
  */
 //=============================================================================
-void SMESHGUI::DisplayEdges(SMESH_Actor * ac, bool visibility)
-{
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-       if (ac->DataSource == NULL || ac->GetMapper() == NULL)
-               return;
-
-       vtkGeometryFilter *gf = vtkGeometryFilter::New();
-       gf->SetInput(ac->DataSource);
-       vtkFeatureEdges *edges = vtkFeatureEdges::New();
-       edges->SetInput(gf->GetOutput());
-       edges->BoundaryEdgesOn();
-       edges->ManifoldEdgesOn();
-
-       vtkPolyDataMapper *edgeMapper = vtkPolyDataMapper::New();
-       edgeMapper->SetInput(edges->GetOutput());
-       edgeMapper->ScalarVisibilityOff();
-
-       vtkRenderer *theRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-       vtkActorCollection *actorList = theRenderer->GetActors();
-
-       int test = actorList->IsItemPresent(ac->EdgeDevice);
-       if (test == 0)
-       {
-               vtkProperty *prop = vtkProperty::New();
-               prop->SetColor(QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed").
-                       toFloat() / 255.,
-                       QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen").
-                       toFloat() / 255.,
-                       QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue").toFloat() /
-                       255.);
-               prop->SetPointSize(QAD_CONFIG->getSetting("SMESH:SettingsNodesSize").
-                       toInt());
-               prop->SetLineWidth(QAD_CONFIG->getSetting("SMESH:SettingsWidth").
-                       toInt());
-               ac->EdgeDevice->SetProperty(prop);
-               ac->SetEdgeColor(QAD_CONFIG->
-                       getSetting("SMESH:SettingsOutlineColorRed").toFloat() / 255.,
-                       QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen").
-                       toFloat() / 255.,
-                       QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue").toFloat() /
-                       255.);
-               ac->EdgeDevice->SetMapper(edgeMapper);
-
-               theRenderer->AddActor(ac->EdgeDevice);
-       }
-       else
-       {
-               ac->EdgeDevice->SetMapper(edgeMapper);
-               edgeMapper->Update();
-       }
-
-       vtkShrinkFilter *shrink = vtkShrinkFilter::New();
-       shrink->SetInput(ac->DataSource);
-       shrink->SetShrinkFactor(ac->GetShrinkFactor());
-       vtkGeometryFilter *Shrinkgf = vtkGeometryFilter::New();
-       Shrinkgf->SetInput(shrink->GetOutput());
-       vtkFeatureEdges *ShrinkEdges = vtkFeatureEdges::New();
-       ShrinkEdges->SetInput(Shrinkgf->GetOutput());
-       ShrinkEdges->BoundaryEdgesOn();
-       ShrinkEdges->ManifoldEdgesOn();
-
-       vtkPolyDataMapper *ShrinkEdgeMapper = vtkPolyDataMapper::New();
-       ShrinkEdgeMapper->SetInput(ShrinkEdges->GetOutput());
-       ShrinkEdgeMapper->ScalarVisibilityOff();
-
-       test = actorList->IsItemPresent(ac->EdgeShrinkDevice);
-       if (test == 0)
-       {
-               vtkProperty *prop = vtkProperty::New();
-               prop->SetColor(QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorRed").
-                       toFloat() / 255.,
-                       QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen").
-                       toFloat() / 255.,
-                       QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue").toFloat() /
-                       255.);
-               prop->SetPointSize(QAD_CONFIG->getSetting("SMESH:SettingsNodesSize").
-                       toInt());
-               prop->SetLineWidth(QAD_CONFIG->getSetting("SMESH:SettingsWidth").
-                       toInt());
-               ac->EdgeShrinkDevice->SetProperty(prop);
-               ac->SetEdgeColor(QAD_CONFIG->
-                       getSetting("SMESH:SettingsOutlineColorRed").toFloat() / 255.,
-                       QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorGreen").
-                       toFloat() / 255.,
-                       QAD_CONFIG->getSetting("SMESH:SettingsOutlineColorBlue").toFloat() /
-                       255.);
-               ac->EdgeShrinkDevice->SetMapper(ShrinkEdgeMapper);
-
-               theRenderer->AddActor(ac->EdgeShrinkDevice);
-       }
-       else
-       {
-               ac->EdgeShrinkDevice->SetMapper(ShrinkEdgeMapper);
-               ShrinkEdgeMapper->Update();
-       }
-
-       vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-       renWin->Render();
-}
+void SMESHGUI::DisplayEdges(SMESH_Actor * ac, bool visibility){}
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::InitActor(SMESH::SMESH_Mesh_ptr aMesh)
-{
-       SALOMEDS::SObject_var aSO_M = myStudyAPI.FindMesh(aMesh);
-       SALOMEDS::GenericAttribute_var anAttr;
-       SALOMEDS::AttributeName_var aName;
-       if (!aSO_M->_is_nil())
-       {
-               if (aSO_M->FindAttribute(anAttr, "AttributeName"))
-               {
-                       aName = SALOMEDS::AttributeName::_narrow(anAttr);
-                       Standard_Boolean result;
-                       SMESH_Actor *MeshActor =
-                               smeshGUI->FindActorByEntry(aSO_M->GetID(), result, true);
-                       if (!result)
-                       {
-                               SMESH_Actor *amesh = SMESH_Actor::New();
-                               Handle(SALOME_InteractiveObject) IO =
-                                       new SALOME_InteractiveObject(aSO_M->GetID(), "MESH",
-                                       aName->Value());
-                               amesh->setIO(IO);
-                               amesh->setName(aName->Value());
-                               DisplayActor(amesh, false);
-                       }
-               }
-       }
-}
+void SMESHGUI::InitActor(SMESH::SMESH_Mesh_ptr aMesh){}
 
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::Update()
-{
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK)
-       {                                                       //VTK
-               vtkRenderer *theRenderer =
-                       ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-                       getRightFrame()->getViewFrame())->getRenderer();
-
-               SALOME_Selection *Sel =
-                       SALOME_Selection::Selection(myActiveStudy->getSelection());
-               int nbSel = Sel->IObjectCount();
-               if (nbSel == 0)
-               {
-                       vtkActorCollection *actorList = theRenderer->GetActors();
-                       actorList->InitTraversal();
-                       vtkActor *ac = actorList->GetNextActor();
-                       while (!(ac == NULL))
-                       {
-                               if (ac->IsA("SMESH_Actor"))
-                               {
-                                       SMESH_Actor *anActor = SMESH_Actor::SafeDownCast(ac);
-                                       if (anActor->hasIO())
-                                       {
-                                               Handle(SALOME_InteractiveObject) IO = anActor->getIO();
-                                               Update(IO);
-                                       }
-                               }
-                               ac = actorList->GetNextActor();
-                       }
-               }
-               else
-               {
-                       SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-                       for (; It.More(); It.Next())
-                       {
-                               Handle(SALOME_InteractiveObject) IO = It.Value();
-                               Update(IO);
-                       }
-               }
-               vtkRenderWindow *renWin = theRenderer->GetRenderWindow();
-               renWin->Render();
-       }
-       QApplication::restoreOverrideCursor();
+void SMESHGUI::Update(){
+  if(VTKViewer_ViewFrame* aViewFrame = GetCurrentVtkView()){
+    SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection());
+    if(Sel->IObjectCount() == 0){
+      vtkRenderer* aRenderer = aViewFrame->getRenderer();
+      vtkActorCollection *aCollection = aRenderer->GetActors();
+      aCollection->InitTraversal();
+      while(vtkActor *anAct = aCollection->GetNextActor()){
+       if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+         if(anActor->hasIO()){
+           Update(anActor->getIO());
+         }
+       }
+      }
+    }else{
+      SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+      for(; It.More(); It.Next()){
+       Handle(SALOME_InteractiveObject) IO = It.Value();
+       Update(IO);
+      }
+    }
+    ::RepaintCurrentView();
+  }
 }
 
 //=============================================================================
@@ -6032,47 +4122,11 @@ void SMESHGUI::Update()
  *
  */
 //=============================================================================
-void SMESHGUI::Update(const Handle(SALOME_InteractiveObject) & IO)
-{
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       if (IO->hasEntry())
-       {
-               Standard_Boolean res;
-               SMESH::SMESH_Mesh_var aMesh = ConvertIOinMesh(IO, res);
-               if (res)
-               {
-                       SMESH_Actor *ac = FindActorByEntry(IO->getEntry(), res, false);
-                       if (res)
-                       {
-                               // Check whether the actor belongs to the active view
-                               VTKViewer_RenderWindowInteractor *rwInter =
-                                       ((VTKViewer_ViewFrame *) myActiveStudy->
-                                       getActiveStudyFrame()->getRightFrame()->getViewFrame())->
-                                       getRWInteractor();
-
-                               // The actor belongs to inactive view -> create a copy and display it in the active view
-                               if (!rwInter->isInViewer(IO))
-                               {
-                                       SMESH_Actor *acCopy = SMESH_Actor::New();
-                                       acCopy->ShallowCopy(ac);
-
-                                       smeshGUI->DisplayActor(acCopy, false);
-                               }
-                               ac = ReadScript(aMesh);
-                               if (ac != NULL)
-                               {
-#ifdef TRACE
-                                       Dump(ac);
-#endif
-                                       DisplayActor(ac);
-                                       DisplayEdges(ac);
-                                       smeshGUI->ChangeRepresentation(ac, ac->getDisplayMode());
-                               }
-                       }
-               }
-       }
+void SMESHGUI::Update(const Handle(SALOME_InteractiveObject) & theIO){
+  CORBA::Long anId = smeshGUI->myStudy->StudyId();
+  TVisualObjPtr aVisualObj = ::GetVisualObj(anId,theIO->getEntry());
+  aVisualObj->Update();
+  ::UpdateView(eDisplay,theIO->getEntry());
 }
 
 //=============================================================================
@@ -6091,7 +4145,7 @@ vtkActor *SMESHGUI::SimulationMoveNode(SMESH_Actor * Mactor, int idnode)
                getRightFrame()->getViewFrame())->getRenderer();
 
        vtkUnstructuredGrid *ugrid =
-               vtkUnstructuredGrid::SafeDownCast(Mactor->DataSource);
+               vtkUnstructuredGrid::SafeDownCast(Mactor->GetUnstructuredGrid());
        vtkIdList *IdCells = vtkIdList::New();
        ugrid->GetPointCells(idnode, IdCells);
 
@@ -6112,7 +4166,7 @@ vtkActor *SMESHGUI::SimulationMoveNode(SMESH_Actor * Mactor, int idnode)
        prop->SetColor(1., 0., 0.);
        prop->SetRepresentationToWireframe();
 
-       int Edgewidth = (int)Mactor->EdgeDevice->GetProperty()->GetLineWidth();
+       int Edgewidth = (int)Mactor->GetLineWidth();
        if (Edgewidth == 0)
                Edgewidth = 1;
        prop->SetLineWidth(Edgewidth + 1);
@@ -6157,7 +4211,7 @@ void SMESHGUI::DisplaySimulationNode(SMESH::SMESH_Mesh_ptr aMesh, float x,
        if (result)
        {
                vtkUnstructuredGrid *ugrid =
-                       vtkUnstructuredGrid::SafeDownCast(ac->DataSource);
+                       vtkUnstructuredGrid::SafeDownCast(ac->GetUnstructuredGrid());
                vtkUnstructuredGrid *newugrid = vtkUnstructuredGrid::New();
 
                vtkPoints *Pts = ugrid->GetPoints();
@@ -6259,36 +4313,17 @@ void SMESHGUI::MoveNode(SMESH::SMESH_Mesh_ptr aMesh, int idnode, float x,
  *
  */
 //=============================================================================
-void SMESHGUI::ScalarVisibilityOff()
-{
-       if (myActiveStudy->getActiveStudyFrame()->getTypeView() != VIEW_VTK)
-               return;
-
-       vtkRenderer *theRenderer =
-               ((VTKViewer_ViewFrame *) myActiveStudy->getActiveStudyFrame()->
-               getRightFrame()->getViewFrame())->getRenderer();
-       vtkActorCollection *actorList = theRenderer->GetActors();
-
-       actorList->InitTraversal();
-       vtkActor *ac = actorList->GetNextActor();
-       while (!(ac == NULL))
-       {
-               if (ac->IsA("SMESH_Actor"))
-               {
-                       SMESH_Actor *anActor = SMESH_Actor::SafeDownCast(ac);
-                       if (anActor->GetVisibility() == 1)
-                       {
-                               vtkDataSetMapper *meshMapper =
-                                       (vtkDataSetMapper *) (anActor->getMapper());
-                               meshMapper->ScalarVisibilityOff();
-                               meshMapper->SetInput(anActor->DataSource);
-                               ChangeRepresentation(anActor, anActor->getDisplayMode());
-                       }
-               }
-               ac = actorList->GetNextActor();
-       }
-
-       theRenderer->Render();
+void SMESHGUI::ScalarVisibilityOff(){
+  if(vtkRenderer *aRenderer = ::GetCurrentRenderer()){
+    vtkActorCollection *actorList = aRenderer->GetActors();
+    actorList->InitTraversal();
+    while(vtkActor *ac = actorList->GetNextActor()){
+      if(SMESH_Actor *anActor = SMESH_Actor::SafeDownCast(ac)){
+       anActor->GetMapper()->ScalarVisibilityOff();
+      }
+    }
+    ::RepaintCurrentView();
+  }
 }
 
 //=============================================================================
@@ -6328,7 +4363,7 @@ void SMESHGUI::DisplaySimulationEdge(SMESH::SMESH_Mesh_ptr aMesh,
                pts[1] = idNodes[1];
 
                vtkUnstructuredGrid *ugrid =
-                       vtkUnstructuredGrid::SafeDownCast(ac->DataSource);
+                       vtkUnstructuredGrid::SafeDownCast(ac->GetUnstructuredGrid());
                vtkUnstructuredGrid *newugrid = vtkUnstructuredGrid::New();
                newugrid->SetPoints(ugrid->GetPoints());
                newugrid->InsertNextCell(VTK_LINE, 2, pts);
@@ -6400,7 +4435,7 @@ void SMESHGUI::DisplaySimulationTriangle(SMESH::SMESH_Mesh_ptr aMesh,
                        pts[2] = idNodes[2];
                }
                vtkUnstructuredGrid *ugrid =
-                       vtkUnstructuredGrid::SafeDownCast(ac->DataSource);
+                       vtkUnstructuredGrid::SafeDownCast(ac->GetUnstructuredGrid());
                vtkUnstructuredGrid *newugrid = vtkUnstructuredGrid::New();
                newugrid->SetPoints(ugrid->GetPoints());
                newugrid->InsertNextCell(VTK_TRIANGLE, 3, pts);
@@ -6442,7 +4477,7 @@ void SMESHGUI::DisplaySimulationQuadrangle(SMESH::SMESH_Mesh_ptr aMesh,
        SMESH_Actor *ac = FindActor(aMesh, result, true);
 
        vtkUnstructuredGrid *ugrid =
-               vtkUnstructuredGrid::SafeDownCast(ac->DataSource);
+               vtkUnstructuredGrid::SafeDownCast(ac->GetUnstructuredGrid());
 
        if (result)
        {
@@ -6507,7 +4542,7 @@ void SMESHGUI::DisplaySimulationQuadrangle(SMESH::SMESH_Mesh_ptr aMesh,
                        Ids->InsertId(3, idNodes[3]);
                }
 
-               //    vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( ac->DataSource );
+               //    vtkUnstructuredGrid* ugrid = vtkUnstructuredGrid::SafeDownCast( ac->GetUnstructuredGrid() );
                vtkUnstructuredGrid *newugrid = vtkUnstructuredGrid::New();
                newugrid->SetPoints(ugrid->GetPoints());
                newugrid->InsertNextCell(VTK_QUAD, Ids);
@@ -6564,7 +4599,7 @@ void SMESHGUI::DisplaySimulationTetra(SMESH::SMESH_Mesh_ptr aMesh,
                Ids->InsertId(3, idNodes[3]);
 
                vtkUnstructuredGrid *ugrid =
-                       vtkUnstructuredGrid::SafeDownCast(ac->DataSource);
+                       vtkUnstructuredGrid::SafeDownCast(ac->GetUnstructuredGrid());
                vtkUnstructuredGrid *newugrid = vtkUnstructuredGrid::New();
                newugrid->SetPoints(ugrid->GetPoints());
                newugrid->InsertNextCell(VTK_TETRA, Ids);
@@ -6625,7 +4660,7 @@ void SMESHGUI::DisplaySimulationHexa(SMESH::SMESH_Mesh_ptr aMesh,
                Ids->InsertId(7, idNodes[7]);
 
                vtkUnstructuredGrid *ugrid =
-                       vtkUnstructuredGrid::SafeDownCast(ac->DataSource);
+                       vtkUnstructuredGrid::SafeDownCast(ac->GetUnstructuredGrid());
                vtkUnstructuredGrid *newugrid = vtkUnstructuredGrid::New();
                newugrid->SetPoints(ugrid->GetPoints());
                newugrid->InsertNextCell(VTK_HEXAHEDRON, Ids);
@@ -6651,101 +4686,84 @@ void SMESHGUI::DisplaySimulationHexa(SMESH::SMESH_Mesh_ptr aMesh,
  *
  */
 //=============================================================================
-void SMESHGUI::AddFace(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex, bool reverse)
+void SMESHGUI::AddFace(SMESH::SMESH_Mesh_ptr theMesh,
+                      const TColStd_MapOfInteger & MapIndex, 
+                      bool reverse)
 {
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       Standard_Boolean result;
-       SMESH_Actor *ac = FindActor(aMesh, result, true);
-       if (result)
-       {
-               TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-               SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
-               anArrayOfIdeces->length(MapIndex.Extent());
-
-               int i = 0;
-               for (; ite.More(); ite.Next())
-               {
-                       anArrayOfIdeces[i] = ac->GetIdSMESHDSNode(ite.Key());
-                       i++;
-               }
-
-               int tmp;
-               if (MapIndex.Extent() == 4)
-               {
-                       int idNodes[4];
-                       int i = 0;
-                       TColStd_MapIteratorOfMapOfInteger ite1(MapIndex);
-                       for (; ite1.More(); ite1.Next())
-                       {
-                               idNodes[i] = ite1.Key();
-                               i++;
-                       }
-
-                       vtkUnstructuredGrid *ugrid =
-                               vtkUnstructuredGrid::SafeDownCast(ac->DataSource);
-                       float *p0 = ugrid->GetPoint(idNodes[0]);
-                       float *p1 = ugrid->GetPoint(idNodes[1]);
-                       float *p2 = ugrid->GetPoint(idNodes[2]);
-                       float *p3 = ugrid->GetPoint(idNodes[3]);
-
-                       gp_Pnt P0(p0[0], p0[1], p0[2]);
-
-                       gp_Vec V1(P0, gp_Pnt(p1[0], p1[1], p1[2]));
-                       gp_Vec V2(P0, gp_Pnt(p2[0], p2[1], p2[2]));
-                       gp_Vec V3(P0, gp_Pnt(p3[0], p3[1], p3[2]));
-
-                       gp_Vec Cross1 = V1 ^ V2;
-                       gp_Vec Cross2 = V2 ^ V3;
-
-                       if (Cross1.Dot(Cross2) < 0)
-                       {
-
-                               V1 = gp_Vec(P0, gp_Pnt(p2[0], p2[1], p2[2]));
-                               V2 = gp_Vec(P0, gp_Pnt(p1[0], p1[1], p1[2]));
-                               Cross1 = V1 ^ V2;
-                               Cross2 = V2 ^ V3;
-
-                               if (Cross1.Dot(Cross2) < 0)
-                               {
-                                       tmp = anArrayOfIdeces[2];
-                                       anArrayOfIdeces[2] = anArrayOfIdeces[3];
-                                       anArrayOfIdeces[3] = tmp;
-                               }
-                               else
-                               {
-                                       tmp = anArrayOfIdeces[1];
-                                       anArrayOfIdeces[1] = anArrayOfIdeces[2];
-                                       anArrayOfIdeces[2] = tmp;
-                               }
-                       }
-               }
-
-               //    int tmp;
-               if (reverse)
-               {
-                       for (i = 0; i < (MapIndex.Extent() / 2); i++)
-                       {
-                               tmp = anArrayOfIdeces[i];
-                               anArrayOfIdeces[i] = anArrayOfIdeces[MapIndex.Extent() - i - 1];
-                               anArrayOfIdeces[MapIndex.Extent() - i - 1] = tmp;
-                       }
-               }
-               SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-               aMeshEditor->AddFace(anArrayOfIdeces);
-       }
-       if (myAutomaticUpdate)
-       {
-               SMESH_Actor *Mesh = smeshGUI->ReadScript(aMesh);
-               if (Mesh != NULL)
-               {
-                       smeshGUI->DisplayActor(Mesh);
-                       smeshGUI->DisplayEdges(Mesh);
-                       smeshGUI->ChangeRepresentation(Mesh, Mesh->getDisplayMode());
-                       AddActorInSelection(Mesh);
-               }
-       }
-       QApplication::restoreOverrideCursor();
+  QAD_WaitCursor wc;
+  try{
+    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
+    CORBA::String_var anEntry = aSobj->GetID();
+    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
+      SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
+      anArrayOfIdeces->length(MapIndex.Extent());
+      TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+      for(int i = 0; ite.More(); ite.Next(), i++){
+       anArrayOfIdeces[i] = anActor->GetNodeObjId(ite.Key());
+      }
+      int tmp;
+      if(MapIndex.Extent() == 4){
+       int idNodes[4];
+       TColStd_MapIteratorOfMapOfInteger ite1(MapIndex);
+       for(int i = 0; ite1.More(); ite1.Next(), i++){
+         idNodes[i] = ite1.Key();
+       }
+       vtkUnstructuredGrid *ugrid = anActor->GetUnstructuredGrid();
+       float *p0 = ugrid->GetPoint(idNodes[0]);
+       float *p1 = ugrid->GetPoint(idNodes[1]);
+       float *p2 = ugrid->GetPoint(idNodes[2]);
+       float *p3 = ugrid->GetPoint(idNodes[3]);
+       
+       gp_Pnt P0(p0[0], p0[1], p0[2]);
+       
+       gp_Vec V1(P0, gp_Pnt(p1[0], p1[1], p1[2]));
+       gp_Vec V2(P0, gp_Pnt(p2[0], p2[1], p2[2]));
+       gp_Vec V3(P0, gp_Pnt(p3[0], p3[1], p3[2]));
+       
+       gp_Vec Cross1 = V1 ^ V2;
+       gp_Vec Cross2 = V2 ^ V3;
+       
+       if(Cross1.Dot(Cross2) < 0){
+         V1 = gp_Vec(P0, gp_Pnt(p2[0], p2[1], p2[2]));
+         V2 = gp_Vec(P0, gp_Pnt(p1[0], p1[1], p1[2]));
+         Cross1 = V1 ^ V2;
+         Cross2 = V2 ^ V3;
+         
+         if(Cross1.Dot(Cross2) < 0){
+           tmp = anArrayOfIdeces[2];
+           anArrayOfIdeces[2] = anArrayOfIdeces[3];
+           anArrayOfIdeces[3] = tmp;
+         }else{
+           tmp = anArrayOfIdeces[1];
+           anArrayOfIdeces[1] = anArrayOfIdeces[2];
+           anArrayOfIdeces[2] = tmp;
+         }
+       }
+      }
+      if(reverse){
+       for(int i = 0; i < (MapIndex.Extent() / 2); i++){
+         tmp = anArrayOfIdeces[i];
+         anArrayOfIdeces[i] = anArrayOfIdeces[MapIndex.Extent() - i - 1];
+         anArrayOfIdeces[MapIndex.Extent() - i - 1] = tmp;
+       }
+      }
+      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
+      aMeshEditor->AddFace(anArrayOfIdeces);
+      if(myAutomaticUpdate){
+       CORBA::Long anId = smeshGUI->myStudy->StudyId();
+       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
+         aVisualObj->Update(true);
+       }
+       AddActorInSelection(anActor);
+      }
+    }
+  }catch(SALOME::SALOME_Exception& exc) {
+    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
+  }catch(const std::exception& exc){
+    INFOS("Follow exception was cought:\n\t"<<exc.what());
+  }catch(...){
+    INFOS("Unknown exception was cought !!!");
+  }
 }
 
 //=============================================================================
@@ -6753,113 +4771,103 @@ void SMESHGUI::AddFace(SMESH::SMESH_Mesh_ptr aMesh,
  *
  */
 //=============================================================================
-void SMESHGUI::AddVolume(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
+void SMESHGUI::AddVolume(SMESH::SMESH_Mesh_ptr theMesh,
+                        const TColStd_MapOfInteger & MapIndex)
 {
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       Standard_Boolean result;
-       SMESH_Actor *ac = FindActor(aMesh, result, true);
-       if (result)
-       {
-               TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-               SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
-               anArrayOfIdeces->length(MapIndex.Extent());
-
-               int i = 0;
-               for (; ite.More(); ite.Next())
-               {
-                       anArrayOfIdeces[i] = ac->GetIdSMESHDSNode(ite.Key());
-                       i++;
-               }
-
-               SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-               aMeshEditor->AddVolume(anArrayOfIdeces);
-       }
-       if (myAutomaticUpdate)
-       {
-               SMESH_Actor *Mesh = smeshGUI->ReadScript(aMesh);
-               if (Mesh != NULL)
-               {
-                       smeshGUI->DisplayActor(Mesh);
-                       smeshGUI->DisplayEdges(Mesh);
-                       smeshGUI->ChangeRepresentation(Mesh, Mesh->getDisplayMode());
-                       AddActorInSelection(Mesh);
-               }
-       }
-       QApplication::restoreOverrideCursor();
+  QAD_WaitCursor wc;
+  try{
+    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
+    CORBA::String_var anEntry = aSobj->GetID();
+    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
+      SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
+      anArrayOfIdeces->length(MapIndex.Extent());
+      TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+      for(int i = 0; ite.More(); ite.Next(), i++){
+       anArrayOfIdeces[i] = anActor->GetNodeObjId(ite.Key());
+      }
+      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
+      aMeshEditor->AddVolume(anArrayOfIdeces);
+      if(myAutomaticUpdate){
+       CORBA::Long anId = smeshGUI->myStudy->StudyId();
+       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
+         aVisualObj->Update(true);
+       }
+      }
+    }
+  }catch(SALOME::SALOME_Exception& exc) {
+    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
+  }catch(const std::exception& exc){
+    INFOS("Follow exception was cought:\n\t"<<exc.what());
+  }catch(...){
+    INFOS("Unknown exception was cought !!!");
+  }
 }
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::AddEdge(SMESH::SMESH_Mesh_ptr aMesh,
-       const TColStd_MapOfInteger & MapIndex)
+void SMESHGUI::AddEdge(SMESH::SMESH_Mesh_ptr theMesh,
+                      const TColStd_MapOfInteger & MapIndex)
 {
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       Standard_Boolean result;
-       SMESH_Actor *ac = FindActor(aMesh, result, true);
-       if (result)
-       {
-               TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
-               SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
-               anArrayOfIdeces->length(MapIndex.Extent());
-
-               int i = 0;
-               for (; ite.More(); ite.Next())
-               {
-                       anArrayOfIdeces[i] = ac->GetIdSMESHDSNode(ite.Key());
-                       i++;
-               }
-
-               SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-               aMeshEditor->AddEdge(anArrayOfIdeces);
-       }
-       if (myAutomaticUpdate)
-       {
-               SMESH_Actor *Mesh = smeshGUI->ReadScript(aMesh);
-               if (Mesh != NULL)
-               {
-                       smeshGUI->DisplayActor(Mesh);
-                       smeshGUI->DisplayEdges(Mesh);
-                       smeshGUI->ChangeRepresentation(Mesh, Mesh->getDisplayMode());
-                       AddActorInSelection(Mesh);
-               }
-       }
-       QApplication::restoreOverrideCursor();
+  QAD_WaitCursor wc;
+  try{
+    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
+    CORBA::String_var anEntry = aSobj->GetID();
+    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
+      SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
+      anArrayOfIdeces->length(MapIndex.Extent());
+      TColStd_MapIteratorOfMapOfInteger ite(MapIndex);
+      for(int i = 0; ite.More(); ite.Next(), i++){
+       anArrayOfIdeces[i] = anActor->GetNodeObjId(ite.Key());
+      }
+      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
+      aMeshEditor->AddEdge(anArrayOfIdeces);
+      if(myAutomaticUpdate){
+       CORBA::Long anId = smeshGUI->myStudy->StudyId();
+       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
+         aVisualObj->Update(true);
+       }
+      }
+    }
+  }catch(SALOME::SALOME_Exception& exc) {
+    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
+  }catch(const std::exception& exc){
+    INFOS("Follow exception was cought:\n\t"<<exc.what());
+  }catch(...){
+    INFOS("Unknown exception was cought !!!");
+  }
 }
-
 //=============================================================================
 /*!
  *
  */
 //=============================================================================
-void SMESHGUI::AddNode(SMESH::SMESH_Mesh_ptr aMesh, float x, float y, float z)
+void SMESHGUI::AddNode(SMESH::SMESH_Mesh_ptr theMesh, 
+                      float x, float y, float z)
 {
-       QApplication::setOverrideCursor(Qt::waitCursor);
-       Standard_Boolean result;
-       SMESH_Actor *ac = FindActor(aMesh, result, true);
-       if (result)
-       {
-               SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-               aMeshEditor->AddNode(x, y, z);
-
-               if (myAutomaticUpdate)
-               {
-                       SMESH_Actor *Mesh = smeshGUI->ReadScript(aMesh);
-                       if (Mesh != NULL)
-                       {
-                               smeshGUI->DisplayActor(Mesh);
-                               smeshGUI->DisplayEdges(Mesh);
-                               smeshGUI->ChangeRepresentation(Mesh, Mesh->getDisplayMode());
-                               AddActorInSelection(Mesh);
-                       }
-               }
-       }
-       QApplication::restoreOverrideCursor();
+  QAD_WaitCursor wc;
+  try{
+    SALOMEDS::SObject_var aSobj = myStudyAPI.FindObject(theMesh);
+    CORBA::String_var anEntry = aSobj->GetID();
+    if(SMESH_Actor* anActor = ::FindActorByEntry(anEntry.in())){
+      SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
+      aMeshEditor->AddNode(x, y, z);
+      if(myAutomaticUpdate){
+       CORBA::Long anId = smeshGUI->myStudy->StudyId();
+       if(TVisualObjPtr aVisualObj = GetVisualObj(anId,anEntry.in())){
+         aVisualObj->Update(true);
+       }
+      }
+    }
+  }catch(SALOME::SALOME_Exception& exc) {
+    INFOS("Follow exception was cought:\n\t"<<exc.details.text);
+  }catch(const std::exception& exc){
+    INFOS("Follow exception was cought:\n\t"<<exc.what());
+  }catch(...){
+    INFOS("Unknown exception was cought !!!");
+  }
 }
-
 //=============================================================================
 /*!
  *
@@ -6918,105 +4926,89 @@ void SMESHGUI::DisplayEdgesConnectivityLegendBox(vtkActor * ac)
 //===============================================================================
 void SMESHGUI::OnEditDelete()
 {
-       if (QAD_MessageBox::warn2
-               (QAD_Application::getDesktop(),
-                       tr("SMESH_WRN_WARNING"),
-                       tr("SMESH_REALLY_DELETE"),
-                       tr("SMESH_BUT_YES"), tr("SMESH_BUT_NO"), 1, 0, 0) != 1)
-               return;
-
-       int nbSf = myActiveStudy->getStudyFramesCount();
-
-       Standard_Boolean found;
-       SALOMEDS::Study_var aStudy = myActiveStudy->getStudyDocument();
-       SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
-       SALOMEDS::GenericAttribute_var anAttr;
-       SALOMEDS::AttributeIOR_var anIOR;
-
-       SALOME_Selection *Sel =
-               SALOME_Selection::Selection(myActiveStudy->getSelection());
-       SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-       for (; It.More(); It.Next())
-       {
-               Handle(SALOME_InteractiveObject) IObject = It.Value();
-               if (IObject->hasEntry())
-               {
-                       SALOMEDS::SObject_var SO =
-                               myStudy->FindObjectID(IObject->getEntry());
-
-                       /* Erase child graphical objects */
-                       SALOMEDS::ChildIterator_var it = aStudy->NewChildIterator(SO);
-                       for (; it->More(); it->Next())
-                       {
-                               SALOMEDS::SObject_var CSO = it->Value();
-                               if (CSO->FindAttribute(anAttr, "AttributeIOR"))
-                               {
-                                       anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-
-                                       for (int i = 0; i < nbSf; i++)
-                                       {
-                                               QAD_StudyFrame *sf = myActiveStudy->getStudyFrame(i);
-                                               if (sf->getTypeView() == VIEW_VTK)
-                                               {
-                                                       vtkRenderer *Renderer =
-                                                               ((VTKViewer_ViewFrame *) smeshGUI->
-                                                               myActiveStudy->getActiveStudyFrame()->
-                                                               getRightFrame()->getViewFrame())->getRenderer();
-                                                       SMESH_Actor *ac =
-                                                               smeshGUI->FindActorByEntry(CSO->GetID(), found,
-                                                               false);
-                                                       if (found)
-                                                       {
-                                                               Renderer->RemoveActor(ac->EdgeDevice);
-                                                               Renderer->RemoveActor(ac->EdgeShrinkDevice);
-                                                               Renderer->RemoveActor(ac);
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-
-                       /* Erase main graphical object */
-                       for (int i = 0; i < nbSf; i++)
-                       {
-                               QAD_StudyFrame *sf = myActiveStudy->getStudyFrame(i);
-                               if (sf->getTypeView() == VIEW_VTK)
-                               {
-                                       vtkRenderer *Renderer =
-                                               ((VTKViewer_ViewFrame *) smeshGUI->myActiveStudy->
-                                               getActiveStudyFrame()->getRightFrame()->
-                                               getViewFrame())->getRenderer();
-                                       VTKViewer_RenderWindowInteractor *myRenderInter =
-                                               ((VTKViewer_ViewFrame *) sf->getRightFrame()->
-                                               getViewFrame())->getRWInteractor();
-                                       SMESH_Actor *ac =
-                                               smeshGUI->FindActorByEntry(IObject->getEntry(), found,
-                                               false);
-                                       if (found)
-                                       {
-                                               Renderer->RemoveActor(ac->EdgeDevice);
-                                               Renderer->RemoveActor(ac->EdgeShrinkDevice);
-                                       }
-                                       myRenderInter->Remove(IObject);
-                               }
-                       }
-
-                       /* Erase objects in Study */
-                       SALOMEDS::SObject_var obj =
-                               myStudy->FindObjectID(IObject->getEntry());
-                       if (!obj->_is_nil())
-                       {
-                               QAD_Operation *op =
-                                       new SALOMEGUI_ImportOperation(myActiveStudy);
-                               op->start();
-                               aStudyBuilder->RemoveObject(obj);
-                               op->finish();
-                       }
-
-               }                                               /* IObject->hasEntry() */
-       }                                                       /* more/next           */
+  if (QAD_MessageBox::warn2
+      (QAD_Application::getDesktop(),
+       tr("SMESH_WRN_WARNING"),
+       tr("SMESH_REALLY_DELETE"),
+       tr("SMESH_BUT_YES"), tr("SMESH_BUT_NO"), 1, 0, 0) != 1)
+    return;
+
+  int nbSf = myActiveStudy->getStudyFramesCount();
+
+  Standard_Boolean found;
+  SALOMEDS::Study_var aStudy = myActiveStudy->getStudyDocument();
+  SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
+  SALOMEDS::GenericAttribute_var anAttr;
+  SALOMEDS::AttributeIOR_var anIOR;
+
+  SALOME_Selection *Sel = SALOME_Selection::Selection(myActiveStudy->getSelection());
+  SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
+  for(; It.More(); It.Next()){
+    Handle(SALOME_InteractiveObject) IObject = It.Value();
+    if(IObject->hasEntry()){
+      SALOMEDS::SObject_var SO = myStudy->FindObjectID(IObject->getEntry());
+
+      /* Erase child graphical objects */
+      SALOMEDS::ChildIterator_var it = aStudy->NewChildIterator(SO);
+      for(; it->More(); it->Next()){
+        SALOMEDS::SObject_var CSO = it->Value();
+        if(CSO->FindAttribute(anAttr, "AttributeIOR")){
+          anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+         
+          for(int i = 0; i < nbSf; i++){
+            QAD_StudyFrame *sf = myActiveStudy->getStudyFrame(i);
+           CORBA::String_var anEntry = CSO->GetID();
+           if(SMESH_Actor* anActor = ::FindActorByEntry(sf,anEntry.in())){
+             RemoveActor(sf,anActor);
+           }
+          }
+        }
+      }
+
+      /* Erase main graphical object */
+      for(int i = 0; i < nbSf; i++){
+       QAD_StudyFrame *sf = myActiveStudy->getStudyFrame(i);
+       if(SMESH_Actor* anActor = ::FindActorByEntry(sf,IObject->getEntry())){
+         RemoveActor(sf,anActor);
+       }
+      }
+
+      // Remove object(s) from data structures
+      SALOMEDS::SObject_var obj = myStudy->FindObjectID(IObject->getEntry());
+      if(!obj->_is_nil()){
+       SMESH::SMESH_Group_var     aGroup = SMESH::SMESH_Group  ::_narrow(obj->GetObject());
+       SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(obj->GetObject());
+
+       if ( !aGroup->_is_nil() ) {                          // DELETE GROUP
+         SMESH::SMESH_Mesh_var aMesh = aGroup->GetMesh();
+         aMesh->RemoveGroup( aGroup );
+       }
+       else if ( !aSubMesh->_is_nil() ) {                   // DELETE SUBMESH
+         SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
+         aMesh->RemoveSubMesh( aSubMesh );
+       }
+       else {// default action: remove SObject from the study
+         // san - it's no use opening a transaction here until UNDO/REDO is provided in SMESH
+         //QAD_Operation *op = new SALOMEGUI_ImportOperation(myActiveStudy);
+         //op->start();
+         aStudyBuilder->RemoveObjectWithChildren( obj );
+         //op->finish();
+       }
+      }
+
+    } /* IObject->hasEntry() */
+  } /* more/next */
+
+  /* Clear any previous selection */
+  Sel->ClearIObjects();
+  myActiveStudy->updateObjBrowser();
+}
 
-       /* Clear any previous selection */
-       Sel->ClearIObjects();
-       myActiveStudy->updateObjBrowser();
+//=======================================================================
+// name    : SMESHGUI::GetFilterMgr
+// Purpose : Get filter manager
+//=======================================================================
+SMESH::FilterManager_ptr SMESHGUI::GetFilterMgr()
+{
+   return myFilterMgr;
 }