Salome HOME
Now 'Erase', 'Display' and 'Display Only' items allways present in popup-menu of...
[modules/visu.git] / src / VISUGUI / VisuGUI.cxx
index 670339b09fbd3531da4cba9a56fe2d4d4fd7d685..1caadb31a5c1a0622dbe87aac7b9ff0266fa069d 100644 (file)
@@ -73,6 +73,7 @@
 #include "SalomeApp_Study.h"
 #include "SalomeApp_SelectionMgr.h"
 #include "SalomeApp_Selection.h"
+#include "SalomeApp_Preferences.h"
 
 #include "VISUConfig.hh"
 #include "VISU_Gen_i.hh"
@@ -85,7 +86,9 @@
 
 #include "VISU_Actor.h"
 
+#include "VisuGUI_Prs3dTools.h"
 #include "VisuGUI_Tools.h"
+
 #include "VisuGUI_PopupTools.h"
 #include "VisuGUI_NameDlg.h"
 #include "VisuGUI_FileDlg.h"
@@ -166,41 +169,41 @@ OnImportFromFile()
 
   QFileInfo aFileInfo =
     SUIT_FileDlg::getFileName(GetDesktop(this),
-                             "",
-                             aFilter,
-                             tr("MEN_IMPORT_FROM_FILE"),
-                             true);
-  if(aFileInfo.exists()){
+                              "",
+                              aFilter,
+                              tr("MEN_IMPORT_FROM_FILE"),
+                              true);
+  if(aFileInfo.exists()) {
     application()->putInfo( "Importing From File " + aFileInfo.filePath() + "..." );
 
     VISU::Result_var aResult;
-    bool anIsBuild = aResourceMgr->booleanValue("Visu:BuildResult",false);
-    if(VisuGUI_FileDlg::IsBuild){
+    bool anIsBuild = aResourceMgr->booleanValue("VISU", "full_med_loading", false);
+    if (VisuGUI_FileDlg::IsBuild) {
       aResult = GetVisuGen(this)->ImportFile(aFileInfo.filePath());
-      if(!CORBA::is_nil(aResult.in()))
-       if(Result_i* aRes = dynamic_cast<Result_i*>(GetServant(aResult).in())){
-         if(!aRes->IsPossible())
-           SUIT_MessageBox::warn1(GetDesktop(this),
-                                  tr("WRN_VISU"),
-                                  tr("ERR_CANT_BUILD_PRESENTATION"),
-                                  tr("BUT_OK") );
-         else
-           aRes->BuildAll();
-       }
-    }else{
-      aResourceMgr->setValue("Visu:BuildResult",false);
+      if (!CORBA::is_nil(aResult.in()))
+        if (Result_i* aRes = dynamic_cast<Result_i*>(GetServant(aResult).in())) {
+          if (!aRes->IsPossible())
+            SUIT_MessageBox::warn1(GetDesktop(this),
+                                   tr("WRN_VISU"),
+                                   tr("ERR_CANT_BUILD_PRESENTATION"),
+                                   tr("BUT_OK"));
+          else
+            aRes->BuildAll();
+        }
+    } else {
+      aResourceMgr->setValue("VISU", "full_med_loading", false);
       aResult = GetVisuGen(this)->ImportFile(aFileInfo.filePath());
-      aResourceMgr->setValue("Visu:BuildResult",anIsBuild);
+      aResourceMgr->setValue("VISU", "full_med_loading", anIsBuild);
     }
 
-    if(CORBA::is_nil(aResult.in())) {
+    if (CORBA::is_nil(aResult.in())) {
       SUIT_MessageBox::warn1(GetDesktop(this),
-                            tr("WRN_VISU"),
-                            tr("ERR_ERROR_IN_THE_FILE"),
-                            tr("BUT_OK") );
+                             tr("WRN_VISU"),
+                             tr("ERR_ERROR_IN_THE_FILE"),
+                             tr("BUT_OK"));
     }else{
-      application()->putInfo(aFileInfo.filePath()+tr("INF_DONE"));
-      updateObjBrowser();
+      application()->putInfo(aFileInfo.filePath() + tr("INF_DONE"));
+      UpdateObjBrowser(this);
     }
   }
 }
@@ -222,16 +225,27 @@ OnExploreMEDFile()
 
   QFileInfo aFileInfo =
     SUIT_FileDlg::getFileName(GetDesktop(this),
-                             "",
-                             aFilter,
-                             tr("MEN_EXPLORE_MED_FILE"),
-                             true);
+                              "",
+                              aFilter,
+                              tr("MEN_EXPLORE_MED_FILE"),
+                              true);
   if(aFileInfo.exists()){
     application()->putInfo( tr("MEN_EXPLORE_MED_FILE") + " " + aFileInfo.filePath() + "..." );
     std::string aStudyName = aStudy->Name();
-    aGen->readStructFileWithFieldType(aFileInfo.filePath(),aStudyName.c_str());
+    try
+    {
+      aGen->readStructFileWithFieldType(aFileInfo.filePath(),aStudyName.c_str());
+    }
+    catch(...)
+    {
+      SUIT_MessageBox::warn1(GetDesktop(this),
+                             tr("WRN_VISU"),
+                             tr("ERR_ERROR_IN_THE_FILE"),
+                             tr("BUT_OK"));
+    }
     application()->putInfo(aFileInfo.filePath()+tr("INF_DONE"));
-    updateObjBrowser();
+    getApp()->updateObjectBrowser(true); // as need to update MED tree
+    getApp()->updateActions();
   }
 }
 
@@ -249,23 +263,23 @@ OnImportTableFromFile()
 
   QFileInfo aFileInfo =
     SUIT_FileDlg::getFileName(GetDesktop(this),
-                             "",
-                             aFilter,
-                             tr("MEN_IMPORT_TABLE"),
-                             true);
-  if(aFileInfo.exists()){
+                              "",
+                              aFilter,
+                              tr("MEN_IMPORT_TABLE"),
+                              true);
+  if (aFileInfo.exists()) {
     application()->putInfo( tr("MEN_IMPORT_TABLE") + " " + aFileInfo.filePath() + " ..." );
 
     CORBA::Object_var anObject = GetVisuGen(this)->ImportTables(aFileInfo.filePath());
 
-    if(CORBA::is_nil(anObject.in())) {
+    if (CORBA::is_nil(anObject.in())) {
       SUIT_MessageBox::warn1(GetDesktop(this),
-                            tr("WRN_VISU"),
-                            tr("ERR_ERROR_IN_THE_FILE"),
-                            tr("BUT_OK") );
-    }else{
+                             tr("WRN_VISU"),
+                             tr("ERR_ERROR_IN_THE_FILE"),
+                             tr("BUT_OK"));
+    } else {
       application()->putInfo(aFileInfo.filePath()+tr("INF_DONE"));
-      updateObjBrowser();
+      UpdateObjBrowser(this);
     }
   }
 }
@@ -275,6 +289,102 @@ VisuGUI::
 OnExportTableToFile()
 {
   if(MYDEBUG) MESSAGE("VisuGUI::OnExportTableToFile()");
+
+  _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this));
+
+  SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this);
+  SALOME_ListIO aListIO;
+  aSelectionMgr->selectedObjects(aListIO);
+
+  if (aListIO.Extent() > 0) {
+    const Handle(SALOME_InteractiveObject)& anIO = aListIO.First();
+    if (anIO->hasEntry()) {
+      _PTR(SObject) aSObj = aCStudy->FindObjectID(anIO->getEntry());
+      if (!aSObj) return;
+
+      // find table attribute
+      bool isTOR = true;
+      _PTR(GenericAttribute) anAttr;
+
+      if (!aSObj->FindAttribute(anAttr, "AttributeTableOfReal")) {
+        isTOR = false;
+        if (!aSObj->FindAttribute(anAttr, "AttributeTableOfInteger")) {
+          // if the current SObject is a table title
+          // we take a father contaning the table
+          aSObj = aSObj->GetFather();
+
+          if (aSObj->FindAttribute(anAttr, "AttributeTableOfReal")) {
+            isTOR = true;
+          } else {
+            if (!aSObj->FindAttribute(anAttr, "AttributeTableOfInteger")) {
+              return;
+            }
+          }
+        }
+      }
+
+      // get table title in order to have default name of the file
+      QString aTitle;
+      if (isTOR) {
+        _PTR(AttributeTableOfReal) aTabAttr (anAttr);
+        if (!aTabAttr) return;
+        aTitle = aTabAttr->GetTitle().c_str();
+      } else {
+       _PTR(AttributeTableOfInteger) aTabAttr (anAttr);
+       if (!aTabAttr) return;
+        aTitle = aTabAttr->GetTitle().c_str();
+      }
+      aTitle.simplifyWhiteSpace();
+      aTitle = aTitle.replace(QRegExp(" "), "_");
+
+      // get default path for the file
+      SUIT_ResourceMgr* aResourceMgr = GetResourceMgr();
+      QString aDir = aResourceMgr->stringValue("VISU","OutputDir","");
+      if (aDir.isEmpty()) {
+        aDir = aResourceMgr->stringValue("VISU","InputDir","");
+        if (aDir.isEmpty()) {
+          aDir = getenv("CSF_PATHData");
+        }
+      }
+      QString aPath = Qtx::addSlash(aDir) + aTitle;
+
+      // get name for the file
+      QStringList aFilter;
+      aFilter.append("Table Files (*.xls)");
+
+      QFileInfo aFileInfo =
+        SUIT_FileDlg::getFileName(GetDesktop(this),
+                                  aPath,
+                                  aFilter,
+                                  tr("MEN_EXPORT_TABLE"), // "Export Table To File"
+                                  false);
+
+      // export
+      QString aFile = aFileInfo.filePath();
+      if (!aFile.isEmpty()) {
+        application()->putInfo(tr("MEN_EXPORT_TABLE") + " " + aFile + " ...");
+       aDir = Qtx::dir(aFile, true);
+        aResourceMgr->setValue("VISU", "OutputDir", aDir);
+
+       try {
+         GetVisuGen(this)->ExportTableToFile(GetSObject(aSObj), aFile.latin1());
+          application()->putInfo(aFile + " " + tr("INF_DONE"));
+       } catch(std::exception& ex) {
+         INFOS(ex.what());
+         SUIT_MessageBox::warn1(GetDesktop(this),
+                                 tr("WRN_VISU"),
+                                tr("ERR_ERROR_DURING_EXPORT") + " " + tr(ex.what()),
+                                tr("BUT_OK"));
+       } catch(...) {
+         INFOS(tr("ERR_ERROR_DURING_EXPORT"));
+         SUIT_MessageBox::warn1(GetDesktop(this),
+                                 tr("WRN_VISU"),
+                                tr("ERR_ERROR_DURING_EXPORT"),
+                                tr("BUT_OK") );
+       }
+      }
+    }
+  }
 }
 
 void
@@ -298,32 +408,32 @@ OnImportMedField()
     if (!aSObject->_is_nil()) {
       CORBA::Object_var anObject = VISU::SObjectToObject(aSObject);
       if (!CORBA::is_nil(anObject)) {
-       SALOME_MED::MED_var aMED = SALOME_MED::MED::_narrow(anObject);
-       if (!CORBA::is_nil(aMED.in()))
-         GetVisuGen(this)->ImportMed(aSObject);
-       SALOME_MED::FIELD_var aField = SALOME_MED::FIELD::_narrow(anObject);
-       if (!CORBA::is_nil(aField.in()))
-         GetVisuGen(this)->ImportMedField(aField);
+        SALOME_MED::MED_var aMED = SALOME_MED::MED::_narrow(anObject);
+        if (!CORBA::is_nil(aMED.in()))
+          GetVisuGen(this)->ImportMed(aSObject);
+        SALOME_MED::FIELD_var aField = SALOME_MED::FIELD::_narrow(anObject);
+        if (!CORBA::is_nil(aField.in()))
+          GetVisuGen(this)->ImportMedField(aField);
       } else {
-       SALOMEDS::SObject_var aSFather = aSObject->GetFather();
-       SALOMEDS::GenericAttribute_var anAttr;
-       aSFather->FindAttribute(anAttr, "AttributeName");
-       SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
-       CORBA::String_var aValue = aName->Value();
-       if (strcmp(aValue.in(), "MEDFIELD") == 0)
-         GetVisuGen(this)->ImportMed(aSObject);
+        SALOMEDS::SObject_var aSFather = aSObject->GetFather();
+        SALOMEDS::GenericAttribute_var anAttr;
+        aSFather->FindAttribute(anAttr, "AttributeName");
+        SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
+        CORBA::String_var aValue = aName->Value();
+        if (strcmp(aValue.in(), "MEDFIELD") == 0)
+          GetVisuGen(this)->ImportMed(aSObject);
       }
     }
   }
-  updateObjBrowser(true);
+  UpdateObjBrowser(this, true);
   QApplication::restoreOverrideCursor();
 }
 
 void
 CreateCurves( SalomeApp_Module* theModule,
-             VISU::CutLines_i* thePrs,
-             QDialog* theDlg,
-             const bool theCreate = true )
+              VISU::CutLines_i* thePrs,
+              QDialog* theDlg,
+              const bool theCreate = true )
 {
   if ( !thePrs )
     return;
@@ -331,20 +441,21 @@ CreateCurves( SalomeApp_Module* theModule,
   if ( !aCutDlg )
     return;
 
-  _PTR(Study)     aStudy = GetCStudy( GetAppStudy( theModule ) );
+  _PTR(Study)   aStudy = GetCStudy( GetAppStudy( theModule ) );
   _PTR(SObject) aSObject = aStudy->FindObjectID( thePrs->GetEntry().latin1() );
 
-  if ( !theCreate && aSObject ){
+  if ( !theCreate && aSObject ) {
     // Remove old Table
     _PTR(StudyBuilder) aBuilder = aStudy->NewBuilder();
-    for ( _PTR(ChildIterator) aIter = aStudy->NewChildIterator( aSObject ); aIter->More(); aIter->Next() ) {
+    _PTR(ChildIterator) aIter = aStudy->NewChildIterator(aSObject);
+    for (; aIter->More(); aIter->Next()) {
       _PTR(SObject) aTblObj = aIter->Value();
       if ( aTblObj ) {
-       _PTR(GenericAttribute) anAttr;
-       if (aTblObj->FindAttribute( anAttr, "AttributeName" ) ) {
-         aBuilder->RemoveObjectWithChildren( aIter->Value() ); // We should have only one child
-         break;
-       }
+        _PTR(GenericAttribute) anAttr;
+        if (aTblObj->FindAttribute( anAttr, "AttributeName" ) ) {
+          aBuilder->RemoveObjectWithChildren( aIter->Value() ); // We should have only one child
+          break;
+        }
       }
     }
   }
@@ -352,126 +463,25 @@ CreateCurves( SalomeApp_Module* theModule,
   if ( aCutDlg->isGenerateTable() ) {
     GetVisuGen( theModule )->CreateTable( thePrs->GetEntry() );
     if ( aCutDlg->isGenerateCurves() ) {
-      if( aSObject ) {
-       _PTR(StudyBuilder) aBuilder = aStudy->NewBuilder();
-       for ( _PTR(ChildIterator) aIter = aStudy->NewChildIterator( aSObject ); aIter->More(); aIter->Next() ) {
-         _PTR(SObject) aTblObj = aIter->Value();
-         if ( aTblObj ) {
-           _PTR(GenericAttribute) anAttr;
-           if ( aTblObj->FindAttribute( anAttr, "AttributeName" ) ) {
-             CreatePlot( theModule, aTblObj );
-           }
-         }
-       }
+      if ( aSObject ) {
+        _PTR(StudyBuilder) aBuilder = aStudy->NewBuilder();
+        _PTR(ChildIterator) aIter = aStudy->NewChildIterator(aSObject);
+        for (; aIter->More(); aIter->Next()) {
+          _PTR(SObject) aTblObj = aIter->Value();
+          if ( aTblObj ) {
+            _PTR(GenericAttribute) anAttr;
+            if ( aTblObj->FindAttribute( anAttr, "AttributeName" ) ) {
+              CreatePlot( theModule, aTblObj );
+            }
+          }
+        }
       }
     }
   }
-}
 
-template<class TPrs3d_i>
-TPrs3d_i*
-CreatePrs3d(SalomeApp_Module* theModule,
-           SALOMEDS::SObject_var theTimeStamp,
-           const char* theMeshName,
-           VISU::Entity theEntity,
-           const char* theFieldName,
-           int theTimeId)
-{
-  VISU::Result_var aResult;
-  if(CheckResult(theModule,theTimeStamp,aResult)){
-    QApplication::setOverrideCursor(Qt::waitCursor);
-    typedef typename TPrs3d_i::TInterface TPrs3d;
-    typename TPrs3d::_var_type aPrs3d =
-      GetVisuGen(theModule)->template Prs3dOnField<TPrs3d_i>
-      (aResult,theMeshName,theEntity,theFieldName,theTimeId);
-    QApplication::restoreOverrideCursor();
-    if(!CORBA::is_nil(aPrs3d.in()))
-      return dynamic_cast<TPrs3d_i*>(VISU::GetServant(aPrs3d.in()).in());
+  if (!theCreate && aSObject) {
+    UpdateObjBrowser(theModule);
   }
-  SUIT_MessageBox::warn1(GetDesktop(theModule),
-                        QObject::tr("WRN_VISU"),
-                        QObject::tr("ERR_CANT_BUILD_PRESENTATION"),
-                        QObject::tr("BUT_OK") );
-  return NULL;
-}
-
-
-template<class TPrs3d_i, class TDlg, int IsDlgModal>
-bool
-CreatePrs3d(SalomeApp_Module* theModule,
-           SALOMEDS::SObject_var theTimeStamp,
-           const Handle(SALOME_InteractiveObject)& theIO)
-{
-  using namespace VISU;
-  Storable::TRestoringMap aMap = getMapOfValue(theTimeStamp);
-  bool isExist;
-  QString aType = Storable::FindValue(aMap,"myType",&isExist);
-  if(!isExist || aType.toInt() != TTIMESTAMP )
-    return false;
-  QString aMeshName = Storable::FindValue(aMap,"myMeshName",&isExist).latin1();
-  QString anEntity = Storable::FindValue(aMap,"myEntityId",&isExist).latin1();
-  QString aFieldName = Storable::FindValue(aMap,"myFieldName",&isExist).latin1();
-  QString aTimeStampId = Storable::FindValue(aMap,"myTimeStampId",&isExist).latin1();
-  QApplication::setOverrideCursor(Qt::waitCursor);
-  TPrs3d_i* aPrs3d =
-    CreatePrs3d<TPrs3d_i>(theModule,
-                         theTimeStamp,
-                         aMeshName.latin1(),
-                         (Entity)anEntity.toInt(),
-                         aFieldName.latin1(),
-                         aTimeStampId.toInt());
-  QApplication::restoreOverrideCursor();
-  if(aPrs3d){
-    SUIT_ResourceMgr* aResourceMgr = GetResourceMgr();
-    int aValue = aResourceMgr->integerValue("Visu:BuildDefaultPrs3d",0);
-    if(!aValue){
-      if(TDlg* aDlg = new TDlg(GetDesktop(theModule))){ // dialog box in creation mode
-       aDlg->initFromPrsObject(aPrs3d);
-       if(IsDlgModal)
-         if(aDlg->exec() && (aDlg->storeToPrsObject(aPrs3d))) {
-           // Optionally, create table and curves for cut lines
-           QApplication::setOverrideCursor(Qt::waitCursor);
-           CreateCurves( theModule, dynamic_cast<VISU::CutLines_i*>( aPrs3d ), aDlg, true ); // in creation mode
-           QApplication::restoreOverrideCursor();
-           delete aDlg;
-         } else {
-           DeletePrs3d(theModule,aPrs3d,theIO);
-           delete aDlg;
-           return false;
-         }
-       else{
-         aDlg->show();
-         return true;
-       }
-      }
-    }
-    PublishInView(theModule,aPrs3d);
-    return true;
-  }
-  return false;
-}
-
-
-template<class TPrs3d_i, class TDlg, int IsDlgModal>
-void
-CreatePrs3d(SalomeApp_Module* theModule)
-{
-  if(CheckLock(GetCStudy(GetAppStudy(theModule))))
-    return;
-
-  SALOMEDS::SObject_var aTimeStampSObj;
-  Handle(SALOME_InteractiveObject) anIO;
-  if(!CheckTimeStamp(theModule,aTimeStampSObj,&anIO))
-    return;
-
-  if(!CreatePrs3d<TPrs3d_i,TDlg,IsDlgModal>(theModule,aTimeStampSObj,anIO))
-    return;
-
-  theModule->application()->putInfo(QObject::tr("INF_DONE"));
-  theModule->updateObjBrowser();
-
-  if(SVTK_ViewWindow* aView = GetViewWindow(theModule))
-    aView->onFitAll();
 }
 
 void
@@ -483,12 +493,14 @@ OnCreateMesh()
     return;
 
   // Get selected SObject
-  SALOMEDS::SObject_var aResultSObj;
   Handle(SALOME_InteractiveObject) anIO;
   CORBA::Object_var anObject = GetSelectedObj(this, &anIO);
   if (anIO.IsNull() || !anIO->hasEntry())
     return;
 
+  // create a VTK view window if it does not exist
+  GetViewWindow( this, /*create=*/true );
+
   CreateMesh(this, anIO);
 }
 
@@ -500,6 +512,9 @@ OnCreateManyMesh()
   if (CheckLock(aStudy))
     return;
 
+  // create a VTK view window if it does not exist
+  GetViewWindow( this, /*create=*/true );
+
   // Get selected SObject
   SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this);
   SALOME_ListIO aListIO;
@@ -547,14 +562,14 @@ void
 VisuGUI::
 OnCreateCutPlanes()
 {
-  CreatePrs3d<VISU::CutPlanes_i,VisuGUI_CutPlanesDlg,1>(this);
+  CreatePrs3d<VISU::CutPlanes_i,VisuGUI_CutPlanesDlg,0>(this);
 }
 
 void
 VisuGUI::
 OnCreateCutLines()
 {
-  CreatePrs3d<VISU::CutLines_i,VisuGUI_CutLinesDlg,1>(this);
+  CreatePrs3d<VISU::CutLines_i,VisuGUI_CutLinesDlg,0>(this);
 }
 
 void
@@ -568,7 +583,7 @@ void
 VisuGUI::
 OnCreatePlot3D()
 {
-  CreatePrs3d<VISU::Plot3D_i,VisuGUI_Plot3DDlg,1>(this);
+  CreatePrs3d<VISU::Plot3D_i,VisuGUI_Plot3DDlg,0>(this);
 }
 
 void
@@ -577,7 +592,7 @@ OnCreatePlot2dView()
 {
   CheckLock(GetCStudy(GetAppStudy(this)));
   GetVisuGen( this )->CreateContainer();
-  updateObjBrowser();
+  UpdateObjBrowser(this);
 }
 
 void
@@ -586,6 +601,8 @@ OnDisplayPrs()
 {
   if(MYDEBUG) MESSAGE("VisuGUI::OnDisplayPrs");
 
+  SVTK_ViewWindow* vw = GetViewWindow( this, /*create=*/true );
+
   QApplication::setOverrideCursor(Qt::waitCursor);
   SALOME_ListIO aList;
   SalomeApp_SelectionMgr* mgr = GetSelectionMgr(this);
@@ -599,37 +616,37 @@ OnDisplayPrs()
       // is it Prs3d object ?
       VISU::Prs3d_i* aPrsObject = dynamic_cast<VISU::Prs3d_i*>(VISU::GetServant(anObject).in());
       if(aPrsObject){
-       if(MYDEBUG) MESSAGE("VisuGUI::OnDisplayPrs : Prs3d object");
-       UpdateViewer( this, aPrsObject );
-       if (SVTK_ViewWindow* vw = GetViewWindow( this )) {
-         vw->highlight(anIO, 1);
-       }
-       continue;
+        if(MYDEBUG) MESSAGE("VisuGUI::OnDisplayPrs : Prs3d object");
+        UpdateViewer( this, aPrsObject );
+        if ( vw ) {
+          vw->highlight(anIO, 1);
+        }
+        continue;
       }
       // is it Curve ?
       VISU::Curve_i* aCurve = dynamic_cast<VISU::Curve_i*>(VISU::GetServant(anObject).in());
       if(aCurve){
-       if(MYDEBUG) MESSAGE("VisuGUI::OnDisplayPrs : Curve object");
-       PlotCurve( this, aCurve, VISU::eDisplay );
-       continue;
+        if(MYDEBUG) MESSAGE("VisuGUI::OnDisplayPrs : Curve object");
+        PlotCurve( this, aCurve, VISU::eDisplay );
+        continue;
       }
       // is it Container ?
       VISU::Container_i* aContainer = dynamic_cast<VISU::Container_i*>(VISU::GetServant(anObject).in());
       if(aContainer){
-       if(MYDEBUG) MESSAGE("VisuGUI::DisplayPrs : Container object");
-       PlotContainer( this, aContainer, VISU::eDisplay );
-       continue;
+        if(MYDEBUG) MESSAGE("VisuGUI::DisplayPrs : Container object");
+        PlotContainer( this, aContainer, VISU::eDisplay );
+        continue;
       }
       // is it Table ?
       VISU::Table_i* aTable = dynamic_cast<VISU::Table_i*>(VISU::GetServant(anObject).in());
       if(aTable){
-       if(MYDEBUG) MESSAGE("VisuGUI::DisplayPrs : Table object");
-       PlotTable( this, aTable, VISU::eDisplay );
-       continue;
+        if(MYDEBUG) MESSAGE("VisuGUI::DisplayPrs : Table object");
+        PlotTable( this, aTable, VISU::eDisplay );
+        continue;
       }
     }
   }
-  if (SVTK_ViewWindow* vw = GetViewWindow( this )) {
+  if ( vw ) {
     vw->getRenderer()->ResetCameraClippingRange();
     vw->Repaint();
   }
@@ -651,6 +668,11 @@ OnErasePrs()
   if(MYDEBUG) MESSAGE("OnErasePrs");
 
   QApplication::setOverrideCursor(Qt::waitCursor);
+
+  SVTK_ViewWindow* vw = GetViewWindow( this );
+  if (vw)
+    vw->unHighlightAll();
+
   SALOME_ListIO aList;
   SalomeApp_SelectionMgr* mgr = GetSelectionMgr(this);
   mgr->selectedObjects(aList);
@@ -659,148 +681,125 @@ OnErasePrs()
   for ( SALOME_ListIteratorOfListIO it( aList ); it.More(); it.Next() ) {
     anIO = it.Value();
     CORBA::Object_var anObject = GetSelectedObj( GetAppStudy(this), anIO->getEntry() );
-    ErasePrs(this, anObject, false);
+    ErasePrs( this, anObject, false );
   }
-  if (SVTK_ViewWindow* vw = GetViewWindow( this ))
+
+  if (vw)
     vw->Repaint();
+
   QApplication::restoreOverrideCursor();
 }
 
-template<class TPrs3d_i, class TDlg>
+
 void
-EditPrs3d (SalomeApp_Module* theModule, VISU::Prs3d_i* thePrs3d)
+VisuGUI::
+OnEditScalarMap()
 {
-  TPrs3d_i* aPrsObject = dynamic_cast<TPrs3d_i*>(thePrs3d);
-  if (aPrsObject) {
-    //TDlg* aDlg = new TDlg (GetDesktop(theModule), false, true);
-    TDlg* aDlg = new TDlg (GetDesktop(theModule));
-    aDlg->initFromPrsObject(aPrsObject);
-    if (aDlg->exec()) {
-      if (!(aDlg->storeToPrsObject(aPrsObject))) {
-       delete aDlg;
-        return;
-      }
-      RecreateActor(theModule, aPrsObject);
-      if (SVTK_ViewWindow* vw = GetViewWindow(theModule)) {
-       //if (vw->getRenderer()->GetActors()->GetNumberOfItems() > 0) {
-          vw->getRenderer()->ResetCameraClippingRange();
-          vw->Repaint();
-       //}
-      }
+  Handle(SALOME_InteractiveObject) anIO;
+  if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){
+    EditPrs3d<VISU::ScalarMap_i, VisuGUI_ScalarBarDlg,1>(this, aPrs3d);
+    if(SVTK_ViewWindow* aViewWindow = GetViewWindow()){
+      aViewWindow->highlight(anIO, 1);
     }
-    delete aDlg;
   }
 }
 
+
 void
 VisuGUI::
-OnEditPrs()
+OnEditDeformedShape()
 {
-  if (CheckLock(GetCStudy(GetAppStudy(this))))
-    return;
-
   Handle(SALOME_InteractiveObject) anIO;
-  CORBA::Object_var anObject = GetSelectedObj(this, &anIO);
-  if (CORBA::is_nil(anObject)) return;
-  PortableServer::ServantBase_var aServant = VISU::GetServant(anObject);
-  if (!aServant.in()) return;
+  if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){
+    EditPrs3d<VISU::DeformedShape_i, VisuGUI_DeformedShapeDlg,1>(this, aPrs3d);
+    if(SVTK_ViewWindow* aViewWindow = GetViewWindow()){
+      aViewWindow->highlight(anIO, 1);
+    }
+  }
+}
 
-  VISU::Prs3d_i* aPrs3d = dynamic_cast<VISU::Prs3d_i*>(aServant.in());
-  if (!aPrs3d) return;
 
-  switch (aPrs3d->GetType()) {
-  case VISU::TMESH:
-    break;
-  case VISU::TSCALARMAP:
-    EditPrs3d<VISU::ScalarMap_i, VisuGUI_ScalarBarDlg>(this, aPrs3d);
-    break;
-  case VISU::TDEFORMEDSHAPE:
-    EditPrs3d<VISU::DeformedShape_i, VisuGUI_DeformedShapeDlg>(this, aPrs3d);
-    break;
-  case VISU::TCUTPLANES:
-    EditPrs3d<VISU::CutPlanes_i, VisuGUI_CutPlanesDlg>(this, aPrs3d);
-    /*{
-      VISU::CutPlanes_i* aPrsObject = dynamic_cast<VISU::CutPlanes_i*>(aPrs3d);
-      if (aPrsObject) {
-       VisuGUI_CutPlanesDlg* aDlg =
-          new VisuGUI_CutPlanesDlg (GetDesktop(this), false, false);
-        aDlg->initFromPrsObject(aPrsObject);
-       aDlg->show();
-      }
-    }*/
-    break;
-  case VISU::TCUTLINES:
-    EditPrs3d<VISU::CutLines_i, VisuGUI_CutLinesDlg>(this, aPrs3d);
-    /*{
-      VISU::CutLines_i* aPrsObject = dynamic_cast<VISU::CutLines_i*>(aPrs3d);
-      if (aPrsObject) {
-       VisuGUI_CutLinesDlg* aDlg =
-          new VisuGUI_CutLinesDlg (GetDesktop(this), false, false);
-        aDlg->initFromPrsObject(aPrsObject);
-       aDlg->show();
-      }
-    }*/
-    break;
-  case VISU::TISOSURFACE:
-    EditPrs3d<VISU::IsoSurfaces_i, VisuGUI_IsoSurfacesDlg>(this, aPrs3d);
-    break;
-  case VISU::TVECTORS:
-    EditPrs3d<VISU::Vectors_i, VisuGUI_VectorsDlg>(this, aPrs3d);
-    break;
-  case VISU::TSTREAMLINES:
-    EditPrs3d<VISU::StreamLines_i, VisuGUI_StreamLinesDlg>(this, aPrs3d);
-    break;
-  case VISU::TPLOT3D:
-    EditPrs3d<VISU::Plot3D_i, VisuGUI_Plot3DDlg>(this, aPrs3d);
-    /*{
-      VISU::Plot3D_i* aPrsObject = dynamic_cast<VISU::Plot3D_i*>(aPrs3d);
-      if (aPrsObject) {
-       VisuGUI_Plot3DDlg* aDlg = new VisuGUI_Plot3DDlg();
-        aDlg->initFromPrsObject(aPrsObject);
-       aDlg->show();
-       myActiveDialogBox = aDlg;
-      }
-    }*/
-    break;
-  default:
-    return;
+void
+VisuGUI::
+OnEditCutPlanes()
+{
+  Handle(SALOME_InteractiveObject) anIO;
+  if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){
+    EditPrs3d<VISU::CutPlanes_i, VisuGUI_CutPlanesDlg,0>(this, aPrs3d);
+    if(SVTK_ViewWindow* aViewWindow = GetViewWindow()){
+      aViewWindow->highlight(anIO, 1);
+    }
   }
-
-  if (SVTK_ViewWindow* vw = GetViewWindow())
-    vw->highlight(anIO, 1);
 }
 
+
 void
 VisuGUI::
-OnDeletePrs()
+OnEditCutLines()
 {
-  _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this));
-  if (CheckLock(aCStudy))
-    return;
-  SALOMEDS::Study_var aStudy = GetDSStudy(aCStudy);
+  Handle(SALOME_InteractiveObject) anIO;
+  if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){
+    EditPrs3d<VISU::CutLines_i, VisuGUI_CutLinesDlg,0>(this, aPrs3d);
+    if(SVTK_ViewWindow* aViewWindow = GetViewWindow()){
+      aViewWindow->highlight(anIO, 1);
+    }
+  }
+}
+
 
+void
+VisuGUI::
+OnEditIsoSurfaces()
+{
   Handle(SALOME_InteractiveObject) anIO;
-  CORBA::Object_var anObject = GetSelectedObj(this, &anIO);
-  if (anIO.IsNull())
-    return;
+  if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){
+    EditPrs3d<VISU::IsoSurfaces_i, VisuGUI_IsoSurfacesDlg,1>(this, aPrs3d);
+    if(SVTK_ViewWindow* aViewWindow = GetViewWindow()){
+      aViewWindow->highlight(anIO, 1);
+    }
+  }
+}
 
-  // There is a transaction
-  SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
-  aStudyBuilder->NewCommand();
 
-  // is it Prs3d object ?
-  VISU::Prs3d_i* aPrsObject = dynamic_cast<VISU::Prs3d_i*>(VISU::GetServant(anObject).in());
-  if (aPrsObject) {
-    DeletePrs3d(this, aPrsObject, anIO);
+void
+VisuGUI::
+OnEditVectors()
+{
+  Handle(SALOME_InteractiveObject) anIO;
+  if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){
+    EditPrs3d<VISU::Vectors_i, VisuGUI_VectorsDlg,1>(this, aPrs3d);
+    if(SVTK_ViewWindow* aViewWindow = GetViewWindow()){
+      aViewWindow->highlight(anIO, 1);
+    }
   }
+}
 
-  // is it Curve object ?
-  VISU::Curve_i* aCurveObject = dynamic_cast<VISU::Curve_i*>(VISU::GetServant(anObject).in());
-  if (aCurveObject) {
-    //jfa tmp:DeleteCurve(this, aCurveObject, anIO);
+
+void
+VisuGUI::
+OnEditStreamLines()
+{
+  Handle(SALOME_InteractiveObject) anIO;
+  if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){
+    EditPrs3d<VISU::StreamLines_i, VisuGUI_StreamLinesDlg,1>(this, aPrs3d);
+    if(SVTK_ViewWindow* aViewWindow = GetViewWindow()){
+      aViewWindow->highlight(anIO, 1);
+    }
   }
+}
 
-  aStudyBuilder->CommitCommand();
+
+void
+VisuGUI::
+OnEditPlot3D()
+{
+  Handle(SALOME_InteractiveObject) anIO;
+  if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){
+    EditPrs3d<VISU::Plot3D_i, VisuGUI_Plot3DDlg,0>(this, aPrs3d);
+    if(SVTK_ViewWindow* aViewWindow = GetViewWindow()){
+      aViewWindow->highlight(anIO, 1);
+    }
+  }
 }
 
 
@@ -814,11 +813,11 @@ OnEraseAll()
       vtkActor *anActor;
       vtkActorCollection *anActColl = aRen->GetActors();
       for (anActColl->InitTraversal(); (anActor = anActColl->GetNextActor()) != NULL; ) {
-       if (anActor->GetVisibility() > 0)
-         if (VISU_Actor* anVISUActor = VISU_Actor::SafeDownCast(anActor)) {
-           anVISUActor = anVISUActor->GetParent();
-           anVISUActor->VisibilityOff();
-         }
+        if (anActor->GetVisibility() > 0)
+          if (VISU_Actor* anVISUActor = VISU_Actor::SafeDownCast(anActor)) {
+            anVISUActor = anVISUActor->GetParent();
+            anVISUActor->VisibilityOff();
+          }
       }
       vw->Repaint();
     }
@@ -895,16 +894,16 @@ OnChangeColor()
   if (aMesh) {
     switch (aRepresent) {
       case VISU::POINT :
-       anOldColor = aMesh->GetNodeColor();
-       break;
+        anOldColor = aMesh->GetNodeColor();
+        break;
       case VISU::WIREFRAME :
       case VISU::INSIDEFRAME :
-       anOldColor = aMesh->GetLinkColor();
-       break;
+        anOldColor = aMesh->GetLinkColor();
+        break;
       case VISU::SHADED :
       case VISU::SURFACEFRAME :
-       anOldColor = aMesh->GetCellColor();
-       break;
+        anOldColor = aMesh->GetCellColor();
+        break;
     }
   } else if (aDeformedShape) {
     anOldColor = aDeformedShape->GetColor();
@@ -922,17 +921,17 @@ OnChangeColor()
     aNewColor.B = aColorNew.blue()/255.;
     if (aMesh) {
       switch (aRepresent) {
-       case VISU::POINT :
-         aMesh->SetNodeColor(aNewColor);
-         break;
-       case VISU::WIREFRAME :
-       case VISU::INSIDEFRAME :
-         aMesh->SetLinkColor(aNewColor);
-         break;
-       case VISU::SHADED :
-       case VISU::SURFACEFRAME :
-         aMesh->SetCellColor(aNewColor);
-         break;
+        case VISU::POINT :
+          aMesh->SetNodeColor(aNewColor);
+          break;
+        case VISU::WIREFRAME :
+        case VISU::INSIDEFRAME :
+          aMesh->SetLinkColor(aNewColor);
+          break;
+        case VISU::SHADED :
+        case VISU::SURFACEFRAME :
+          aMesh->SetCellColor(aNewColor);
+          break;
       }
     } else {
       aDeformedShape->SetColor(aNewColor);
@@ -1068,10 +1067,10 @@ OnShowTable()
     if ( !CORBA::is_nil( aVisuObj ) && aVisuObj->GetType() == VISU::TTABLE ) {
       CORBA::Object_ptr aTable = VISU::Table::_narrow( anObject );
       if( !CORBA::is_nil( aTable ) ) {
-       VISU::Table_i* table = dynamic_cast<VISU::Table_i*>( VISU::GetServant(aTable).in() );
-       if ( table ) {
-         SO = GetCStudy( GetAppStudy( this ) )->FindObjectID( table->GetObjectEntry() );
-       }
+        VISU::Table_i* table = dynamic_cast<VISU::Table_i*>( VISU::GetServant(aTable).in() );
+        if ( table ) {
+          SO = GetCStudy( GetAppStudy( this ) )->FindObjectID( table->GetObjectEntry() );
+        }
       }
     }
   } else {
@@ -1083,11 +1082,11 @@ OnShowTable()
     return;
 
   VisuGUI_TableDlg* dlg = new VisuGUI_TableDlg( GetDesktop( this ),
-                                              SO,
-                                              false,
-                                              //SAL2670 Orientation of show tables
-                                              VisuGUI_TableDlg::ttAuto,
-                                              Qt::Vertical );
+                                               SO,
+                                               false,
+                                               //SAL2670 Orientation of show tables
+                                               VisuGUI_TableDlg::ttAuto,
+                                               Qt::Vertical );
   dlg->show();
 }
 
@@ -1102,76 +1101,7 @@ OnCreateTable()
   VISU::CutLines_var aCutLines = VISU::CutLines::_narrow( anObject );
   if(!aCutLines->_is_nil() || IsSObjectTable(aSObject)) {
     GetVisuGen( this )->CreateTable( aSObject->GetID().c_str() );
-    updateObjBrowser();
-  }
-}
-
-void
-VisuGUI::
-OnDeleteObject()
-{
-  _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this));
-  if (CheckLock(aCStudy))
-    return;
-  SALOMEDS::Study_var aStudy = GetDSStudy(aCStudy);
-
-  Handle(SALOME_InteractiveObject) anIO;
-  CORBA::Object_var anObject = GetSelectedObj(this, &anIO);
-  if (anIO.IsNull() || !anIO->hasEntry())
-    return;
-
-  SALOMEDS::SObject_var aSObject = aStudy->FindObjectID(anIO->getEntry());
-  if (!aSObject->_is_nil()) {
-    SALOMEDS::ChildIterator_var aChildIter = aStudy->NewChildIterator(aSObject);
-    for (aChildIter->InitEx(true); aChildIter->More(); aChildIter->Next()) {
-      SALOMEDS::SObject_var aChildSObject = aChildIter->Value();
-      CORBA::Object_var aChildObj = VISU::SObjectToObject(aChildSObject);
-      ErasePrs(this, aChildObj);
-    }
-    SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
-    // There is a transaction
-    aStudyBuilder->NewCommand();
-    CORBA::Object_var anObj = VISU::SObjectToObject(aSObject);
-    if (!CORBA::is_nil(anObj)) {
-      VISU::Base_var aBase = VISU::Base::_narrow(anObj);
-      if (!CORBA::is_nil(aBase)) {
-        VISU::VISUType aType = aBase->GetType();
-        switch (aType) {
-        case VISU::TRESULT:
-          {
-            SALOMEDS::ChildIterator_var aChildIter = aStudy->NewChildIterator(aSObject);
-           for (aChildIter->InitEx(true); aChildIter->More(); aChildIter->Next()) {
-              SALOMEDS::SObject_var aChildSObject = aChildIter->Value();
-              CORBA::Object_var aChildObj = VISU::SObjectToObject(aChildSObject);
-              if (CORBA::is_nil(aChildObj)) continue;
-              VISU::Prs3d_var aPrs3d = VISU::Prs3d::_narrow(aChildObj);
-              if (CORBA::is_nil(aPrs3d)) continue;
-              VISU::Prs3d_i* pPrs3d = dynamic_cast<VISU::Prs3d_i*>(VISU::GetServant(aPrs3d).in());
-              DeletePrs3d(this, pPrs3d, NULL);
-           }
-           break;
-         }
-        case VISU::TTABLE:
-          {
-            SALOMEDS::ChildIterator_var aChildIter = aStudy->NewChildIterator(aSObject);
-           for (aChildIter->InitEx(true); aChildIter->More(); aChildIter->Next()) {
-              SALOMEDS::SObject_var aChildSObject = aChildIter->Value();
-              CORBA::Object_var aChildObj = VISU::SObjectToObject(aChildSObject);
-              if (CORBA::is_nil(aChildObj)) continue;
-              CORBA::Object_ptr aCurve = VISU::Curve::_narrow(aChildObj);
-              if (CORBA::is_nil(aCurve)) continue;
-              //VISU::Curve_i* pCurve = dynamic_cast<VISU::Curve_i*>(VISU::GetServant(aCurve).in());
-              //jfa tmp:DeleteCurve(this, pCurve, NULL);
-            }
-            break;
-          }
-        }
-      }
-    }
-    aStudyBuilder->RemoveObjectWithChildren(aSObject);
-    aStudyBuilder->CommitCommand();
-    //jfa tmp:GetActiveStudy()->unHighlightAll();
-    updateObjBrowser(true);
+    UpdateObjBrowser(this);
   }
 }
 
@@ -1182,7 +1112,6 @@ OnDeleteObjects()
   _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this));
   if (CheckLock(aCStudy))
     return;
-  SALOMEDS::Study_var aStudy = GetDSStudy(aCStudy);
 
   SALOME_ListIO aList;
   SalomeApp_SelectionMgr* mgr = GetSelectionMgr(this);
@@ -1201,13 +1130,13 @@ OnDeleteObjects()
   if (nbSelected < 1) return;
 
   // There is a transaction
-  SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
+  _PTR(StudyBuilder) aStudyBuilder = aCStudy->NewBuilder();
   aStudyBuilder->NewCommand();
 
   for (i = 0; i < nbSelected; i++) {
-    SALOMEDS::SObject_var aSObject = aStudy->FindObjectID(entries[i]);
-    if (!aSObject->_is_nil()) {
-      DeleteSObject(this, aStudy, aSObject);
+    _PTR(SObject) aSObject = aCStudy->FindObjectID(entries[i]);
+    if (aSObject) {
+      DeleteSObject(this, aCStudy, aSObject);
     }
   }
 
@@ -1215,7 +1144,7 @@ OnDeleteObjects()
   aStudyBuilder->CommitCommand();
 
   //GetActiveStudy()->unHighlightAll();
-  updateObjBrowser(true);
+  UpdateObjBrowser(this, true);
 }
 
 void
@@ -1236,73 +1165,73 @@ OnPlotData()
       // Table (VISU object) is selected
       CORBA::Object_ptr aTbl = VISU::Table::_narrow( anObject );
       if( !CORBA::is_nil( aTbl ) ) {
-       VISU::Table_i* table = dynamic_cast<VISU::Table_i*>(VISU::GetServant(aTbl).in());
-       if ( table ) {
-         _PTR(SObject) SO = aStudy->FindObjectID( table->GetObjectEntry() );
-         if ( IsSObjectTable(SO) ) {
-           // get name of SObject
-           if ( SO->FindAttribute( anAttr, "AttributeName" ) ) {
-             aName = anAttr;
-             SOName = QString( aName->Value().c_str() );
-           }
-           SPlot2d_SetupPlot2dDlg* dlg = new SPlot2d_SetupPlot2dDlg( SO, GetDesktop( this ) );
-           if ( dlg->exec() == QDialog::Accepted ) {
-             if ( !IsStudyLocked( aStudy ) ) {
-               // if study is not locked - create new container, create curves and insert them
-               // into container, then plot container if current viewer is of VIEW_PLOT2D type
-               int horIndex;
-               QValueList<int> verIndices;
-               dlg->getCurvesSource( horIndex, verIndices );
-               if ( horIndex >= 0 && verIndices.count() > 0 ) {
-                 CORBA::Object_var aContainer = GetVisuGen(this)->CreateContainer();
-                 if( !CORBA::is_nil( aContainer ) ) {
-                   VISU::Container_i* pContainer =
+        VISU::Table_i* table = dynamic_cast<VISU::Table_i*>(VISU::GetServant(aTbl).in());
+        if ( table ) {
+          _PTR(SObject) SO = aStudy->FindObjectID( table->GetObjectEntry() );
+          if ( IsSObjectTable(SO) ) {
+            // get name of SObject
+            if ( SO->FindAttribute( anAttr, "AttributeName" ) ) {
+              aName = anAttr;
+              SOName = QString( aName->Value().c_str() );
+            }
+            SPlot2d_SetupPlot2dDlg* dlg = new SPlot2d_SetupPlot2dDlg( SO, GetDesktop( this ) );
+            if ( dlg->exec() == QDialog::Accepted ) {
+              if ( !IsStudyLocked( aStudy ) ) {
+                // if study is not locked - create new container, create curves and insert them
+                // into container, then plot container if current viewer is of VIEW_PLOT2D type
+                int horIndex;
+                QValueList<int> verIndices;
+                dlg->getCurvesSource( horIndex, verIndices );
+                if ( horIndex >= 0 && verIndices.count() > 0 ) {
+                  CORBA::Object_var aContainer = GetVisuGen(this)->CreateContainer();
+                  if( !CORBA::is_nil( aContainer ) ) {
+                    VISU::Container_i* pContainer =
                       dynamic_cast<VISU::Container_i*>(VISU::GetServant(aContainer).in());
-                   if ( pContainer ) {
-                     for ( int i = 0; i < verIndices.count(); i++ ) {
-                       CORBA::Object_var aNewCurve =
+                    if ( pContainer ) {
+                      for ( int i = 0; i < verIndices.count(); i++ ) {
+                        CORBA::Object_var aNewCurve =
                           GetVisuGen(this)->CreateCurve( table->_this(), horIndex+1, verIndices[i]+1 );
-                       if( !CORBA::is_nil( aNewCurve ) ) {
-                         VISU::Curve_i* pCrv =
+                        if( !CORBA::is_nil( aNewCurve ) ) {
+                          VISU::Curve_i* pCrv =
                             dynamic_cast<VISU::Curve_i*>(VISU::GetServant(aNewCurve).in());
-                         if ( pCrv ) {
-                           bool isAuto;
-                           int  marker, line, lineWidth;
-                           QColor color;
-                           if ( dlg->getCurveAttributes(verIndices[i], isAuto, marker,
+                          if ( pCrv ) {
+                            bool isAuto;
+                            int  marker, line, lineWidth;
+                            QColor color;
+                            if ( dlg->getCurveAttributes(verIndices[i], isAuto, marker,
                                                          line, lineWidth, color) && !isAuto ) {
-                             SALOMEDS::Color c;
+                              SALOMEDS::Color c;
                               c.R = color.red()  /255.;
                               c.G = color.green()/255.;
                               c.B = color.blue() /255.;
-                             pCrv->SetColor( c );
-                             pCrv->SetMarker( ( VISU::Curve::MarkerType )marker );
-                             pCrv->SetLine( ( VISU::Curve::LineType )line, lineWidth );
-                           }
-                           pContainer->AddCurve( pCrv->_this() );
-                         }
-                       }
-                     }
-                     updateObjBrowser();
-                     PlotContainer( this, pContainer, VISU::eDisplay );
-                   }
-                 }
-               }
-             }
-             else {
-               // if study is locked just get curves info and plot them
+                              pCrv->SetColor( c );
+                              pCrv->SetMarker( ( VISU::Curve::MarkerType )marker );
+                              pCrv->SetLine( ( VISU::Curve::LineType )line, lineWidth );
+                            }
+                            pContainer->AddCurve( pCrv->_this() );
+                          }
+                        }
+                      }
+                      UpdateObjBrowser(this);
+                      PlotContainer( this, pContainer, VISU::eDisplay );
+                    }
+                  }
+                }
+              }
+              else {
+                // if study is locked just get curves info and plot them
                 // if current viewer is of VIEW_PLOT2D type
-               QPtrList<Plot2d_Curve> container;
-               dlg->getCurves( container );
-               if ( !container.isEmpty() ) {
-                 GetPlot2dViewer( this )->getActiveViewFrame()->displayCurves( container, true );
-                 GetPlot2dViewer( this )->getActiveViewFrame()->setTitle( SOName );
-               }
-             }
-           }
-           delete dlg;
-         }
-       }
+                QPtrList<Plot2d_Curve> container;
+                dlg->getCurves( container );
+                if ( !container.isEmpty() ) {
+                  GetPlot2dViewer( this )->getActiveViewFrame()->displayCurves( container, true );
+                  GetPlot2dViewer( this )->getActiveViewFrame()->setTitle( SOName );
+                }
+              }
+            }
+            delete dlg;
+          }
+        }
       }
     }
   }
@@ -1312,62 +1241,62 @@ OnPlotData()
     if ( IsSObjectTable(SO) ) {
       // get name of SObject
       if ( SO->FindAttribute( anAttr, "AttributeName" ) ) {
-       aName = anAttr;
-       SOName = QString( aName->Value().c_str() );
+        aName = anAttr;
+        SOName = QString( aName->Value().c_str() );
       }
       SPlot2d_SetupPlot2dDlg* dlg = new SPlot2d_SetupPlot2dDlg( SO, GetDesktop( this ) );
       if ( dlg->exec() == QDialog::Accepted ) {
-       if ( !IsStudyLocked( aStudy ) ) {
-         // if study is not locked - create new table and container objects, create curves
-         // and insert them into container, then plot container if current viewer is of VIEW_PLOT2D type
-         int horIndex;
-         QValueList<int> verIndices;
-         dlg->getCurvesSource( horIndex, verIndices );
-         if ( horIndex >= 0 && verIndices.count() > 0 ) {
-           CORBA::Object_var aTable = GetVisuGen(this)->CreateTable( SO->GetID().c_str() );
-           CORBA::Object_var aContainer = GetVisuGen(this)->CreateContainer();
-           if ( !CORBA::is_nil( aTable ) && !CORBA::is_nil( aContainer ) ) {
-             VISU::Table_i*     pTable     = dynamic_cast<VISU::Table_i*>(VISU::GetServant(aTable).in());
-             VISU::Container_i* pContainer = dynamic_cast<VISU::Container_i*>(VISU::GetServant(aContainer).in());
-
-             if ( pContainer && pTable ) {
-               for ( int i = 0; i < verIndices.count(); i++ ) {
-                 CORBA::Object_var aNewCurve = GetVisuGen(this)->CreateCurve
+        if ( !IsStudyLocked( aStudy ) ) {
+          // if study is not locked - create new table and container objects, create curves
+          // and insert them into container, then plot container if current viewer is of VIEW_PLOT2D type
+          int horIndex;
+          QValueList<int> verIndices;
+          dlg->getCurvesSource( horIndex, verIndices );
+          if ( horIndex >= 0 && verIndices.count() > 0 ) {
+            CORBA::Object_var aTable = GetVisuGen(this)->CreateTable( SO->GetID().c_str() );
+            CORBA::Object_var aContainer = GetVisuGen(this)->CreateContainer();
+            if ( !CORBA::is_nil( aTable ) && !CORBA::is_nil( aContainer ) ) {
+              VISU::Table_i*     pTable     = dynamic_cast<VISU::Table_i*>(VISU::GetServant(aTable).in());
+              VISU::Container_i* pContainer = dynamic_cast<VISU::Container_i*>(VISU::GetServant(aContainer).in());
+
+              if ( pContainer && pTable ) {
+                for ( int i = 0; i < verIndices.count(); i++ ) {
+                  CORBA::Object_var aNewCurve = GetVisuGen(this)->CreateCurve
                     ( pTable->_this(), horIndex+1, verIndices[i]+1 );
-                 if( !CORBA::is_nil( aNewCurve ) ) {
-                   VISU::Curve_i* pCrv = dynamic_cast<VISU::Curve_i*>(VISU::GetServant(aNewCurve).in());
-                   if ( pCrv ) {
-                     bool isAuto;
-                     int  marker, line, lineWidth;
-                     QColor color;
-                     if ( dlg->getCurveAttributes(verIndices[i], isAuto, marker,
+                  if( !CORBA::is_nil( aNewCurve ) ) {
+                    VISU::Curve_i* pCrv = dynamic_cast<VISU::Curve_i*>(VISU::GetServant(aNewCurve).in());
+                    if ( pCrv ) {
+                      bool isAuto;
+                      int  marker, line, lineWidth;
+                      QColor color;
+                      if ( dlg->getCurveAttributes(verIndices[i], isAuto, marker,
                                                    line, lineWidth, color) && !isAuto ) {
-                       SALOMEDS::Color c;
-                       c.R = color.red()/255.;
-                       c.G = color.green()/255.;
-                       c.B = color.blue()/255.;
-                       pCrv->SetColor( c );
-                       pCrv->SetMarker( ( VISU::Curve::MarkerType )marker );
-                       pCrv->SetLine( ( VISU::Curve::LineType )line, lineWidth );
-                     }
-                     pContainer->AddCurve( pCrv->_this() );
-                   }
-                 }
-               }
-               updateObjBrowser();
-               PlotContainer( this, pContainer, VISU::eDisplay );
-             }
-           }
-         }
-       } else {
-         // if study is locked just get curves info and plot them
-         QPtrList<Plot2d_Curve> container;
-         dlg->getCurves( container );
-         if ( !container.isEmpty() ) {
-           GetPlot2dViewer( this )->getActiveViewFrame()->displayCurves( container, true );
-           GetPlot2dViewer( this )->getActiveViewFrame()->setTitle( SOName );
-         }
-       }
+                        SALOMEDS::Color c;
+                        c.R = color.red()/255.;
+                        c.G = color.green()/255.;
+                        c.B = color.blue()/255.;
+                        pCrv->SetColor( c );
+                        pCrv->SetMarker( ( VISU::Curve::MarkerType )marker );
+                        pCrv->SetLine( ( VISU::Curve::LineType )line, lineWidth );
+                      }
+                      pContainer->AddCurve( pCrv->_this() );
+                    }
+                  }
+                }
+                UpdateObjBrowser(this);
+                PlotContainer( this, pContainer, VISU::eDisplay );
+              }
+            }
+          }
+        } else {
+          // if study is locked just get curves info and plot them
+          QPtrList<Plot2d_Curve> container;
+          dlg->getCurves( container );
+          if ( !container.isEmpty() ) {
+            GetPlot2dViewer( this )->getActiveViewFrame()->displayCurves( container, true );
+            GetPlot2dViewer( this )->getActiveViewFrame()->setTitle( SOName );
+          }
+        }
       }
       delete dlg;
     }
@@ -1395,22 +1324,22 @@ OnCurveProperties()
     if( !CORBA::is_nil( aCurve ) ) {
       VISU::Curve_i* aDSCurve = dynamic_cast<VISU::Curve_i*>(VISU::GetServant(aCurve).in());
       if ( aDSCurve && (!IsStudyLocked( GetCStudy(aAppStudy) )) ) {
-       Plot2d_SetupCurveDlg aDlg(GetDesktop( this ));
-
-       aDlg.setLine( (int)aDSCurve->GetLine(), aDSCurve->GetLineWidth() );
-       aDlg.setMarker( (int)aDSCurve->GetMarker() );
-       SALOMEDS::Color aColor = aDSCurve->GetColor();
-       aDlg.setColor( QColor( (int)(aColor.R*255.), (int)(aColor.G*255.), (int)(aColor.B*255.) ) );
-       if( aDlg.exec() == QDialog::Accepted ) {
-         aDSCurve->SetLine( (VISU::Curve::LineType)aDlg.getLine(), aDlg.getLineWidth() );
-         aDSCurve->SetMarker( (VISU::Curve::MarkerType)aDlg.getMarker());
-         SALOMEDS::Color newColor;
-         newColor.R = aDlg.getColor().red()/255.;
-         newColor.G = aDlg.getColor().green()/255.;
-         newColor.B = aDlg.getColor().blue()/255.;
-         aDSCurve->SetColor( newColor );
-         PlotCurve(this, aDSCurve, VISU::eDisplay);
-       }
+        Plot2d_SetupCurveDlg aDlg(GetDesktop( this ));
+
+        aDlg.setLine( (int)aDSCurve->GetLine(), aDSCurve->GetLineWidth() );
+        aDlg.setMarker( (int)aDSCurve->GetMarker() );
+        SALOMEDS::Color aColor = aDSCurve->GetColor();
+        aDlg.setColor( QColor( (int)(aColor.R*255.), (int)(aColor.G*255.), (int)(aColor.B*255.) ) );
+        if( aDlg.exec() == QDialog::Accepted ) {
+          aDSCurve->SetLine( (VISU::Curve::LineType)aDlg.getLine(), aDlg.getLineWidth() );
+          aDSCurve->SetMarker( (VISU::Curve::MarkerType)aDlg.getMarker());
+          SALOMEDS::Color newColor;
+          newColor.R = aDlg.getColor().red()/255.;
+          newColor.G = aDlg.getColor().green()/255.;
+          newColor.B = aDlg.getColor().blue()/255.;
+          aDSCurve->SetColor( newColor );
+          PlotCurve(this, aDSCurve, VISU::eDisplay);
+        }
       }
     }
   }
@@ -1423,7 +1352,6 @@ OnClearContainer()
   _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this));
   if (CheckLock(aCStudy))
     return;
-  SALOMEDS::Study_var aStudy = GetDSStudy(aCStudy);
   Handle(SALOME_InteractiveObject) anIO;
   CORBA::Object_var anObject = GetSelectedObj(this, &anIO);
   if (anIO.IsNull() || CORBA::is_nil(anObject))
@@ -1436,8 +1364,8 @@ OnClearContainer()
     if (!CORBA::is_nil(aCnt)) {
       VISU::Container_i* container = dynamic_cast<VISU::Container_i*>(VISU::GetServant(aCnt).in());
       if (container && container->GetNbCurves() > 0) {
-       container->Clear();
-       updateObjBrowser();
+        container->Clear();
+        UpdateObjBrowser(this);
       }
     }
   }
@@ -1456,11 +1384,11 @@ OnEditContainer()
   VISU::Container_i* aContainer = dynamic_cast<VISU::Container_i*>(aServant.in());
   if (!aContainer) return;
 
-  VisuGUI_EditContainerDlg* aDlg = new VisuGUI_EditContainerDlg (GetDesktop(this));
+  VisuGUI_EditContainerDlg* aDlg = new VisuGUI_EditContainerDlg (this);
   aDlg->initFromPrsObject(aContainer);
   if (aDlg->exec()) {
     aDlg->storeToPrsObject(aContainer);
-    updateObjBrowser(true);
+    UpdateObjBrowser(this, true);
   }
   delete aDlg;
 }
@@ -1472,7 +1400,6 @@ OnSaveViewParams()
   _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this));
   if (CheckLock(aCStudy))
     return;
-  SALOMEDS::Study_var aStudy = GetDSStudy(aCStudy);
 
   SUIT_ViewManager* aViewMgr = getApp()->activeViewManager();
   if (aViewMgr->getType() != SVTK_Viewer::Type())
@@ -1490,7 +1417,7 @@ OnSaveViewParams()
     const Handle(SALOME_InteractiveObject)& anIO = aListIO.First();
     VISU::View3D_i::SaveViewParams(aViewMgr, anIO->getName());
   }
-  updateObjBrowser();
+  UpdateObjBrowser(this);
 }
 
 void
@@ -1514,38 +1441,6 @@ OnRestoreViewParams()
   VISU::View3D_i::RestoreViewParams(aViewMgr, aSObj->GetName().c_str());//jfa tmp
 }
 
-void
-VisuGUI::
-OnDeleteViewParams()
-{
-  _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this));
-  if (CheckLock(aCStudy))
-    return;
-  SALOMEDS::Study_var aStudy = GetDSStudy(aCStudy);
-
-  Handle(SALOME_InteractiveObject) anIO;
-  CORBA::Object_var anObject = GetSelectedObj(this, &anIO);
-  _PTR(SObject) aSObject = aCStudy->FindObjectID(anIO->getEntry());
-  if (!aSObject) return;
-
-  VISU::VISUType aType = (VISU::VISUType)getValue(aSObject, "myType").toInt();
-  if (aType == VISU::TVIEW3D) {
-    SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this);
-    SALOME_ListIO aListIO, aNewListIO;
-    aSelectionMgr->selectedObjects(aListIO);
-    for (SALOME_ListIteratorOfListIO it (aListIO); it.More(); it.Next()) {
-      if (it.Value()->getEntry() != anIO->getEntry()) {
-        aNewListIO.Append(it.Value());
-      }
-    }
-    aSelectionMgr->setSelectedObjects(aNewListIO);
-
-    aCStudy->NewBuilder()->RemoveObject(aSObject);
-
-    updateObjBrowser();
-  }
-}
-
 void
 VisuGUI::
 OnRename()
@@ -1561,8 +1456,9 @@ OnRename()
   if (!aSObj) return;
 
   //TEST DU PARENT == VISU
-  _PTR(GenericAttribute) anAttr;
-  if (aSObj->FindAttribute(anAttr, "AttributeName")) {
+  _PTR(StudyBuilder) aBuilder = aCStudy->NewBuilder();
+  _PTR(GenericAttribute) anAttr = aBuilder->FindOrCreateAttribute(aSObj, "AttributeName");
+  if (anAttr) {
     _PTR(AttributeName) aName (anAttr);
     QString Name = VisuGUI_NameDlg::getName( GetDesktop( this ), aName->Value().c_str() );
     if (!Name.isEmpty()) {
@@ -1580,7 +1476,7 @@ OnRename()
                 VISU::Curve_i* curve =
                   dynamic_cast<VISU::Curve_i*>(VISU::GetServant(aCurve).in());
                 if (curve)
-                 curve->SetName(Name.latin1());
+                  curve->SetName(Name.latin1());
               }
               break;
             }
@@ -1591,7 +1487,7 @@ OnRename()
                 VISU::Table_i* table =
                   dynamic_cast<VISU::Table_i*>(VISU::GetServant(aTable).in());
                 if (table)
-                 table->SetName(Name.latin1());
+                  table->SetName(Name.latin1());
               }
               break;
             }
@@ -1602,7 +1498,7 @@ OnRename()
                 VISU::Container_i* container =
                   dynamic_cast<VISU::Container_i*>(VISU::GetServant(aContainer).in());
                 if (container)
-                 container->SetName(Name.latin1());
+                  container->SetName(Name.latin1());
               }
               break;
             }
@@ -1614,10 +1510,9 @@ OnRename()
       }
 
       // rename the study object
-      //getApp()->activeStudy()->renameIObject(anIO, Name);
       aName->SetValue(Name.latin1()); // rename the SObject
       anIO->setName(Name.latin1()); // rename the InteractiveObject
-      updateObjBrowser(false);
+      UpdateObjBrowser(this, false);
 
       QApplication::restoreOverrideCursor();
     }
@@ -1658,22 +1553,22 @@ OnSweep()
   // Get sweep parameters
   SUIT_ResourceMgr* aResourceMgr = GetResourceMgr();
 
-  double aTempoDbl = aResourceMgr->doubleValue("Visu:SweepTempo", 0.1);
+  double aTempoDbl = aResourceMgr->doubleValue("VISU", "sweeping_time_step", 0.1);
   int aTemp = int(1.E6 * aTempoDbl);
 
-  int aCycles = aResourceMgr->integerValue("Visu:SweepCycles", 1);
-  int aSteps  = aResourceMgr->integerValue("Visu:SweepSteps", 40);
+  int aCycles = aResourceMgr->integerValue("VISU", "sweeping_number_cycles", 1);
+  int aSteps  = aResourceMgr->integerValue("VISU", "sweeping_time_step", 40);
 
   // Sweep
   QApplication::setOverrideCursor(Qt::waitCursor);
   try {
     for (int j = 0; j < aCycles; j++) {
       for (int i = 0; i <= aSteps; i++) {
-       float aPercents = float(i)/aSteps;
-       aPrsObject->SetMapScale(aPercents);
-       aPrsObject->UpdateActor(aActor);
-       vw->getRenderWindow()->getRenderWindow()->Render();
-       usleep(aTemp);
+        float aPercents = float(i)/aSteps;
+        aPrsObject->SetMapScale(aPercents);
+        aPrsObject->UpdateActor(aActor);
+        vw->getRenderWindow()->getRenderWindow()->Render();
+        usleep(aTemp);
       }
     }
   } catch (std::exception& exc) {
@@ -1706,13 +1601,13 @@ OnTimeAnimation()
     if (getValue(aSObject, "myComment") == QString("FIELD")) {
       long aNumber = getValue(aSObject, "myNbTimeStamps").toLong();
       if (aNumber > 1) {
-       if (!isDefined) {
-         aNbTimes = aNumber;
-         aAnimationDlg->addField(aSObject);
-         isDefined = true;
-       } else if (aNbTimes == aNumber) {
-         aAnimationDlg->addField(aSObject);
-       }
+        if (!isDefined) {
+          aNbTimes = aNumber;
+          aAnimationDlg->addField(aSObject);
+          isDefined = true;
+        } else if (aNbTimes == aNumber) {
+          aAnimationDlg->addField(aSObject);
+        }
       }
     }
   }
@@ -1735,25 +1630,23 @@ OnShowAnimation()
   const Handle(SALOME_InteractiveObject)& anIO = aListIO.First();
 
   _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this));
-  SALOMEDS::Study_var aStudy = GetDSStudy(aCStudy);
 
-  SALOMEDS::SObject_var aSObj = aStudy->FindObjectID(anIO->getEntry());
-  if (aSObj->_is_nil()) return;
+  _PTR(SObject) aSObj = aCStudy->FindObjectID(anIO->getEntry());
+  if (!aSObj) return;
 
   VISU::Storable::TRestoringMap aMap;
-  SALOMEDS::GenericAttribute_var anAttr;
+  _PTR(GenericAttribute) anAttr;
   if (!aSObj->FindAttribute(anAttr, "AttributeComment")) return;
 
-  SALOMEDS::AttributeComment_var aComment = SALOMEDS::AttributeComment::_narrow(anAttr);
+  _PTR(AttributeComment) aComment (anAttr);
   string aComm = aComment->Value();
-  QString strIn(aComm.c_str());
-  VISU::Storable::StrToMap(strIn,aMap);
+  QString strIn (aComm.c_str());
+  VISU::Storable::StrToMap(strIn, aMap);
   bool isExist;
   VISU::VISUType aType = (VISU::VISUType)VISU::Storable::FindValue(aMap,"myType",&isExist).toInt();
   if (aType != VISU::TANIMATION) return;
 
   VisuGUI_TimeAnimationDlg* aAnimationDlg =
-//    new VisuGUI_TimeAnimationDlg(GetDesktop(this), aCStudy);
     new VisuGUI_TimeAnimationDlg(this, aCStudy);
   aAnimationDlg->restoreFromStudy(aSObj);
   aAnimationDlg->show();
@@ -1767,7 +1660,6 @@ OnCopyPresentation()
   if (CheckLock(aCStudy))
     return;
 
-  //VISU::Prs3d_i* aPrsObject = GetSelectedPrs3d();
   Handle(SALOME_InteractiveObject) anIO;
   CORBA::Object_var anObject = GetSelectedObj(this, &anIO);
   if (CORBA::is_nil(anObject)) return;
@@ -1851,14 +1743,20 @@ OnCopyPresentation()
     }
     break;
   }
-  updateObjBrowser();
+  UpdateObjBrowser(this);
 }
 
 void
 VisuGUI::
 OnSelectionInfo()
 {
-  (new VisuGUI_SelectionDlg(GetDesktop(this)))->show();
+  if (GetViewWindow())
+    (new VisuGUI_SelectionDlg(GetDesktop(this)))->show();
+  else
+    SUIT_MessageBox::warn1(GetDesktop(this),
+                           tr("WRN_VISU"),
+                           tr("ERR_ACTIVATE_VIEW3D"),
+                           tr("BUT_OK") );
 }
 
 void
@@ -1897,19 +1795,19 @@ OnMergeScalarBars()
     std::vector<VISU::Prs3d_i*> aPrsList = GetPrs3dList(this, anIO);
     if (!aPrsList.empty()) {
       for (int i = 0, n = aPrsList.size(); i < n; i++) {
-       VISU::Prs3d_i* aPrsObject = aPrsList[i];
-       if (aPrsObject) {
-         VISU::ScalarMap_i* aScalar = dynamic_cast<VISU::ScalarMap_i*>(aPrsObject);
-         if (aScalar) {
-           if (first) {
-             first = false;
-             aMin = aScalar->GetMin(); aMax = aScalar->GetMax();
-           } else {
-             if (aScalar->GetMin() < aMin) aMin = aScalar->GetMin();
-             if (aScalar->GetMax() > aMax) aMax = aScalar->GetMax();
-           }
-         }
-       }
+        VISU::Prs3d_i* aPrsObject = aPrsList[i];
+        if (aPrsObject) {
+          VISU::ScalarMap_i* aScalar = dynamic_cast<VISU::ScalarMap_i*>(aPrsObject);
+          if (aScalar) {
+            if (first) {
+              first = false;
+              aMin = aScalar->GetMin(); aMax = aScalar->GetMax();
+            } else {
+              if (aScalar->GetMin() < aMin) aMin = aScalar->GetMin();
+              if (aScalar->GetMax() > aMax) aMax = aScalar->GetMax();
+            }
+          }
+        }
       }
     }
   }
@@ -1921,23 +1819,23 @@ OnMergeScalarBars()
     std::vector<VISU::Prs3d_i*> aPrsList = GetPrs3dList(this, anIO);
     if (!aPrsList.empty()) {
       for (int i = 0, n = aPrsList.size(); i < n; i++) {
-       VISU::Prs3d_i* aPrsObject = aPrsList[i];
-       if(aPrsObject){
-         VISU::ScalarMap_i* aScalar = dynamic_cast<VISU::ScalarMap_i*>(aPrsObject);
-         if (aScalar) {
-           aScalar->SetRange(aMin, aMax);
-           RecreateActor(this, aScalar);
-           update = true;
-         }
-       }
+        VISU::Prs3d_i* aPrsObject = aPrsList[i];
+        if(aPrsObject){
+          VISU::ScalarMap_i* aScalar = dynamic_cast<VISU::ScalarMap_i*>(aPrsObject);
+          if (aScalar) {
+            aScalar->SetRange(aMin, aMax);
+            RecreateActor(this, aScalar);
+            update = true;
+          }
+        }
       }
     }
   }
   if (update) {
     if (SVTK_ViewWindow* vw = GetViewWindow(this)) {
 //if (vw->getRenderer()->GetActors()->GetNumberOfItems() > 0) {
-       vw->getRenderer()->ResetCameraClippingRange();
-       vw->Repaint();
+        vw->getRenderer()->ResetCameraClippingRange();
+        vw->Repaint();
 //}
     }
   }
@@ -1960,23 +1858,23 @@ OnFreeScalarBars()
     std::vector<VISU::Prs3d_i*> aPrsList = GetPrs3dList(this, anIO);
     if (!aPrsList.empty()) {
       for (int i = 0, n = aPrsList.size(); i < n; i++) {
-       VISU::Prs3d_i* aPrsObject = aPrsList[i];
-       if (aPrsObject) {
-         VISU::ScalarMap_i* aScalar = dynamic_cast<VISU::ScalarMap_i*>(aPrsObject);
-         if (aScalar) {
-           aScalar->SetSourceRange();
-           RecreateActor(this, aScalar);
-           update = true;
-         }
-       }
+        VISU::Prs3d_i* aPrsObject = aPrsList[i];
+        if (aPrsObject) {
+          VISU::ScalarMap_i* aScalar = dynamic_cast<VISU::ScalarMap_i*>(aPrsObject);
+          if (aScalar) {
+            aScalar->SetSourceRange();
+            RecreateActor(this, aScalar);
+            update = true;
+          }
+        }
       }
     }
   }
   if (update) {
     if (SVTK_ViewWindow* vw = GetViewWindow(this)) {
 //if (vw->getRenderer()->GetActors()->GetNumberOfItems() > 0) {
-       vw->getRenderer()->ResetCameraClippingRange();
-       vw->Repaint();
+        vw->getRenderer()->ResetCameraClippingRange();
+        vw->Repaint();
 //}
     }
   }
@@ -1990,7 +1888,6 @@ OnTranslatePrs()
   VisuGUI_OffsetDlg* aDlg = new VisuGUI_OffsetDlg (this);
 
   _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this));
-  SALOMEDS::Study_var aStudy = GetDSStudy(aCStudy);
 
   SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this);
   SALOME_ListIO aListIO;
@@ -2000,15 +1897,15 @@ OnTranslatePrs()
   for (; It.More(); It.Next()) {
     Handle(SALOME_InteractiveObject)& anIO = It.Value();
     if (anIO->hasEntry()) {
-      SALOMEDS::SObject_var aSObject = aStudy->FindObjectID(anIO->getEntry());
-      if (!aSObject->_is_nil()) {
-       CORBA::Object_var aCORBAObject = VISU::SObjectToObject(aSObject);
-       if (!CORBA::is_nil(aCORBAObject)) {
-         PortableServer::ServantBase_var aServant = VISU::GetServant(aCORBAObject);
-         if (VISU::Prs3d_i* aPrsObject = dynamic_cast<VISU::Prs3d_i*>(aServant.in())) {
-           aDlg->addPresentation(aPrsObject);
-         }
-       }
+      _PTR(SObject) aSObject = aCStudy->FindObjectID(anIO->getEntry());
+      if (aSObject) {
+        CORBA::Object_var aCORBAObject = VISU::ClientSObjectToObject(aSObject);
+        if (!CORBA::is_nil(aCORBAObject)) {
+          PortableServer::ServantBase_var aServant = VISU::GetServant(aCORBAObject);
+          if (VISU::Prs3d_i* aPrsObject = dynamic_cast<VISU::Prs3d_i*>(aServant.in())) {
+            aDlg->addPresentation(aPrsObject);
+          }
+        }
       }
     }
   }
@@ -2052,40 +1949,52 @@ createActions()
   SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr();
 
   // Create actions
-  createAction( VISU_IMPORT_FROM_FILE, "", QIconSet(), tr("MEN_IMPORT_FROM_FILE"), "", (CTRL + Key_I), aParent, false,
-               this, SLOT(OnImportFromFile()));
-  createAction( VISU_EXPLORE_MED, "", QIconSet(), tr("MEN_EXPLORE_MED_FILE"), "", (CTRL + Key_M), aParent, false,
-               this, SLOT(OnExploreMEDFile()));
-  createAction( VISU_IMPORT_TABLE, "", QIconSet(), tr("MEN_IMPORT_TABLE"), "", 0, aParent, false,
-               this, SLOT(OnImportTableFromFile()));
+  createAction( VISU_IMPORT_FROM_FILE, "", QIconSet(),
+                tr("MEN_IMPORT_FROM_FILE"), "", (CTRL + Key_I), aParent, false,
+                this, SLOT(OnImportFromFile()));
+
+  createAction( VISU_EXPLORE_MED, "", QIconSet(),
+                tr("MEN_EXPLORE_MED_FILE"), "", (CTRL + Key_M), aParent, false,
+                this, SLOT(OnExploreMEDFile()));
+
+  createAction( VISU_IMPORT_TABLE, "", QIconSet(),
+                tr("MEN_IMPORT_TABLE"), "", 0, aParent, false,
+                this, SLOT(OnImportTableFromFile()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_SCALAR_MAP"));
-  createAction( VISU_SCALAR_MAP, tr("MEN_SCALAR_MAP"), QIconSet(aPixmap), tr("MEN_SCALAR_MAP"), "", 0, aParent, false,
-               this, SLOT(OnCreateScalarMap()));
+  createAction( VISU_SCALAR_MAP, tr("MEN_SCALAR_MAP"), QIconSet(aPixmap),
+                tr("MEN_SCALAR_MAP"), "", 0, aParent, false,
+                this, SLOT(OnCreateScalarMap()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_DEFORMED_SHAPE"));
-  createAction( VISU_DEFORMED_SHAPE, tr("MEN_DEFORMED_SHAPE"), QIconSet(aPixmap), tr("MEN_DEFORMED_SHAPE"), "", 0, aParent, false,
-               this, SLOT(OnCreateDeformedShape()));
+  createAction( VISU_DEFORMED_SHAPE, tr("MEN_DEFORMED_SHAPE"), QIconSet(aPixmap),
+                tr("MEN_DEFORMED_SHAPE"), "", 0, aParent, false,
+                this, SLOT(OnCreateDeformedShape()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_VECTORS"));
-  createAction( VISU_VECTORS, tr("MEN_VECTORS"), QIconSet(aPixmap), tr("MEN_VECTORS"), "", 0, aParent, false,
-               this, SLOT(OnCreateVectors()));
+  createAction( VISU_VECTORS, tr("MEN_VECTORS"), QIconSet(aPixmap),
+                tr("MEN_VECTORS"), "", 0, aParent, false,
+                this, SLOT(OnCreateVectors()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_ISO_SURFACES"));
-  createAction( VISU_ISO_SURFACES, tr("MEN_ISO_SURFACES"), QIconSet(aPixmap), tr("MEN_ISO_SURFACES"), "", 0, aParent, false,
-               this, SLOT(OnCreateIsoSurfaces()));
+  createAction( VISU_ISO_SURFACES, tr("MEN_ISO_SURFACES"), QIconSet(aPixmap),
+                tr("MEN_ISO_SURFACES"), "", 0, aParent, false,
+                this, SLOT(OnCreateIsoSurfaces()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_CUT_PLANES"));
-  createAction( VISU_CUT_PLANES, tr("MEN_CUT_PLANES"), QIconSet(aPixmap), tr("MEN_CUT_PLANES"), "", 0, aParent, false,
-               this, SLOT(OnCreateCutPlanes()));
+  createAction( VISU_CUT_PLANES, tr("MEN_CUT_PLANES"), QIconSet(aPixmap),
+                tr("MEN_CUT_PLANES"), "", 0, aParent, false,
+                this, SLOT(OnCreateCutPlanes()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_STREAM_LINES"));
-  createAction( VISU_STREAM_LINES, tr("MEN_STREAM_LINES"), QIconSet(aPixmap), tr("MEN_STREAM_LINES"), "", 0, aParent, false,
-               this, SLOT(OnCreateStreamLines()));
+  createAction( VISU_STREAM_LINES, tr("MEN_STREAM_LINES"), QIconSet(aPixmap),
+                tr("MEN_STREAM_LINES"), "", 0, aParent, false,
+                this, SLOT(OnCreateStreamLines()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_CUT_LINES"));
-  createAction( VISU_CUT_LINES, tr("MEN_CUT_LINES"), QIconSet(aPixmap), tr("MEN_CUT_LINES"), "", 0, aParent, false,
-               this, SLOT(OnCreateCutLines()));
+  createAction( VISU_CUT_LINES, tr("MEN_CUT_LINES"), QIconSet(aPixmap),
+                tr("MEN_CUT_LINES"), "", 0, aParent, false,
+                this, SLOT(OnCreateCutLines()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_PLOT_3D"));
   createAction( VISU_PLOT_3D, tr("MEN_PLOT_3D"), QIconSet(aPixmap),
@@ -2093,220 +2002,245 @@ createActions()
                 this, SLOT(OnCreatePlot3D()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_PLOT2D"));
-  createAction( VISU_PLOT2D, tr("MEN_CREATE_PLOT2D"), QIconSet(aPixmap), tr("MEN_CREATE_PLOT2D"), "", 0, aParent, false,
-               this, SLOT(OnCreatePlot2dView()));
-
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  //createAction( VISU_DELETE, tr("MEN_DELETE_OBJ"), QIconSet(), tr("MEN_DELETE_OBJ"), "", 0, aParent, false,
-  //              this, SLOT(OnDeleteObject()));
+  createAction( VISU_PLOT2D, tr("MEN_CREATE_PLOT2D"), QIconSet(aPixmap),
+                tr("MEN_CREATE_PLOT2D"), "", 0, aParent, false,
+                this, SLOT(OnCreatePlot2dView()));
 
   createAction( VISU_DELETE_OBJS, tr("MEN_DELETE_OBJS"), QIconSet(),
                 tr("MEN_DELETE_OBJS"), "", 0, aParent, false,
-               this, SLOT(OnDeleteObjects()));
+                this, SLOT(OnDeleteObjects()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  //createAction( 4022, tr("MEN_RENAME_TABLE"), QIconSet(aPixmap), tr("MEN_RENAME_TABLE"), "", 0, aParent, false,
-               //this, SLOT(OnRenameTable()));
+  createAction( VISU_SHOW_TABLE, tr("MEN_SHOW_TABLE"), QIconSet(),
+                tr("MEN_SHOW_TABLE"), "", 0, aParent, false,
+                this, SLOT(OnShowTable()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_SHOW_TABLE, tr("MEN_SHOW_TABLE"), QIconSet(), tr("MEN_SHOW_TABLE"), "", 0, aParent, false,
-               this, SLOT(OnShowTable()));
+  createAction( VISU_CREATE_CURVES, tr("MEN_CREATE_CURVES"), QIconSet(),
+                tr("MEN_CREATE_CURVES"), "", 0, aParent, false,
+                this, SLOT(OnPlotData()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_CREATE_CURVES, tr("MEN_CREATE_CURVES"), QIconSet(), tr("MEN_CREATE_CURVES"), "", 0, aParent, false,
-               this, SLOT(OnPlotData()));
+  createAction( VISU_EXPORT_TABLE, tr("MEN_EXPORT_TABLE"), QIconSet(),
+                tr("MEN_EXPORT_TABLE"), "", 0, aParent, false,
+                this, SLOT(OnExportTableToFile()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_EXPORT_TABLE, tr("MEN_EXPORT_TABLE"), QIconSet(), tr("MEN_EXPORT_TABLE"), "", 0, aParent, false,
-               this, SLOT(OnExportTableToFile()));
+  createAction( VISU_IMPORT_MED_STRUCTURE, tr("MEN_IMPORT_MED_STRUCTURE"), QIconSet(),
+                tr("MEN_IMPORT_MED_STRUCTURE"), "", 0, aParent, false,
+                this, SLOT(OnImportMedField()));
 
-  createAction( VISU_IMPORT_MED, tr("MEN_IMPORT_MED"), QIconSet(),
-                tr("MEN_IMPORT_MED"), "", 0, aParent, false,
-               this, SLOT(OnImportMedField()));
+  createAction( VISU_IMPORT_MED_TIMESTAMP, tr("MEN_IMPORT_MED_TIMESTAMP"), QIconSet(),
+                tr("MEN_IMPORT_MED_TIMESTAMP"), "", 0, aParent, false,
+                this, SLOT(OnImportMedField()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_CREATE_PRS, tr("MEN_CREATE_PRS"), QIconSet(), tr("MEN_CREATE_PRS"), "", 0, aParent, false,
-               this, SLOT(OnCreateMesh()));
+  createAction( VISU_IMPORT_MED_FIELD, tr("MEN_IMPORT_MED_FIELD"), QIconSet(),
+                tr("MEN_IMPORT_MED_FIELD"), "", 0, aParent, false,
+                this, SLOT(OnImportMedField()));
+
+  createAction( VISU_CREATE_PRS, tr("MEN_CREATE_PRS"), QIconSet(),
+                tr("MEN_CREATE_PRS"), "", 0, aParent, false,
+                this, SLOT(OnCreateMesh()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
   createAction( VISU_CREATE_MANY_PRS, tr("MEN_CREATE_MANY_PRS"), QIconSet(),
                 tr("MEN_CREATE_MANY_PRS"), "", 0, aParent, false,
-               this, SLOT(OnCreateManyMesh()));
+                this, SLOT(OnCreateManyMesh()));
 
   createAction( VISU_TRANSLATE_PRS, tr("MEN_TRANSLATE_PRS"), QIconSet(),
                 tr("MEN_TRANSLATE_PRS"), "", 0, aParent, false,
-               this, SLOT(OnTranslatePrs()));
+                this, SLOT(OnTranslatePrs()));
 
   createAction( VISU_MERGE_SCALAR_BARS, tr("MEN_MERGE_SCALAR_BARS"), QIconSet(),
                 tr("MEN_MERGE_SCALAR_BARS"), "", 0, aParent, false,
-               this, SLOT(OnMergeScalarBars()));
+                this, SLOT(OnMergeScalarBars()));
 
   createAction( VISU_FREE_SCALAR_BARS, tr("MEN_FREE_SCALAR_BARS"), QIconSet(),
                 tr("MEN_FREE_SCALAR_BARS"), "", 0, aParent, false,
-               this, SLOT(OnFreeScalarBars()));
-
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_ERASE"));
-  createAction( VISU_ERASE, tr("MEN_ERASE"), QIconSet(), tr("MEN_ERASE"), "", 0, aParent, false,
-               this, SLOT(OnErasePrs()));
+                this, SLOT(OnFreeScalarBars()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_DISPLAY, tr("MEN_DISPLAY"), QIconSet(), tr("MEN_DISPLAY"), "", 0, aParent, false,
-               this, SLOT(OnDisplayPrs()));
+  createAction( VISU_ERASE, tr("MEN_ERASE"), QIconSet(),
+                tr("MEN_ERASE"), "", 0, aParent, false,
+                this, SLOT(OnErasePrs()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_DISPLAY_ONLY, tr("MEN_DISPLAY_ONLY"), QIconSet(), tr("MEN_DISPLAY_ONLY"), "", 0, aParent, false,
-               this, SLOT(OnDisplayOnlyPrs()));
+  createAction( VISU_DISPLAY, tr("MEN_DISPLAY"), QIconSet(),
+                tr("MEN_DISPLAY"), "", 0, aParent, false,
+                this, SLOT(OnDisplayPrs()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_DELETE_PRS, tr("MEN_DELETE_PRS"), QIconSet(), tr("MEN_DELETE_PRS"), "", 0, aParent, false,
-               this, SLOT(OnDeletePrs()));
+  createAction( VISU_DISPLAY_ONLY, tr("MEN_DISPLAY_ONLY"), QIconSet(),
+                tr("MEN_DISPLAY_ONLY"), "", 0, aParent, false,
+                this, SLOT(OnDisplayOnlyPrs()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_COPY_PRS, tr("MEN_COPY_PRS"), QIconSet(), tr("MEN_COPY_PRS"), "", 0, aParent, false,
-               this, SLOT(OnCopyPresentation()));
+  createAction( VISU_COPY_PRS, tr("MEN_COPY_PRS"), QIconSet(),
+                tr("MEN_COPY_PRS"), "", 0, aParent, false,
+                this, SLOT(OnCopyPresentation()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_CURVE_PROPS, tr("MEN_CURVE_PROPS"), QIconSet(), tr("MEN_CURVE_PROPS"), "", 0, aParent, false,
-               this, SLOT(OnCurveProperties()));
+  createAction( VISU_CURVE_PROPS, tr("MEN_CURVE_PROPS"), QIconSet(),
+                tr("MEN_CURVE_PROPS"), "", 0, aParent, false,
+                this, SLOT(OnCurveProperties()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
   createAction( VISU_RENAME, tr("MEN_RENAME"), QIconSet(), tr("MEN_RENAME"), "", 0, aParent, false,
-               this, SLOT(OnRename()));
+                this, SLOT(OnRename()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_EDIT_CONTAINER, tr("MEN_EDIT_CONTAINER"), QIconSet(), tr("MEN_EDIT_CONTAINER"), "", 0, aParent, false,
-               this, SLOT(OnEditContainer()));
+  createAction( VISU_EDIT_CONTAINER, tr("MEN_EDIT_CONTAINER"), QIconSet(),
+                tr("MEN_EDIT_CONTAINER"), "", 0, aParent, false,
+                this, SLOT(OnEditContainer()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  //createAction( 4043, tr("MEN_RENAME_CONTAINER"), QIconSet(aPixmap), tr("MEN_RENAME_CONTAINER"), "", 0, aParent, false,
-               //this, SLOT(OnRenameContainer()));
+  createAction( VISU_CLEAR_CONTAINER, tr("MEN_CLEAR_CONTAINER"), QIconSet(),
+                tr("MEN_CLEAR_CONTAINER"), "", 0, aParent, false,
+                this, SLOT(OnClearContainer()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_CLEAR_CONTAINER, tr("MEN_CLEAR_CONTAINER"), QIconSet(), tr("MEN_CLEAR_CONTAINER"), "", 0, aParent, false,
-               this, SLOT(OnClearContainer()));
-
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
   createAction( VISU_SAVE_VIEW_PARAMS, tr("MEN_SAVE_VIEWPARAMS"), QIconSet(),
                 tr("MEN_SAVE_VIEWPARAMS"), "", 0, aParent, false,
-               this, SLOT(OnSaveViewParams()));
+                this, SLOT(OnSaveViewParams()));
+  createAction( VISU_SAVE_VIEW_PARAMS_1, tr("MEN_SAVE_VIEWPARAMS"), QIconSet(),
+                tr("MEN_SAVE_VIEWPARAMS"), "", 0, aParent, false,
+                this, SLOT(OnSaveViewParams()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
   createAction( VISU_RESTORE_VIEW_PARAMS, tr("MEN_RESTORE_VIEWPARAMS"), QIconSet(),
                 tr("MEN_RESTORE_VIEWPARAMS"), "", 0, aParent, false,
-               this, SLOT(OnRestoreViewParams()));
+                this, SLOT(OnRestoreViewParams()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_DELETE_VIEW_PARAMS, tr("MEN_DELETE_VIEWPARAMS"), QIconSet(),
-                tr("MEN_DELETE_VIEWPARAMS"), "", 0, aParent, false,
-               this, SLOT(OnDeleteViewParams()));
+  //createAction( VISU_DELETE_VIEW_PARAMS, tr("MEN_DELETE_VIEWPARAMS"), QIconSet(),
+  //              tr("MEN_DELETE_VIEWPARAMS"), "", 0, aParent, false,
+  //              this, SLOT(OnDeleteObjects()));
 
   createAction( VISU_ARRANGE_ACTORS, tr("MEN_ARRANGE_ACTORS"), QIconSet(),
                 tr("MEN_ARRANGE_ACTORS"), "", 0, aParent, false,
-               this, SLOT(OnArrangeActors()));
+                this, SLOT(OnArrangeActors()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_POINTS"));
-  createAction( VISU_POINTS, tr("MEN_POINTS"), QIconSet(aPixmap), tr("MEN_POINTS"), "", 0, aParent, false,
-               this, SLOT(OnMakePoints()));
+  createAction( VISU_POINTS, tr("MEN_POINTS"), QIconSet(aPixmap),
+                tr("MEN_POINTS"), "", 0, aParent, false,
+                this, SLOT(OnMakePoints()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_WIREFRAME"));
-  createAction( VISU_WIREFRAME, tr("MEN_WIREFRAME"), QIconSet(aPixmap), tr("MEN_WIREFRAME"), "", 0, aParent, false,
-               this, SLOT(OnMakeWireframe()));
+  createAction( VISU_WIREFRAME, tr("MEN_WIREFRAME"), QIconSet(aPixmap),
+                tr("MEN_WIREFRAME"), "", 0, aParent, false,
+                this, SLOT(OnMakeWireframe()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_SURFACE"));
-  createAction( VISU_SURFACE, tr("MEN_SURFACE"), QIconSet(aPixmap), tr("MEN_SURFACE"), "", 0, aParent, false,
-               this, SLOT(OnMakeSurface()));
+  createAction( VISU_SURFACE, tr("MEN_SURFACE"), QIconSet(aPixmap),
+                tr("MEN_SURFACE"), "", 0, aParent, false,
+                this, SLOT(OnMakeSurface()));
+
+  createAction( VISU_INSIDEFRAME, tr("MEN_INSIDEFRAME"), QIconSet(),
+                tr("MEN_INSIDEFRAME"), "", 0, aParent, false,
+                this, SLOT(OnMakeInsideframe()));
+
+  createAction( VISU_SURFACEFRAME, tr("MEN_SURFACEFRAME"), QIconSet(),
+                tr("MEN_SURFACEFRAME"), "", 0, aParent, false,
+                this, SLOT(OnMakeSurfaceframe()));
+
+  createAction( VISU_SHRINK, tr("MEN_SHRINK"), QIconSet(),
+                tr("MEN_SHRINK"), "", 0, aParent, false,
+                this, SLOT(OnMakeShrink()));
+
+  createAction( VISU_UNSHRINK, tr("MEN_UNSHRINK"), QIconSet(),
+                tr("MEN_UNSHRINK"), "", 0, aParent, false,
+                this, SLOT(OnMakeShrink()));
+
+  createAction( VISU_CELL_COLOR, tr("MEN_CELL_COLOR"), QIconSet(),
+                tr("MEN_CELL_COLOR"), "", 0, aParent, false,
+                this, SLOT(OnChangeColor()));
+
+  createAction( VISU_COLOR, tr("MEN_COLOR"), QIconSet(),
+                tr("MEN_COLOR"), "", 0, aParent, false,
+                this, SLOT(OnChangeColor()));
+
+  createAction( VISU_EDGE_COLOR, tr("MEN_EDGE_COLOR"), QIconSet(),
+                tr("MEN_EDGE_COLOR"), "", 0, aParent, false,
+                this, SLOT(OnChangeWireframeColor()));
+
+  createAction( VISU_OPACITY, tr("MEN_OPACITY"), QIconSet(),
+                tr("MEN_OPACITY"), "", 0, aParent, false,
+                this, SLOT(OnChangeOpacity()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_INSIDEFRAME, tr("MEN_INSIDEFRAME"), QIconSet(), tr("MEN_INSIDEFRAME"), "", 0, aParent, false,
-               this, SLOT(OnMakeInsideframe()));
+  createAction( VISU_LINE_WIDTH, tr("MEN_LINE_WIDTH"), QIconSet(),
+                tr("MEN_LINE_WIDTH"), "", 0, aParent, false,
+                this, SLOT(OnChangeLines()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_SURFACEFRAME, tr("MEN_SURFACEFRAME"), QIconSet(), tr("MEN_SURFACEFRAME"), "", 0, aParent, false,
-               this, SLOT(OnMakeSurfaceframe()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_SHRINK, tr("MEN_SHRINK"), QIconSet(), tr("MEN_SHRINK"), "", 0, aParent, false,
-               this, SLOT(OnMakeShrink()));
+  createAction( VISU_EDIT_SCALARMAP, tr("MEN_EDIT_PRS"), QIconSet(),
+                tr("MEN_EDIT_PRS"), "", 0, aParent, false,
+                this, SLOT(OnEditScalarMap()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_UNSHRINK, tr("MEN_UNSHRINK"), QIconSet(), tr("MEN_UNSHRINK"), "", 0, aParent, false,
-               this, SLOT(OnMakeShrink()));
+  createAction( VISU_EDIT_DEFORMEDSHAPE, tr("MEN_EDIT_PRS"), QIconSet(),
+                tr("MEN_EDIT_PRS"), "", 0, aParent, false,
+                this, SLOT(OnEditDeformedShape()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_CELL_COLOR, tr("MEN_CELL_COLOR"), QIconSet(), tr("MEN_CELL_COLOR"), "", 0, aParent, false,
-               this, SLOT(OnChangeColor()));
+  createAction( VISU_EDIT_CUTPLANES, tr("MEN_EDIT_PRS"), QIconSet(),
+                tr("MEN_EDIT_PRS"), "", 0, aParent, false,
+                this, SLOT(OnEditCutPlanes()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_COLOR, tr("MEN_COLOR"), QIconSet(), tr("MEN_COLOR"), "", 0, aParent, false,
-               this, SLOT(OnChangeColor()));
+  createAction( VISU_EDIT_CUTLINES, tr("MEN_EDIT_PRS"), QIconSet(),
+                tr("MEN_EDIT_PRS"), "", 0, aParent, false,
+                this, SLOT(OnEditCutLines()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_EDGE_COLOR, tr("MEN_EDGE_COLOR"), QIconSet(), tr("MEN_EDGE_COLOR"), "", 0, aParent, false,
-               this, SLOT(OnChangeWireframeColor()));
+  createAction( VISU_EDIT_ISOSURFACE, tr("MEN_EDIT_PRS"), QIconSet(),
+                tr("MEN_EDIT_PRS"), "", 0, aParent, false,
+                this, SLOT(OnEditIsoSurfaces()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_OPACITY, tr("MEN_OPACITY"), QIconSet(), tr("MEN_OPACITY"), "", 0, aParent, false,
-               this, SLOT(OnChangeOpacity()));
+  createAction( VISU_EDIT_VECTORS, tr("MEN_EDIT_PRS"), QIconSet(),
+                tr("MEN_EDIT_PRS"), "", 0, aParent, false,
+                this, SLOT(OnEditVectors()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_LINE_WIDTH, tr("MEN_LINE_WIDTH"), QIconSet(), tr("MEN_LINE_WIDTH"), "", 0, aParent, false,
-               this, SLOT(OnChangeLines()));
+  createAction( VISU_EDIT_STREAMLINES, tr("MEN_EDIT_PRS"), QIconSet(),
+                tr("MEN_EDIT_PRS"), "", 0, aParent, false,
+                this, SLOT(OnEditStreamLines()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_EDIT_PRS, tr("MEN_EDIT_PRS"), QIconSet(), tr("MEN_EDIT_PRS"), "", 0, aParent, false,
-               this, SLOT(OnEditPrs()));
+  createAction( VISU_EDIT_PLOT3D, tr("MEN_EDIT_PRS"), QIconSet(),
+                tr("MEN_EDIT_PRS"), "", 0, aParent, false,
+                this, SLOT(OnEditPlot3D()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_CREATE_TABLE, tr("MEN_CREATE_TABLE"), QIconSet(), tr("MEN_CREATE_TABLE"), "", 0, aParent, false,
-               this, SLOT(OnCreateTable()));
+
+  createAction( VISU_CREATE_TABLE, tr("MEN_CREATE_TABLE"), QIconSet(),
+                tr("MEN_CREATE_TABLE"), "", 0, aParent, false,
+                this, SLOT(OnCreateTable()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_SWEEP"));
-  createAction( VISU_SWEEP, tr("MEN_SWEEP"), QIconSet(aPixmap), tr("MEN_SWEEP"), "", 0, aParent, false,
-               this, SLOT(OnSweep()));
+  createAction( VISU_SWEEP, tr("MEN_SWEEP"), QIconSet(aPixmap),
+                tr("MEN_SWEEP"), "", 0, aParent, false,
+                this, SLOT(OnSweep()));
 
   createAction( VISU_CLIPPING, tr("MEN_CLIPPING"), QIconSet(),
                 tr("MEN_CLIPPING"), "", 0, aParent, false,
-               this, SLOT(OnClippingPlanes()));
+                this, SLOT(OnClippingPlanes()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
   createAction( VISU_SELECTION_INFO, tr("MEN_SELECTION_INFO"), QIconSet(),
                 tr("MEN_SELECTION_INFO"), "", 0, aParent, false,
-               this, SLOT(OnSelectionInfo()));
+                this, SLOT(OnSelectionInfo()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_TIMEANIMATION"));
-  createAction( VISU_ANIMATION, tr("MEN_ANIMATION"), QIconSet(aPixmap), tr("MEN_ANIMATION"), "", 0, aParent, false,
-               this, SLOT(OnTimeAnimation()));
+  createAction( VISU_ANIMATION, tr("MEN_ANIMATION"), QIconSet(aPixmap),
+                tr("MEN_ANIMATION"), "", 0, aParent, false,
+                this, SLOT(OnTimeAnimation()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_ERASE_ALL"));
   createAction( VISU_ERASE_ALL, tr("MEN_ERASE_ALL"), QIconSet(aPixmap),
                 tr("MEN_ERASE_ALL"), "", 0, aParent, false,
-               this, SLOT(OnEraseAll()));
+                this, SLOT(OnEraseAll()));
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_GLOBAL_SELECTION"));
   createAction( VISU_GLOBAL_SELECTION, tr("MEN_GLOBAL_SELECTION"), QIconSet(aPixmap),
                 tr("MEN_GLOBAL_SELECTION"), "", 0, aParent, false,
-               //this, SLOT(OnEraseAll()));
-               this);
+                //this, SLOT(OnEraseAll()));
+                this);
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_PARTIAL_SELECTION"));
   createAction( VISU_PARTIAL_SELECTION, tr("MEN_PARTIAL_SELECTION"), QIconSet(aPixmap),
                 tr("MEN_PARTIAL_SELECTION"), "", 0, aParent, false,
-               //this, SLOT(OnEraseAll()));
-               this);
+                //this, SLOT(OnEraseAll()));
+                this);
 
   aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_SCALING"));
   createAction( VISU_SCALING, tr("MEN_SCALING"), QIconSet(aPixmap),
                 tr("MEN_SCALING"), "", 0, aParent, false,
-               this, SLOT(OnScaling()));
+                this, SLOT(OnScaling()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_CUBE_AXES"));
-  createAction( VISU_CUBE_AXES, tr("MEN_CUBE_AXES"), QIconSet(/*aPixmap*/),
+  aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_CUBE_AXES"));
+  createAction( VISU_CUBE_AXES, tr("MEN_CUBE_AXES"), QIconSet(aPixmap),
                 tr("MEN_CUBE_AXES"), "", 0, aParent, false,
-               this, SLOT(OnCubeAxes()));
+                this, SLOT(OnCubeAxes()));
 
   createAction( VISU_SHOW_ANIMATION, tr("MEN_SHOW_ANIMATION"), QIconSet(),
                 tr("MEN_SHOW_ANIMATION"), "", 0, aParent, false,
-               this, SLOT(OnShowAnimation()));
+                this, SLOT(OnShowAnimation()));
 }
 
 void
@@ -2315,7 +2249,7 @@ createMenus()
 {
   // Add actions to menus
   int aMenuId;
-  aMenuId = createMenu( tr( "MEN_FILE" ), -1 );
+  aMenuId = createMenu( tr( "MEN_DESK_FILE" ), -1 );
   createMenu( separator(), aMenuId, -1, 10 );
   createMenu( VISU_IMPORT_FROM_FILE, aMenuId, 10 ); // import from file
   createMenu( VISU_EXPLORE_MED, aMenuId, 10 ); // explore MED file
@@ -2360,6 +2294,16 @@ createToolBars()
   createTool( VISU_CUT_LINES, aToolId );
   createTool( VISU_STREAM_LINES, aToolId );
   createTool( VISU_PLOT_3D, aToolId );
+
+  aToolId = createTool(tr("TOOL_REPRESENTATION"));
+  createTool( VISU_POINTS, aToolId );
+  createTool( VISU_WIREFRAME, aToolId );
+  createTool( VISU_SURFACE, aToolId );
+  createTool( VISU_ERASE_ALL, aToolId );
+  createTool( VISU_GLOBAL_SELECTION, aToolId );
+  createTool( VISU_PARTIAL_SELECTION, aToolId );
+  createTool( VISU_SCALING, aToolId );
+  createTool( VISU_CUBE_AXES, aToolId );
 }
 
 void
@@ -2374,7 +2318,7 @@ createPopupMenus()
   mgr->insert( action( VISU_IMPORT_TABLE ), -1, -1, -1 ); // import tables from file
   mgr->insert( action( VISU_PLOT2D ), -1, -1, -1 ); // create Plot2d View
 
-  mgr->insert( action( VISU_IMPORT_MED ), -1, -1, -1 ); // import MED structure from MED module
+  //mgr->insert( action( VISU_IMPORT_MED ), -1, -1, -1 ); // import MED structure from MED module
 
   // create
   mgr->insert( action( VISU_SCALAR_MAP ), -1, -1, -1 ); // scalar bar
@@ -2392,7 +2336,14 @@ createPopupMenus()
   mgr->insert( action( VISU_CREATE_TABLE ), -1, -1, -1 ); // create table
 
   // edit
-  mgr->insert( action( VISU_EDIT_PRS ), -1, -1, -1 );
+  mgr->insert( action( VISU_EDIT_SCALARMAP ), -1, -1, -1 );
+  mgr->insert( action( VISU_EDIT_DEFORMEDSHAPE ), -1, -1, -1 );
+  mgr->insert( action( VISU_EDIT_CUTPLANES ), -1, -1, -1 );
+  mgr->insert( action( VISU_EDIT_CUTLINES ), -1, -1, -1 );
+  mgr->insert( action( VISU_EDIT_ISOSURFACE ), -1, -1, -1 );
+  mgr->insert( action( VISU_EDIT_VECTORS ), -1, -1, -1 );
+  mgr->insert( action( VISU_EDIT_STREAMLINES ), -1, -1, -1 );
+  mgr->insert( action( VISU_EDIT_PLOT3D ), -1, -1, -1 );
   mgr->insert( action( VISU_EDIT_CONTAINER ), -1, -1, -1 );
 
   // rename
@@ -2402,15 +2353,12 @@ createPopupMenus()
   mgr->insert( action( VISU_COPY_PRS ), -1, -1, -1 );
 
   // delete
-  mgr->insert( action( VISU_DELETE_OBJS ), -1, -1, -1 );
-  //mgr->insert( action( VISU_DELETE ), -1, -1, -1 ); // TODO: remove
-  //mgr->insert( action( VISU_DELETE_PRS ), -1, -1, -1 ); // TODO: remove
   mgr->insert( action( VISU_CLEAR_CONTAINER ), -1, -1, -1 );
 
   // table commands
-  mgr->insert( action( VISU_SHOW_TABLE ), -1, -1, -1 ); // show table
-  mgr->insert( action( VISU_CREATE_CURVES ), -1, -1, -1 ); // create curves
-  mgr->insert( action( VISU_EXPORT_TABLE ), -1, -1, -1 ); // export table
+  //mgr->insert( action( VISU_SHOW_TABLE ), -1, -1, -1 ); // show table
+  //mgr->insert( action( VISU_CREATE_CURVES ), -1, -1, -1 ); // create curves
+  //mgr->insert( action( VISU_EXPORT_TABLE ), -1, -1, -1 ); // export table
 
   mgr->insert( separator(), -1, -1, -1 );
 
@@ -2447,14 +2395,14 @@ createPopupMenus()
 
   mgr->insert( action( VISU_SWEEP ), -1, -1, -1 );
   mgr->insert( action( VISU_ANIMATION ), -1, -1, -1 );
-  mgr->insert( action( VISU_SHOW_ANIMATION ), -1, -1, -1 );
 
   mgr->insert( separator(), -1, -1, -1 );
 
   // view parameters commands
   mgr->insert( action( VISU_SAVE_VIEW_PARAMS ), -1, -1, -1 ); // save view params
+  mgr->insert( action( VISU_SAVE_VIEW_PARAMS_1 ), -1, -1, -1 ); // save view params
   mgr->insert( action( VISU_RESTORE_VIEW_PARAMS ), -1, -1, -1 ); // restore view params
-  mgr->insert( action( VISU_DELETE_VIEW_PARAMS ), -1, -1, -1 ); // delete view params
+  //mgr->insert( action( VISU_DELETE_VIEW_PARAMS ), -1, -1, -1 ); // delete view params
 
   mgr->insert( action( VISU_ARRANGE_ACTORS ), -1, -1, -1 ); // arrange actors
 
@@ -2464,69 +2412,62 @@ createPopupMenus()
 
   // Rules
 
-  QString aSel_One_ObjBr  ("client='ObjectBrowser' and selcount=1");
-  QString aSel_Some_ObjBr ("client='ObjectBrowser' and selcount>0");
-  QString aSel_Many_ObjBr ("client='ObjectBrowser' and selcount>1");
-
   QString aPrsAll ("'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' "
                    "'VISU::TCUTLINES' 'VISU::TVECTORS' 'VISU::TSTREAMLINES' 'VISU::TPLOT3D'");
 
-  QString aCurveAll = "'VISU::TTABLE' 'VISU::TCURVE' 'VISU::TCONTAINER'";
-
   // VISU root commands
-  QString aRule = aSel_One_ObjBr + " and type='VISU::TVISUGEN'";
+  QString aRule = "client='ObjectBrowser' and selcount=1 and type='VISU::TVISUGEN'";
   mgr->setRule( action( VISU_IMPORT_FROM_FILE ), aRule, true );
   mgr->setRule( action( VISU_IMPORT_TABLE ), aRule, true );
   mgr->setRule( action( VISU_PLOT2D ), aRule, true );
 
-  //aRule = aSel_One_ObjBr + " and $type in {'VISU::TRESULT' 'VISU::TTABLE' 'VISU::TCONTAINER'}";
-  //mgr->setRule( action( VISU_DELETE ), aRule, true );
-
-  QString aDeletable ("$type in {'VISU::TTABLE' 'VISU::TCURVE' 'VISU::TCONTAINER' ");
-  aDeletable += aPrsAll + " 'VISU::TRESULT' 'VISU::TMESH'}";
-  mgr->setRule( action( VISU_DELETE_OBJS ), aSel_Some_ObjBr + " and " + aDeletable, true );
-
   // timestamp commands
-  aRule = aSel_One_ObjBr + " and type='VISU::TTIMESTAMP'";
+  aRule = "client='ObjectBrowser' and selcount=1 and type='VISU::TTIMESTAMP'";
   mgr->setRule( action( VISU_SCALAR_MAP ), aRule, true );
   mgr->setRule( action( VISU_ISO_SURFACES ), aRule, true );
   mgr->setRule( action( VISU_CUT_PLANES ), aRule, true );
   mgr->setRule( action( VISU_CUT_LINES ), aRule, true );
+  mgr->setRule( action( VISU_PLOT_3D ), aRule, true );
   aRule += " and nbComponents>1";
   mgr->setRule( action( VISU_DEFORMED_SHAPE ), aRule, true );
   mgr->setRule( action( VISU_VECTORS ), aRule, true );
   mgr->setRule( action( VISU_STREAM_LINES ), aRule, true );
-  mgr->setRule( action( VISU_PLOT_3D ), aRule, true );
 
-  // table commands
-  aRule = aSel_One_ObjBr + " and type='VISU::TTABLE'";
-  mgr->setRule( action( VISU_SHOW_TABLE ), aRule, true );
-  mgr->setRule( action( VISU_CREATE_CURVES ), aRule, true );
-  mgr->setRule( action( VISU_EXPORT_TABLE ), aRule, true );
+  // display/erase commands
+  QString andInvisible = " and (((not isVisible) and isActiveView) or (not isActiveView))";
+  QString aTableOrCont = "(type='VISU::TTABLE' and nbChildren>0) or type='VISU::TCONTAINER'";
+  QString orCurveVisible   = "or (type='VISU::TCURVE' and isVisible)";
+  QString orCurveInvisible = "or (type='VISU::TCURVE'" + andInvisible + ")";
+  QString aPrsVisible   = "(($type in {'VISU::TMESH' " + aPrsAll + "}) and isVisible)";
+  QString aPrsInvisible = "(($type in {'VISU::TMESH' " + aPrsAll + "})" + andInvisible + ")";
 
-  aRule = "(" + aSel_Some_ObjBr + " and ((type='VISU::TTABLE' and nbChildren>0) or"
-          " ($type in {'VISU::TCURVE' 'VISU::TCONTAINER'}))"
-          ") or (selcount>0 and $type in {'VISU::TMESH' " + aPrsAll + "})";
+  QString anEraseRule = "selcount>0 and (" + aPrsVisible +
+    " or (client='ObjectBrowser' and (" + aTableOrCont + orCurveVisible + ")))";
 
-  mgr->setRule( action( VISU_ERASE ), aRule + "and (isVisible=true)", true );// TODO: aRule.arg(" and isVisible=1"), true );
-  mgr->setRule( action( VISU_DISPLAY ), aRule + "and (isVisible=false)", true );// TODO: aRule.arg(" and isVisible=0"), true );
-  mgr->setRule( action( VISU_DISPLAY_ONLY ), aRule, true );
+  QString aDisplayRule = "selcount>0 and (" + aPrsInvisible +
+    " or (client='ObjectBrowser' and (" + aTableOrCont + orCurveInvisible + ")))";
 
+  QString aDOnlyRule = "selcount>0 and (($type in {'VISU::TMESH' " + aPrsAll + "})"
+    " or (client='ObjectBrowser' and ((type='VISU::TTABLE' and nbChildren>0) or"
+    " ($type in {'VISU::TCURVE' 'VISU::TCONTAINER'}))))";
+
+  mgr->setRule( action( VISU_ERASE ), anEraseRule, true );
+  mgr->setRule( action( VISU_DISPLAY ), aDisplayRule, true );
+  mgr->setRule( action( VISU_DISPLAY_ONLY ), aDOnlyRule, true );
+
+  aRule = "selcount>0 and $type in {'VISU::TMESH' " + aPrsAll + "}";
   mgr->setRule( action( VISU_TRANSLATE_PRS ), aRule, true );
 
+  aRule = "selcount>1 and $type in {'VISU::TMESH' " + aPrsAll + "}";
   mgr->setRule( action( VISU_MERGE_SCALAR_BARS ), aRule, true );
   mgr->setRule( action( VISU_FREE_SCALAR_BARS ), aRule, true );
 
-  //aRule = "selcount=1 and $type in {'VISU::TTABLE' 'VISU::TCURVE' "
-  //        "'VISU::TCONTAINER' 'VISU::TMESH' " + aPrsAll + "}";
-  //mgr->setRule( action( VISU_DELETE_PRS ), aRule, true );
-
-  // View parameters
-  //jfa tmp:aRule = "(client='VTKViewer' and selcount=0) or (selcount=1 and type='VISU::TVIEW3D')";
-  //jfa tmp:mgr->setRule( action( VISU_SAVE_VIEW_PARAMS ), aRule, true );
-  mgr->setRule( action( VISU_SAVE_VIEW_PARAMS ), "client='VTKViewer' and selcount=0", true ); //jfa tmp
+  // view parameters
+  aRule = "selcount=1 and type='VISU::TVIEW3D'";
+  mgr->setRule( action( VISU_SAVE_VIEW_PARAMS_1 ), aRule, true );
+  mgr->setRule( action( VISU_SAVE_VIEW_PARAMS ), "client='VTKViewer' and selcount=0", true );
   mgr->setRule( action( VISU_RESTORE_VIEW_PARAMS ), "selcount=1 and type='VISU::TVIEW3D'", true );
-  mgr->setRule( action( VISU_DELETE_VIEW_PARAMS ), "selcount=1 and type='VISU::TVIEW3D'", true );
+  //mgr->setRule( action( VISU_DELETE_VIEW_PARAMS ), "selcount=1 and type='VISU::TVIEW3D'", true );
 
   mgr->setRule( action( VISU_ARRANGE_ACTORS ), "client='VTKViewer' and selcount=0", true );
 
@@ -2562,13 +2503,15 @@ createPopupMenus()
   mgr->setRule( action( VISU_CELL_COLOR ), aRule + " and type='VISU::TMESH' and representation='VISU::SURFACEFRAME'", true );
   mgr->setRule( action( VISU_EDGE_COLOR ), aRule + " and type='VISU::TMESH' and representation='VISU::SURFACEFRAME'", true );
   mgr->setRule( action( VISU_COLOR ), aRule + " and ((type='VISU::TMESH'"
-              " and $representation in {'VISU::POINT' 'VISU::WIREFRAME' 'VISU::SHADED' 'VISU::INSIDEFRAME'}) "
+               " and $representation in {'VISU::POINT' 'VISU::WIREFRAME' 'VISU::SHADED' 'VISU::INSIDEFRAME'}) "
                "or (type='VISU::TDEFORMEDSHAPE' and hasActor=1))", true );
   mgr->setRule( action( VISU_OPACITY ), aRule + aShrinkType + " and hasActor=1", true );
   mgr->setRule( action( VISU_LINE_WIDTH ), aRule + aLineType + " and hasActor=1", true );
 
   // rename command
-  aRule = "selcount=1 and ($type in {'VISU::TVIEW3D' " + aCurveAll + " " + aPrsAll + "})";
+  QString aCurveAll = "'VISU::TTABLE' 'VISU::TCURVE' 'VISU::TCONTAINER'";
+
+  aRule = "selcount=1 and ($type in {'VISU::TVIEW3D' 'VISU::TMESH' " + aCurveAll + " " + aPrsAll + "})";
   mgr->setRule( action( VISU_RENAME ), aRule, true );
 
   // copy presentation command
@@ -2580,21 +2523,35 @@ createPopupMenus()
   mgr->setRule( action( VISU_CURVE_PROPS ), aRule, true );
 
   // curve container commands
-  aRule = aSel_One_ObjBr + " and type='VISU::TCONTAINER'";
+  aRule = "client='ObjectBrowser' and selcount=1 and type='VISU::TCONTAINER'";
   mgr->setRule( action( VISU_EDIT_CONTAINER ), aRule, true );
   mgr->setRule( action( VISU_CLEAR_CONTAINER ), aRule, true );
 
-  aRule = "selcount=1 and $type in {" + aPrsAll + "}";
-  mgr->setRule( action( VISU_EDIT_PRS ), aRule, true );
+  mgr->setRule( action( VISU_EDIT_SCALARMAP ),
+               "selcount=1 and type='VISU::TSCALARMAP'", true );
+  mgr->setRule( action( VISU_EDIT_DEFORMEDSHAPE ),
+               "selcount=1 and type='VISU::TDEFORMEDSHAPE'", true );
+  mgr->setRule( action( VISU_EDIT_CUTPLANES ),
+               "selcount=1 and type='VISU::TCUTPLANES'", true );
+  mgr->setRule( action( VISU_EDIT_CUTLINES ),
+               "selcount=1 and type='VISU::TCUTLINES'", true );
+  mgr->setRule( action( VISU_EDIT_ISOSURFACE ),
+               "selcount=1 and type='VISU::TISOSURFACE'", true );
+  mgr->setRule( action( VISU_EDIT_VECTORS ),
+               "selcount=1 and type='VISU::TVECTORS'", true );
+  mgr->setRule( action( VISU_EDIT_STREAMLINES ),
+               "selcount=1 and type='VISU::TSTREAMLINES'", true );
+  mgr->setRule( action( VISU_EDIT_PLOT3D ),
+               "selcount=1 and type='VISU::TPLOT3D'", true );
 
   aRule = "selcount=1 and type='VISU::TCUTLINES' and nbNamedChildren=0";
   mgr->setRule( action( VISU_CREATE_TABLE ), aRule, true );
 
-  aRule = "selcount=1 and type='VISU::TSCALARMAP'";
+  aRule = "selcount=1 and ($type in {" + aPrsAll + "})";
   mgr->setRule( action( VISU_SWEEP ), aRule, true );
 
-  // Selection info popup item
-  aRule = "client='ObjectBrowser' and selcount=1" + aInsideType;
+  // "Selection info" popup item
+  aRule = "client='VTKViewer' and selcount=1" + aInsideType;
   mgr->setRule( action( VISU_SELECTION_INFO ), aRule, true );
 
   aRule = "client='ObjectBrowser' and selcount>0 and $type in {'VISU::TFIELD'} and nbTimeStamps>1";
@@ -2604,11 +2561,8 @@ createPopupMenus()
   mgr->setRule( action( VISU_CREATE_PRS ), aRule + " and selcount=1", true );
   mgr->setRule( action( VISU_CREATE_MANY_PRS ), aRule + " and selcount>1", true );
 
-  aRule = "client='ObjectBrowser' and type='MEDFIELD'";
-  mgr->setRule( action( VISU_IMPORT_MED ), aRule, true );
-
-  aRule = "client='ObjectBrowser' and selcount=1 and type='VISU::TANIMATION'";
-  mgr->setRule( action( VISU_SHOW_ANIMATION ), aRule, true );
+  //aRule = "client='ObjectBrowser' and type='MEDFIELD'";
+  //mgr->setRule( action( VISU_IMPORT_MED ), aRule, true );
 }
 
 //***************************************************************************
@@ -2616,41 +2570,106 @@ void VisuGUI::contextMenuPopup( const QString& theClient, QPopupMenu* theMenu, Q
 {
   SalomeApp_Module::contextMenuPopup(theClient, theMenu, theTitle);
 
-  // Check multiple selection
-  if (IsRemovableSelected(this)) {
-    action( VISU_DELETE_OBJS )->addTo(theMenu);
-  }
+  OB_Browser* ob = getApp()->objectBrowser();
+  bool isOBClient = (ob && theClient == ob->popupClientType());
 
-  // Check single selection
   SalomeApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this);
   SALOME_ListIO aListIO;
   aSelectionMgr->selectedObjects(aListIO);
+
+  if (aListIO.Extent() < 1) return;
+
+  _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this));
+
+  // Check if "Merge Scalar Range" can be applied
+  int nbPrs = 0;
+  SALOME_ListIteratorOfListIO It (aListIO);
+  for (; It.More(); It.Next()) {
+    Handle(SALOME_InteractiveObject)& anIO = It.Value();
+
+    if (!anIO.IsNull() && anIO->hasEntry()) {
+      _PTR(SObject) aSObject = aCStudy->FindObjectID(anIO->getEntry());
+      CORBA::Object_var aCORBAObject = VISU::ClientSObjectToObject(aSObject);
+      if (CORBA::is_nil(aCORBAObject)) {
+        _PTR(GenericAttribute) anAttr;
+        if (aSObject->FindAttribute(anAttr, "AttributeComment")) {
+          _PTR(AttributeComment) aComment (anAttr);
+          string aComm = aComment->Value();
+          QString strIn (aComm.c_str());
+          VISU::Storable::TRestoringMap pMap;
+          VISU::Storable::StrToMap(strIn, pMap);
+          bool isExist;
+          VISU::VISUType aType = (VISU::VISUType)VISU::Storable::FindValue(pMap,"myType",&isExist).toInt();
+          if (isExist && aType == VISU::TTIMESTAMP) {
+            _PTR(ChildIterator) anIter = aCStudy->NewChildIterator(aSObject);
+            _PTR(SObject) aPrs;
+            for (; anIter->More(); anIter->Next()) {
+              aPrs = anIter->Value();
+              if (!aPrs) continue;
+              std::vector<VISU::Prs3d_i*> aSubList = GetPrs3dList(this, aPrs);
+              nbPrs += aSubList.size();
+            }
+          }
+        }
+      }
+    }
+  }
+
+  if (nbPrs > 1) {
+    theMenu->insertSeparator();
+    action( VISU_MERGE_SCALAR_BARS )->addTo(theMenu);
+    action( VISU_FREE_SCALAR_BARS  )->addTo(theMenu);
+  }
+
+  theMenu->insertSeparator();
+
+  // Check if some (nb > 0) removable objects selected
+  if (isOBClient && IsRemovableSelected(this)) {
+    action( VISU_DELETE_OBJS )->addTo(theMenu);
+  }
+
+  // Check single selection
   if (aListIO.Extent() != 1) return;
 
   Handle(SALOME_InteractiveObject) anIO;
-  CORBA::Object_var anObject = GetSelectedObj( this, &anIO );
-  _PTR(SObject) SO = GetCStudy( GetAppStudy( this ) )->FindObjectID( anIO->getEntry() );
-  if (IsSObjectTable(SO)) {
-    action( VISU_SHOW_TABLE )->addTo(theMenu);
-    action( VISU_CREATE_CURVES )->addTo(theMenu);
-    action( VISU_EXPORT_TABLE )->addTo(theMenu);
-    theMenu->insertSeparator();
-    //action( VISU_DELETE )->addTo(theMenu);
-  } else {
-    if (!CORBA::is_nil(anObject)) {
-      SALOME_MED::MED_var aMED = SALOME_MED::MED::_narrow(anObject);
-      if (!CORBA::is_nil(aMED.in())) {
-        action( VISU_IMPORT_MED )->addTo(theMenu);
+  VISU::Storable::TRestoringMap aMap;
+  CORBA::Object_var anObject = GetSelectedObj( this, &anIO, &aMap);
+
+  _PTR(SObject) SO = aCStudy->FindObjectID(anIO->getEntry());
+  bool isExist;
+  VISU::VISUType aType = (VISU::VISUType)VISU::Storable::FindValue(aMap,"myType",&isExist).toInt();
+
+  if (aType == VISU::TANIMATION) {
+    action( VISU_SHOW_ANIMATION )->addTo(theMenu);
+
+  } else if (isOBClient) {
+    if (IsSObjectTable(SO)) {
+      action( VISU_SHOW_TABLE )->addTo(theMenu);
+      action( VISU_CREATE_CURVES )->addTo(theMenu);
+      action( VISU_EXPORT_TABLE )->addTo(theMenu);
+      theMenu->insertSeparator();
+    } else {
+      if (!CORBA::is_nil(anObject)) {
+        SALOME_MED::MED_var aMED = SALOME_MED::MED::_narrow(anObject);
+        if (!CORBA::is_nil(aMED.in())) {
+          action( VISU_IMPORT_MED_STRUCTURE )->addTo(theMenu);
+        }
+
+        SALOME_MED::FIELD_var aField = SALOME_MED::FIELD::_narrow(anObject); // "Import Structure"
+        if (!CORBA::is_nil(aField)) {
+          action( VISU_IMPORT_MED_TIMESTAMP )->addTo(theMenu); // "Import TimeStamp"
+        }
       } else {
-       _PTR(SObject) aSFather = SO->GetFather();
+        _PTR(SObject) aSFather = SO->GetFather();
         if (aSFather) {
-         _PTR(GenericAttribute) anAttr;
+          _PTR(GenericAttribute) anAttr;
           aSFather->FindAttribute(anAttr, "AttributeName");
           if (anAttr) {
             _PTR(AttributeName) aName (anAttr);
             std::string aValue = aName->Value();
-            if (strcmp(aValue.c_str(), "MEDFIELD") == 0)
-              action( VISU_IMPORT_MED )->addTo(theMenu);
+            if (strcmp(aValue.c_str(), "MEDFIELD") == 0) {
+              action( VISU_IMPORT_MED_FIELD )->addTo(theMenu); // "Import Field"
+            }
           }
         }
       }
@@ -2724,7 +2743,7 @@ void VisuGUI::studyActivated()
   GetVisuGen(this)->SetCurrentStudy(GetDSStudy(GetCStudy(GetAppStudy(this))));
 }
 
-
+/*
 extern "C" {
   CAM_Module*
   createModule()
@@ -2732,3 +2751,154 @@ extern "C" {
     return new VisuGUI();
   }
 }
+*/
+void VisuGUI::createPreferences()
+{
+  int sbarTab = addPreference( tr( "VISU_SCALAR_BAR" ) );
+
+  int fontGr = addPreference( tr( "VISU_FONT" ), sbarTab );
+  int tfont = addPreference( tr( "VISU_TITLE" ), fontGr, SalomeApp_Preferences::Font, "VISU", "scalar_bar_title_font" );
+  addPreference( tr( "VISU_TITLE" ), fontGr, SalomeApp_Preferences::Color, "VISU", "scalar_bar_title_color" );
+  int lfont = addPreference( tr( "VISU_LABELS" ), fontGr, SalomeApp_Preferences::Font, "VISU", "scalar_bar_label_font" );
+  addPreference( tr( "VISU_LABELS" ), fontGr, SalomeApp_Preferences::Color, "VISU", "scalar_bar_label_color" );
+
+  QStringList fam;
+  fam.append( tr( "VISU_FONT_ARIAL" ) );
+  fam.append( tr( "VISU_FONT_COURIER" ) );
+  fam.append( tr( "VISU_FONT_TIMES" ) );
+  int wflag = ( QtxListResourceEdit::FontItem::All & ( ~( QtxListResourceEdit::FontItem::Size | QtxListResourceEdit::FontItem::UserSize ) ) );
+
+  setPreferenceProperty( tfont, "families", fam );
+  setPreferenceProperty( tfont, "system", false );
+  setPreferenceProperty( tfont, "widget_flags", wflag );
+  setPreferenceProperty( lfont, "families", fam );
+  setPreferenceProperty( lfont, "system", false );
+  setPreferenceProperty( lfont, "widget_flags", wflag );
+
+  int colorsLabelsGr = addPreference( tr( "VISU_COLORS_AND_LABELS" ), sbarTab );
+
+  int numcol = addPreference( tr( "VISU_NB_COLORS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "VISU", "scalar_bar_num_colors" );
+  setPreferenceProperty( numcol, "min", 2 );
+  setPreferenceProperty( numcol, "max", 64 );
+
+  int numlab = addPreference( tr( "VISU_NB_LABELS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "VISU", "scalar_bar_num_labels" );
+  setPreferenceProperty( numlab, "min", 2 );
+  setPreferenceProperty( numlab, "max", 65 );
+
+  int orientGr = addPreference( tr( "VISU_ORIENTATION" ), sbarTab );
+  int orient = addPreference( tr( "VISU_ORIENTATION" ), orientGr, SalomeApp_Preferences::Selector, "VISU", "scalar_bar_orientation" );
+  QStringList orients;
+  orients.append( tr( "VISU_VERTICAL" ) );
+  orients.append( tr( "VISU_HORIZONTAL" ) );
+  QValueList<QVariant> indices;
+  indices.append( 0 );
+  indices.append( 1 );
+  setPreferenceProperty( orient, "strings", orients );
+  setPreferenceProperty( orient, "indexes", indices );
+
+  int posVSizeGr = addPreference( tr( "VISU_ORIGIN_AND_SIZE" ) + " " + tr( "VISU_VERTICAL" ), sbarTab );
+  int xv = addPreference( tr( "VISU_X" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_x" );
+  int yv = addPreference( tr( "VISU_Y" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_y" );
+  int wv = addPreference( tr( "VISU_WIDTH" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_width" );
+  int hv = addPreference( tr( "VISU_HEIGHT" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_vertical_height" );
+  setPreferenceProperty( xv, "step", 0.1 );
+  setPreferenceProperty( yv, "step", 0.1 );
+  setPreferenceProperty( wv, "step", 0.1 );
+  setPreferenceProperty( hv, "step", 0.1 );
+  setPreferenceProperty( xv, "min", 0.0 );
+  setPreferenceProperty( yv, "min", 0.0 );
+  setPreferenceProperty( wv, "min", 0.0 );
+  setPreferenceProperty( hv, "min", 0.0 );
+  setPreferenceProperty( xv, "max", 1.0 );
+  setPreferenceProperty( yv, "max", 1.0 );
+  setPreferenceProperty( wv, "max", 1.0 );
+  setPreferenceProperty( hv, "max", 1.0 );
+
+  int posHSizeGr = addPreference( tr( "VISU_ORIGIN_AND_SIZE" ) + " " + tr( "VISU_HORIZONTAL" ), sbarTab );
+  int xh = addPreference( tr( "VISU_X" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_x" );
+  int yh = addPreference( tr( "VISU_Y" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_y" );
+  int wh = addPreference( tr( "VISU_WIDTH" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_width" );
+  int hh = addPreference( tr( "VISU_HEIGHT" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_bar_horizontal_height" );
+  setPreferenceProperty( xh, "step", 0.1 );
+  setPreferenceProperty( yh, "step", 0.1 );
+  setPreferenceProperty( wh, "step", 0.1 );
+  setPreferenceProperty( hh, "step", 0.1 );
+  setPreferenceProperty( xh, "min", 0.0 );
+  setPreferenceProperty( yh, "min", 0.0 );
+  setPreferenceProperty( wh, "min", 0.0 );
+  setPreferenceProperty( hh, "min", 0.0 );
+  setPreferenceProperty( xh, "max", 1.0 );
+  setPreferenceProperty( yh, "max", 1.0 );
+  setPreferenceProperty( wh, "max", 1.0 );
+  setPreferenceProperty( hh, "max", 1.0 );
+
+  int srangeTab = addPreference( tr( "Scalar range, Sweep, MED import" ) );
+
+  int rangeGr = addPreference( tr( "VISU_SCALAR_RANGE" ), srangeTab );
+  setPreferenceProperty( rangeGr, "columns", 1 );
+
+  int mode = addPreference( tr( "VISU_SCALAR_MODE" ), rangeGr, SalomeApp_Preferences::Selector, "VISU", "scalar_bar_mode" );
+  QStringList modes;
+  modes.append( tr( "VISU_MODULUS" ) );
+  modes.append( tr( "VISU_COMPONENT" ) + tr("1") );
+  modes.append( tr( "VISU_COMPONENT" ) + tr("2") );
+  modes.append( tr( "VISU_COMPONENT" ) + tr("3") );
+  indices.clear();
+  indices.append( 0 );
+  indices.append( 1 );
+  indices.append( 2 );
+  indices.append( 3 );
+  setPreferenceProperty( mode, "strings", modes );
+  setPreferenceProperty( mode, "indexes", indices );
+
+  addPreference( tr( "VISU_LOGARITHMIC_SCALING" ), rangeGr, SalomeApp_Preferences::Bool, "VISU", "scalar_bar_logarithmic" );
+
+  int rangetype = addPreference( tr( "VISU_RANGE_TO_USE" ), rangeGr, SalomeApp_Preferences::Selector, "VISU", "scalar_range_type" );
+  QStringList types;
+  types.append( tr( "VISU_FIELD_RANGE" ) );
+  types.append( tr( "VISU_IMPOSED_RANGE" ) );
+  indices.clear();
+  indices.append( 0 );
+  indices.append( 1 );
+  setPreferenceProperty( rangetype, "strings", types );
+  setPreferenceProperty( rangetype, "indexes", indices );
+
+  int imposedGr = addPreference( tr( "VISU_MINMAX_IMPOSED_RANGE" ), srangeTab );
+
+  int min = addPreference( tr( "VISU_MIN" ), imposedGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_range_min" );
+  int max = addPreference( tr( "VISU_MAX" ), imposedGr, SalomeApp_Preferences::DblSpin, "VISU", "scalar_range_max" );
+  setPreferenceProperty( min, "step", 0.1 );
+  setPreferenceProperty( max, "step", 0.1 );
+
+  int sweepGr = addPreference( tr( "VISU_SWEEPING_PREF" ), srangeTab );
+  setPreferenceProperty( sweepGr, "columns", 1 );
+
+  int timestep   = addPreference( tr( "VISU_TIME_STEP" ), sweepGr, SalomeApp_Preferences::DblSpin, "VISU", "sweeping_time_step" );
+  int nbcycles   = addPreference( tr( "VISU_NB_CYCLES" ), sweepGr, SalomeApp_Preferences::IntSpin, "VISU", "sweeping_number_cycles" );
+  int nbsteps    = addPreference( tr( "VISU_NB_STEPS" ),  sweepGr, SalomeApp_Preferences::IntSpin, "VISU", "sweeping_number_steps" );
+  setPreferenceProperty( timestep, "min",  0.1 );
+  setPreferenceProperty( timestep, "step", 0.1 );
+  setPreferenceProperty( timestep, "max",  1000 );
+  setPreferenceProperty( nbcycles, "max",  100  );
+  setPreferenceProperty( nbsteps,  "max",  200  );
+
+  int importGr = addPreference( tr( "MED files import" ), srangeTab );
+  addPreference( tr( "Full MED loading" ), importGr, SalomeApp_Preferences::Bool, "VISU", "full_med_loading" );
+}
+
+void VisuGUI::preferencesChanged( const QString&, const QString& )
+{
+}
+
+SUIT_ViewManager*
+VisuGUI
+::getViewManager(const QString& theType,
+                const bool theIsCreate)
+{
+  return getApp()->getViewManager(theType,theIsCreate);
+}
+
+SalomeApp_Displayer* VisuGUI::displayer()
+{
+  return 0;
+}