From: rnv <rnv@opencascade.com>
Date: Tue, 18 Feb 2014 11:20:06 +0000 (+0400)
Subject: Issue "0021793: [CEA 625] Clipping : from coordinates or from bounding
X-Git-Tag: V7_4_0a1~21
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f52f29e2784cc9ab3e4d7910354edaa4fa75a6db;p=modules%2Fgui.git

Issue "0021793: [CEA 625] Clipping : from coordinates or from bounding
box": fix "Fatal Error" in case vector product of the parallel vectors.
---

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
index 93097cee8..8daae8578 100644
--- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
@@ -305,7 +305,14 @@ void absolutePlaneToRelative( OCCViewer_ClipPlane& thePlane, Handle(AIS_Interact
   {
     case 0:
     {
-      if ( aDY.IsEqual( aPlaneN, Precision::Angular() ) )
+      if ( aDY.IsParallel( aPlaneN, Precision::Angular() ) )
+      {
+        anAng1 = 0.0;
+        anAng2 = 0.0;
+        break;
+      }
+
+      if ( aDX.IsParallel( aPlaneN, Precision::Angular() ) )
       {
         anAng1 = 0.0;
         anAng2 = 0.0;
@@ -331,7 +338,14 @@ void absolutePlaneToRelative( OCCViewer_ClipPlane& thePlane, Handle(AIS_Interact
     }
     case 1:
     {
-      if ( aDZ.IsEqual( aPlaneN, Precision::Angular() ) )
+      if ( aDZ.IsParallel( aPlaneN, Precision::Angular() ) )
+      {
+        anAng1 = 0.0;
+        anAng2 = 0.0;
+        break;
+      }
+
+      if ( aDY.IsParallel( aPlaneN, Precision::Angular() ) )
       {
         anAng1 = 0.0;
         anAng2 = 0.0;
@@ -357,7 +371,14 @@ void absolutePlaneToRelative( OCCViewer_ClipPlane& thePlane, Handle(AIS_Interact
     }
     case 2:
     {
-      if ( aDX.IsEqual( aPlaneN, Precision::Angular() ) )
+      if ( aDX.IsParallel( aPlaneN, Precision::Angular() ) )
+      {
+        anAng1 = 0.0;
+        anAng2 = 0.0;
+        break;
+      }
+
+      if ( aDZ.IsParallel( aPlaneN, Precision::Angular() ) )
       {
         anAng1 = 0.0;
         anAng2 = 0.0;
@@ -1286,7 +1307,7 @@ void OCCViewer_ClippingDlg::onSelectPlane ( int theIndex )
 */
 void OCCViewer_ClippingDlg::SetCurrentPlaneParam()
 {
-  if ( clipPlanesCount() == 0 || myIsSelectPlane )
+  if ( clipPlanesCount() == 0 || myIsSelectPlane || myBusy)
     return;
 
   int aCurPlaneIndex = ComboBoxPlanes->currentIndex();
@@ -1295,6 +1316,11 @@ void OCCViewer_ClippingDlg::SetCurrentPlaneParam()
 
   if ( aPlane.PlaneMode == Absolute )
   {
+    if( qFuzzyIsNull( SpinBox_Dx->value() ) && 
+        qFuzzyIsNull( SpinBox_Dy->value() ) && 
+        qFuzzyIsNull( SpinBox_Dz->value() ) ) {
+      return;
+    }
     aPlane.Orientation = CBAbsoluteOrientation->currentIndex();
     aPlane.X  = SpinBox_X->value();
     aPlane.Y  = SpinBox_Y->value();