RNC: EDF 1618 Modified sketcher to allow creation of arcs of circle with the destination point and the radius or the center of the circle

src/EntityGUI/EntityGUI_SketcherDlg.h

@@ -32,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_3Spin1Check;
-class EntityGUI_4Spin;
+class EntityGUI_4Spin1Check;
 class EntityGUI_Point;
 class EntityGUI_Dir1;
 class EntityGUI_Dir2;
@@ -107,6 +110,7 @@ private:
 private:
   int                                myConstructorId;
   int                                myConstructorDirId;
+  int                                myConstructorPntId;
   int                                mySketchType;
   int                                mySketchState;
 
@@ -122,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;                            
@@ -134,14 +140,19 @@ 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_3Spin1Check*             Group3Spin;
-  EntityGUI_4Spin*                   Group4Spin;
+  EntityGUI_4Spin1Check*             Group4Spin;
+
+  QLabel*			     myErrLabel;
 
   QGroupBox*                         GroupBox1;
   QComboBox*                         ComboBox1;
@@ -155,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,
@@ -179,8 +194,10 @@ 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();

src/EntityGUI/EntityGUI_Widgets.cxx

@@ -37,6 +37,35 @@ EntityGUI_1Sel::~EntityGUI_1Sel()
 {
 }
 
+//////////////////////////////////////////
+// EntityGUI_2Sel1Check
+//////////////////////////////////////////
+
+EntityGUI_2Sel1Check::EntityGUI_2Sel1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+EntityGUI_2Sel1Check::~EntityGUI_2Sel1Check()
+{
+}
+
+
+//////////////////////////////////////////
+// EntityGUI_1Sel1Spin1Check
+//////////////////////////////////////////
+
+EntityGUI_1Sel1Spin1Check::EntityGUI_1Sel1Spin1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+EntityGUI_1Sel1Spin1Check::~EntityGUI_1Sel1Spin1Check()
+{
+}
+
 //////////////////////////////////////////
 // EntityGUI_1Spin
 //////////////////////////////////////////
@@ -79,6 +108,21 @@ EntityGUI_3Spin::~EntityGUI_3Spin()
 {
 }
 
+
+//////////////////////////////////////////
+// EntityGUI_3Spin1Check
+//////////////////////////////////////////
+
+EntityGUI_3Spin1Check::EntityGUI_3Spin1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+EntityGUI_3Spin1Check::~EntityGUI_3Spin1Check()
+{
+}
+
 //////////////////////////////////////////
 // EntityGUI_4Spin
 //////////////////////////////////////////
@@ -93,6 +137,21 @@ EntityGUI_4Spin::~EntityGUI_4Spin()
 {
 }
 
+
+//////////////////////////////////////////
+// EntityGUI_4Spin1Check
+//////////////////////////////////////////
+
+EntityGUI_4Spin1Check::EntityGUI_4Spin1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+EntityGUI_4Spin1Check::~EntityGUI_4Spin1Check()
+{
+}
+
 //////////////////////////////////////////
 // EntityGUI_Dir1
 //////////////////////////////////////////

src/EntityGUI/EntityGUI_Widgets.h

@@ -39,6 +39,39 @@ public:
   ~EntityGUI_1Sel();
 };
 
+//////////////////////////////////////////
+// EntityGUI_2Sel1Check
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_2Sel1Check_QTD.h"
+
+class EntityGUI_2Sel1Check : public QWidget, 
+                       public Ui::EntityGUI_2Sel1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_2Sel1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_2Sel1Check();
+};
+
+
+//////////////////////////////////////////
+// EntityGUI_1Sel1Spin1Check
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_1Sel1Spin1Check_QTD.h"
+
+class EntityGUI_1Sel1Spin1Check : public QWidget, 
+                            public Ui::EntityGUI_1Sel1Spin1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_1Sel1Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_1Sel1Spin1Check();
+};
+
 //////////////////////////////////////////
 // EntityGUI_1Spin
 //////////////////////////////////////////
@@ -103,6 +136,38 @@ public:
   ~EntityGUI_4Spin();
 };
 
+//////////////////////////////////////////
+// EntityGUI_3Spin1Check
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_3Spin1Check_QTD.h"
+
+class EntityGUI_3Spin1Check : public QWidget, 
+                        public Ui::EntityGUI_3Spin1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_3Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_3Spin1Check();
+};
+
+//////////////////////////////////////////
+// EntityGUI_4Spin1Check
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_4Spin1Check_QTD.h"
+
+class EntityGUI_4Spin1Check : public QWidget, 
+                        public Ui::EntityGUI_4Spin1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_4Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_4Spin1Check();
+};
+
 //////////////////////////////////////////
 // EntityGUI_Dir1
 //////////////////////////////////////////

src/EntityGUI/Makefile.am

@@ -53,10 +53,14 @@ nodist_libEntityGUI_la_SOURCES =	\
 
 UIC_FILES =				\
 	ui_EntityGUI_1Sel_QTD.h		\
+	ui_EntityGUI_2Sel1Check_QTD.h		
+	ui_EntityGUI_1Sel1Spin1Check_QTD.h	\
 	ui_EntityGUI_1Spin_QTD.h	\
 	ui_EntityGUI_2Spin_QTD.h	\
 	ui_EntityGUI_3Spin_QTD.h	\
 	ui_EntityGUI_4Spin_QTD.h	\
+	ui_EntityGUI_3Spin1Check_QTD.h	\
+	ui_EntityGUI_4Spin1Check_QTD.h	\
 	ui_EntityGUI_Dir1_QTD.h		\
 	ui_EntityGUI_Dir2_QTD.h		\
 	ui_EntityGUI_Point_QTD.h	\