X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasicGUI%2FBasicGUI_EllipseDlg.h;h=c3568c3a6ca695a02f73fc2923c7b4e5ac996fc1;hb=f0a071156a96bbae014d319b433d62e8b93d1f24;hp=21491d29e94fc5691c96679865dd5e9e5767aded;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git

diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h
index 21491d29e..c3568c3a6 100644
--- a/src/BasicGUI/BasicGUI_EllipseDlg.h
+++ b/src/BasicGUI/BasicGUI_EllipseDlg.h
@@ -1,41 +1,36 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE 
-// 
-//  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.
+//
+// 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
 //
-//  File   : BasicGUI_EllipseDlg.h
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
 
-#ifndef BASICGUI_ELLIPSE_H
-#define BASICGUI_ELLIPSE_H
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_EllipseDlg.h
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
+//
+#ifndef BASICGUI_ELLIPSEDLG_H
+#define BASICGUI_ELLIPSEDLG_H
 
 #include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel2Spin.h"
+#include "GEOM_GenericObjPtr.h"
 
-#include "BasicGUI.h"
-
-#include "GEOM_ShapeTypeFilter.hxx"
-#include "GEOM_EdgeFilter.hxx"
-#include <gp_Dir.hxx>
+class DlgRef_3Sel2Spin;
 
 //=================================================================================
 // class    : BasicGUI_EllipseDlg
@@ -43,41 +38,39 @@
 //=================================================================================
 class BasicGUI_EllipseDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BasicGUI_EllipseDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BasicGUI_EllipseDlg();
+  BasicGUI_EllipseDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~BasicGUI_EllipseDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
-    virtual void closeEvent( QCloseEvent* e );
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-
-    GEOM::GEOM_Object_var myPoint, myDir;
-
-    DlgRef_2Sel2Spin* GroupPoints;
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+  
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
+private:
+  GEOM::GeomObjPtr                   myPoint, myDir, myMajor;
+  
+  DlgRef_3Sel2Spin*                  GroupPoints;
+  
 private slots:
-    void ClickOnOk();
-    void ClickOnCancel();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
-    
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ValueChangedInSpinBox(double newValue);
-
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  
+  void                               ActivateThisDialog();
+  void                               DeactivateActiveDialog();
+  
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ValueChangedInSpinBox( double );
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // BASICGUI_ELLIPSE_H
+#endif // BASICGUI_ELLIPSEDLG_H