Salome HOME
Add of exports
[modules/geom.git] / src / BasicGUI / BasicGUI_ArcDlg.cxx
index 06ed13b5558c07cb7c1d83dfb1ebea5372e32073..ae3a4fac9dcf060b282d3fb8d3438db1d11df482 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2013  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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_ArcDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
 
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_ArcDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
 #include "BasicGUI_ArcDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include <qlabel.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <GC_MakeArcOfCircle.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <Precision.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS.hxx>
+#include <TopExp.hxx>
 
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : BasicGUI_ArcDlg()
-// purpose  : Constructs a BasicGUI_ArcDlg which is a child of 'parent', with the 
+// purpose  : Constructs a BasicGUI_ArcDlg which is a child of 'parent', with the
 //            name 'name' and widget flags set to 'f'.
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-BasicGUI_ArcDlg::BasicGUI_ArcDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
-   myGeometryGUI()
+BasicGUI_ArcDlg::BasicGUI_ArcDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                  bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_ARC")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+  QPixmap image0( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_ARC" ) ) );
+  QPixmap image1( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_ARC_CENTER" ) ) );
+  QPixmap image2( aResMgr->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+  QPixmap image3( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_ARC_OF_ELLIPSE" ) ) );
 
-  setCaption(tr("GEOM_ARC_TITLE"));
+  setWindowTitle( tr( "GEOM_ARC_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_ARC"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_ARC" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image1 );
+  mainFrame()->RadioButton3->setIcon( image3 );
+
+  Group3Pnts = new DlgRef_3Sel( centralWidget() );
 
-  Group3Pnts = new DlgRef_3Sel_QTD(this, "Group3Pnts");
-  Group3Pnts->GroupBox1->setTitle(tr("GEOM_POINTS"));
-  Group3Pnts->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
-  Group3Pnts->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
-  Group3Pnts->TextLabel3->setText(tr("GEOM_POINT_I").arg("3"));
+  Group3Pnts->GroupBox1->setTitle( tr( "GEOM_POINTS" ) );
+  Group3Pnts->TextLabel1->setText( tr( "GEOM_POINT_I" ).arg( 1 ) );
+  Group3Pnts->TextLabel2->setText( tr( "GEOM_POINT_I" ).arg( 2 ) );
+  Group3Pnts->TextLabel3->setText( tr( "GEOM_POINT_I" ).arg( 3 ) );
 
   Group3Pnts->LineEdit1->setReadOnly( true );
   Group3Pnts->LineEdit2->setReadOnly( true );
   Group3Pnts->LineEdit3->setReadOnly( true );
+
+  Group3Pnts->LineEdit1->setEnabled(true);
+  Group3Pnts->LineEdit2->setEnabled(false);
+  Group3Pnts->LineEdit3->setEnabled(false);
+
+  Group3Pnts->PushButton1->setIcon(image2);
+  Group3Pnts->PushButton2->setIcon(image2);
+  Group3Pnts->PushButton3->setIcon(image2);
+
+
+  Group3Pnts2 = new DlgRef_3Sel1Check( centralWidget() );
+
+  Group3Pnts2->GroupBox1->setTitle( tr( "GEOM_POINTS" ) );
+  Group3Pnts2->TextLabel1->setText( tr( "GEOM_CENTER_POINT" ) );
+  Group3Pnts2->TextLabel2->setText( tr( "GEOM_POINT_I" ).arg( "Start" ) );
+  Group3Pnts2->TextLabel3->setText( tr( "GEOM_POINT_I" ).arg( "End" ) );
+
+  Group3Pnts2->LineEdit1->setReadOnly( true );
+  Group3Pnts2->LineEdit2->setReadOnly( true );
+  Group3Pnts2->LineEdit3->setReadOnly( true );
+
+  Group3Pnts2->LineEdit1->setEnabled(true);
+  Group3Pnts2->LineEdit2->setEnabled(false);
+  Group3Pnts2->LineEdit3->setEnabled(false);
+
+  Group3Pnts2->PushButton1->setIcon( image2 );
+  Group3Pnts2->PushButton2->setIcon( image2 );
+  Group3Pnts2->PushButton3->setIcon( image2 );
   
-  Group3Pnts->PushButton1->setPixmap(image1);
-  Group3Pnts->PushButton2->setPixmap(image1);
-  Group3Pnts->PushButton3->setPixmap(image1);
+  Group3Pnts2->CheckButton1->setText( tr( "GEOM_REVERSE" ) );
+
+  Group3Pnts3 = new DlgRef_3Sel( centralWidget() );
+
+  Group3Pnts3->GroupBox1->setTitle( tr( "GEOM_POINTS" ) );
+  Group3Pnts3->TextLabel1->setText( tr( "GEOM_CENTER_POINT" ) );
+  Group3Pnts3->TextLabel2->setText( tr( "GEOM_POINT_I" ).arg( 1 ) );
+  Group3Pnts3->TextLabel3->setText( tr( "GEOM_POINT_I" ).arg( 2 ) );
 
-  Layout1->addWidget( Group3Pnts, 2, 0 );
+  Group3Pnts3->LineEdit1->setReadOnly( true );
+  Group3Pnts3->LineEdit2->setReadOnly( true );
+  Group3Pnts3->LineEdit3->setReadOnly( true );
+
+  Group3Pnts3->LineEdit1->setEnabled(true);
+  Group3Pnts3->LineEdit2->setEnabled(false);
+  Group3Pnts3->LineEdit3->setEnabled(false);
+
+  Group3Pnts3->PushButton1->setIcon(image2);
+  Group3Pnts3->PushButton2->setIcon(image2);
+  Group3Pnts3->PushButton3->setIcon(image2);
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( Group3Pnts );
+  layout->addWidget( Group3Pnts2 );
+  layout->addWidget( Group3Pnts3 );
+
+  setHelpFileName( "create_arc_page.html" );
 
   Init();
 }
@@ -104,34 +157,44 @@ BasicGUI_ArcDlg::~BasicGUI_ArcDlg()
 void BasicGUI_ArcDlg::Init()
 {
   /* init variables */
-  // myGeometryGUI->SetState( 0 );
-  globalSelection( GEOM_POINT );
-
   myEditCurrentArgument = Group3Pnts->LineEdit1;
-  myEditCurrentArgument->setFocus();
 
-  myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
+  myPoint1.nullify();
+  myPoint2.nullify();
+  myPoint3.nullify();
+  Group3Pnts2->CheckButton1->setChecked( false );
+  Group3Pnts->PushButton1->setDown(true);
 
   /* signals and slots connections */
-  connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
-  connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
-  connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
+  connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
+  connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+  connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+  connect( Group3Pnts->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+
+  connect( Group3Pnts2->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts2->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts2->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( Group3Pnts2->CheckButton1, SIGNAL( toggled( bool ) ), this, SLOT( ReverseSense() ) );
 
-  connect(Group3Pnts->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( Group3Pnts3->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts3->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts3->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(Group3Pnts->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+           this, SLOT( SelectionIntoArgument() ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  initName( tr( "GEOM_ARC" ) ); 
+  
 
-  initName( tr( "GEOM_ARC" ) );
+  ConstructorsClicked( 0 );
 }
 
 
@@ -141,19 +204,11 @@ void BasicGUI_ArcDlg::Init()
 //=================================================================================
 void BasicGUI_ArcDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_ArcDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
@@ -164,14 +219,8 @@ bool BasicGUI_ArcDlg::ClickOnApply()
     return false;
 
   initName();
+  ConstructorsClicked( getConstructorId() );
 
-  // reset
-  myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
-  Group3Pnts->LineEdit1->setText( "" );
-  Group3Pnts->LineEdit2->setText( "" );
-  Group3Pnts->LineEdit3->setText( "" );
-  myEditCurrentArgument = Group3Pnts->LineEdit1;
-  
   return true;
 }
 
@@ -182,28 +231,96 @@ bool BasicGUI_ArcDlg::ClickOnApply()
 //=================================================================================
 void BasicGUI_ArcDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
-  
-  if ( IObjectCount() != 1 )  
-  {
-    if      ( myEditCurrentArgument == Group3Pnts->LineEdit1 )   myPoint1 = GEOM::GEOM_Object::_nil();
-    else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 )   myPoint2 = GEOM::GEOM_Object::_nil();
-    else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 )   myPoint3 = GEOM::GEOM_Object::_nil();
+  myEditCurrentArgument->setText( "" );
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    switch (getConstructorId()) {
+    case 0:
+      if      ( myEditCurrentArgument == Group3Pnts->LineEdit1 )   myPoint1.nullify();
+      else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 )   myPoint2.nullify();
+      else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 )   myPoint3.nullify();
+      break;
+    case 1:
+      if      ( myEditCurrentArgument == Group3Pnts2->LineEdit1 )   myPoint1.nullify();
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 )   myPoint2.nullify();
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 )   myPoint3.nullify();
+      break;
+    case 2:
+      if      ( myEditCurrentArgument == Group3Pnts3->LineEdit1 )   myPoint1.nullify();
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit2 )   myPoint2.nullify();
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit3 )   myPoint3.nullify();
+      break;
+    default:
+      break;
+    }
     return;
+  }   
+
+  GEOM::GeomObjPtr aSelectedObject = getSelected( TopAbs_VERTEX );
+  TopoDS_Shape aShape;
+  if ( aSelectedObject && GEOMBase::GetShape( aSelectedObject.get(), aShape ) && !aShape.IsNull() ) {
+    QString aName = GEOMBase::GetName( aSelectedObject.get() );
+    myEditCurrentArgument->setText(aName);
+    switch ( getConstructorId() ) {
+    case 0:
+      if ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) {
+        myPoint1 = aSelectedObject;
+        if ( myPoint1 && !myPoint2 )
+          Group3Pnts->PushButton2->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) {
+        myPoint2 = aSelectedObject;
+        if ( myPoint2 && !myPoint3 )
+          Group3Pnts->PushButton3->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 ) {
+        myPoint3 = aSelectedObject;
+        if ( myPoint3 && !myPoint1 )
+          Group3Pnts->PushButton1->click();
+      }
+      break;
+    case 1:
+      if ( myEditCurrentArgument == Group3Pnts2->LineEdit1 ) {
+        myPoint1 = aSelectedObject;
+        if ( myPoint1 && !myPoint2 )
+          Group3Pnts2->PushButton2->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 ) {
+        myPoint2 = aSelectedObject;
+        if ( myPoint2 && !myPoint3 )
+          Group3Pnts2->PushButton3->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 ) {
+        myPoint3 = aSelectedObject;
+        if ( myPoint3 && !myPoint1 )
+          Group3Pnts2->PushButton1->click();
+      }
+      break;
+    case 2:
+      if ( myEditCurrentArgument == Group3Pnts3->LineEdit1 ) {
+        myPoint1 = aSelectedObject;
+        if ( myPoint1 && !myPoint2 )
+          Group3Pnts3->PushButton2->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit2 ) {
+        myPoint2 = aSelectedObject;
+        if ( myPoint2 && !myPoint3 )
+          Group3Pnts3->PushButton3->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit3 ) {
+        myPoint3 = aSelectedObject;
+        if ( myPoint3 && !myPoint1 )
+          Group3Pnts3->PushButton1->click();
+      }
+      break;
+    }
   }
 
-  // nbSel == 1
-  Standard_Boolean aRes = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
-  if ( !CORBA::is_nil( aSelectedObject ) && aRes )
-  {  
-    myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) ); 
-    if      ( myEditCurrentArgument == Group3Pnts->LineEdit1 )   myPoint1 = aSelectedObject;
-    else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 )   myPoint2 = aSelectedObject;
-    else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 )   myPoint3 = aSelectedObject;
-  }
-
-  displayPreview();
+  displayPreview(true);
 }
 
 
@@ -213,31 +330,94 @@ void BasicGUI_ArcDlg::SelectionIntoArgument()
 //=================================================================================
 void BasicGUI_ArcDlg::SetEditCurrentArgument()
 {
-  QPushButton* send = (QPushButton*)sender();
-
-  if      ( send == Group3Pnts->PushButton1 )   myEditCurrentArgument = Group3Pnts->LineEdit1;
-  else if ( send == Group3Pnts->PushButton2 )   myEditCurrentArgument = Group3Pnts->LineEdit2;
-  else if ( send == Group3Pnts->PushButton3 )   myEditCurrentArgument = Group3Pnts->LineEdit3;
-  
-  myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
-}
+  globalSelection(); // close local selection to clear it
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
 
-
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void BasicGUI_ArcDlg::LineEditReturnPressed()
-{ 
-  QLineEdit* send = (QLineEdit*)sender();
-  if ( send == Group3Pnts->LineEdit1 ||
-       send == Group3Pnts->LineEdit2 ||
-       send == Group3Pnts->LineEdit3 )
-  {
-    myEditCurrentArgument = send;
-    GEOMBase_Skeleton::LineEditReturnPressed();
+  QPushButton* send = (QPushButton*)sender();
+  switch ( getConstructorId() ) {
+  case 0:
+    if      ( send == Group3Pnts->PushButton1 ) {
+      myEditCurrentArgument = Group3Pnts->LineEdit1;
+      Group3Pnts->PushButton2->setDown(false);
+      Group3Pnts->PushButton3->setDown(false);
+      Group3Pnts->LineEdit1->setEnabled(true);
+      Group3Pnts->LineEdit2->setEnabled(false);
+      Group3Pnts->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts->PushButton2 ) {
+      myEditCurrentArgument = Group3Pnts->LineEdit2;
+      Group3Pnts->PushButton1->setDown(false);
+      Group3Pnts->PushButton3->setDown(false);
+      Group3Pnts->LineEdit1->setEnabled(false);
+      Group3Pnts->LineEdit2->setEnabled(true);
+      Group3Pnts->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts->PushButton3 ) {
+      myEditCurrentArgument = Group3Pnts->LineEdit3;
+      Group3Pnts->PushButton1->setDown(false);
+      Group3Pnts->PushButton2->setDown(false);
+      Group3Pnts->LineEdit1->setEnabled(false);
+      Group3Pnts->LineEdit2->setEnabled(false);
+      Group3Pnts->LineEdit3->setEnabled(true);
+    }
+    break;
+  case 1:
+    if      ( send == Group3Pnts2->PushButton1 ) {
+      myEditCurrentArgument = Group3Pnts2->LineEdit1;
+      Group3Pnts2->PushButton2->setDown(false);
+      Group3Pnts2->PushButton3->setDown(false);
+      Group3Pnts2->LineEdit1->setEnabled(true);
+      Group3Pnts2->LineEdit2->setEnabled(false);
+      Group3Pnts2->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts2->PushButton2 ) {
+      myEditCurrentArgument = Group3Pnts2->LineEdit2;
+      Group3Pnts2->PushButton1->setDown(false);
+      Group3Pnts2->PushButton3->setDown(false);
+      Group3Pnts2->LineEdit1->setEnabled(false);
+      Group3Pnts2->LineEdit2->setEnabled(true);
+      Group3Pnts2->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts2->PushButton3 ) {
+      myEditCurrentArgument = Group3Pnts2->LineEdit3;
+      Group3Pnts2->PushButton1->setDown(false);
+      Group3Pnts2->PushButton2->setDown(false);
+      Group3Pnts2->LineEdit1->setEnabled(false);
+      Group3Pnts2->LineEdit2->setEnabled(false);
+      Group3Pnts2->LineEdit3->setEnabled(true);
+    }
+    break;
+  case 2:
+    if ( send == Group3Pnts3->PushButton1 ) {
+      myEditCurrentArgument = Group3Pnts3->LineEdit1;
+      Group3Pnts3->PushButton2->setDown(false);
+      Group3Pnts3->PushButton3->setDown(false);
+      Group3Pnts3->LineEdit1->setEnabled(true);
+      Group3Pnts3->LineEdit2->setEnabled(false);
+      Group3Pnts3->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts3->PushButton2 ) {
+      myEditCurrentArgument = Group3Pnts3->LineEdit2;
+      Group3Pnts3->PushButton1->setDown(false);
+      Group3Pnts3->PushButton3->setDown(false);
+      Group3Pnts3->LineEdit1->setEnabled(false);
+      Group3Pnts3->LineEdit2->setEnabled(true);
+      Group3Pnts3->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts3->PushButton3 ) {
+      myEditCurrentArgument = Group3Pnts3->LineEdit3;
+      Group3Pnts3->PushButton1->setDown(false);
+      Group3Pnts3->PushButton2->setDown(false);
+      Group3Pnts3->LineEdit1->setEnabled(false);
+      Group3Pnts3->LineEdit2->setEnabled(false);
+      Group3Pnts3->LineEdit3->setEnabled(true);
+    }
+    break;
   }
+  myEditCurrentArgument->setFocus();
+  //  SelectionIntoArgument();
+  send->setDown(true);
+  displayPreview(true);
 }
 
 
@@ -248,38 +428,22 @@ void BasicGUI_ArcDlg::LineEditReturnPressed()
 void BasicGUI_ArcDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 
-  // myGeometryGUI->SetState( 0 );
-  globalSelection( GEOM_POINT );
+  connect( myGeomGUI->getApp()->selectionMgr(),
+           SIGNAL( currentSelectionChanged() ),
+           this,
+           SLOT(SelectionIntoArgument() ) );
 
-  myEditCurrentArgument = Group3Pnts->LineEdit1;
-  myEditCurrentArgument->setFocus();
-
-  Group3Pnts->LineEdit1->setText( "" );
-  Group3Pnts->LineEdit2->setText( "" );
-  Group3Pnts->LineEdit3->setText( "" );
-  myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
-}
-
-//=================================================================================
-// function : DeactivateActiveDialog()
-// purpose  : public slot to deactivate if active
-//=================================================================================
-void BasicGUI_ArcDlg::DeactivateActiveDialog()
-{
-  // myGeometryGUI->SetState( -1 );
-  GEOMBase_Skeleton::DeactivateActiveDialog();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_ArcDlg::enterEvent(QEvent* e)
+void BasicGUI_ArcDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -289,16 +453,7 @@ void BasicGUI_ArcDlg::enterEvent(QEvent* e)
 //=================================================================================
 GEOM::GEOM_IOperations_ptr BasicGUI_ArcDlg::createOperation()
 {
-  return myGeometryGUI->GetGeomGen()->GetICurvesOperations( getStudyId() );
-}
-
-//=================================================================================
-// function : isEqual
-// purpose  : it may also be needed to check for min distance between gp_Pnt-s...
-//=================================================================================
-static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Object_var& thePnt2 )
-{
-  return thePnt1->_is_equivalent( thePnt2 );
+  return myGeomGUI->GetGeomGen()->GetICurvesOperations( getStudyId() );
 }
 
 //=================================================================================
@@ -307,8 +462,9 @@ static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Obje
 //=================================================================================
 bool BasicGUI_ArcDlg::isValid( QString& msg )
 {
-  return !myPoint1->_is_nil() && !myPoint2->_is_nil() && !myPoint3->_is_nil() &&
-    !isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 );
+  bool ok = myPoint1 && myPoint2 && myPoint3 &&
+    myPoint1 != myPoint2 && myPoint1 != myPoint3 && myPoint2 != myPoint3;
+  return ok;
 }
 
 //=================================================================================
@@ -317,18 +473,153 @@ bool BasicGUI_ArcDlg::isValid( QString& msg )
 //=================================================================================
 bool BasicGUI_ArcDlg::execute( ObjectList& objects )
 {
-  GEOM::GEOM_Object_var anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeArc( myPoint1, myPoint2, myPoint3 );
-  if ( !anObj->_is_nil() )
+  bool res = false;
+  GEOM::GEOM_Object_var anObj;
+
+  GEOM::GEOM_ICurvesOperations_var anOper = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() );
+
+  switch ( getConstructorId() ) {
+  case 0:
+    {
+      if ( myPoint1 && myPoint2 && myPoint3 ) {
+        anObj = anOper->MakeArc( myPoint1.get(), myPoint2.get(), myPoint3.get() );
+        res = true;
+      }
+      break;
+    }
+  case 1:
+    {
+      bool Sense = Group3Pnts2->CheckButton1->isChecked();
+      if ( myPoint1 && myPoint2 && myPoint3 ) {
+        anObj = anOper->MakeArcCenter( myPoint1.get(), myPoint2.get(), myPoint3.get(), Sense );
+        res = true;
+      }
+      break;
+    }
+  case 2:
+    {
+      if ( myPoint1 && myPoint2 && myPoint3 ) {
+        anObj = anOper->MakeArcOfEllipse( myPoint1.get(), myPoint2.get(), myPoint3.get() );
+        res = true;
+      }
+      break;
+    }
+  }
+  if ( !anObj->_is_nil() ) {
     objects.push_back( anObj._retn() );
-  return true;
+  }
+  return res;
 }
 
 //=================================================================================
-// function : closeEvent
-// purpose  :
+// function : ConstructorsClicked()
+// purpose  : Radio button management
 //=================================================================================
-void BasicGUI_ArcDlg::closeEvent( QCloseEvent* e )
+void BasicGUI_ArcDlg::ConstructorsClicked( int constructorId )
 {
-  // myGeometryGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
+
+  myPoint1.nullify();
+  myPoint2.nullify();
+  myPoint3.nullify();
+  
+  switch ( constructorId ) {
+  case 0:
+    {
+      Group3Pnts->show();
+      Group3Pnts2->hide();
+      Group3Pnts3->hide();
+      Group3Pnts->PushButton1->setDown(true);
+      Group3Pnts->PushButton2->setDown(false);
+      Group3Pnts->PushButton3->setDown(false);
+      Group3Pnts->LineEdit1->setText( "" );
+      Group3Pnts->LineEdit2->setText( "" );
+      Group3Pnts->LineEdit3->setText( "" );
+      Group3Pnts->LineEdit1->setEnabled(true);
+      Group3Pnts->LineEdit2->setEnabled(false);
+      Group3Pnts->LineEdit3->setEnabled(false);
+
+      myEditCurrentArgument = Group3Pnts->LineEdit1;
+      break;
+    }
+  case 1:
+    {
+      Group3Pnts->hide();
+      Group3Pnts2->show();
+      Group3Pnts3->hide();
+      Group3Pnts2->PushButton1->setDown(true);
+      Group3Pnts2->PushButton2->setDown(false);
+      Group3Pnts2->PushButton3->setDown(false);
+      Group3Pnts2->LineEdit1->setText( "" );
+      Group3Pnts2->LineEdit2->setText( "" );
+      Group3Pnts2->LineEdit3->setText( "" );
+      Group3Pnts2->LineEdit1->setEnabled(true);
+      Group3Pnts2->LineEdit2->setEnabled(false);
+      Group3Pnts2->LineEdit3->setEnabled(false);
+      
+      myEditCurrentArgument = Group3Pnts2->LineEdit1;
+      break;
+    }
+  case 2:
+    {
+      Group3Pnts->hide();
+      Group3Pnts2->hide();
+      Group3Pnts3->show();
+      Group3Pnts3->PushButton1->setDown(true);
+      Group3Pnts3->PushButton2->setDown(false);
+      Group3Pnts3->PushButton3->setDown(false);
+      Group3Pnts3->LineEdit1->setText( "" );
+      Group3Pnts3->LineEdit2->setText( "" );
+      Group3Pnts3->LineEdit3->setText( "" );
+      Group3Pnts3->LineEdit1->setEnabled(true);
+      Group3Pnts3->LineEdit2->setEnabled(false);
+      Group3Pnts3->LineEdit3->setEnabled(false);
+
+      myEditCurrentArgument = Group3Pnts3->LineEdit1;
+      break;
+    }
+  }
+
+  globalSelection(); // close local contexts, if any
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes
+  
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
+
+  myEditCurrentArgument->setFocus();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+           this, SLOT( SelectionIntoArgument() ) );
+
+  SelectionIntoArgument();
+
+  displayPreview(true);
+}
+
+//=================================================================================
+// function : ReverseSense()
+// purpose  : Orientation of the arc
+//=================================================================================
+void BasicGUI_ArcDlg::ReverseSense()
+{
+  displayPreview(true);
+}
+
+//=================================================================================
+// function : addSubshapeToStudy
+// purpose  : virtual method to add new SubObjects if local selection
+//=================================================================================
+void BasicGUI_ArcDlg::addSubshapesToStudy()
+{
+  switch ( getConstructorId() ) {
+  case 0:
+  case 1:
+  case 2:
+    GEOMBase::PublishSubObject( myPoint1.get() );
+    GEOMBase::PublishSubObject( myPoint2.get() );
+    GEOMBase::PublishSubObject( myPoint3.get() );
+    break;
+  default:
+    break;
+  }
 }