Merge from V6_main_20120808 08Aug12

[modules/geom.git] / src / BasicGUI / BasicGUI_MarkerDlg.h

diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h
index 364b0d7375786a1e1bbaee3650b0dbe759f5c3ee..9219db2347e66a2d80a5d049f6266ce0cbe5a294 100644 (file)
--- a/src/BasicGUI/BasicGUI_MarkerDlg.h
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.h
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// 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 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : BasicGUI_MarkerDlg.h
 // Author : Sergey LITONIN, Open CASCADE S.A.S. (sergey.litonin@opencascade.com)
@@ -26,7 +27,8 @@
 #ifndef BASICGUI_MARKERDLG_H
 #define BASICGUI_MARKERDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
+#include "GEOM_GenericObjPtr.h"
 
 #include <QMap>
 
@@ -56,11 +58,17 @@ protected:
                                                  const bool   = true,
                                                  const bool   = true,
                                                  const double = -1 );
+  virtual void                  addSubshapesToStudy();
 
 private:
   void                          enterEvent( QEvent* );
   void                          onSelectionDone0();
 
+  GEOM::GeomObjPtr              myShape;
+  GEOM::GeomObjPtr              myPoint;
+  GEOM::GeomObjPtr              myVectorX;
+  GEOM::GeomObjPtr              myVectorY;
+
 private slots:
   void                          onOk();
   bool                          onApply();
@@ -69,7 +77,6 @@ private slots:
   void                          onSelectionDone();
   void                          onValueChanged( double );
   void                          ConstructorsClicked( int );
-  void                          LineEditReturnPressed();
   void                          SetEditCurrentArgument();
 
 private: