X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FEntityGUI%2FEntityGUI_SketcherDlg.h;h=63cf7d5dbbb07fd4d32d3e379c81ada5173179e7;hb=8f2d0b5697219b8b53289bd9c25a60ddc354ab53;hp=13d2a880e4bb4cba7aa72f01c38c41b0b7849e55;hpb=0b6826bc5f36b5420f41af1475e1a79371a25323;p=modules%2Fgeom.git

diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.h b/src/EntityGUI/EntityGUI_SketcherDlg.h
index 13d2a880e..63cf7d5db 100644
--- a/src/EntityGUI/EntityGUI_SketcherDlg.h
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : EntityGUI_SketcherDlg.h
 // Author : Damien COQUERET, Open CASCADE S.A.S.
@@ -31,16 +32,19 @@
 #include <QGroupBox>
 #include <QComboBox>
 #include <QDialog>
+#include <QLabel>
 
 #include <gp_Ax3.hxx>
 
 class QLineEdit;
 class SalomeApp_DoubleSpinBox;
 class EntityGUI_1Sel;
+class EntityGUI_2Sel1Check;
+class EntityGUI_1Sel1Spin1Check;
 class EntityGUI_1Spin;
 class EntityGUI_2Spin;
-class EntityGUI_3Spin;
-class EntityGUI_4Spin;
+class EntityGUI_3Spin1Check;
+class EntityGUI_4Spin1Check;
 class EntityGUI_Point;
 class EntityGUI_Dir1;
 class EntityGUI_Dir2;
@@ -72,7 +76,7 @@ public:
 protected:
   void                               initSpinBox( SalomeApp_DoubleSpinBox*, 
                                                   double, double, double = 0.1, 
-                                                  int = 3 );
+                                                  const char* quantity = "length_precision" );
 
   // redefined from GEOMBase_Helper
   virtual GEOM::GEOM_IOperations_ptr createOperation();
@@ -106,6 +110,7 @@ private:
 private:
   int                                myConstructorId;
   int                                myConstructorDirId;
+  int                                myConstructorPntId;
   int                                mySketchType;
   int                                mySketchState;
 
@@ -121,11 +126,13 @@ private:
   QStringList                        myUndoParameters;
 
   Standard_Real                      myX, myY, myDX, myDY;
+  Standard_Real			     myXc, myYc, myDXc, myDYc;
   Standard_Real                      myLength, myAngle, myRadius;
   Standard_Real                      myLastX1, myLastY1;
   Standard_Real                      myLastX2, myLastY2;
 
   QString                            myXStr, myYStr, myDXStr, myDYStr;
+  QString			     myXcStr, myYcStr, myDXcStr, myDYcStr;
   QString                            myLengthStr, myAngleStr, myRadiusStr;
   QString                            myLastX1Str, myLastY1Str;
   QString                            myLastX2Str, myLastY2Str;                            
@@ -133,17 +140,23 @@ private:
   EntityGUI_Skeleton*                MainWidget;
 
   EntityGUI_Point*                   GroupPt;
+  EntityGUI_Point*                   GroupPt2;
   EntityGUI_Dir1*                    GroupD1;
   EntityGUI_Dir2*                    GroupD2;
 
   EntityGUI_1Sel*                    Group1Sel;
+  EntityGUI_2Sel1Check*              Group2Sel;
+  EntityGUI_1Sel1Spin1Check*         Group1Sel1Spin; 
   EntityGUI_1Spin*                   Group1Spin;
   EntityGUI_2Spin*                   Group2Spin;
-  EntityGUI_3Spin*                   Group3Spin;
-  EntityGUI_4Spin*                   Group4Spin;
+  EntityGUI_3Spin1Check*             Group3Spin;
+  EntityGUI_4Spin1Check*             Group4Spin;
+
+  QLabel*			     myErrLabel;
 
   QGroupBox*                         GroupBox1;
   QComboBox*                         ComboBox1;
+  QPushButton*                       planeButton;
 
   GeometryGUI*                       myGeometryGUI;
 
@@ -153,10 +166,14 @@ private:
 
   QList<gp_Ax3>                      myLCSList;
 
+  int				     myCheckFlag;
+
 private:
   enum SketchState { FIRST_POINT, NEXT_POINT };
   
   enum SketchType { PT_ABS, PT_RELATIVE, PT_SEL,
+                    PT_ABS_RADIUS,PT_REL_RADIUS,PT_SEL_RADIUS,
+                    PT_ABS_CENTER,PT_REL_CENTER,PT_SEL_CENTER,
                     DIR_ANGLE_LENGTH, DIR_ANGLE_X, DIR_ANGLE_Y,
                     DIR_PER_LENGTH, DIR_PER_X, DIR_PER_Y,
                     DIR_TAN_LENGTH, DIR_TAN_X, DIR_TAN_Y,
@@ -177,12 +194,15 @@ private slots:
   void                               TypeClicked( int );
   void                               DestClicked( int );
   void                               PointClicked( int );
+  void                               Point2Clicked( int );
   void                               Dir1Clicked( int );
   void                               Dir2Clicked( int );
+  void                               CheckBoxClicked( int );
   void                               ValueChangedInSpinBox( double );
   void                               SetDoubleSpinBoxStep( double );
   void                               FindLocalCS();
   gp_Ax3                             GetActiveLocalCS();
+  void                               ActivateLocalCS();
 };
 
 #endif // ENTITYGUI_SKETCHERDLG_H