Merge remote branch 'origin/V7_dev'

[modules/geom.git] / src / PrimitiveGUI / PrimitiveGUI_CylinderDlg.h

diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
index d7035831bee6f497ec3fd4a9c1bc619bc97fed63..8c46171f8c67b7ecabf4b259803ab19305b7ed93 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,8 +30,8 @@
 #include "GEOMBase_Skeleton.h"
 #include "GEOM_GenericObjPtr.h"
 
-class DlgRef_2Sel2Spin;
-class DlgRef_2Spin;
+class DlgRef_2Sel3Spin1Check;
+class DlgRef_3Spin1CheckCyl;
 
 //=================================================================================
 // class    : PrimitiveGUI_CylinderDlg
@@ -51,12 +51,14 @@ protected:
   virtual bool                       isValid( QString& );
   virtual bool                       execute( ObjectList& );
   virtual void                       addSubshapesToStudy();
+  virtual QList<GEOM::GeomObjPtr>    getSourceObjects();
 
 private:
   void                               Init();
   void                               enterEvent( QEvent* );
   double                             getRadius() const;
   double                             getHeight() const;
+  double                             getAngle() const;
   
 private:
   GEOM::GeomObjPtr                   myPoint, myDir;
@@ -64,8 +66,8 @@ private:
   // to initialize the first selection field with a selected object on the dialog creation
   bool                               myInitial;
   
-  DlgRef_2Sel2Spin*                  GroupPoints;
-  DlgRef_2Spin*                      GroupDimensions;
+  DlgRef_2Sel3Spin1Check*            GroupPoints;
+  DlgRef_3Spin1CheckCyl*             GroupDimensions;
 
 private slots:
   void                               ClickOnOk();
@@ -76,6 +78,7 @@ private slots:
   void                               ConstructorsClicked( int );
   void                               ValueChangedInSpinBox();
   void                               SetDoubleSpinBoxStep( double );
+  void                               ActivateAngle();
 };
 
 #endif // PRIMITIVEGUI_CYLINDERDLG_H