From: mzn <mzn@opencascade.com>
Date: Mon, 2 Jun 2008 06:27:24 +0000 (+0000)
Subject: Fix for bug IPAL19798(Qt4 porting: Sphere Construction - Entities of primitives are... 
X-Git-Tag: V5_1_0a1~44
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4832804ffbdca6d9863232743f5e82b5d0498027;p=modules%2Fgeom.git

Fix for bug IPAL19798(Qt4 porting: Sphere Construction - Entities of primitives are not selectable after switch Geom/Mesh/Geom).
---

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 3a0d044aa..f24a8b9bb 100644
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -1209,14 +1209,14 @@ bool GeometryGUI::activateModule( SUIT_Study* study )
     myVTKSelectors.append( new LightApp_VTKSelector( dynamic_cast<SVTK_Viewer*>( vm->getViewModel() ), sm ) );
 
   // disable OCC selectors
-  //getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() );
+  getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() ); //@
   QListIterator<GEOMGUI_OCCSelector*> itOCCSel( myOCCSelectors );
   while ( itOCCSel.hasNext() )
     if ( GEOMGUI_OCCSelector* sr = itOCCSel.next() )
       sr->setEnabled(true);
 
   // disable VTK selectors
-  //getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() );
+  getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() ); //@
   QListIterator<LightApp_VTKSelector*> itVTKSel( myVTKSelectors );
   while ( itVTKSel.hasNext() )
     if ( LightApp_VTKSelector* sr = itVTKSel.next() )
@@ -1250,9 +1250,11 @@ bool GeometryGUI::deactivateModule( SUIT_Study* study )
   action(111)->setEnabled(false); // Import
   action(121)->setEnabled(false); // Export
 
+  qDeleteAll(myOCCSelectors);
   myOCCSelectors.clear();
   getApp()->selectionMgr()->setEnabled( true, OCCViewer_Viewer::Type() );
 
+  qDeleteAll(myVTKSelectors);
   myVTKSelectors.clear();
   getApp()->selectionMgr()->setEnabled( true, SVTK_Viewer::Type() );