Fix for problem: empty root object in the Object Browser after trying to delete...

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 1a469b7a85bfb032f53196c06c828f64d62185ec..f3889647249840f059d72f005a40259d4bdfe876 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -655,7 +655,8 @@ namespace{
     return RefType;
   }
 
-  void OnEditDelete()
+
+  void SMESHGUI::OnEditDelete()
   {
     // VSR 17/11/04: check if all objects selected belong to SMESH component --> start
     SalomeApp_SelectionMgr* aSel = SMESHGUI::selectionMgr();
@@ -703,6 +704,13 @@ namespace{
       if(IObject->hasEntry()){
        _PTR(SObject) SO = aStudy->FindObjectID(IObject->getEntry());
 
+       // disable removal of "SMESH" component object
+       if(SO->FindAttribute(anAttr, "AttributeIOR")){
+         anIOR = anAttr;
+         if ( !strcmp( (char*)anIOR->Value().c_str(), engineIOR().latin1() ) )
+           continue;
+       }
+
        /* Erase child graphical objects */
        _PTR(ChildIterator) it = aStudy->NewChildIterator(SO);
        for(it->InitEx(true); it->More(); it->Next()){
@@ -1053,7 +1061,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
   switch (theCommandID)        {
   case 33:                                     // DELETE
     if(checkLock(aStudy)) break;
-    ::OnEditDelete();
+    OnEditDelete();
     break;
 
   case 113:                                    // IMPORT
@@ -2601,7 +2609,7 @@ void SMESHGUI::initialize( CAM_Application* app )
   anId = popupMgr()->insert( tr( "MEN_NUM" ), -1, -1 );
   
   popupMgr()->insert( action( 9010 ), anId, -1 );
-  popupMgr()->setRule( action( 9010 ), aMeshInVTK + "&& isVisible &&" + hasNodes, true );//@
+  popupMgr()->setRule( action( 9010 ), aMeshInVTK + "&& isVisible &&" + hasNodes, true );
   popupMgr()->setRule( action( 9010 ), "{'Point'} in labeledTypes", false );
 
   popupMgr()->insert( action( 9011 ), anId, -1 );

diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h
index a3b75e9c834ac51a67dcb117492ce47ad37fceaa..c072201830752f11981ce787b514235732053751 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.h
+++ b/src/SMESHGUI/SMESHGUI.h
@@ -119,6 +119,9 @@ protected:
   void createPopupItem( const int, const QString&, const QString&,
                         const QString& = QString::null, const int = -1 );
 
+private:
+  void OnEditDelete();
+
 private :
   static SMESH::SMESH_Gen_var      myComponentSMESH;
   QDialog*                         myActiveDialogBox;