CCAR:remove trailing whitespace

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

diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h
index 1ccc7461b2fba1342a235a826b07884d50a82d60..bebfa3feca2f2d582e89fbffffd08f6002bcca4f 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.h
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : GenerationGUI_PrismDlg.h
 // Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
@@ -26,7 +27,8 @@
 #ifndef GENERATIONGUI_PRISMDLG_H
 #define GENERATIONGUI_PRISMDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
+#include "GEOM_GenericObjPtr.h"
 
 class DlgRef_2Sel1Spin2Check;
 class DlgRef_3Sel1Check;
@@ -50,6 +52,7 @@ protected:
   virtual bool                       isValid( QString& );
   virtual bool                       execute( ObjectList& );    
   virtual void                       addSubshapesToStudy();
+  virtual bool                       extractPrefix() const;
 
 private:
   void                               Init();
@@ -57,20 +60,9 @@ private:
   double                             getHeight() const;
  
 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;
-  bool                               myBothway;
-  bool                               myBothway2;
-  bool                               myBothway3;
-  
-  // to initialize the first selection field with a selected object on the dialog creation
-  bool                               myInitial;
+  QList<GEOM::GeomObjPtr>            myBaseObjects;  /* Base shapes */
+  GEOM::GeomObjPtr                   myVec;  /* Vector, defining the direction */
+  GEOM::GeomObjPtr                   myPoint1, myPoint2;   /* Points for extrusion */ 
   
   DlgRef_2Sel1Spin2Check*            GroupPoints;
   DlgRef_3Sel1Check*                 GroupPoints2; // for second layout for extrusion using 2 points
@@ -80,7 +72,6 @@ private slots:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
-  void                               LineEditReturnPressed();
   void                               SelectionIntoArgument();
   void                               SetEditCurrentArgument();
   void                               ConstructorsClicked( int );