Merge from V6_main_20120808 08Aug12

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

diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h
index 1dfd48618edb751d4a937f9159797903097f1a4d..092a491b727083a6add02a1a58494150e539b6db 100644 (file)
--- a/src/BasicGUI/BasicGUI_PointDlg.h
+++ b/src/BasicGUI/BasicGUI_PointDlg.h
@@ -1,34 +1,37 @@
-//  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_PointDlg.h
 // Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
-//
+
 #ifndef BASICGUI_POINTDLG_H
 #define BASICGUI_POINTDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
+#include "GEOM_GenericObjPtr.h"
+#include <QMap>
 
-class DlgRef_1Sel1Spin;
+class DlgRef_2Sel1Spin;
 class DlgRef_3Spin;
 class DlgRef_2Sel;
 class DlgRef_1Sel3Spin;
@@ -36,6 +39,9 @@ class DlgRef_1Sel2Spin;
 
 class QLineEdit;
 class QGroupBox;
+class QButtonGroup;
+class QMenu;
+class QAction;
 
 class gp_Pnt;
 
@@ -68,17 +74,20 @@ private:
   double                             getParameter() const;
   double                             getUParameter() const;
   double                             getVParameter() const;
+  void                               updateParamCoord(bool theIsUpdate);
 
 private:
-  GEOM::GEOM_Object_var              myEdge;
-  GEOM::GEOM_Object_var              myFace;
-  GEOM::GEOM_Object_var              myRefPoint; 
-  GEOM::GEOM_Object_var              myLine1; 
-  GEOM::GEOM_Object_var              myLine2;
-  
+  GEOM::GeomObjPtr                   myEdge;
+  GEOM::GeomObjPtr                   myFace;
+  GEOM::GeomObjPtr                   myRefPoint; 
+  GEOM::GeomObjPtr                   myLine1; 
+  GEOM::GeomObjPtr                   myLine2;
+
+  bool                               myBusy;
+
   DlgRef_3Spin*                      GroupXYZ;
   DlgRef_1Sel3Spin*                  GroupRefPoint;
-  DlgRef_1Sel1Spin*                  GroupOnCurve;
+  DlgRef_2Sel1Spin*                  GroupOnCurve;
   DlgRef_2Sel*                       GroupLineIntersection;
   DlgRef_1Sel2Spin*                  GroupOnSurface;
   
@@ -86,18 +95,29 @@ private:
   QLineEdit*                         myX;
   QLineEdit*                         myY;
   QLineEdit*                         myZ;
+
+  QGroupBox*                         myParamGroup;
+  QButtonGroup*                      myParamCoord;
+
+  QMenu*                             myBtnPopup;
+  QMap<QAction*, int>                myActions;
+
+  TopAbs_ShapeEnum                   myNeedType;
   
 private slots:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
   void                               DeactivateActiveDialog();
-  void                               LineEditReturnPressed();
   void                               SelectionIntoArgument();
   void                               SetEditCurrentArgument();
   void                               ConstructorsClicked( int );
   void                               ValueChangedInSpinBox( double );
   void                               SetDoubleSpinBoxStep( double );
+  void                               ClickParamCoord( int );
+  void                               CheckBoxClicked( int );
+  void                               onBtnPopup( QAction* );
+  void                               updateSize();
 };
 
 #endif // BASICGUI_POINTDLG_H