X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasicGUI%2FBasicGUI_MarkerDlg.h;h=e2cdb7f0711b54e17eb5959dcdeb547ecb03767c;hb=723f0c59fbe9ee4bc11f11513a971fd4e691b55d;hp=7ba75b60b52fa548a15b4179ceb1136ede81e237;hpb=239f8109c64fa0c5a2e1d87a420bad5529b57f48;p=modules%2Fgeom.git

diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h
index 7ba75b60b..e2cdb7f07 100644
--- a/src/BasicGUI/BasicGUI_MarkerDlg.h
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.h
@@ -1,80 +1,82 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2010  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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_MarkerDlg.h
-//  Author : Sergey LITONIN
-//  Module : GEOM
-
-#ifndef DIALOGBOX_Marker_H
-#define DIALOGBOX_Marker_H
 
-#include "GEOM_BasicGUI.hxx"
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_MarkerDlg.h
+// Author : Sergey LITONIN, Open CASCADE S.A.S. (sergey.litonin@opencascade.com)
+//
+#ifndef BASICGUI_MARKERDLG_H
+#define BASICGUI_MARKERDLG_H
 
 #include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
-#include "DlgRef_3Sel_QTD.h"
+#include "GEOM_GenericObjPtr.h"
 
-#include <qmap.h>
+#include <QMap>
 
-class DlgRef_SpinBox;
+class DlgRef_1Sel;
+class DlgRef_3Sel;
+class SalomeApp_DoubleSpinBox;
+class QFrame;
 
-class GEOM_BASICGUI_EXPORT BasicGUI_MarkerDlg : public GEOMBase_Skeleton
+class BasicGUI_MarkerDlg : public GEOMBase_Skeleton
 {
   Q_OBJECT
 
 private:
   enum { X, Y, Z, DX1, DY1, DZ1, DX2, DY2, DZ2 };
-  typedef QMap< int, DlgRef_SpinBox* > DataMap;
+  typedef QMap< int, SalomeApp_DoubleSpinBox* > 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 );
+  virtual void                  addSubshapesToStudy();
 
 private:
-  void                          enterEvent( QEvent* e );
+  void                          enterEvent( QEvent* );
   void                          onSelectionDone0();
 
+  GEOM::GeomObjPtr              myShape;
+  GEOM::GeomObjPtr              myPoint;
+  GEOM::GeomObjPtr              myVectorX;
+  GEOM::GeomObjPtr              myVectorY;
+
 private slots:
   void                          onOk();
-  void                          onClose();
   bool                          onApply();
   void                          onActivate();
   void                          onDeactivate();
   void                          onSelectionDone();
   void                          onValueChanged( double );
   void                          ConstructorsClicked( int );
-  void                          LineEditReturnPressed();
   void                          SetEditCurrentArgument();
 
 private:
@@ -82,10 +84,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