Fixed bug GVIEW10296 : Segmentation cursor are operable after closing of correspondin...

diff --git a/src/VVTK/VVTK_PickingDlg.cxx b/src/VVTK/VVTK_PickingDlg.cxx
index 5ff46c773a13cacfc04494b55a0da30f4c809ee3..9a8ed193d64cbc3c9324c7c0488c36ad610d6fbe 100644 (file)
--- a/src/VVTK/VVTK_PickingDlg.cxx
+++ b/src/VVTK/VVTK_PickingDlg.cxx
@@ -232,11 +232,11 @@ void VVTK_PickingDlg::onClickApply()
 void VVTK_PickingDlg::onClickClose()
 {
   myAction->setOn( false );
-
   reject();
 }
 
-void VVTK_PickingDlg::closeEvent( QCloseEvent* )
+void VVTK_PickingDlg::done( int r )
 {
   myAction->setOn( false );
+  QDialog::done( r );
 }

diff --git a/src/VVTK/VVTK_PickingDlg.h b/src/VVTK/VVTK_PickingDlg.h
index 767dc3c7ba3dece32eeaf29531b8e114af6cea35..17ff30f3ea9d46c68886aa0cc24295153377e469 100644 (file)
--- a/src/VVTK/VVTK_PickingDlg.h
+++ b/src/VVTK/VVTK_PickingDlg.h
@@ -47,10 +47,9 @@ public:
 
   VISU_PickingSettings* GetPickingSettings();
 
-protected:
-  virtual void     closeEvent( QCloseEvent* );
+protected slots:
+  virtual void     done( int );
 
-private slots:
   void             onClickApply();
   void             onClickClose();
 

diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.cxx b/src/VVTK/VVTK_SegmentationCursorDlg.cxx
index 39e7869e276c5eac5d587396885b68cb1402d764..4e20b11bc1e10c4a29a0d9bdf1ab04cac901e5ac 100644 (file)
--- a/src/VVTK/VVTK_SegmentationCursorDlg.cxx
+++ b/src/VVTK/VVTK_SegmentationCursorDlg.cxx
@@ -534,11 +534,11 @@ void VVTK_SegmentationCursorDlg::ApplyOutsideCursor()
 void VVTK_SegmentationCursorDlg::onClickClose()
 {
   myAction->setOn( false );
-
   reject();
 }
 
-void VVTK_SegmentationCursorDlg::closeEvent( QCloseEvent* )
+void VVTK_SegmentationCursorDlg::done( int r )
 {
   myAction->setOn( false );
+  QDialog::done( r );
 }

diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.h b/src/VVTK/VVTK_SegmentationCursorDlg.h
index 270ef2fc59ddf968b39204554ea92ddfba81df24..1e63fcad3c36a7de0f10d846c1876e3bbdeb7ea8 100644 (file)
--- a/src/VVTK/VVTK_SegmentationCursorDlg.h
+++ b/src/VVTK/VVTK_SegmentationCursorDlg.h
@@ -61,16 +61,15 @@ protected:
   vtkImageData*    MakeImageData( const QString& theMainTexture, 
                                  const QString& theAlphaTexture );
 
-protected:
-  virtual void     closeEvent( QCloseEvent* );
-
 private:
   static void      ProcessEvents(vtkObject* theObject, 
                                 unsigned long theEvent,
                                 void* theClientData, 
                                 void* theCallData);
 
-private slots:
+protected slots:
+  virtual void     done( int );
+
   void             onClickApply();
   void             onClickClose();