Fix for NPAL19673 : GUI bug with clipping.

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
index 106e28b8f936830b36ecdabc02cf7ed7b8e78423..606dd3ed4a648dfa8621b69fb635d228c322ceae 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
@@ -247,8 +247,7 @@ void OCCViewer_ClippingDlg::closeEvent( QCloseEvent* e )
   if ( !aView3d.IsNull() && !myClippingPlane.IsNull() )
     aView3d->SetPlaneOn( myClippingPlane );
   
-  if (!myView->isCuttingPlane())
-    myAction->setOn( false );
+  myAction->setOn( false );
   
   QDialog::closeEvent( e );
 }
@@ -288,8 +287,7 @@ void OCCViewer_ClippingDlg::ClickOnClose()
   if ( !aView3d.IsNull() && !myClippingPlane.IsNull() )
     aView3d->SetPlaneOn( myClippingPlane );
 
-  if (!myView->isCuttingPlane())
-    myAction->setOn( false );
+  myAction->setOn( false );
   
   reject();
 }

diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
index 0aed2c230fd9a64bd963ae236085d65edb686f6b..c01136f98d6fdc65450e53a95170b9e731ff1b4f 100644 (file)
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
@@ -276,3 +276,13 @@ OCCViewer_SetRotationPointDlg
 {
   hide();
 }
+
+/*!
+  Custom handling of close event: toggle action
+*/
+void
+OCCViewer_SetRotationPointDlg::closeEvent( QCloseEvent* e )
+{
+  myAction->setOn( false );
+  QDialog::closeEvent( e );
+}

diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
index 18c1f654e1a386edc254e9458c4a63a8b55952b6..1da4e708c527970dba6cd74c3cfad9ab7a1c280b 100644 (file)
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
@@ -77,6 +77,9 @@ protected slots:
 
   void onViewShow();
   void onViewHide();
+
+private:
+  virtual void closeEvent( QCloseEvent* e );
 };
 
 #endif // OCCVIEWER_SETROTATIONPOINTDLG_H