X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOperationGUI%2FOperationGUI_FilletDlg.h;h=ab55f1469c2f9502f9fb0b9d9239ec4dec29808b;hb=db3bc223f3c294b55ab667f86d46824c51ec49ea;hp=3756f82b2825a27253f6c18dc95f7d8cc430070a;hpb=a596550f89dfafcf288f8d62a2ca2a1be40ca512;p=modules%2Fgeom.git

diff --git a/src/OperationGUI/OperationGUI_FilletDlg.h b/src/OperationGUI/OperationGUI_FilletDlg.h
index 3756f82b2..ab55f1469 100644
--- a/src/OperationGUI/OperationGUI_FilletDlg.h
+++ b/src/OperationGUI/OperationGUI_FilletDlg.h
@@ -17,22 +17,23 @@
 //  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
 //
 //
 //
 //  File   : OperationGUI_FilletDlg.h
 //  Author : Damien COQUERET
 //  Module : GEOM
-//  $Header$
 
 #ifndef DIALOGBOX_FILLET_H
 #define DIALOGBOX_FILLET_H
 
 #include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel1Spin.h"
 
-#include "OperationGUI.h"
+#include <TColStd_IndexedMapOfInteger.hxx>
+
+class DlgRef_1Sel1Spin;
+class DlgRef_2Sel1Spin;
 
 //=================================================================================
 // class    : OperationGUI_FilletDlg
@@ -43,47 +44,44 @@ class OperationGUI_FilletDlg : public GEOMBase_Skeleton
     Q_OBJECT
 
 public:
-    OperationGUI_FilletDlg(QWidget* parent = 0, const char* name = 0, OperationGUI* theOperationGUI = 0, SALOME_Selection* Sel = 0, Handle(AIS_InteractiveContext) ic = 0, bool modal = FALSE, WFlags fl = 0);
+    OperationGUI_FilletDlg(GeometryGUI* theGeometryGUI, QWidget* parent);
     ~OperationGUI_FilletDlg();
 
-private :
-    void Init(Handle(AIS_InteractiveContext) ic);
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void MakeFilletSimulationAndDisplay();
-
-    void ResetStateOfDialog();
-    void MakePreview();
-
-    OperationGUI* myOperationGUI;
+protected:
+    // redefined from GEOMBase_Helper
+    virtual                             GEOM::GEOM_IOperations_ptr createOperation();
+    virtual                             bool isValid( QString& msg );
+    virtual                             bool execute( ObjectList& objects );
 
-    int myConstructorId;   /* Current constructor id = radio button id */
+private slots:
+    void                                ClickOnOk();
+    bool                                ClickOnApply();
+    void                                ActivateThisDialog();
+    void                                LineEditReturnPressed();
+    void                                SelectionIntoArgument();
+    void                                SetEditCurrentArgument();
+    void                                ValueChangedInSpinBox( double newValue );
+    void                                ConstructorsClicked( int constructorId );
 
-    /* Interactive and local context management see also : bool myUseLocalContext() */
-    Handle(AIS_InteractiveContext) myIC;   /* Interactive context */ 
-    Standard_Integer myLocalContextId;   /* identify a local context used by this method */
-    bool myUseLocalContext;   /* true when this method as opened a local context  */
+private:
+    void                                Init();
+    void                                enterEvent( QEvent* e );
+    void                                reset();
+    int                                 getConstructorId() const;
+    void                                activateSelection();
+    void                                enableWidgets();
+    double                              getRadius() const;
 
-    TopoDS_Shape myShape;
-    bool myOkShape;
-    char* myShapeIOR;
-    int myShapeType;
-    double myRadius;
-    
-    DlgRef_1Sel1Spin* Group1;
+private:
+    int                                 myConstructorId;
 
-private slots:
-    void ClickOnOk();
-    void ClickOnApply();
-    void ClickOnCancel();
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ValueChangedInSpinBox(double newValue);
-    void ConstructorsClicked(int constructorId);
+    GEOM::GEOM_Object_var               myShape;
+    TColStd_IndexedMapOfInteger         myEdges;
+    TColStd_IndexedMapOfInteger         myFaces;
 
+    DlgRef_1Sel1Spin*                   Group1;
+    DlgRef_2Sel1Spin*                   Group2;
+    DlgRef_2Sel1Spin*                   Group3;
 };
 
 #endif // DIALOGBOX_FILLET_H
-