X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBooleanGUI%2FBooleanGUI_Dialog.h;h=71eb2667b49b3aa127b38de6c35636509593a461;hb=bbafce4b04731f9219f75dc124ec2429d994c202;hp=c9ac5a5c2728ea7016b735a55354d4a6a8b8b8db;hpb=392885c1a8d50369708bbe5e6b44033ed8b8ba51;p=modules%2Fgeom.git

diff --git a/src/BooleanGUI/BooleanGUI_Dialog.h b/src/BooleanGUI/BooleanGUI_Dialog.h
index c9ac5a5c2..71eb2667b 100644
--- a/src/BooleanGUI/BooleanGUI_Dialog.h
+++ b/src/BooleanGUI/BooleanGUI_Dialog.h
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  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 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, or (at your option) any later version.
 //
-//  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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : BooleanGUI_Dialog.h
 // Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
@@ -26,9 +27,12 @@
 #ifndef BOOLEANGUI_DIALOG_H
 #define BOOLEANGUI_DIALOG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
+#include "GEOM_GenericObjPtr.h"
 
-class DlgRef_2Sel;
+class DlgRef_2Sel2Spin3Check;
+class QLabel;
+class SalomeApp_DoubleSpinBox;
 
 //=================================================================================
 // class    : BooleanGUI_Dialog
@@ -40,7 +44,7 @@ class BooleanGUI_Dialog : public GEOMBase_Skeleton
 
 public:
   BooleanGUI_Dialog( const int, GeometryGUI*, QWidget* = 0,
-		     bool = false, Qt::WindowFlags = 0 );
+                     bool = false, Qt::WindowFlags = 0 );
   ~BooleanGUI_Dialog();
   
 protected:
@@ -48,26 +52,33 @@ protected:
   virtual GEOM::GEOM_IOperations_ptr createOperation();
   virtual bool                       isValid( QString& );
   virtual bool                       execute( ObjectList& );
-  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
+  virtual void                       restoreSubShapes( SALOMEDS::SObject_ptr );
+  virtual void                       addSubshapesToStudy();
+  virtual QList<GEOM::GeomObjPtr>    getSourceObjects();
 
 private:
   void                               Init();
   void                               enterEvent( QEvent* );
+  void                               reset();
+  void                               singleSelection();
+  void                               multipleSelection();
   
 private:
   int                                myOperation;
   
-  GEOM::GEOM_Object_var              myObject1;
-  GEOM::GEOM_Object_var              myObject2;
+  GEOM::GeomObjPtr                   myObject1;
+  QList<GEOM::GeomObjPtr>            myObjects;
   
-  DlgRef_2Sel*                       myGroup;
+  DlgRef_2Sel2Spin3Check*            myGroup;
+  QLabel*                            myFuzzyLbl;
+  SalomeApp_DoubleSpinBox*           myFuzzyEdt;
 
 private slots:
   void                               ClickOnOk();
   bool                               ClickOnApply();
+  void                               UseFuzzyChanged(int state);
   void                               SetEditCurrentArgument();
   void                               SelectionIntoArgument();
-  void                               LineEditReturnPressed();
   void                               ActivateThisDialog();
 };