X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPrimitiveGUI%2FPrimitiveGUI_TorusDlg.h;h=ef90ffbdf62ede8cc9dcf4aada183b558efbe53b;hb=35c0ccc26885b896b4e62981979fd987e4b20f76;hp=84068f432b75fdb395cc394bc7fcc1d54ceafcd9;hpb=a596550f89dfafcf288f8d62a2ca2a1be40ca512;p=modules%2Fgeom.git

diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
index 84068f432..ef90ffbdf 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
@@ -33,13 +33,6 @@
 #include "DlgRef_2Sel2Spin.h"
 #include "DlgRef_2Spin.h"
 
-#include "PrimitiveGUI.h"
-
-#include "GEOM_EdgeFilter.hxx"
-#include "GEOM_ShapeTypeFilter.hxx"
-
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
 
 //=================================================================================
 // class    : PrimitiveGUI_TorusDlg
@@ -50,41 +43,41 @@ class PrimitiveGUI_TorusDlg : public GEOMBase_Skeleton
     Q_OBJECT
 
 public:
-    PrimitiveGUI_TorusDlg(QWidget* parent = 0, const char* name = 0, PrimitiveGUI* thePrimitiveGUI = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
+    PrimitiveGUI_TorusDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
     ~PrimitiveGUI_TorusDlg();
 
+protected:
+    // redefined from GEOMBase_Helper
+    virtual GEOM::GEOM_IOperations_ptr createOperation();
+    virtual bool isValid( QString& );
+    virtual bool execute( ObjectList& objects );
+
+    virtual void closeEvent( QCloseEvent* e );
+    
 private:
     void Init();
     void enterEvent(QEvent* e);
-    void MakeTorusSimulationAndDisplay();
-
-    PrimitiveGUI* myPrimitiveGUI;
-
-    double step;
-    int myConstructorId;
-    Handle(GEOM_ShapeTypeFilter) myVertexFilter;
-    Handle(GEOM_EdgeFilter) myEdgeFilter;  /* Filter selection */
-
-    gp_Pnt myPoint1;   /* topology used  */
-    gp_Dir myDir;
-    bool myOkPoint1;   /* to check when arguments is defined */
-    bool myOkDir;
-
-    Standard_Real myRadius1;
-    Standard_Real myRadius2;
+    double getRadius1() const;
+    double getRadius2() const;
 
+    GeometryGUI* myGeometryGUI;
+    
+    GEOM::GEOM_Object_var myPoint, myDir;
+    
     DlgRef_2Sel2Spin* GroupPoints;
     DlgRef_2Spin* GroupDimensions;
-
-private slots:
+    
+    private slots:
     void ClickOnOk();
-    void ClickOnApply();
+    bool ClickOnApply();
+    void ClickOnCancel();
     void ActivateThisDialog();
+    void DeactivateActiveDialog();
     void LineEditReturnPressed();
     void SelectionIntoArgument();
     void SetEditCurrentArgument();
-    void ConstructorsClicked(int constructorId);
-    void ValueChangedInSpinBox(double newValue);
+    void ConstructorsClicked(int);
+    void ValueChangedInSpinBox();
 
 };