X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FRepairGUI%2FRepairGUI_GlueDlg.h;h=863e398e9d21944f6aa776a338efa8827789a708;hb=0c352ca06a65684d30a85df8a2b9e5f26dd9e45b;hp=8d838ab85b6fc6a475416238a8cf6896d50d795a;hpb=392885c1a8d50369708bbe5e6b44033ed8b8ba51;p=modules%2Fgeom.git

diff --git a/src/RepairGUI/RepairGUI_GlueDlg.h b/src/RepairGUI/RepairGUI_GlueDlg.h
index 8d838ab85..863e398e9 100644
--- a/src/RepairGUI/RepairGUI_GlueDlg.h
+++ b/src/RepairGUI/RepairGUI_GlueDlg.h
@@ -1,33 +1,38 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, 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.
 //
-//  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
-//
-// GEOM GEOMGUI : GUI for Geometry component
-// File   : RepairGUI_GlueDlg.h
-// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
+//  GEOM GEOMGUI : GUI for Geometry component
+//  File   : RepairGUI_GlueDlg.h
+//  Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+
 #ifndef REPAIRGUI_GLUEDLG_H
 #define REPAIRGUI_GLUEDLG_H
 
 #include <GEOMBase_Skeleton.h>
 
+#include <TopAbs.hxx>
+
+#include <QList>
+
 class DlgRef_1SelExt;
 class SalomeApp_DoubleSpinBox;
 class QPushButton;
@@ -42,47 +47,50 @@ class RepairGUI_GlueDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  RepairGUI_GlueDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  RepairGUI_GlueDlg (GeometryGUI*, QWidget* = 0, bool = false, TopAbs_ShapeEnum theGlueMode = TopAbs_FACE);
   ~RepairGUI_GlueDlg();
 
 protected:
   // redefined from GEOMBase_Helper
   virtual GEOM::GEOM_IOperations_ptr createOperation();
-  virtual bool                       isValid( QString& );
-  virtual bool                       execute( ObjectList& );
-  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
+  virtual bool                       isValid (QString&);
+  virtual bool                       execute (ObjectList&);
+  virtual void                       restoreSubShapes (SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr);
 
 private:
   void                               Init();
-  void                               enterEvent( QEvent* );
+  void                               enterEvent (QEvent*);
   void                               initSelection();
-  
+
   void                               clearTemporary();
-  
-  bool                               onAcceptLocal();
-  void                               clearShapeBufferLocal( GEOM::GEOM_Object_ptr );
+
   // Reimplementation of onAccept for local case of this class.
-  
+  bool                               onAcceptLocal();
+  void                               clearShapeBufferLocal (GEOM::GEOM_Object_ptr);
+
   void                               activateSelection();
   void                               updateButtonState();
   void                               selectTmpInViewer();
-    
-private:    
+
+private:
   GEOM::GEOM_Object_var              myObject;
-  ObjectList                         myTmpObjs;
-    
+  QList<GEOM::GeomObjPtr>            myTmpObjs;
+
   DlgRef_1SelExt*                    GroupPoints;
   DlgRef_1SelExt*                    GroupPoints2;
   SalomeApp_DoubleSpinBox*           myTolEdt;
   SalomeApp_DoubleSpinBox*           myTolEdt2;
   QPushButton*                       myDetectBtn;
   QCheckBox*                         mySubShapesChk;
-  
+  QCheckBox*                         myGlueAllEdgesChk;
+
   int                                myCurrConstrId;
-    
+
+  TopAbs_ShapeEnum                   myGlueMode;
+
 protected slots:
   virtual void                       ClickOnCancel();
-    
+
 private slots:
   void                               ClickOnOk();
   bool                               ClickOnApply();
@@ -93,11 +101,10 @@ private slots:
   void                               SelectionIntoArgument();
   void                               SetEditCurrentArgument();
 
-  void                               ConstructorsClicked( int );
-  //void                               ValueChangedInSpinBox();
-  
+  void                               ConstructorsClicked (int);
+
   void                               onDetect();
-  void                               onTolerChanged( double );
+  void                               onTolerChanged (double);
   void                               onSubShapesChk();
 };