Merge with version on tag OCC-V2_1_0d

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

diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
index b8d69724c6bb96f53e7c033be6359d7f6ab320f0..a92048576ae44c5c3fe87ee0283fc5d69984cde1 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
@@ -25,6 +25,7 @@
 #include <qhgroupbox.h>
 
 #include <vtkRenderer.h>
+#include <vtkPolyData.h>
 #include <vtkAppendPolyData.h>
 #include <vtkDataSetMapper.h>
 
@@ -591,6 +592,7 @@ void VisuGUI_CutLinesDlg::accept() {
   MYGenerateTable = myCreateTable->isChecked();
   MYGenerateCurve = myCurvesCheck->isChecked();
   if (myScalarPane->check()) {
+    ((QWidget*)sender())->setDisabled(true);
     storeToPrsObject(myPrs);
     if (myIsCreation) {
       if (isGenerateTable()) {
@@ -614,7 +616,13 @@ void VisuGUI_CutLinesDlg::accept() {
        }
       }
       if (myStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) {
-       visuGUI->CreateActor(myPrs);
+       try {
+         visuGUI->CreateActor(myPrs);
+       }
+       catch (...) {
+         reject();
+         return;
+       }
        GET_VTK_VIEWFRAME(myStudy)->onViewFitAll(); 
       }
     } else {