X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPrimitiveGUI%2FPrimitiveGUI_CylinderDlg.h;h=0e6fc18fdcede5f9bdec38e200d70fe7f3ad6b84;hb=c20be9052a89947a36ccc6693d6723214a31aa1a;hp=47cc315268a5bcae43df5b7692fe73c566cfc30d;hpb=c577ca78d7a6e286526662cf54df6de1f4f2f449;p=modules%2Fgeom.git

diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
index 47cc31526..0e6fc18fd 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
@@ -1,45 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  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 
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
+//  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.
 //
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
 //
-//  File   : PrimitiveGUI_CylinderDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#ifndef DIALOGBOX_CYLINDER_H
-#define DIALOGBOX_CYLINDER_H
-
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel2Spin.h"
-#include "DlgRef_2Spin.h"
-
-#include "PrimitiveGUI.h"
+//  You should have received a copy of the GNU Lesser General Public
+//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_CylinderDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef PRIMITIVEGUI_CYLINDERDLG_H
+#define PRIMITIVEGUI_CYLINDERDLG_H
 
-#include "GEOM_EdgeFilter.hxx"
-#include "GEOM_ShapeTypeFilter.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
+class DlgRef_2Sel2Spin;
+class DlgRef_2Spin;
 
 //=================================================================================
 // class    : PrimitiveGUI_CylinderDlg
@@ -47,47 +37,44 @@
 //=================================================================================
 class PrimitiveGUI_CylinderDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    PrimitiveGUI_CylinderDlg(QWidget* parent = 0, const char* name = 0, PrimitiveGUI* thePrimitiveGUI = 0, SALOME_Selection* Sel = 0,  bool modal = FALSE, WFlags fl = 0);
-    ~PrimitiveGUI_CylinderDlg();
+  PrimitiveGUI_CylinderDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~PrimitiveGUI_CylinderDlg();
 
-private:
-    void Init();
-    void enterEvent(QEvent* e);
-    void MakeCylinderSimulationAndDisplay();
+protected:
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
 
-    PrimitiveGUI* myPrimitiveGUI;
-
-    double step;
-    int myConstructorId;
-    Handle(GEOM_ShapeTypeFilter) myVertexFilter;
-    Handle(GEOM_EdgeFilter) myEdgeFilter;  /* Filter selection */
-
-    gp_Pnt myPoint1;   /* topology used  */
-    gp_Dir myDir;
-    bool myOkPoint1;   /* to check when arguments is defined */
-    bool myOkDir;
-
-    Standard_Real myRadius;
-    Standard_Real myHeight;
-    bool myOkRadius;
-    bool myOkHeight;
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getRadius() const;
+  double                             getHeight() const;
+  
+private:
+  GEOM::GEOM_Object_var              myPoint, myDir;
 
-    DlgRef_2Sel2Spin* GroupPoints;
-    DlgRef_2Spin* GroupDimensions;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  DlgRef_2Sel2Spin*                  GroupPoints;
+  DlgRef_2Spin*                      GroupDimensions;
 
 private slots:
-    void ClickOnOk();
-    void ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int constructorId);
-    void ValueChangedInSpinBox(double newValue);
-
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox();
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_CYLINDER_H
+#endif // PRIMITIVEGUI_CYLINDERDLG_H