X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasicGUI%2FBasicGUI_MarkerDlg.h;h=7dc5cd9a9132879477409adad9fb03fd3a61f45b;hb=b568e7744737ad193de8a49b27a5769a4777d7fd;hp=2f76d8063528dd0d8fc33cbcb01c01bb1aa7b5ca;hpb=732211808796539fcf1de34e06038e7fb015ece9;p=modules%2Fgeom.git

diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h
index 2f76d8063..7dc5cd9a9 100644
--- a/src/BasicGUI/BasicGUI_MarkerDlg.h
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.h
@@ -1,41 +1,39 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// GEOM GEOMGUI : GUI for Geometry component
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 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 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. 
+// 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 
+// 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 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File   : BasicGUI_MarkerDlg.h
+// Author : Sergey LITONIN, Open CASCADE S.A.S. (sergey.litonin@opencascade.com)
 //
-//
-//  File   : BasicGUI_MarkerDlg.h
-//  Author : Sergey LITONIN
-//  Module : GEOM
-//  $Header$
 
-#ifndef DIALOGBOX_Marker_H
-#define DIALOGBOX_Marker_H
+#ifndef BASICGUI_MARKERDLG_H
+#define BASICGUI_MARKERDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
-#include "DlgRef_3Sel_QTD.h"
+#include <GEOMBase_Skeleton.h>
 
-#include <qmap.h>
+#include <QMap>
 
-class DlgRef_SpinBox;
+class DlgRef_1Sel;
+class DlgRef_3Sel;
+class QDoubleSpinBox;
+class QFrame;
 
 class BasicGUI_MarkerDlg : public GEOMBase_Skeleton
 {
@@ -43,32 +41,28 @@ class BasicGUI_MarkerDlg : public GEOMBase_Skeleton
 
 private:
   enum { X, Y, Z, DX1, DY1, DZ1, DX2, DY2, DZ2 };
-  typedef QMap< int, DlgRef_SpinBox* > DataMap;
+  typedef QMap< int, QDoubleSpinBox* > DataMap;
 
 public:
-                                BasicGUI_MarkerDlg( GeometryGUI* theGeometryGUI, QWidget* );
+                                BasicGUI_MarkerDlg( GeometryGUI*, QWidget* );
   virtual                       ~BasicGUI_MarkerDlg();
   void                          Init();
 
 protected:
   virtual                       GEOM::GEOM_IOperations_ptr createOperation();
   virtual bool                  isValid( QString& );
-  virtual bool                  execute( ObjectList& objects );
-  virtual void                  closeEvent( QCloseEvent* e );
-  virtual void                  displayPreview ( const bool   activate = false,
-                                                 const bool   update = true,
-                                                 const bool   toRemoveFromEngine = true,
-                                                 const double lineWidth = -1 );
+  virtual bool                  execute( ObjectList& );
+  virtual void                  displayPreview ( const bool   = false,
+                                                 const bool   = true,
+                                                 const bool   = true,
+                                                 const double = -1 );
 
-private :
-  void                          enterEvent( QEvent* e );
+private:
+  void                          enterEvent( QEvent* );
   void                          onSelectionDone0();
 
-  GeometryGUI* myGeometryGUI;
-
 private slots:
   void                          onOk();
-  void                          onClose();
   bool                          onApply();
   void                          onActivate();
   void                          onDeactivate();
@@ -83,10 +77,9 @@ private:
   int                           myConstructorId;
   int                           myBlockPreview;
 
-  QGroupBox*                    aMainGrp;
-  DlgRef_1Sel_QTD*              Group1;
-  DlgRef_3Sel_QTD*              Group2;
-
+  QFrame*                       aMainGrp;
+  DlgRef_1Sel*                  Group1;
+  DlgRef_3Sel*                  Group2;
 };
 
-#endif // DIALOGBOX_Marker_H
+#endif // BASICGUI_MARKERDLG_H