Salome HOME
Updated copyright comment
[modules/geom.git] / src / GEOMToolsGUI / GEOMToolsGUI.cxx
index a977323fc3e5b4b3445bec24033f3d119d2154f4..639c370caad6adc53a4fc9702e52ede4b60dea6a 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
 //
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  File   : GEOMBase_Tools.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
 
-using namespace std;
-#include "GEOMToolsGUI.h"
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMBase_Tools.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 
-#include "QAD_Config.h"
-#include "QAD_FileDlg.h"
-#include "QAD_Tools.h"
-#include "QAD_MessageBox.h"
-#include "QAD_RightFrame.h"
+#include "GEOMToolsGUI.h"
+#include "GEOMToolsGUI_DeleteDlg.h"
+
+#include <GeometryGUI.h>
+#include "GeometryGUI_Operations.h"
+#include <GEOMBase.h>
+#include <GEOM_Operation.h>
+#include <GEOM_Displayer.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_OverrideCursor.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_Tools.h>
+#include <SUIT_FileDlg.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ViewModel.h>
+#include <SUIT_ViewManager.h>
+
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
+#include <LightApp_SelectionMgr.h>
+#include <GEOMImpl_Types.hxx>
+
+#include <SALOME_ListIO.hxx>
+#include <SALOME_Prs.h>
+
+// QT Includes
+#include <QApplication>
+#include <QMap>
+#include <QRegExp>
+
+// OCCT Includes
+#include <TCollection_AsciiString.hxx>
+
+typedef QMap<QString, QString> FilterMap;
+static QString lastUsedFilter;
 
-#include "OCCViewer_Viewer3d.h"
-#include "VTKViewer_ViewFrame.h"
+//=======================================================================
+// function : getParentComponent
+// purpose  : Get object's parent component entry
+//=======================================================================
+static QString getParentComponent( _PTR( SObject ) obj )
+{
+  if ( obj ) {
+    _PTR(SComponent) comp = obj->GetFatherComponent();
+    if ( comp )
+      return QString( comp->GetID().c_str() );
+  }
+  return QString();
+}
 
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SALOMEGUI_NameDlg.h"
-#include "SALOMEGUI_ImportOperation.h"
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
+//=====================================================================================
+// function : inUse
+// purpose  : check if the object(s) passed as the second arguments are used
+//            by the other objects in the study
+//=====================================================================================
+static bool inUse( const QString& component, const QMap<QString,QString>& objects )
+{
+  _PTR(Study) study = SalomeApp_Application::getStudy();
+  _PTR(SObject) comp = study->FindObjectID( component.toLatin1().data() );
+  if ( !comp )
+    return false;
+
+  // collect all GEOM objects being deleted
+  QMap<QString, GEOM::GEOM_BaseObject_var> gobjects;
+  QMap<QString, QString>::ConstIterator oit;
+  std::list<_PTR(SObject)> aSelectedSO;
+  for ( oit = objects.begin(); oit != objects.end(); ++oit )
+  {
+    _PTR(SObject) so = study->FindObjectID( oit.key().toUtf8().data() );
+    if ( !GeometryGUI::IsInGeomComponent( so ))
+      continue;
+    aSelectedSO.push_back(so);
+    CORBA::Object_var        corbaObj_rem = GeometryGUI::ClientSObjectToObject( so );
+    GEOM::GEOM_BaseObject_var geomObj_rem = GEOM::GEOM_BaseObject::_narrow( corbaObj_rem );
+    if ( ! CORBA::is_nil( geomObj_rem ))
+      gobjects.insert( oit.key(), geomObj_rem );
+  }
 
-#include <AIS_Drawer.hxx>
-#include <AIS_ListIteratorOfListOfInteractive.hxx>
-#include <Prs3d_IsoAspect.hxx>
+  // Search References with other Modules
+  std::list< _PTR(SObject) >::iterator itSO = aSelectedSO.begin();
+  for ( ; itSO != aSelectedSO.end(); ++itSO )
+  {
+    std::vector<_PTR(SObject)> aReferences = study->FindDependances( *itSO  );
+    int aRefLength = aReferences.size();
+    for ( int i = 0; i < aRefLength; i++ )
+    {
+      _PTR(SObject) firstSO( aReferences[i] );
+      _PTR(SComponent) aComponent = firstSO->GetFatherComponent();
+      QString type = aComponent->ComponentDataType().c_str();
+      if ( type == "SMESH" )
+        return true;
+    }
+  }
 
-#include <vtkBMPReader.h>
-#include <vtkTexture.h>
-#include <vtkTextureMapToPlane.h>
-#include <vtkTransformTextureCoords.h>
-#include <vtkDataSetMapper.h>
+  // browse through all GEOM data tree to find an object with is not deleted and depends
+  // on a deleted object
+  _PTR(ChildIterator) it ( study->NewChildIterator( comp ) );
+  for ( it->InitEx( true ); it->More(); it->Next() )
+  {
+    _PTR(SObject) child   = it->Value();
+    QString       childID = child->GetID().c_str();
+    bool deleted = objects.contains( childID );
+    if ( deleted )
+      continue; // deleted object
+
+    CORBA::Object_var    corbaObj = GeometryGUI::ClientSObjectToObject( child );
+    GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj );
+    if ( CORBA::is_nil( geomObj ) )
+      continue;
+
+    GEOM::ListOfGBO_var dep = geomObj->GetDependency(); // child depends on dep
+    for( CORBA::ULong i = 0; i < dep->length(); i++ )
+    {
+      CORBA::String_var id = dep[i]->GetStudyEntry();
+      bool depends = objects.contains( id.in() ); // depends on deleted
 
-#include <qfileinfo.h>
-#include <qcolordialog.h>
-#include <qspinbox.h>
+      QMap<QString, GEOM::GEOM_BaseObject_var>::Iterator git;
+      for ( git = gobjects.begin(); git != gobjects.end() && ( !depends || !deleted ); ++git )
+      {
+        depends = depends || dep[i]->_is_equivalent( *git );
+        deleted = deleted || git.key() == childID ;//geomObj->_is_equivalent( *git )
+      }
+      if ( depends && !deleted )
+        return true;
+    }
+  }
+  return false;
+}
 
-#include "GEOMToolsGUI_NbIsosDlg.h"        // Method ISOS adjustement
-#include "GEOMToolsGUI_TransparencyDlg.h"  // Method TRANSPARENCY adjustement
+//=======================================================================
+// function : getGeomChildrenAndFolders
+// purpose  : Get direct (1-level) GEOM objects under each folder, sub-folder, etc. and these folders itself
+//=======================================================================
+static void getGeomChildrenAndFolders( _PTR(SObject) theSO,
+                                       QMap<QString,QString>& geomObjList,
+                                       QMap<QString,QString>& folderList ) {
+  if ( !theSO ) return;
+  _PTR(Study) aStudy = SalomeApp_Application::getStudy();
+  if ( !aStudy ) return;
+  _PTR(UseCaseBuilder) aUseCaseBuilder = aStudy->GetUseCaseBuilder();
+
+  bool isFolder = false;
+  _PTR(GenericAttribute) anAttr;
+  if ( theSO->FindAttribute(anAttr, "AttributeLocalID") ) {
+    _PTR(AttributeLocalID) aLocalID( anAttr );
+    isFolder = aLocalID->Value() == 999;
+  }
+  QString anEntry = theSO->GetID().c_str();
+  QString aName = theSO->GetName().c_str();
+  if ( isFolder ) {
+    folderList.insert( anEntry, aName );
+    _PTR(UseCaseIterator) ucit ( aUseCaseBuilder->GetUseCaseIterator( theSO ) );
+    for ( ucit->Init( false ); ucit->More(); ucit->Next() ) {
+      getGeomChildrenAndFolders( ucit->Value(), geomObjList, folderList );
+    }
+  } else {
+    geomObjList.insert( anEntry, aName );
+  }
+}
 
 //=======================================================================
 // function : GEOMToolsGUI()
 // purpose  : Constructor
 //=======================================================================
-GEOMToolsGUI::GEOMToolsGUI() :
-  QObject()
+GEOMToolsGUI::GEOMToolsGUI( GeometryGUI* parent )
+  : GEOMGUI( parent )
 {
-  myGeomBase = new GEOMBase();
-  myGeomGUI = GEOMContext::GetGeomGUI();
-  myGeom = myGeomGUI->myComponentGeom;
 }
 
-
 //=======================================================================
 // function : ~GEOMToolsGUI()
 // purpose  : Destructor
@@ -81,434 +202,153 @@ GEOMToolsGUI::~GEOMToolsGUI()
 {
 }
 
-
 //=======================================================================
 // function : OnGUIEvent()
-// purpose  : 
+// purpose  :
 //=======================================================================
-bool GEOMToolsGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
+bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/)
 {
-  GEOMToolsGUI* myGEOMToolsGUI = new GEOMToolsGUI();
-  myGEOMToolsGUI->myGeomGUI->EmitSignalDeactivateDialog();
-  SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection());
-
-  SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
-  switch (theCommandID)
-    {
-    case 31: // COPY
-      {
-       myGEOMToolsGUI->OnEditCopy();
-       break;
-      }
-    case 33: // DELETE
-      {
-       myGEOMToolsGUI->OnEditDelete();
-       break;
-      }
-    case 111: // IMPORT BREP
-      {
-       myGEOMToolsGUI->Import(theCommandID);
-       break;
-      }
-    case 112: // IMPORT IGES
-      {
-       myGEOMToolsGUI->Import(theCommandID);
-       break;
-      }
-    case 113: // IMPORT STEP
-      {
-       myGEOMToolsGUI->Import(theCommandID);
-       break;
-      }
-    case 121: // EXPORT BREP
-      {
-       myGEOMToolsGUI->Export(theCommandID);
-       break;
-      }
-    case 122: // EXPORT IGES
-      {
-       myGEOMToolsGUI->Export(theCommandID);
-       break;
-      }
-    case 123: // EXPORT STEP
-      {
-       myGEOMToolsGUI->Export(theCommandID);
-       break;
-      }
-    case 411: // SETTINGS - ADD IN STUDY
-      {
-       QMenuBar* Mb = QAD_Application::getDesktop()->getMainMenuBar();
-       QMenuData* pp;
-       QMenuItem* item = parent->menuBar()->findItem(411, &pp);
-       bool check = !pp->isItemChecked(411);
-       pp->setItemChecked(411,check);
-       //myGEOMToolsGUI->myGeomGUI->GetSettings_AddInStudy() = check;
-       QAD_CONFIG->addSetting("Geometry:SettingsAddInStudy", check);
-       break;
-      }
-    case 412: // SETTINGS - SHADING COLOR
-      {
-       if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
-         break;
-
-       OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
-       Handle (AIS_InteractiveContext) ic = v3d->getAISContext();
-
-       QString SCr = QAD_CONFIG->getSetting("Geometry:SettingsShadingColorRed");
-       QString SCg = QAD_CONFIG->getSetting("Geometry:SettingsShadingColorGreen");
-       QString SCb = QAD_CONFIG->getSetting("Geometry:SettingsShadingColorBlue");
-       QColor color;
-       if(!SCr.isEmpty() && !SCg.isEmpty() && !SCb.isEmpty()) {          
-         color = QColor (SCr.toInt(), SCg.toInt(), SCb.toInt());
-       } 
-       else {
-         Quantity_Color Default = Quantity_Color();
-         color = QColor ((int)Default.Red()  * 255.0, (int)Default.Green()* 255.0, (int)Default.Blue() * 255.0);
-       }
-       
-       QColor c = QColorDialog::getColor(color, QAD_Application::getDesktop());
-       if(c.isValid()) {
-         //myGEOMToolsGUI->myGeomGUI->GetShadingColor() = Quantity_Color(c.red() / 255.0, c.green() / 255.0, c.blue() / 255.0, Quantity_TOC_RGB);
-         
-         AIS_ListOfInteractive List;
-         ic->DisplayedObjects(List);
-         AIS_ListOfInteractive List1;
-         ic->ObjectsInCollector(List1);
-         List.Append(List1);
-         
-         AIS_ListIteratorOfListOfInteractive ite(List);
-         while(ite.More()) {
-           if(ite.Value()->IsInstance(STANDARD_TYPE(GEOM_AISShape))) {
-             Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(ite.Value());
-             aSh->SetShadingColor(Quantity_Color(c.red() / 255.0, c.green() / 255.0, c.blue() / 255.0, Quantity_TOC_RGB));
-             ic->Redisplay(aSh, Standard_True, Standard_True);
-           }
-           ite.Next();
-         }
-         
-         ic->UpdateCurrentViewer();
-               
-         QAD_CONFIG->addSetting("Geometry:SettingsShadingColorRed", c.red());
-         QAD_CONFIG->addSetting("Geometry:SettingsShadingColorGreen", c.green());
-         QAD_CONFIG->addSetting("Geometry:SettingsShadingColorBlue", c.blue());        
-       }
-       break;
-      }
-    case 413: // SETTINGS - ISOS
-      {
-       if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
-         break;
-
-       OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
-       Handle (AIS_InteractiveContext) ic = v3d->getAISContext();
-
-       QString IsoU = QAD_CONFIG->getSetting("Geometry:SettingsIsoU");
-       QString IsoV = QAD_CONFIG->getSetting("Geometry:SettingsIsoV");
-       if(!IsoU.isEmpty())
-         ic->DefaultDrawer()->UIsoAspect()->SetNumber(IsoU.toInt());
-       else
-         IsoU = "1";
-       if (!IsoV.isEmpty())
-         ic->DefaultDrawer()->VIsoAspect()->SetNumber(IsoV.toInt());
-       else
-         IsoV = "1";
-       
-       GEOMBase_NbIsosDlg* NbIsosDlg = new GEOMBase_NbIsosDlg(QAD_Application::getDesktop(), tr("GEOM_MEN_ISOS"), TRUE);       
-       int UIso = IsoU.toInt();
-       int VIso = IsoV.toInt();
-       
-       NbIsosDlg->SpinBoxU->setValue(UIso);
-       NbIsosDlg->SpinBoxV->setValue(VIso);
-
-       if(NbIsosDlg->exec()) {
-         UIso = NbIsosDlg->SpinBoxU->text().toInt();
-         VIso = NbIsosDlg->SpinBoxV->text().toInt();
-         
-         ic->DefaultDrawer()->UIsoAspect()->SetNumber(UIso);
-         ic->DefaultDrawer()->VIsoAspect()->SetNumber(VIso);
-         QAD_CONFIG->addSetting("Geometry:SettingsIsoU", NbIsosDlg->SpinBoxU->text()); /* text format */
-         QAD_CONFIG->addSetting("Geometry:SettingsIsoV", NbIsosDlg->SpinBoxV->text()); /* text format */
-       }
-
-       AIS_ListOfInteractive List;
-       ic->DisplayedObjects(List);
-       AIS_ListOfInteractive List1;
-       ic->ObjectsInCollector(List1);
-       List.Append(List1);
-       
-       AIS_ListIteratorOfListOfInteractive ite(List);
-       ic->InitCurrent();
-       if(ic->NbCurrents())
-         while(ite.More()) {
-           if(ite.Value()->IsInstance(STANDARD_TYPE(GEOM_AISShape))) {
-             Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(ite.Value());
-             Handle (AIS_Drawer) CurDrawer;
-             CurDrawer = aSh->Attributes();
-             CurDrawer->UIsoAspect()->SetNumber(UIso);
-             CurDrawer->VIsoAspect()->SetNumber(VIso);
-             ic->SetLocalAttributes(aSh, CurDrawer);
-             ic->Redisplay(aSh);       
-           }
-           ite.Next();
-         }
-       ic->UpdateCurrentViewer();
-       break;
-      }
-    case 414: // SETTINGS : STEP VALUE FOR SPIN BOXES
-      {
-       QString step = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
-       if(step.isEmpty())
-         step = "100.0";
-
-       Standard_Boolean res = false;
-       double dd = myGEOMToolsGUI->myGeomBase->Parameter(res, QString("%1").arg(step), tr("GEOM_MEN_STEP_LABEL"), tr("GEOM_STEP_TITLE"), 0.001, 10000.0, 3);
-       if(res) {
-         QAD_CONFIG->addSetting("Geometry:SettingsGeomStep", QString("%1").arg(dd));
-
-         /* Emit signal to GeometryGUI_SpinBoxes */
-         myGEOMToolsGUI->myGeomGUI->EmitSignalDefaultStepValueChanged(dd);
-       }
-       else
-         parent->putInfo(tr("GEOM_PRP_ABORT"));
-       break;
-      }
-    case 804: // ADD IN STUDY - POPUP VIEWER
-      {
-       const SALOME_ListIO& ListSelected = Sel->StoredIObjects();
-       SALOME_ListIteratorOfListIO It(ListSelected);
-       for(; It.More(); It.Next()) {
-         Handle(SALOME_InteractiveObject) IObject = It.Value();
-         myGEOMToolsGUI->myGeomBase->AddInStudy(true, IObject);
-       }
-       /* Is set on the dialog box */
-       QApplication::restoreOverrideCursor();
-       break;
-      }
-    case 901: // RENAME
-      {
-       SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-       for(; It.More(); It.Next()) {
-         Handle(SALOME_InteractiveObject) IObject = It.Value();
-
-         SALOMEDS::SObject_var obj = aStudy->FindObjectID(IObject->getEntry());
-          SALOMEDS::GenericAttribute_var anAttr;
-          SALOMEDS::AttributeName_var aName;
-         if(!obj->_is_nil()) {
-           if(obj->FindAttribute(anAttr, "AttributeName")) {
-              aName = SALOMEDS::AttributeName::_narrow(anAttr);
-
-             QString nm = QString(aName->Value());
-             nm = SALOMEGUI_NameDlg::getName(QAD_Application::getDesktop(), nm);
-             if(!nm.isEmpty()) {
-               QApplication::setOverrideCursor(Qt::waitCursor);
-               QAD_Application::getDesktop()->getActiveStudy()->renameIObject(IObject, nm);
-               QApplication::restoreOverrideCursor();
-             }
-           }
-         }
-       }
-       break;
-      }
-    case 5103: // CHECK GEOMETRY
-      {
-       QAD_PyEditor* PyEditor = QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getPyEditor();
-       PyEditor->setText("from GEOM_usinggeom import *\n");
-       //PyEditor->setText(">>> ");
-       PyEditor->handleReturn();
-       break;
-      }
-    case 5104: // LOAD SCRIPT
-      {
-       QStringList filtersList;
-       filtersList.append(tr("GEOM_MEN_LOAD_SCRIPT"));
-       filtersList.append(tr("GEOM_MEN_ALL_FILES"));
-
-       QString aFile = QAD_FileDlg::getFileName(QAD_Application::getDesktop(), "", filtersList, tr("GEOM_MEN_IMPORT"), true);
-       if(!aFile.isEmpty()) {
-         QFileInfo file = aFile;
-         QApplication::setOverrideCursor(Qt::waitCursor);
-         QAD_PyEditor* PyEditor = QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getPyEditor();
-
-         PyEditor->setText("import geompy\n");
-         PyEditor->handleReturn();
-
-         QStringList aTextList = QStringList::split(".", file.fileName());
-         PyEditor->setText("geompy.Path('" + file.dirPath() + "')\n");
-         PyEditor->handleReturn();
-
-         PyEditor->setText("from " + aTextList.first() + " import *\n");
-         PyEditor->handleReturn();
-       }
-       QApplication::restoreOverrideCursor();
-       break;
-      }
-    case 8032: // COLOR - POPUP VIEWER
-      {
-       if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-         // VTK
-         VTKViewer_RenderWindowInteractor* myRenderInter = ((VTKViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getRWInteractor();
-         
-         SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-         Handle(SALOME_InteractiveObject) FirstIOS =  Sel->firstIObject();
-         if(!FirstIOS.IsNull()) {
-           QColor initcolor = myRenderInter->GetColor(FirstIOS);
-           QColor c = QColorDialog::getColor( initcolor, QAD_Application::getDesktop());
-           
-           if(c.isValid()) {
-             QApplication::setOverrideCursor(Qt::waitCursor);
-             for(;It.More();It.Next()) {
-               Handle(SALOME_InteractiveObject) IOS = It.Value();
-               myRenderInter->SetColor(IOS,c);
-             }
-           }
-           QApplication::restoreOverrideCursor();
-         }
-       }
-       else if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
-         Handle(SALOME_InteractiveObject) IO = Sel->firstIObject();
-         Standard_Boolean found;
-         Handle(GEOM_AISShape) Shape = myGEOMToolsGUI->myGeomBase->ConvertIOinGEOMAISShape(IO, found, true);
-         if(found) {
-           Quantity_Color CSFColor;
-           Shape->Color(CSFColor);
-           
-           QColor c = QColorDialog::getColor(QColor(CSFColor.Red()  * 255.0, CSFColor.Green()* 255.0, CSFColor.Blue() * 255.0), QAD_Application::getDesktop());
-           
-           if(c.isValid()) {
-             CSFColor = Quantity_Color (c.red()/255., c.green()/255., c.blue()/255., Quantity_TOC_RGB);
-             QApplication::setOverrideCursor( Qt::waitCursor );
-           
-             SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-             for(;It.More();It.Next()) {
-               Handle(SALOME_InteractiveObject) IObject = It.Value();
-               Standard_Boolean found;
-               Handle(GEOM_AISShape) Shape = myGEOMToolsGUI->myGeomBase->ConvertIOinGEOMAISShape(IObject, found, true);
-               if(found) {
-                 Shape->SetColor(CSFColor);
-                 Shape->SetShadingColor(CSFColor);
-               }
-             }
-           }
-         }
-       }
-       QApplication::restoreOverrideCursor();
-       break;
-      }
-    case 8033: // TRANSPARENCY - POPUP VIEWER
-      {
-       Handle(AIS_InteractiveContext) ic;
-       if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) {
-         OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
-         ic = v3d->getAISContext();
-       }
-       GEOMBase_TransparencyDlg *aDlg = new GEOMBase_TransparencyDlg(parent, "", Sel, ic);
-       break;
-      }
-    case 8034: // ISOS - POPUP VIEWER
-      {
-       if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC)
-         break;
-
-       OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer();
-       Handle (AIS_InteractiveContext) ic = v3d->getAISContext();
-
-       ic->InitCurrent();
-       if(ic->MoreCurrent()) {
-         Handle(GEOM_AISShape) CurObject = Handle(GEOM_AISShape)::DownCast(ic->Current());
-         QString IsoU = QAD_CONFIG->getSetting("Geometry:SettingsIsoU");
-         QString IsoV = QAD_CONFIG->getSetting("Geometry:SettingsIsoV");
-
-         if(!IsoU.isEmpty())
-           ic->DefaultDrawer()->UIsoAspect()->SetNumber(IsoU.toInt());
-         else
-           IsoU = "1";
-         if (!IsoV.isEmpty())
-           ic->DefaultDrawer()->VIsoAspect()->SetNumber(IsoV.toInt());
-         else
-           IsoV = "1";
-           
-         GEOMBase_NbIsosDlg * NbIsosDlg =
-           new GEOMBase_NbIsosDlg(QAD_Application::getDesktop(), tr("GEOM_MEN_ISOS"), TRUE);
-    
-         NbIsosDlg->SpinBoxU->setValue(IsoU.toInt());
-         NbIsosDlg->SpinBoxV->setValue(IsoV.toInt());
-
-         if(NbIsosDlg->exec()) {
-           QApplication::setOverrideCursor(Qt::waitCursor);
-           for(; ic->MoreCurrent(); ic->NextCurrent()) {
-             Handle(AIS_Drawer) CurDrawer;
-             
-             CurDrawer = ic->Current()->Attributes();
-             CurDrawer->UIsoAspect()->SetNumber(NbIsosDlg->SpinBoxU->text().toInt());
-             CurDrawer->VIsoAspect()->SetNumber(NbIsosDlg->SpinBoxV->text().toInt());
-               
-             ic->SetLocalAttributes(CurObject, CurDrawer);
-             ic->Redisplay(CurObject);
-           }
-         }
-       }
-       QApplication::restoreOverrideCursor();
-       break;
-      }
-    case 9024 : // OPEN - OBJBROSER POPUP
-      {
-       SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-       Handle(SALOME_InteractiveObject) anIObject;
-       for(;It.More();It.Next()) {
-         anIObject = It.Value();
-         SALOMEDS::SObject_var obj = aStudy->FindObjectID(anIObject->getEntry());
-         SALOMEDS::AttributePersistentRef_var aPersist;
-         SALOMEDS::AttributeIOR_var anIOR;
-         if(!obj->_is_nil()) {
-           // this SObject may be GEOM module root SObject
-           SALOMEDS::ChildIterator_var anIter = aStudy->NewChildIterator(obj);
-           SALOMEDS::GenericAttribute_var anAttr;
-           bool useSubItems = false;
-           while (anIter->More() && !useSubItems) {
-             SALOMEDS::SObject_var subobj = anIter->Value();
-             if (subobj->FindAttribute(anAttr, "AttributePersistentRef")) {
-               useSubItems = true;
-               obj = subobj;
-             }
-             else 
-               anIter->Next();
-           }
-           obj->FindAttribute(anAttr, "AttributePersistentRef");
-             
-           while(useSubItems?anIter->More():!anAttr->_is_nil()) { 
-             if(!obj->FindAttribute(anAttr, "AttributeIOR") &&
-                 obj->FindAttribute(anAttr, "AttributePersistentRef")) {
-               // load
-               Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer","GEOM");
-               if (!CORBA::is_nil(comp)) {
-                 SALOMEDS::Driver_var driver = SALOMEDS::Driver::_narrow(comp);
-                 SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
-                 aStudyBuilder->LoadWith(aStudy->FindComponent("GEOM"),driver);
-               } 
-               else {
-                 MESSAGE("Component is null");
-               }
-             }
-             if(useSubItems) {
-               anIter->Next();
-               obj = anIter->Value();
-             } 
-             else 
-               anAttr = SALOMEDS::GenericAttribute::_nil();
-           }
-         }
-       }
-       break;
-      }
-    default:
-      {
-       parent->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
-       break;
-      }
-    }
+  getGeometryGUI()->EmitSignalDeactivateDialog();
+
+  switch ( theCommandID ) {
+  case GEOMOp::OpDelete:         // EDIT - DELETE
+    OnEditDelete();
+    break;
+#ifndef DISABLE_PYCONSOLE
+  case GEOMOp::OpCheckGeom:      // TOOLS - CHECK GEOMETRY
+    OnCheckGeometry();
+    break;
+#endif
+  case GEOMOp::OpSelectVertex:   // POPUP - SELECT ONLY - VERTEX
+    OnSelectOnly( GEOM_POINT );
+    break;
+  case GEOMOp::OpSelectEdge:     // POPUP - SELECT ONLY - EDGE
+    OnSelectOnly( GEOM_EDGE );
+    break;
+  case GEOMOp::OpSelectWire:     // POPUP - SELECT ONLY - WIRE
+    OnSelectOnly( GEOM_WIRE );
+    break;
+  case GEOMOp::OpSelectFace:     // POPUP - SELECT ONLY - FACE
+    OnSelectOnly( GEOM_FACE );
+    break;
+  case GEOMOp::OpSelectShell:    // POPUP - SELECT ONLY - SHELL
+    OnSelectOnly( GEOM_SHELL );
+    break;
+  case GEOMOp::OpSelectSolid:    // POPUP - SELECT ONLY - SOLID
+    OnSelectOnly( GEOM_SOLID );
+    break;
+  case GEOMOp::OpSelectCompound: // POPUP - SELECT ONLY - COMPOUND
+    OnSelectOnly( GEOM_COMPOUND );
+    break;
+  case GEOMOp::OpSelectAll:      // POPUP - SELECT ONLY - SELECT ALL
+    OnSelectOnly( GEOM_ALLOBJECTS );
+    break;
+  case GEOMOp::OpDeflection:     // POPUP - DEFLECTION ANGLE
+    OnDeflection();
+    break;
+  case GEOMOp::OpColor:          // POPUP - COLOR
+    OnColor();
+    break;
+  case GEOMOp::OpSetTexture:     // POPUP - TEXTURE
+    OnTexture();
+    break;
+  case GEOMOp::OpTransparency:   // POPUP - TRANSPARENCY
+    OnTransparency();
+    break;
+  case GEOMOp::OpIncrTransparency: // SHORTCUT   - INCREASE TRANSPARENCY
+    OnChangeTransparency( true );
+    break;
+  case GEOMOp::OpDecrTransparency: // SHORTCUT   - DECREASE TRANSPARENCY
+    OnChangeTransparency( false );
+    break;
+  case GEOMOp::OpIsos:           // POPUP - ISOS
+    OnNbIsos();
+    break;
+  case GEOMOp::OpIncrNbIsos:     // SHORTCUT   - INCREASE NB ISOLINES
+    OnNbIsos( INCR );
+    break;
+  case GEOMOp::OpDecrNbIsos:     // SHORTCUT   - DECREASE NB ISOLINES
+    OnNbIsos( DECR );
+    break;
+  case GEOMOp::OpMaterialProperties: // POPUP - MATERIAL PROPERTIES
+    OnMaterialProperties();
+    break;
+  case GEOMOp::OpPredefMaterCustom:  // POPUP  - MATERIAL PROPERTIES - CUSTOM...
+    OnMaterialProperties();
+    break;
+  case GEOMOp::OpMaterialsLibrary:    // POPUP MENU - MATERIAL PROPERTIES
+    OnMaterialsLibrary();
+    break;
+  case GEOMOp::OpAutoColor:      // POPUP - AUTO COLOR
+    OnAutoColor();
+    break;
+  case GEOMOp::OpNoAutoColor:    // POPUP - DISABLE AUTO COLOR
+    OnDisableAutoColor();
+    break;
+  case GEOMOp::OpDiscloseChildren:   // POPUP - SHOW CHILDREN
+  case GEOMOp::OpConcealChildren:   // POPUP - HIDE CHILDREN
+    OnDiscloseConcealChildren( theCommandID == GEOMOp::OpDiscloseChildren );
+    break;
+  case GEOMOp::OpPointMarker:    // POPUP - POINT MARKER
+    OnPointMarker();
+    break;
+  case GEOMOp::OpUnpublishObject:// POPUP - UNPUBLISH
+    OnUnpublishObject();
+    break;
+  case GEOMOp::OpPublishObject:// GEOM ROOT OBJECT - POPUP - PUBLISH
+    OnPublishObject();
+    break;
+  case GEOMOp::OpEdgeWidth:
+    OnEdgeWidth();
+    break;
+  case GEOMOp::OpIsosWidth:
+    OnIsosWidth();
+    break;
+  case GEOMOp::OpBringToFront:
+    OnBringToFront();
+    break;
+  case GEOMOp::OpClsBringToFront:
+    OnClsBringToFront();
+     break;
+  case GEOMOp::OpCreateFolder:
+    OnCreateFolder();
+     break;
+  case GEOMOp::OpSortChildren:
+    OnSortChildren();
+    break;
+#ifndef DISABLE_GRAPHICSVIEW
+  case GEOMOp::OpShowDependencyTree:
+    OnShowDependencyTree();
+     break;
+#endif
+  case GEOMOp::OpReduceStudy:
+    OnReduceStudy();
+    break;
+  default:
+    SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
+    break;
+  }
   return true;
 }
 
+//=======================================================================
+// function : OnGUIEvent()
+// purpose  :
+//=======================================================================
+bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/, const QVariant& theParam )
+{
+  getGeometryGUI()->EmitSignalDeactivateDialog();
+
+  switch ( theCommandID ) {
+  case GEOMOp::OpPredefMaterial:         // POPUP MENU - MATERIAL PROPERTIES - <SOME MATERIAL>
+    OnSetMaterial( theParam );
+    break;
+  default:
+    SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
+    break;
+  }
+  return true;
+}
 
 //===============================================================================
 // function : OnEditDelete()
@@ -516,399 +356,249 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
 //===============================================================================
 void GEOMToolsGUI::OnEditDelete()
 {
-  SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection());
-  if(Sel->IObjectCount() == 0)
+  SALOME_ListIO selected;
+  SalomeApp_Application* app =
+    dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+  if ( !app )
     return;
 
-  if(QAD_MessageBox::warn2(QAD_Application::getDesktop(), tr("GEOM_WRN_WARNING"), tr("GEOM_REALLY_DELETE"), tr("GEOM_BUT_YES"), tr("GEOM_BUT_NO"), 1, 0, 0) != 1)
+  LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
+  if ( !aSelMgr )
     return;
-       
-  int nbSf = QAD_Application::getDesktop()->getActiveStudy()->getStudyFramesCount();
-    
-  Standard_Boolean found;
-  SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
-  SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
-  SALOMEDS::GenericAttribute_var anAttr;
-  SALOMEDS::AttributeIOR_var anIOR;
-  
-  SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
-  QAD_Operation* op = new SALOMEGUI_ImportOperation( QAD_Application::getDesktop()->getActiveStudy() );
-  op->start();
-  Standard_Boolean deleted = false;
-  for(;It.More();It.Next()) {
-    Handle(SALOME_InteractiveObject) IObject = It.Value();
-    if(IObject->hasEntry()) {
-      SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
-      SALOMEDS::SObject_var SO = aStudy->FindObjectID(IObject->getEntry());
-      
-      /* Erase child graphical objects */
-      SALOMEDS::ChildIterator_var it = aStudy->NewChildIterator(SO);
-      for(; it->More();it->Next()) {
-       SALOMEDS::SObject_var CSO= it->Value();
-       if(CSO->FindAttribute(anAttr, "AttributeIOR") ) {
-          anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-         /* Delete child(s) shape in Client : */
-         const TCollection_AsciiString ASCior(anIOR->Value()) ;
-         myGeomGUI->GetShapeReader().RemoveShapeFromBuffer(ASCior);
-
-         for(int i = 0; i < nbSf; i++) {
-           QAD_StudyFrame* sf = QAD_Application::getDesktop()->getActiveStudy()->getStudyFrame(i);
-           if(sf->getTypeView() == VIEW_OCC) {
-             OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)sf->getRightFrame()->getViewFrame())->getViewer();
-             Handle (AIS_InteractiveContext) myContext = v3d->getAISContext();
-             Handle(GEOM_AISShape) Result = myGeomBase->ConvertIORinGEOMAISShape(anIOR->Value(), found);
-             if(found)
-               myContext->Erase(Result, true, false);
-           }
-           else if(sf->getTypeView() == VIEW_VTK) {
-             //vtkRenderer* Renderer = ((VTKViewer_ViewFrame*)sf->getRightFrame()->getViewFrame())->getRenderer();
-             VTKViewer_RenderWindowInteractor* myRenderInter = ((VTKViewer_ViewFrame*)sf->getRightFrame()->getViewFrame())->getRWInteractor();
-             GEOM_Actor* ac = myGeomBase->ConvertIORinGEOMActor(anIOR->Value(), found);
-             if(found) {
-               //Renderer->RemoveActor(ac);
-               if(ac->hasIO()) 
-                 myRenderInter->Remove(ac->getIO());
-             }
-           }
-         }
-       }
-      }
-      
-      /* Erase main graphical object */
-      for(int i = 0; i < nbSf; i++) {
-       QAD_StudyFrame* sf = QAD_Application::getDesktop()->getActiveStudy()->getStudyFrame(i);
-       if(sf->getTypeView() == VIEW_OCC) {
-         OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)sf->getRightFrame()->getViewFrame())->getViewer();
-         Handle(AIS_InteractiveContext) myContext = v3d->getAISContext();
-         Handle(GEOM_AISShape) Result = myGeomBase->ConvertIOinGEOMAISShape(IObject, found );
-         if(found)
-           myContext->Erase(Result, true, false);
-       }
-       else if(sf->getTypeView() == VIEW_VTK) {
-         VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)sf->getRightFrame()->getViewFrame())->getRWInteractor();
-         myRenderInter->Remove( IObject );
-       }
-      }
-      
-      /* Delete main shape in Client : */
-      if(SO->FindAttribute(anAttr, "AttributeIOR")) {
-        anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-       const TCollection_AsciiString ASCIor(anIOR->Value()) ;
-       myGeomGUI->GetShapeReader().RemoveShapeFromBuffer(ASCIor);
-      }
-
-      /* Erase objects in Study */
-      SALOMEDS::SObject_var obj = aStudy->FindObjectID(IObject->getEntry());
-      if(!obj->_is_nil()) {
-       aStudyBuilder->RemoveObject(obj);
-       deleted = true;
-      }
-
-    } /* IObject->hasEntry() */
-  }   /* more/next           */
-
-  if (deleted) op->finish();
-  else op->abort();
-
-  /* Clear any previous selection */
-  Sel->ClearIObjects(); 
-  QAD_Application::getDesktop()->getActiveStudy()->updateObjBrowser();
-}
 
+  // get selection
+  aSelMgr->selectedObjects( selected, "ObjectBrowser", false );
+  if ( selected.IsEmpty() )
+    return;
 
-//==============================================================================
-// function : OnEditCopy()
-// purpose  :
-//==============================================================================
-void GEOMToolsGUI::OnEditCopy()
-{
-  SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection() );
-  GEOM::GEOM_Gen::ListOfIOR_var listIOR = new GEOM::GEOM_Gen::ListOfIOR;
-
-  const SALOME_ListIO& List = Sel->StoredIObjects();
+  _PTR(Study) aStudy = SalomeApp_Application::getStudy();
+  _PTR(UseCaseBuilder) aUseCaseBuilder = aStudy->GetUseCaseBuilder();
 
-  myGeomBase->ConvertListOfIOInListOfIOR(List, listIOR);
+  // check if study is locked
+  if ( _PTR(AttributeStudyProperties)( aStudy->GetProperties() )->IsLocked() ) {
+    SUIT_MessageBox::warning( app->desktop(),
+                              tr("WRN_WARNING"),
+                              tr("WRN_STUDY_LOCKED") );
+    return; // study is locked
+  }
 
-  Sel->ClearIObjects();
+  // get GEOM component
+  CORBA::String_var geomIOR = app->orb()->object_to_string( GeometryGUI::GetGeomGen() );
+  QString geomComp = getParentComponent( aStudy->FindObjectIOR( geomIOR.in() ) );
+
+  // check each selected object: if belongs to GEOM, if not reference...
+  QMap<QString,QString> toBeDeleted;
+  QMap<QString,QString> allDeleted;
+  QMap<QString,QString> toBeDelFolders;
+  bool isComponentSelected = false;
+
+  for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
+    Handle(SALOME_InteractiveObject) anIObject = It.Value();
+    if ( !anIObject->hasEntry() )
+      continue; // invalid object
+    // ...
+    QString entry = anIObject->getEntry();
+    _PTR(SObject) obj = aStudy->FindObjectID( entry.toUtf8().data() );
+    // check parent component
+    QString parentComp = getParentComponent( obj );
+    if ( parentComp != geomComp )  {
+      SUIT_MessageBox::warning( app->desktop(),
+                                QObject::tr("ERR_ERROR"),
+                                QObject::tr("NON_GEOM_OBJECTS_SELECTED").arg( getGeometryGUI()->moduleName() ) );
+      return; // not GEOM object selected
+    }
 
-  for (unsigned int ind = 0; ind < listIOR->length();ind++) {
-    GEOM::GEOM_Shape_var aShapeInit = myGeom->GetIORFromString(listIOR[ind]);
-    try {
-      GEOM::GEOM_Shape_var result = myGeom->MakeCopy(aShapeInit) ;
-      result->NameType( aShapeInit->NameType() );
-      myGeomBase->Display(result);
+    ///////////////////////////////////////////////////////
+    // if GEOM component is selected, so skip other checks
+    if ( isComponentSelected ) continue;
+    ///////////////////////////////////////////////////////
+
+    // check if object is reference
+    _PTR(SObject) refobj;
+    if ( obj && obj->ReferencedObject( refobj ) ) {
+      // get the main object by reference IPAL 21354
+      obj = refobj;
+      entry = obj->GetID().c_str();
     }
-    catch  (const SALOME::SALOME_Exception& S_ex) {
-      QtCatchCorbaException(S_ex);
+    // ...
+    QString aName = obj->GetName().c_str();
+    if ( entry == geomComp ) {
+      // GEOM component is selected, skip other checks
+      isComponentSelected = true;
+      continue;
+    }
+    // all sub-objects of folder have to be deleted
+    getGeomChildrenAndFolders( obj, toBeDeleted, toBeDelFolders );
+    allDeleted.insert( entry, aName ); // skip GEOM component
+    // browse through all children recursively
+    _PTR(UseCaseIterator) it ( aUseCaseBuilder->GetUseCaseIterator( obj ) );
+    for ( it->Init( true ); it->More(); it->Next() ) {
+      _PTR(SObject) child( it->Value() );
+      if ( child && child->ReferencedObject( refobj ) )
+        continue; // skip references
+      aName = child->GetName().c_str();
+      if ( !aName.isEmpty() )
+        allDeleted.insert( child->GetID().c_str(), aName );
     }
   }
-  
-  QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_READY"));
-}
 
+  // is there is anything to delete?
+  if ( !isComponentSelected && allDeleted.count() <= 0 )
+    return; // nothing to delete
+
+  // show confirmation dialog box
+  GEOMToolsGUI_DeleteDlg dlg( app->desktop(), allDeleted, isComponentSelected );
+  if ( !dlg.exec() )
+    return; // operation is cancelled by user
+
+  SUIT_OverrideCursor wc;
+
+  // get currently opened views
+  QList<SALOME_View*> views;
+  SALOME_View* view;
+  ViewManagerList vmans = app->viewManagers();
+  SUIT_ViewManager* vman;
+  foreach ( vman, vmans ) {
+    SUIT_ViewModel* vmod = vman->getViewModel();
+    view = dynamic_cast<SALOME_View*> ( vmod ); // must work for OCC and VTK views
+    if ( view )
+      views.append( view );
+  }
 
-//=====================================================================================
-// function : Import
-// purpose  : BRep, Iges, Step
-//=====================================================================================
-bool GEOMToolsGUI::Import(int aState)
-{
-  SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
-  SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
-  
-  GEOM::GEOM_Shape_var aShape;
-  QString file;
-  QStringList filtersList;
-  
-  switch(aState)
-    {
-    case 111 : // Import BREP
-      {
-       filtersList.append(tr("GEOM_MEN_IMPORT_BREP"));
-       filtersList.append(tr("GEOM_MEN_ALL_FILES"));
-
-       file = QAD_FileDlg::getFileName(QAD_Application::getDesktop(), "", filtersList, tr("GEOM_MEN_IMPORT"), true);
-       if(!file.isEmpty()) {
-         QApplication::setOverrideCursor(Qt::waitCursor);
-         try {
-           aShape = myGeom->ImportBREP(file.latin1());
-         }
-         catch(const SALOME::SALOME_Exception& S_ex) {
-           QtCatchCorbaException(S_ex);
-         }
-       }
-       break;
-      }
-    case 112 : // Import IGES
-      {
-       filtersList.append( tr("GEOM_MEN_IMPORT_IGES") ) ;
-       filtersList.append( tr("GEOM_MEN_ALL_FILES") ) ;
-
-       file = QAD_FileDlg::getFileName(QAD_Application::getDesktop(),
-                                       "",
-                                       filtersList,
-                                       tr("GEOM_MEN_IMPORT"),
-                                       true);
-       if ( !file.isEmpty() ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         try {
-           aShape = myGeom->ImportIGES( file.latin1() );
-         }
-         catch (const SALOME::SALOME_Exception& S_ex) {
-           QtCatchCorbaException(S_ex);
-         }
-       }
-       break;
-      }
-    case 113 : // Import STEP
-      {
-       filtersList.append( tr("GEOM_MEN_IMPORT_STEP") ) ;
-       filtersList.append( tr("GEOM_MEN_ALL_FILES") ) ;
-
-       file = QAD_FileDlg::getFileName(QAD_Application::getDesktop(),
-                                       "",
-                                       filtersList,
-                                       tr("GEOM_MEN_IMPORT"),
-                                       true);
-       if ( !file.isEmpty() ) {
-         QApplication::setOverrideCursor( Qt::waitCursor );
-         try {
-           aShape = myGeom->ImportSTEP( file.latin1() );
-         }
-         catch  (const SALOME::SALOME_Exception& S_ex) {
-           QtCatchCorbaException(S_ex);
-         }
-       }
-       break;
-      }
+  _PTR(StudyBuilder) aStudyBuilder (aStudy->NewBuilder());
+  GEOM_Displayer disp;
+  bool toUpdateColorScale = disp.SetUpdateColorScale( false ); // IPAL54049
+
+  if ( isComponentSelected ) {
+    // GEOM component is selected: delete all objects recursively
+    _PTR(SObject) comp = aStudy->FindObjectID( geomComp.toUtf8().data() );
+    if ( !comp )
+      return;
+    _PTR(ChildIterator) it ( aStudy->NewChildIterator( comp ) );
+    // remove top-level objects only
+    for ( it->InitEx( false ); it->More(); it->Next() ) {
+      _PTR(SObject) child( it->Value() );
+      // remove object from GEOM engine
+      removeObjectWithChildren( child, views, &disp );
+      // remove object from study
+      aStudyBuilder->RemoveObjectWithChildren( child );
+      // remove object from use case tree
+      aUseCaseBuilder->Remove( child );
     }
-  
-  if ( !file.isEmpty() ) {
-    QAD_Application::getDesktop()->putInfo( tr("GEOM_PRP_LOADING").arg(QAD_Tools::getFileNameFromPath( file )) );
-
-    SALOMEDS::SComponent_var father = aStudy->FindComponent("GEOM");
-    SALOMEDS::SObject_var fatherSF = aStudy->FindObjectID(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->entry());
-    SALOMEDS::GenericAttribute_var anAttr;
-    SALOMEDS::AttributeName_var    aName;
-    SALOMEDS::AttributePixMap_var  aPixmap;
-    int aLocked = false;
-    if (father->_is_nil()) {
-      QAD_Operation* op = new SALOMEGUI_ImportOperation(QAD_Application::getDesktop()->getActiveStudy() );
-      op->start();
-      aLocked = aStudy->GetProperties()->IsLocked();
-      if (aLocked) aStudy->GetProperties()->SetLocked(false);
-      father = aStudyBuilder->NewComponent("GEOM");
-      anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributeName");
-      aName = SALOMEDS::AttributeName::_narrow(anAttr);
-      //      aName->SetValue( tr("GEOM_MEN_COMPONENT") );
-      aName->SetValue(QAD_Application::getDesktop()->getComponentUserName( "GEOM" ) );
-      anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap");
-      aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
-      aPixmap->SetPixMap( "ICON_OBJBROWSER_Geometry" );
-      aStudyBuilder->DefineComponentInstance( father, myGeom );
-      if (aLocked) aStudy->GetProperties()->SetLocked(true);
-      op->finish();
+  }
+  else {
+    // GEOM component is not selected: check if selected objects are in use
+    if ( inUse( geomComp, allDeleted ) &&
+         SUIT_MessageBox::question( app->desktop(),
+                                    QObject::tr("WRN_WARNING"),
+                                    QObject::tr("DEP_OBJECT"),
+                                    SUIT_MessageBox::Yes | SUIT_MessageBox::No,
+                                    SUIT_MessageBox::No ) != SUIT_MessageBox::Yes ) {
+      return; // object(s) in use
     }
-//      if (aLocked) return false;
-    father->ComponentIOR(myGeomGUI->GetFatherior());
-
-    QString nameShape = QAD_Tools::getFileNameFromPath(file,false) +  QString("_%1").arg(myGeomGUI->GetNbGeom()++);
-
-    if(myGeomBase->Display(aShape, strdup(nameShape.latin1()))) {
-      QAD_Application::getDesktop()->getActiveStudy()->setMessage( tr("GEOM_INF_LOADED").arg(QAD_Tools::getFileNameFromPath( file )) );
-      QAD_Application::getDesktop()->putInfo( tr("GEOM_PRP_READY"));
+    // ... and then delete all objects
+    QMap<QString, QString>::Iterator it;
+    for ( it = toBeDeleted.begin(); it != toBeDeleted.end(); ++it ) {
+      _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toUtf8().data() ) );
+      // remove object from GEOM engine
+      removeObjectWithChildren( obj, views, &disp );
+      // remove objects from study
+      aStudyBuilder->RemoveObjectWithChildren( obj );
+      // remove object from use case tree
+      aUseCaseBuilder->Remove( obj );
+    }
+    // ... and then delete all folders
+    for ( it = toBeDelFolders.begin(); it != toBeDelFolders.end(); ++it ) {
+      _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toUtf8().data() ) );
+      // remove object from GEOM engine
+      removeObjectWithChildren( obj, views, &disp );
+      // remove objects from study
+      aStudyBuilder->RemoveObjectWithChildren( obj );
+      // remove object from use case tree
+      aUseCaseBuilder->Remove( obj );
     }
   }
-  QApplication::restoreOverrideCursor();
-  return true;
-}
 
+  disp.SetUpdateColorScale( toUpdateColorScale ); // IPAL54049
+  selected.Clear();
+  aSelMgr->setSelectedObjects( selected );
+  getGeometryGUI()->updateObjBrowser();
+  app->updateActions(); //SRN: To update a Save button in the toolbar
+}
 
 //=====================================================================================
-// function : Export
-// purpose  : BRep, Iges, Step
+// function : RemoveObjectWithChildren
+// purpose  : used by OnEditDelete() method
 //=====================================================================================
-bool GEOMToolsGUI::Export(int aState)
+void GEOMToolsGUI::removeObjectWithChildren(_PTR(SObject) obj,
+                                            QList<SALOME_View*> views,
+                                            GEOM_Displayer* disp)
 {
-  SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
-  SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
+  _PTR(Study) aStudy = SalomeApp_Application::getStudy();
+  // iterate through all children of obj
+  for (_PTR(ChildIterator) it (aStudy->NewChildIterator(obj)); it->More(); it->Next()) {
+  // for (_PTR(UseCaseIterator) it (aStudy->GetUseCaseBuilder()->GetUseCaseIterator(obj)); it->More(); it->Next()) {
+    _PTR(SObject) child (it->Value());
+    removeObjectWithChildren(child, views, disp);
+  }
 
-  GEOM::GEOM_Shape_var aShape;
+  // erase object and remove it from engine
+  _PTR(GenericAttribute) anAttr;
+  if (obj->FindAttribute(anAttr, "AttributeIOR")) {
+    _PTR(AttributeIOR) anIOR (anAttr);
 
-  static QString filters[] = { tr("GEOM_MEN_IMPORT_BREP"),
-                              tr("GEOM_MEN_IMPORT_IGES"),
-                              tr("GEOM_MEN_IMPORT_STEP") };
-  
-  SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection());
-  SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
+    SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
 
-  switch (aState)
-    {
-    case 121 :
-      {
-       for(;It.More();It.Next()) {
-         QApplication::restoreOverrideCursor();
-         Handle(SALOME_InteractiveObject) IObject = It.Value();
-         Standard_Boolean found;
-         GEOM::GEOM_Shape_var aShape = myGeomBase->ConvertIOinGEOMShape(IObject, found);
-         //      Handle(GEOM_AISShape) Shape = myGeomGUI->ConvertIOinGEOMAISShape(IObject, found, true);
-         if ( found ) {
-           QString file = QAD_FileDlg::getFileName(QAD_Application::getDesktop(), 
-                                                   QString( IObject->getName() ) + ".brep",
-                                                   tr("GEOM_MEN_IMPORT_BREP"),
-                                                   tr("GEOM_MEN_EXPORT"),
-                                                   false);
-           if ( !file.isEmpty() && !aShape->_is_nil() ) {
-             QApplication::setOverrideCursor( Qt::waitCursor );
-             //      Standard_Boolean result = BRepTools::Write(Shape->Shape(), strdup(file.latin1()) );
-             try {
-               myGeom->ExportBREP(strdup( file.latin1()), aShape);
-             }  
-             catch (const SALOME::SALOME_Exception& S_ex) {
-               QtCatchCorbaException(S_ex);
-             }
-           }
-         }
-       }
-       break;
-      }
-    case 122 :
-      {
-       for(;It.More();It.Next()) {
-         QApplication::restoreOverrideCursor();
-         Handle(SALOME_InteractiveObject) IObject = It.Value();
-         Standard_Boolean found;
-         GEOM::GEOM_Shape_var aShape = myGeomBase->ConvertIOinGEOMShape(IObject, found);
-         //      Handle(GEOM_AISShape) Shape = myGeomGUI->ConvertIOinGEOMAISShape(IObject, found, true);
-         if ( found ) {
-           QString file = QAD_FileDlg::getFileName(QAD_Application::getDesktop(), 
-                                                   QString( IObject->getName() ) + ".igs",
-                                                   tr("GEOM_MEN_IMPORT_IGES"),
-                                                   tr("GEOM_MEN_EXPORT"),
-                                                   false);
-           if ( !file.isEmpty() && !aShape->_is_nil() ) {
-             QApplication::setOverrideCursor( Qt::waitCursor );
-             try {
-               myGeom->ExportIGES(strdup( file.latin1()), aShape);
-             }  
-             catch (const SALOME::SALOME_Exception& S_ex) {
-               QtCatchCorbaException(S_ex);
-             }
-//           //VRV: OCC 4.0 migration
-//           IGESControl_Controller::Init();
-//           IGESControl_Writer ICW (Interface_Static::CVal("XSTEP.iges.unit"),
-//                                      Interface_Static::IVal("XSTEP.iges.writebrep.mode"));
-//           //VRV: OCC 4.0 migration
-
-//           ICW.AddShape (Shape->Shape());
-//           ICW.ComputeModel();
-//           Standard_Boolean result = ICW.Write( strdup(file.latin1()) );
-           }
-         }
-       }
-       break;
-      }
+    // Delete shape in Client
+    const TCollection_AsciiString ASCIor ((char*)anIOR->Value().c_str());
+    getGeometryGUI()->GetShapeReader().RemoveShapeFromBuffer(ASCIor);
 
-    case 123 :
-      {
-//     bool test = false ;
-//     IFSelect_ReturnStatus status ;
-//     //VRV: OCC 4.0 migration
-//     STEPControl_Writer aWriter;
-//     //VRV: OCC 4.0 migration
-       QString file;
-
-       for( ; It.More(); It.Next() ) {
-//       GEOM::GEOM_Shape_var aShape = myGeomBase->ConvertIOinGEOMShape(IObject, found);
-         QApplication::restoreOverrideCursor();
-         Handle(SALOME_InteractiveObject) IObject = It.Value();
-         Standard_Boolean found;
-         GEOM::GEOM_Shape_var aShape = myGeomBase->ConvertIOinGEOMShape(IObject, found);
-         //      Handle(GEOM_AISShape) Shape = myGeomBase->ConvertIOinGEOMAISShape(IObject, found, true);
-         if ( found ) {
-           file = QAD_FileDlg::getFileName(QAD_Application::getDesktop(), 
-                                           QString( IObject->getName() ) + ".stp",
-                                           tr("GEOM_MEN_IMPORT_STEP"),
-                                           tr("GEOM_MEN_EXPORT"),
-                                           false);
-           if ( !file.isEmpty() && !aShape->_is_nil() ) {
-
-             QApplication::setOverrideCursor( Qt::waitCursor ) ;       
-             try {   
-               myGeom->ExportSTEP(strdup( file.latin1()), aShape);   
-             }  
-             catch (const SALOME::SALOME_Exception& S_ex) {
-               QtCatchCorbaException(S_ex);
-             }
-//           //VRV: OCC 4.0 migration
-//           status = aWriter.Transfer( Shape->Shape(), STEPControl_ManifoldSolidBrep ) ;
-//           //VRV: OCC 4.0 migration
-//           test = true ;
-//           if ( status != IFSelect_RetDone ) {
-//             QApplication::restoreOverrideCursor() ;
-//             return false ;
-//           }
-           }
-         }
-       }
-//     if(test) {
-//       status = aWriter.Write( strdup(file.latin1()) ) ;
-//       QApplication::restoreOverrideCursor() ;
-//       return status ;
-//     }
-       break;
-      }
+    CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject(obj);
+    GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj );
+    if (!CORBA::is_nil(geomObj)) {
+
+      //Remove visual properties of the object
+      appStudy->removeObjectProperties(obj->GetID().c_str());
 
+      // Erase graphical object
+      QListIterator<SALOME_View*> it( views );
+      while ( it.hasNext() )
+        if ( SALOME_View* view = it.next() )
+          disp->Erase(geomObj, true, true, view);
+
+      // Remove object from Engine
+      // We can't directly remove object from engine. All we can do is to unpublish the object
+      // from the study. Another client could be using the object.
+      // Unpublishing is done just after in aStudyBuilder->RemoveObjectWithChildren( child );
+      //GeometryGUI::GetGeomGen()->RemoveObject( geomObj );
     }
-  QApplication::restoreOverrideCursor() ;
+  }
 }
 
+//=================================================================================
+// function : deactivate()
+// purpose  : Called when GEOM component is deactivated
+//=================================================================================
+void GEOMToolsGUI::deactivate()
+{
+  SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+  if ( app ) {
+    GEOM_Displayer aDisp;
+    aDisp.GlobalSelection();
+    getGeometryGUI()->setLocalSelectionMode(GEOM_ALLOBJECTS);
+  }
+}
 
 //=====================================================================================
 // EXPORTED METHODS
 //=====================================================================================
 extern "C"
 {
-  bool OnGUIEvent(int theCommandID, QAD_Desktop* parent)
-  {return GEOMToolsGUI::OnGUIEvent(theCommandID, parent);}
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
+  GEOMGUI* GetLibGUI( GeometryGUI* parent )
+  {
+    return new GEOMToolsGUI( parent );
+  }
 }