X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGenerationGUI%2FGenerationGUI_PipeDlg.h;h=6921b376011da78c268080ede713f0e4a4348e7a;hb=721a3588c024c2772e7cfc99ddd8ffce6a47d57f;hp=795c36ed4abaa5001ad2d557f16ab63230f6fb96;hpb=c577ca78d7a6e286526662cf54df6de1f4f2f449;p=modules%2Fgeom.git

diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.h b/src/GenerationGUI/GenerationGUI_PipeDlg.h
index 795c36ed4..6921b3760 100644
--- a/src/GenerationGUI/GenerationGUI_PipeDlg.h
+++ b/src/GenerationGUI/GenerationGUI_PipeDlg.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_PipeDlg.h
 //  Author : Lucien PIGNOLONI
 //  Module : GEOM
-//  $Header$
 
 #ifndef DIALOGBOX_PIPE_H
 #define DIALOGBOX_PIPE_H
@@ -32,8 +31,6 @@
 #include "GEOMBase_Skeleton.h"
 #include "DlgRef_2Sel_QTD.h"
 
-#include "GenerationGUI.h"
-
 //=================================================================================
 // class    : GenerationGUI_PipeDlg
 // purpose  :
@@ -43,33 +40,34 @@ class GenerationGUI_PipeDlg : public GEOMBase_Skeleton
     Q_OBJECT
 
 public:
-    GenerationGUI_PipeDlg(QWidget* parent = 0, const char* name = 0, GenerationGUI* theGenerationGUI = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
+    GenerationGUI_PipeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
+			  const char* name = 0, bool modal = FALSE, WFlags fl = 0);
     ~GenerationGUI_PipeDlg();
 
+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 MakePipeSimulationAndDisplay();
 
-    GenerationGUI* myGenerationGUI;
-
-    TopoDS_Shape myShape1;   /* topology used */
-    TopoDS_Shape myShape2;   /* topology used */
-    GEOM::GEOM_Shape_var myGeomShape1; /* is myShape1 */
-    GEOM::GEOM_Shape_var myGeomShape2; /* is myShape2 */
-    bool myOkShape1;
-    bool myOkShape2;   /* to check when arguments are defined */
+    GEOM::GEOM_Object_var myBase; /* Base shape */
+    GEOM::GEOM_Object_var myPath; /* Shape, defining the path */
+    bool myOkBase;
+    bool myOkPath; /* to check when arguments are defined */
 
     DlgRef_2Sel_QTD* GroupPoints;
 
 private slots:
     void ClickOnOk();
-    void ClickOnApply();
+    bool ClickOnApply();
     void ActivateThisDialog();
     void LineEditReturnPressed();
     void SelectionIntoArgument();
     void SetEditCurrentArgument();
-
 };
 
 #endif // DIALOGBOX_PIPE_H