0021787: [CEA 621] Desactivate preview for partition and boolean operations in prefer...

diff --git a/doc/salome/gui/GEOM/images/bool1.png b/doc/salome/gui/GEOM/images/bool1.png
index 5dac3ca2440916ce5cbd0365510641eee1df295a..704a7a37db235057f37284279a6f39b6e5d66131 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/bool1.png and b/doc/salome/gui/GEOM/images/bool1.png differ

diff --git a/doc/salome/gui/GEOM/images/bool2.png b/doc/salome/gui/GEOM/images/bool2.png
index a14fec4e8e6cf362e76c0997f3823c40fe38d6a0..026e607054f993e30d6aabfd92a146b1a112affd 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/bool2.png and b/doc/salome/gui/GEOM/images/bool2.png differ

diff --git a/doc/salome/gui/GEOM/images/bool3.png b/doc/salome/gui/GEOM/images/bool3.png
index 1e8941a3ccef42fe121a17d28dc7f7b7baf1a475..11c5ade724c02d474a6c54bb414ee86c6cda90bf 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/bool3.png and b/doc/salome/gui/GEOM/images/bool3.png differ

diff --git a/doc/salome/gui/GEOM/images/neo-section.png b/doc/salome/gui/GEOM/images/neo-section.png
index 532d1f835329a2bb8ae77ffe4d2fd129bff2c5c9..901b1f3c2526e6cac1a79587717413cd0d559031 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-section.png and b/doc/salome/gui/GEOM/images/neo-section.png differ

diff --git a/doc/salome/gui/GEOM/images/partition1.png b/doc/salome/gui/GEOM/images/partition1.png
index baf8c4ac951e091cf87a0a34d94f9a287a873bfa..b0136adb88f353073d9726ee0a6a2911f393821e 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/partition1.png and b/doc/salome/gui/GEOM/images/partition1.png differ

diff --git a/doc/salome/gui/GEOM/images/partition2.png b/doc/salome/gui/GEOM/images/partition2.png
index 12b92335b02d3779b17ad3b37ec03d868d5b3ab2..38b3dd474958a946db34ea35d0f96591ff6226a7 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/partition2.png and b/doc/salome/gui/GEOM/images/partition2.png differ

diff --git a/src/BooleanGUI/BooleanGUI_Dialog.cxx b/src/BooleanGUI/BooleanGUI_Dialog.cxx
index 0972a79897f56a07e904163d3bad5ff0d5845dfc..94143574ec3a98d03c0bc90892dc68faab32d458 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_Dialog.cxx
+++ b/src/BooleanGUI/BooleanGUI_Dialog.cxx
@@ -36,6 +36,10 @@
 #include <SalomeApp_Application.h>
 #include <LightApp_SelectionMgr.h>
 
+// VSR 22/08/2012: issue 0021787: remove "Preview" button from BOP and Partition operations
+// Comment next line to enable preview in BOP dialog box
+#define NO_PREVIEW
+
 //=================================================================================
 // class    : BooleanGUI_Dialog()
 // purpose  : Constructs a BooleanGUI_Dialog which is a child of 'parent', with the
@@ -110,6 +114,10 @@ BooleanGUI_Dialog::BooleanGUI_Dialog (const int theOperation, GeometryGUI* theGe
   layout->addWidget(myGroup);
   /***************************************************************/
 
+#ifdef NO_PREVIEW
+  mainFrame()->CheckBoxPreview->setChecked( false );
+  mainFrame()->CheckBoxPreview->hide();
+#endif
   // Initialisation
   Init();
 }

diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.cxx b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
index 5c940f1ea4d9acf2055cbde5b7604e8e2c3989a4..c6dd6c14bd25c11206d81ed24fd07267780f1c31 100644 (file)
--- a/src/OperationGUI/OperationGUI_PartitionDlg.cxx
+++ b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
@@ -42,6 +42,10 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 
+// VSR 22/08/2012: issue 0021787: remove "Preview" button from BOP and Partition operations
+// Comment next line to enable preview in Partition dialog box
+#define NO_PREVIEW
+
 //=================================================================================
 // class    : OperationGUI_PartitionDlg()
 // purpose  : Constructs a OperationGUI_PartitionDlg which is a child of 'parent', with the
@@ -89,6 +93,10 @@ OperationGUI_PartitionDlg::OperationGUI_PartitionDlg( GeometryGUI* theGeometryGU
 
   setHelpFileName( "partition_page.html" );
 
+#ifdef NO_PREVIEW
+  mainFrame()->CheckBoxPreview->setChecked( false );
+  mainFrame()->CheckBoxPreview->hide();
+#endif
   Init();
 }