X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FRepairGUI%2FRepairGUI_GlueDlg.h;h=8d838ab85b6fc6a475416238a8cf6896d50d795a;hb=83831609036ed1ee13742a7ef275c25f5b577da1;hp=2c493dfa53e5ab3f9cc01005078444d6664fb66c;hpb=732211808796539fcf1de34e06038e7fb015ece9;p=modules%2Fgeom.git

diff --git a/src/RepairGUI/RepairGUI_GlueDlg.h b/src/RepairGUI/RepairGUI_GlueDlg.h
index 2c493dfa5..8d838ab85 100644
--- a/src/RepairGUI/RepairGUI_GlueDlg.h
+++ b/src/RepairGUI/RepairGUI_GlueDlg.h
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  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
@@ -17,22 +17,21 @@
 //  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//  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.
 //
-//
-//  File   : RepairGUI_GlueDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#ifndef DIALOGBOX_Glue_H
-#define DIALOGBOX_Glue_H
+#ifndef REPAIRGUI_GLUEDLG_H
+#define REPAIRGUI_GLUEDLG_H
 
-#include "GEOMBase_Skeleton.h"
+#include <GEOMBase_Skeleton.h>
 
-class QtxDblSpinBox;
-class DlgRef_1Sel_Ext;
+class DlgRef_1SelExt;
+class SalomeApp_DoubleSpinBox;
+class QPushButton;
+class QCheckBox;
 
 //=================================================================================
 // class    : RepairGUI_GlueDlg
@@ -40,44 +39,66 @@ class DlgRef_1Sel_Ext;
 //=================================================================================
 class RepairGUI_GlueDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_GlueDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_GlueDlg();
+  RepairGUI_GlueDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_GlueDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void initSelection();
-
-    bool onAcceptLocal( const bool publish = true, const bool useTransaction = true );
-    void clearShapeBufferLocal( GEOM::GEOM_Object_ptr );
-    // Reimplementation of onAccept for local case of this class.
-
-    GEOM::GEOM_Object_var myObject;
-
-    DlgRef_1Sel_Ext* GroupPoints;
-    QtxDblSpinBox*   myTolEdt;
+  // 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 );
 
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               initSelection();
+  
+  void                               clearTemporary();
+  
+  bool                               onAcceptLocal();
+  void                               clearShapeBufferLocal( GEOM::GEOM_Object_ptr );
+  // Reimplementation of onAccept for local case of this class.
+  
+  void                               activateSelection();
+  void                               updateButtonState();
+  void                               selectTmpInViewer();
+    
+private:    
+  GEOM::GEOM_Object_var              myObject;
+  ObjectList                         myTmpObjs;
+    
+  DlgRef_1SelExt*                    GroupPoints;
+  DlgRef_1SelExt*                    GroupPoints2;
+  SalomeApp_DoubleSpinBox*           myTolEdt;
+  SalomeApp_DoubleSpinBox*           myTolEdt2;
+  QPushButton*                       myDetectBtn;
+  QCheckBox*                         mySubShapesChk;
+  
+  int                                myCurrConstrId;
+    
+protected slots:
+  virtual void                       ClickOnCancel();
+    
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ClickOnCancel();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+
+  void                               ActivateThisDialog();
 
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  //void                               ValueChangedInSpinBox();
+  
+  void                               onDetect();
+  void                               onTolerChanged( double );
+  void                               onSubShapesChk();
 };
 
-#endif // DIALOGBOX_Glue_H
+#endif // REPAIRGUI_GLUEDLG_H