Join modifications from branch BR_DEBUG_3_2_0b1

[modules/visu.git] / src / VISUGUI / VisuGUI_CutLinesDlg.cxx

diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
index 7b6c49a718c106bfb7b4cfa99c5bc4aa9d3353af..0a5172adb429e699de72ddadf42b35fe9dab4f39 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
@@ -1,8 +1,21 @@
-//  VISU VISUGUI : GUI of VISU component
-//
-//  Copyright (C) 2003  CEA/DEN, EDF R&D
-//
-//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : VisuGUI_CutLinesDlg.cxx
 //  Author : VSV
@@ -368,9 +381,12 @@ void VisuGUI_CutLinesDlg::deletePlanes()
   SVTK_ViewWindow* aView;
   vtkRenderer* aRend       = myPreviewActor->GetRenderer();
   vtkRenderer* aRendGlyphs = myPreviewActorGlyphs->GetRenderer();
-  if(aRend)
+  
+  vtkRenderWindow* aWnd1 = aRend->GetRenderWindow();
+  vtkRenderWindow* aWnd2 = aRendGlyphs->GetRenderWindow();
+  if(aRend && aWnd1)
     myPreviewActor->RemoveFromRender(aRend);
-  if(aRendGlyphs)
+  if(aRendGlyphs && aWnd2)
     myPreviewActorGlyphs->RemoveFromRender(aRendGlyphs);
 
 //   Bug IPAL11962: preview is still in the viewer, if viewer not active.
@@ -560,9 +576,9 @@ void VisuGUI_CutLinesDlg::updateGlyphs(bool update){
   for(int i=0; i<3; i++) aBoundCenter[i] = (bounds[i*2] + bounds[i*2+1])/2.0;
   for(int i=0; i<3; i++){ 
     if (!myAllCurvesInvertedCheck->isChecked())
-      aSecondPnt[i] = aBasePnt[i] + aDirLn[i];
+      aSecondPnt[i] = aDirLn[i];
     else
-      aSecondPnt[i] = -aBasePnt[i] - aDirLn[i];
+      aSecondPnt[i] = - aDirLn[i];
   }
   
   vtkFloatingPointType max_bound = 0;