Merging with WPdev

[modules/geom.git] / src / GenerationGUI / GenerationGUI_PrismDlg.h

diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h
index b6b7ba17dcc41e5598d220fed77a81a02ae76f4d..2c106080c9f8dec7692272c993931d3b5d7e5228 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.h
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.h
@@ -17,7 +17,7 @@
 //  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
 //
 //
 //
@@ -28,14 +28,17 @@
 #ifndef DIALOGBOX_PRISM_H
 #define DIALOGBOX_PRISM_H
 
+#include "GenerationGUI.h"
+
 #include "GEOMBase_Skeleton.h"
 #include "DlgRef_2Sel1Spin2Check.h"
+#include "DlgRef_3Sel_QTD.h"
 
 //=================================================================================
 // class    : GenerationGUI_PrismDlg
 // purpose  :
 //=================================================================================
-class GenerationGUI_PrismDlg : public GEOMBase_Skeleton
+class GENERATIONGUI_EXPORT GenerationGUI_PrismDlg : public GEOMBase_Skeleton
 { 
     Q_OBJECT
 
@@ -57,11 +60,15 @@ private :
     
     GEOM::GEOM_Object_var myBase; /* Base shape */
     GEOM::GEOM_Object_var myVec;  /* Vector, defining the direction */
-
+    GEOM::GEOM_Object_var myPoint1, myPoint2;   /* Points for extrusion */ 
+ 
     bool myOkBase;
     bool myOkVec;
+    bool myOkPnt1;
+    bool myOkPnt2;
 
     DlgRef_2Sel1Spin2Check* GroupPoints;
+    DlgRef_3Sel_QTD* GroupPoints2; // for second layout for extrusion using 2 points
 
 private slots:
     void ClickOnOk();
@@ -70,6 +77,7 @@ private slots:
     void LineEditReturnPressed();
     void SelectionIntoArgument();
     void SetEditCurrentArgument();
+    void ConstructorsClicked(int);
     void ValueChangedInSpinBox();
     void onReverse();
 };