Salome HOME
Update copyright notes (for 2010)
[modules/geom.git] / src / BasicGUI / BasicGUI_ArcDlg.cxx
index f9668b5cebc93cdcfa303d64f1d89c5a6a442ec3..a4a6dfc81c8f8fecc86ac43717e4f708c373b4db 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  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
 //
 //  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 "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopoDS.hxx>
 #include <TopExp.hxx>
 
-#include <qlabel.h>
-#include <qcheckbox.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : BasicGUI_ArcDlg()
 //            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(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                      WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BasicGUI_ArcDlg::BasicGUI_ArcDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                  bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
   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 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->setPixmap(image1);
-  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->PushButton1->setPixmap(image2);
-  Group3Pnts->PushButton2->setPixmap(image2);
-  Group3Pnts->PushButton3->setPixmap(image2);
+  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_QTD(this, "Group3Pnts2");
-  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 = 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->PushButton1->setPixmap(image2);
-  Group3Pnts2->PushButton2->setPixmap(image2);
-  Group3Pnts2->PushButton3->setPixmap(image2);
+  Group3Pnts2->LineEdit1->setEnabled(true);
+  Group3Pnts2->LineEdit2->setEnabled(false);
+  Group3Pnts2->LineEdit3->setEnabled(false);
 
-  Group3Pnts2->CheckButton1->setText(tr("GEOM_REVERSE"));
+  Group3Pnts2->PushButton1->setIcon( image2 );
+  Group3Pnts2->PushButton2->setIcon( image2 );
+  Group3Pnts2->PushButton3->setIcon( image2 );
+  
+  Group3Pnts2->CheckButton1->setText( tr( "GEOM_REVERSE" ) );
 
-  Layout1->addWidget( Group3Pnts, 2, 0 );
-  Layout1->addWidget( Group3Pnts2, 2, 0 );
-  /***************************************************************/
+  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 ) );
+
+  Group3Pnts3->LineEdit1->setReadOnly( true );
+  Group3Pnts3->LineEdit2->setReadOnly( true );
+  Group3Pnts3->LineEdit3->setReadOnly( true );
+
+  Group3Pnts3->LineEdit1->setEnabled(true);
+  Group3Pnts3->LineEdit2->setEnabled(false);
+  Group3Pnts3->LineEdit3->setEnabled(false);
 
-  setHelpFileName("create_arc_page.html");
+  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();
 }
@@ -130,102 +158,56 @@ void BasicGUI_ArcDlg::Init()
 {
   /* init variables */
   myEditCurrentArgument = Group3Pnts->LineEdit1;
+
   myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
-  Group3Pnts2->CheckButton1->setChecked(FALSE);
+  Group3Pnts2->CheckButton1->setChecked( false );
+  Group3Pnts->PushButton1->setDown(true);
 
   /* signals and slots connections */
-  connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
-  connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
-  connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
-
-  connect(GroupConstructors, SIGNAL(clicked(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(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, 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( Group3Pnts->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts->LineEdit3, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  
+  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( Group3Pnts2->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts2->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts2->LineEdit3, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+
+  connect( Group3Pnts2->CheckButton1, SIGNAL( toggled( bool ) ), this, SLOT( ReverseSense() ) );
+
+  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( Group3Pnts3->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts3->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts3->LineEdit3, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+           this, SLOT( SelectionIntoArgument() ) );
+
+  initName( tr( "GEOM_ARC" ) ); 
+  
 
-  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(Group3Pnts2->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts2->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts2->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-  connect(Group3Pnts2->CheckButton1, SIGNAL(stateChanged(int)), this, SLOT(ReverseSense(int)));
-
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
-
-  initName( tr( "GEOM_ARC" ));
   ConstructorsClicked( 0 );
 }
 
 
-//=================================================================================
-// function : ConstructorsClicked()
-// purpose  : Radio button management
-//=================================================================================
-void BasicGUI_ArcDlg::ConstructorsClicked (int constructorId)
-{
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
-
-  switch (constructorId)
-  {
-  case 0:
-    {
-      globalSelection(); // close local contexts, if any
-      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX); //Select Vertex on All Shapes
-
-      Group3Pnts->show();
-      resize(0, 0);
-      Group3Pnts2->hide();
-
-      Group3Pnts->LineEdit1->setText(Group3Pnts2->LineEdit1->text());
-      Group3Pnts->LineEdit2->setText(Group3Pnts2->LineEdit2->text());
-      Group3Pnts->LineEdit3->setText(Group3Pnts2->LineEdit3->text());
-
-      myEditCurrentArgument = Group3Pnts->LineEdit1;
-
-      break;
-    }
-  case 1:
-    {
-      globalSelection(); // close local contexts, if any
-      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX); //Select Vertex on All Shapes
-
-      Group3Pnts->hide();
-      resize(0, 0);
-      Group3Pnts2->show();
-
-      Group3Pnts2->LineEdit1->setText(Group3Pnts->LineEdit1->text());
-      Group3Pnts2->LineEdit2->setText(Group3Pnts->LineEdit2->text());
-      Group3Pnts2->LineEdit3->setText(Group3Pnts->LineEdit3->text());
-
-      myEditCurrentArgument = Group3Pnts2->LineEdit1;
-
-      break;
-    }
-  }
-
-  myEditCurrentArgument->setFocus();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
-
-  if (CORBA::is_nil(myPoint1))
-    SelectionIntoArgument();
-
-  displayPreview();
-}
-
-
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
@@ -246,71 +228,72 @@ bool BasicGUI_ArcDlg::ClickOnApply()
     return false;
 
   initName();
+  ConstructorsClicked( getConstructorId() );
+
   return true;
 }
 
+
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed or other case
 //=================================================================================
 void BasicGUI_ArcDlg::SelectionIntoArgument()
 {
-  if ((getConstructorId() != 0) && (getConstructorId() != 1))
-    return;
+  myEditCurrentArgument->setText( "" );
 
-  myEditCurrentArgument->setText("");
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
-  if (IObjectCount() != 1)
-  {
-    switch (getConstructorId())
-    {
+  if (aSelList.Extent() != 1) {
+    switch (getConstructorId()) {
     case 0:
-      {
-        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();
-        return;
-        break;
-      }
+      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();
+      return;
+      break;
     case 1:
-      {
-        if      ( myEditCurrentArgument == Group3Pnts2->LineEdit1 )   myPoint1 = GEOM::GEOM_Object::_nil();
-        else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 )   myPoint2 = GEOM::GEOM_Object::_nil();
-        else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 )   myPoint3 = GEOM::GEOM_Object::_nil();
-        return;
-        break;
-      }
+      if      ( myEditCurrentArgument == Group3Pnts2->LineEdit1 )   myPoint1 = GEOM::GEOM_Object::_nil();
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 )   myPoint2 = GEOM::GEOM_Object::_nil();
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 )   myPoint3 = GEOM::GEOM_Object::_nil();
+      return;
+      break;
+    case 2:
+      if      ( myEditCurrentArgument == Group3Pnts3->LineEdit1 )   myPoint1 = GEOM::GEOM_Object::_nil();
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit2 )   myPoint2 = GEOM::GEOM_Object::_nil();
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit3 )   myPoint3 = GEOM::GEOM_Object::_nil();
+      return;
+      break;
     }
-  }
-
+  }   
   // nbSel == 1
   Standard_Boolean aRes = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aRes);
-  if (!CORBA::is_nil(aSelectedObject) && aRes)
-  {
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
+  if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
     QString aName = GEOMBase::GetName(aSelectedObject);
 
     // Get Selected object if selected subshape
     TopoDS_Shape aShape;
     if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
     {
-      LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
       TColStd_IndexedMapOfInteger aMap;
-      aSelMgr->GetIndexes(firstIObject(), aMap);
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
       if (aMap.Extent() == 1) // Local Selection
       {
         int anIndex = aMap(1);
         aName += QString(":vertex_%1").arg(anIndex);
 
-       //Find SubShape Object in Father
-       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
+        //Find SubShape Object in Father
+        GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
 
-       if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-         GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
-         aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-       }
-       else
-         aSelectedObject = aFindedObject; // get Object from study
+        if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
+          GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
+          aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+        }
+        else
+          aSelectedObject = aFindedObject; // get Object from study
       }
       else // Global Selection
       {
@@ -323,70 +306,180 @@ void BasicGUI_ArcDlg::SelectionIntoArgument()
 
     myEditCurrentArgument->setText(aName);
 
-    switch (getConstructorId())
-    {
-      case 0:
-      {
-        if      ( myEditCurrentArgument == Group3Pnts->LineEdit1 )   myPoint1 = aSelectedObject;
-        else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 )   myPoint2 = aSelectedObject;
-        else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 )   myPoint3 = aSelectedObject;
-        break;
+    if (!aSelectedObject->_is_nil()) { // clear selection if something selected
+      globalSelection();
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );      
+    }
+
+    switch ( getConstructorId() ) {
+    case 0:
+      if      ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) {
+        myPoint1 = aSelectedObject;
+        if ( !myPoint1->_is_nil() && myPoint2->_is_nil() )
+          Group3Pnts->PushButton2->click();
       }
-      case 1:
-      {
-        if      ( myEditCurrentArgument == Group3Pnts2->LineEdit1 )   myPoint1 = aSelectedObject;
-        else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 )   myPoint2 = aSelectedObject;
-        else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 )   myPoint3 = aSelectedObject;
-        break;
+      else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) {
+        myPoint2 = aSelectedObject;
+        if ( !myPoint2->_is_nil() && myPoint3->_is_nil() )
+          Group3Pnts->PushButton3->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 ) {
+        myPoint3 = aSelectedObject;
+        if ( !myPoint3->_is_nil() && myPoint1->_is_nil() )
+          Group3Pnts->PushButton1->click();
+      }
+      break;
+    case 1:
+      if ( myEditCurrentArgument == Group3Pnts2->LineEdit1 ) {
+        myPoint1 = aSelectedObject;
+        if ( !myPoint1->_is_nil() && myPoint2->_is_nil() )
+          Group3Pnts2->PushButton2->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 ) {
+        myPoint2 = aSelectedObject;
+        if ( !myPoint2->_is_nil() && myPoint3->_is_nil() )
+          Group3Pnts2->PushButton3->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 ) {
+        myPoint3 = aSelectedObject;
+        if ( !myPoint3->_is_nil() && myPoint1->_is_nil() )
+          Group3Pnts2->PushButton1->click();
+      }
+      break;
+    case 2:
+      if ( myEditCurrentArgument == Group3Pnts3->LineEdit1 ) {
+        myPoint1 = aSelectedObject;
+        if ( !myPoint1->_is_nil() && myPoint2->_is_nil() )
+          Group3Pnts3->PushButton2->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit2 ) {
+        myPoint2 = aSelectedObject;
+        if ( !myPoint2->_is_nil() && myPoint3->_is_nil() )
+          Group3Pnts3->PushButton3->click();
       }
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit3 ) {
+        myPoint3 = aSelectedObject;
+        if ( !myPoint3->_is_nil() && myPoint1->_is_nil() )
+          Group3Pnts3->PushButton1->click();
+      }
+      break;
     }
   }
 
   displayPreview();
 }
 
+
 //=================================================================================
-// function : LineEditReturnPressed()
+// function : SetEditCurrentArgument()
 // purpose  :
 //=================================================================================
-void BasicGUI_ArcDlg::LineEditReturnPressed()
+void BasicGUI_ArcDlg::SetEditCurrentArgument()
 {
-  QLineEdit* send = (QLineEdit*)sender();
-  if (send == Group3Pnts->LineEdit1  || send == Group3Pnts->LineEdit2  || send == Group3Pnts->LineEdit3 ||
-      send == Group3Pnts2->LineEdit1 || send == Group3Pnts2->LineEdit2 || send == Group3Pnts2->LineEdit3)
-  {
-    myEditCurrentArgument = send;
-    GEOMBase_Skeleton::LineEditReturnPressed();
+  globalSelection(); // close local selection to clear it
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+  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();
 }
 
 
 //=================================================================================
-// function : SetEditCurrentArgument()
+// function : LineEditReturnPressed()
 // purpose  :
 //=================================================================================
-void BasicGUI_ArcDlg::SetEditCurrentArgument()
+void BasicGUI_ArcDlg::LineEditReturnPressed()
 {
-  QPushButton* send = (QPushButton*)sender();
-  switch (getConstructorId())
-  {
-    case 0:
-    {
-      if      ( send == Group3Pnts->PushButton1 )   myEditCurrentArgument = Group3Pnts->LineEdit1;
-      else if ( send == Group3Pnts->PushButton2 )   myEditCurrentArgument = Group3Pnts->LineEdit2;
-      else if ( send == Group3Pnts->PushButton3 )   myEditCurrentArgument = Group3Pnts->LineEdit3;
-      break;
-    }
-    case 1:
-    {
-      if      ( send == Group3Pnts2->PushButton1 )   myEditCurrentArgument = Group3Pnts2->LineEdit1;
-      else if ( send == Group3Pnts2->PushButton2 )   myEditCurrentArgument = Group3Pnts2->LineEdit2;
-      else if ( send == Group3Pnts2->PushButton3 )   myEditCurrentArgument = Group3Pnts2->LineEdit3;
-      break;
-    }
+  QLineEdit* send = (QLineEdit*)sender();
+  if ( send == Group3Pnts->LineEdit1 || send == Group3Pnts->LineEdit2 || send == Group3Pnts->LineEdit3 ||
+       send == Group3Pnts2->LineEdit1 || send == Group3Pnts2->LineEdit2 || send == Group3Pnts2->LineEdit3 ||
+       send == Group3Pnts3->LineEdit1 || send == Group3Pnts3->LineEdit2 || send == Group3Pnts3->LineEdit3 ) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
   }
-  myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
 }
 
 
@@ -398,24 +491,24 @@ void BasicGUI_ArcDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(),
+           SIGNAL( currentSelectionChanged() ),
+           this,
+           SLOT(SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_ArcDlg::enterEvent(QEvent* e)
+void BasicGUI_ArcDlg::enterEvent( QEvent* )
 {
-  if (!GroupConstructors->isEnabled())
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
@@ -440,6 +533,32 @@ static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Obje
 //=================================================================================
 bool BasicGUI_ArcDlg::isValid( QString& msg )
 {
+  switch (getConstructorId()) {
+  case 0:
+    {
+      if (Group3Pnts->LineEdit1->text().trimmed().isEmpty() ||
+          Group3Pnts->LineEdit2->text().trimmed().isEmpty() ||
+          Group3Pnts->LineEdit3->text().trimmed().isEmpty())
+        return false;
+      break;
+    }
+  case 1:
+    {
+      if (Group3Pnts2->LineEdit1->text().trimmed().isEmpty() ||
+          Group3Pnts2->LineEdit2->text().trimmed().isEmpty() ||
+          Group3Pnts2->LineEdit3->text().trimmed().isEmpty())
+        return false;
+      break;
+    }
+  case 2:
+    {
+      if (Group3Pnts3->LineEdit1->text().trimmed().isEmpty() ||
+          Group3Pnts3->LineEdit2->text().trimmed().isEmpty() ||
+          Group3Pnts3->LineEdit3->text().trimmed().isEmpty())
+        return false;
+      break;
+    }
+  }
   return !myPoint1->_is_nil() && !myPoint2->_is_nil() && !myPoint3->_is_nil() &&
     !isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 );
 }
@@ -453,42 +572,137 @@ bool BasicGUI_ArcDlg::execute( ObjectList& objects )
   bool res = false;
   GEOM::GEOM_Object_var anObj;
 
-  switch (getConstructorId())
-  {
+  GEOM::GEOM_ICurvesOperations_var anOper = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() );
+
+  switch ( getConstructorId() ) {
   case 0:
     {
-      if ( !CORBA::is_nil(myPoint1) && !CORBA::is_nil(myPoint2) &&!CORBA::is_nil(myPoint3) )
-      {
-        anObj = GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->
-          MakeArc(myPoint1, myPoint2, myPoint3);
+      if ( !CORBA::is_nil( myPoint1 ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) ) {
+        anObj = anOper->MakeArc( myPoint1, myPoint2, myPoint3 );
         res = true;
       }
       break;
     }
   case 1:
     {
-      bool Sense;
-      (Group3Pnts2->CheckButton1->isChecked()) ? Sense = true : Sense = false;
-      if ( !CORBA::is_nil(myPoint1) && !CORBA::is_nil(myPoint2) &&!CORBA::is_nil(myPoint3) )
-      {
-        anObj = GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->
-          MakeArcCenter(myPoint1, myPoint2, myPoint3, Sense);
+      bool Sense = Group3Pnts2->CheckButton1->isChecked();
+      if ( !CORBA::is_nil( myPoint1 ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) ) {
+        anObj = anOper->MakeArcCenter( myPoint1, myPoint2, myPoint3, Sense );
+        res = true;
+      }
+      break;
+    }
+  case 2:
+    {
+      if ( !CORBA::is_nil( myPoint1 ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) ) {
+        anObj = anOper->MakeArcOfEllipse( myPoint1, myPoint2, myPoint3 );
         res = true;
       }
       break;
     }
   }
-  if ( !anObj->_is_nil() )
+  if ( !anObj->_is_nil() ) {
     objects.push_back( anObj._retn() );
-
+  }
   return res;
 }
 
+//=================================================================================
+// function : ConstructorsClicked()
+// purpose  : Radio button management
+//=================================================================================
+void BasicGUI_ArcDlg::ConstructorsClicked( int constructorId )
+{
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
+
+  switch ( constructorId ) {
+  case 0:
+    {
+      globalSelection(); // close local contexts, if any
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes
+
+      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);
+      myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
+
+      myEditCurrentArgument = Group3Pnts->LineEdit1;
+      break;
+    }
+  case 1:
+    {
+      globalSelection(); // close local contexts, if any
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes
+
+      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);
+      myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
+      
+      myEditCurrentArgument = Group3Pnts2->LineEdit1;
+      break;
+    }
+  case 2:
+    {
+      globalSelection(); // close local contexts, if any
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes
+
+      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);
+      myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
+
+      myEditCurrentArgument = Group3Pnts3->LineEdit1;
+      break;
+    }
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
+
+  myEditCurrentArgument->setFocus();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+           this, SLOT( SelectionIntoArgument() ) );
+
+  if ( CORBA::is_nil( myPoint1 ) )
+    SelectionIntoArgument();
+
+  displayPreview();
+}
+
 //=================================================================================
 // function : ReverseSense()
 // purpose  : Orientation of the arc
 //=================================================================================
-void BasicGUI_ArcDlg::ReverseSense(int sense)
+void BasicGUI_ArcDlg::ReverseSense()
 {
   displayPreview();
 }
@@ -501,8 +715,7 @@ void BasicGUI_ArcDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-switch (getConstructorId())
-  {
+  switch ( getConstructorId() ) {
   case 0:
     objMap[Group3Pnts->LineEdit1->text()] = myPoint1;
     objMap[Group3Pnts->LineEdit2->text()] = myPoint2;
@@ -513,6 +726,11 @@ switch (getConstructorId())
     objMap[Group3Pnts2->LineEdit2->text()] = myPoint2;
     objMap[Group3Pnts2->LineEdit3->text()] = myPoint3;
     break;
+  case 2:
+    objMap[Group3Pnts3->LineEdit1->text()] = myPoint1;
+    objMap[Group3Pnts3->LineEdit2->text()] = myPoint2;
+    objMap[Group3Pnts3->LineEdit3->text()] = myPoint3;
+    break;
   }
- addSubshapesToFather( objMap );
 addSubshapesToFather( objMap );
 }