X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGenerationGUI%2FGenerationGUI_FillingDlg.h;h=1590f28bfb3c5d5ca265339a3beee2a4c2b04b80;hb=08bda50cec9099246ae2f61b4c413af9e437068d;hp=967c9d78c06a4a68faacef08b392f4416b721313;hpb=c577ca78d7a6e286526662cf54df6de1f4f2f449;p=modules%2Fgeom.git

diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.h b/src/GenerationGUI/GenerationGUI_FillingDlg.h
index 967c9d78c..1590f28bf 100644
--- a/src/GenerationGUI/GenerationGUI_FillingDlg.h
+++ b/src/GenerationGUI/GenerationGUI_FillingDlg.h
@@ -17,14 +17,13 @@
 //  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   : GenerationGUI_FillingDlg.h
 //  Author : Lucien PIGNOLONI
 //  Module : GEOM
-//  $Header$
 
 #ifndef DIALOGBOX_FILLING_H
 #define DIALOGBOX_FILLING_H
@@ -32,10 +31,6 @@
 #include "GEOMBase_Skeleton.h"
 #include "DlgRef_1Sel5Spin.h"
 
-#include "GenerationGUI.h"
-
-#include "GEOM_ShapeTypeFilter.hxx"
-
 //=================================================================================
 // class    : GenerationGUI_FillingDlg
 // purpose  :
@@ -45,38 +40,38 @@ class GenerationGUI_FillingDlg : public GEOMBase_Skeleton
     Q_OBJECT
 
 public:
-    GenerationGUI_FillingDlg(QWidget* parent = 0, const char* name = 0, GenerationGUI* theGenerationGUI = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
+    GenerationGUI_FillingDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
+			     const char* name = 0, bool modal = FALSE, WFlags fl = 0);
     ~GenerationGUI_FillingDlg();
 
+protected:
+    // redefined from GEOMBase_Helper
+    virtual GEOM::GEOM_IOperations_ptr createOperation();
+    virtual bool isValid( QString& msg );
+    virtual bool execute( ObjectList& objects );    
+
 private:
     void Init();
     void enterEvent(QEvent* e);
-    void MakeFillingSimulationAndDisplay();
 
-    GenerationGUI* myGenerationGUI;
-
-    Handle(GEOM_ShapeTypeFilter) myCompoundFilter;  /* Filter selection */
-
-    GEOM::GEOM_Shape_var myGeomShape; /* is mySectionShape */
-    TopoDS_Shape mySectionShape;
+    GEOM::GEOM_Object_var myCompound; /* compound of curves */
     Standard_Integer myMinDeg;
     Standard_Integer myMaxDeg;
     Standard_Real myTol3D;
     Standard_Real myTol2D;
     Standard_Integer myNbIter;
-    bool myOkSectionShape;         /* to check when arguments is defined */
+    bool myOkCompound;         /* to check when curv. compound is defined */
 
     DlgRef_1Sel5Spin* GroupPoints;
 
 private slots:
     void ClickOnOk();
-    void ClickOnApply();
+    bool ClickOnApply();
     void ActivateThisDialog();
     void LineEditReturnPressed();
     void SelectionIntoArgument();
     void SetEditCurrentArgument();
     void ValueChangedInSpinBox(double newValue);
-
 };
 
 #endif // DIALOGBOX_FILLING_H