Salome HOME
IMPs 21188, 21053, 21064
[modules/geom.git] / src / BasicGUI / BasicGUI_PointDlg.cxx
index 7810dcdda7031210e1752c2f5971871e6cd1a6cb..78fdec2b780bcdc560404766ec9b63c4055a8d4f 100644 (file)
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 //  GEOM GEOMGUI : GUI for Geometry component
 //  File   : BasicGUI_PointDlg.cxx
 //  Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
-//
+
 #include "BasicGUI_PointDlg.h"
 
 #include <SUIT_ResourceMgr.h>
@@ -77,131 +76,132 @@ enum { SelectEdge, SelectWire };
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-BasicGUI_PointDlg::BasicGUI_PointDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
-                                      bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl ),
-    myBusy ( false )
+BasicGUI_PointDlg::BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
+                                      bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myBusy (false)
 {
-  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT") ) );
-  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT_EDGE" ) ) );
-  QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
-  QPixmap image3( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT_REF" ) ) );
-  QPixmap image4( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT_LINES") ) );
-  QPixmap image5( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT_FACE" ) ) );
-  QPixmap image6( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICO_LINE" ) ) );
-  QPixmap image7( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICO_WIRE" ) ) );
-
-  setWindowTitle( tr( "GEOM_POINT_TITLE" ) );
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_POINT")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_POINT_EDGE")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image3 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_POINT_REF")));
+  QPixmap image4 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_POINT_LINES")));
+  QPixmap image5 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_POINT_FACE")));
+  QPixmap image6 (aResMgr->loadPixmap("GEOM", tr("ICO_LINE")));
+  QPixmap image7 (aResMgr->loadPixmap("GEOM", tr("ICO_WIRE")));
+
+  setWindowTitle(tr("GEOM_POINT_TITLE"));
 
   /***************************************************************/
-  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_POINTS" ) );
-  mainFrame()->RadioButton1->setIcon( image0 );
-  mainFrame()->RadioButton2->setIcon( image3 );
-  mainFrame()->RadioButton3->setIcon( image1 );
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_POINTS"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image3);
+  mainFrame()->RadioButton3->setIcon(image1);
   mainFrame()->RadioButton4->show();
-  mainFrame()->RadioButton4->setIcon( image4 );
+  mainFrame()->RadioButton4->setIcon(image4);
   mainFrame()->RadioButton5->show();
-  mainFrame()->RadioButton5->setIcon( image5 );
-
-  myParamGroup = new QGroupBox( centralWidget() );
-  myParamCoord = new QButtonGroup( myParamGroup );
-  QHBoxLayout* boxLayout = new QHBoxLayout( myParamGroup );
-  boxLayout->setMargin( MARGIN ); boxLayout->setSpacing( SPACING );
-  QRadioButton* btn = new QRadioButton( tr( "GEOM_PARAM_VALUE" ), myParamGroup );
-  myParamCoord->addButton( btn, PARAM_VALUE );
-  boxLayout->addWidget( btn );
-  btn = new QRadioButton( tr( "GEOM_LENGTH_VALUE" ), myParamGroup ); 
-  myParamCoord->addButton( btn, LENGTH_VALUE );
-  boxLayout->addWidget( btn );
-  btn = new QRadioButton( tr( "GEOM_COORD_VALUE" ), myParamGroup );
-  myParamCoord->addButton( btn, COORD_VALUE );
-  boxLayout->addWidget( btn );
-  myParamCoord->setExclusive( true );
-  myParamCoord->button( PARAM_VALUE )->setChecked( true );
-
-  GroupXYZ = new DlgRef_3Spin( centralWidget() );
-  GroupXYZ->GroupBox1->setTitle( tr( "GEOM_COORDINATES" ) );
-  GroupXYZ->TextLabel1->setText( tr( "GEOM_X" ) );
-  GroupXYZ->TextLabel2->setText( tr( "GEOM_Y" ) );
-  GroupXYZ->TextLabel3->setText( tr( "GEOM_Z" ) );
-
-  GroupOnCurve = new DlgRef_1Sel1Spin1Check( centralWidget() );
-  GroupOnCurve->GroupBox1->setTitle( tr( "GEOM_POINT_ON_EDGE" ) );
-  GroupOnCurve->TextLabel1->setText( tr( "GEOM_EDGE" ) );
-  GroupOnCurve->TextLabel2->setText( tr( "GEOM_PARAMETER" ) );
-  GroupOnCurve->CheckButton1->setText( tr( "GEOM_REVERSE" ) );
-  GroupOnCurve->PushButton1->setIcon( image2 );
-  
-
-  GroupOnSurface = new DlgRef_1Sel2Spin( centralWidget() );
-  GroupOnSurface->GroupBox1->setTitle( tr( "GEOM_POINT_ON_FACE" ) );
-  GroupOnSurface->TextLabel1->setText( tr( "GEOM_FACE" ) );
-  GroupOnSurface->TextLabel2->setText( tr( "GEOM_UPARAMETER" ) );
-  GroupOnSurface->TextLabel3->setText( tr( "GEOM_VPARAMETER" ) );
-  GroupOnSurface->PushButton1->setIcon( image2 );
-
-  GroupRefPoint = new DlgRef_1Sel3Spin( centralWidget() );
-  GroupRefPoint->GroupBox1->setTitle( tr( "GEOM_REF_POINT" ) );
-  GroupRefPoint->TextLabel1->setText( tr( "GEOM_POINT" ) );
-  GroupRefPoint->PushButton1->setIcon( image2 );
-  GroupRefPoint->TextLabel2->setText( tr( "GEOM_DX" ) );
-  GroupRefPoint->TextLabel3->setText( tr( "GEOM_DY" ) );
-  GroupRefPoint->TextLabel4->setText( tr( "GEOM_DZ" ) );
+  mainFrame()->RadioButton5->setIcon(image5);
+
+  myParamGroup = new QGroupBox(centralWidget());
+  myParamCoord = new QButtonGroup(myParamGroup);
+  QHBoxLayout* boxLayout = new QHBoxLayout(myParamGroup);
+  boxLayout->setMargin(MARGIN); boxLayout->setSpacing(SPACING);
+  QRadioButton* btn = new QRadioButton(tr("GEOM_PARAM_VALUE"), myParamGroup);
+  myParamCoord->addButton(btn, PARAM_VALUE);
+  boxLayout->addWidget(btn);
+  btn = new QRadioButton(tr("GEOM_LENGTH_VALUE"), myParamGroup);
+  myParamCoord->addButton(btn, LENGTH_VALUE);
+  boxLayout->addWidget(btn);
+  btn = new QRadioButton(tr("GEOM_COORD_VALUE"), myParamGroup);
+  myParamCoord->addButton(btn, COORD_VALUE);
+  boxLayout->addWidget(btn);
+  myParamCoord->setExclusive(true);
+  myParamCoord->button(PARAM_VALUE)->setChecked(true);
+
+  GroupXYZ = new DlgRef_3Spin(centralWidget());
+  GroupXYZ->GroupBox1->setTitle(tr("GEOM_COORDINATES"));
+  GroupXYZ->TextLabel1->setText(tr("GEOM_X"));
+  GroupXYZ->TextLabel2->setText(tr("GEOM_Y"));
+  GroupXYZ->TextLabel3->setText(tr("GEOM_Z"));
+
+  GroupOnCurve = new DlgRef_2Sel1Spin(centralWidget());
+  GroupOnCurve->GroupBox1->setTitle(tr("GEOM_POINT_ON_EDGE"));
+  GroupOnCurve->TextLabel1->setText(tr("GEOM_EDGE"));
+  GroupOnCurve->TextLabel2->setText(tr("GEOM_START_POINT"));
+  GroupOnCurve->TextLabel3->setText(tr("GEOM_PARAMETER"));
+  GroupOnCurve->PushButton1->setIcon(image2);
+  GroupOnCurve->PushButton2->setIcon(image2);
+
+  GroupOnSurface = new DlgRef_1Sel2Spin(centralWidget());
+  GroupOnSurface->GroupBox1->setTitle(tr("GEOM_POINT_ON_FACE"));
+  GroupOnSurface->TextLabel1->setText(tr("GEOM_FACE"));
+  GroupOnSurface->TextLabel2->setText(tr("GEOM_UPARAMETER"));
+  GroupOnSurface->TextLabel3->setText(tr("GEOM_VPARAMETER"));
+  GroupOnSurface->PushButton1->setIcon(image2);
+
+  GroupRefPoint = new DlgRef_1Sel3Spin(centralWidget());
+  GroupRefPoint->GroupBox1->setTitle(tr("GEOM_REF_POINT"));
+  GroupRefPoint->TextLabel1->setText(tr("GEOM_POINT"));
+  GroupRefPoint->PushButton1->setIcon(image2);
+  GroupRefPoint->TextLabel2->setText(tr("GEOM_DX"));
+  GroupRefPoint->TextLabel3->setText(tr("GEOM_DY"));
+  GroupRefPoint->TextLabel4->setText(tr("GEOM_DZ"));
 
   /* popup menu for line intersect buttons */
   myBtnPopup = new QMenu(this);
-  QIcon ico_line = QIcon( image6 );
-  QIcon ico_wire = QIcon( image7 );
-  myActions[myBtnPopup->addAction( ico_line, tr( "GEOM_EDGE" ) )] = SelectEdge;
-  myActions[myBtnPopup->addAction( ico_wire, tr( "GEOM_WIRE" ) )] = SelectWire;
-
-  GroupLineIntersection = new DlgRef_2Sel( centralWidget() );
-  GroupLineIntersection->GroupBox1->setTitle( tr( "GEOM_LINE_INTERSECTION" ) );
-  GroupLineIntersection->TextLabel1->setText( tr( "GEOM_LINE1" ) );
-  GroupLineIntersection->TextLabel2->setText( tr( "GEOM_LINE2" ) );
-  GroupLineIntersection->PushButton1->setIcon( image2 );
-  GroupLineIntersection->PushButton1->setMenu( myBtnPopup );
-  GroupLineIntersection->PushButton2->setIcon( image2 );
-  GroupLineIntersection->PushButton2->setMenu( myBtnPopup );
+  QIcon ico_line = QIcon(image6);
+  QIcon ico_wire = QIcon(image7);
+  myActions[myBtnPopup->addAction(ico_line, tr("GEOM_EDGE"))] = SelectEdge;
+  myActions[myBtnPopup->addAction(ico_wire, tr("GEOM_WIRE"))] = SelectWire;
+
+  GroupLineIntersection = new DlgRef_2Sel(centralWidget());
+  GroupLineIntersection->GroupBox1->setTitle(tr("GEOM_LINE_INTERSECTION"));
+  GroupLineIntersection->TextLabel1->setText(tr("GEOM_LINE1"));
+  GroupLineIntersection->TextLabel2->setText(tr("GEOM_LINE2"));
+  GroupLineIntersection->PushButton1->setIcon(image2);
+  GroupLineIntersection->PushButton1->setMenu(myBtnPopup);
+  GroupLineIntersection->PushButton2->setIcon(image2);
+  GroupLineIntersection->PushButton2->setMenu(myBtnPopup);
   GroupLineIntersection->LineEdit2->setEnabled(false);
 
-  myCoordGrp = new QGroupBox( tr( "GEOM_COORDINATES_RES" ), centralWidget() );
-  QGridLayout* myCoordGrpLayout = new QGridLayout( myCoordGrp );
-  myCoordGrpLayout->addWidget( new QLabel( tr( "GEOM_X" ), myCoordGrp ), 0, 0 );
-  myX = new QLineEdit( myCoordGrp );
-  myCoordGrpLayout->addWidget( myX, 0, 1 );
-  myCoordGrpLayout->addWidget( new QLabel( tr( "GEOM_Y" ), myCoordGrp ), 1, 0 );
-  myY = new QLineEdit( myCoordGrp );
-  myCoordGrpLayout->addWidget( myY, 1, 1 );
-  myCoordGrpLayout->addWidget( new QLabel( tr( "GEOM_Z" ), myCoordGrp ), 2, 0 );
-  myZ = new QLineEdit( myCoordGrp );
-  myCoordGrpLayout->addWidget( myZ, 2, 1 );
-
-  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
-  layout->setMargin( 0 ); layout->setSpacing( 6 );
-  layout->addWidget( myParamGroup );
-  layout->addWidget( GroupXYZ );
-  layout->addWidget( GroupOnCurve );
-  layout->addWidget( GroupOnSurface );
-  layout->addWidget( GroupRefPoint );
-  layout->addWidget( GroupLineIntersection );
-  layout->addWidget( myCoordGrp );
-
-  myX->setReadOnly( true );
-  myY->setReadOnly( true );
-  myZ->setReadOnly( true );
-
-  myX->setEnabled( false );
-  myY->setEnabled( false );
-  myZ->setEnabled( false );
+  myCoordGrp = new QGroupBox(tr("GEOM_COORDINATES_RES"), centralWidget());
+  QGridLayout* myCoordGrpLayout = new QGridLayout(myCoordGrp);
+  myCoordGrpLayout->addWidget(new QLabel(tr("GEOM_X"), myCoordGrp), 0, 0);
+  myX = new QLineEdit(myCoordGrp);
+  myCoordGrpLayout->addWidget(myX, 0, 1);
+  myCoordGrpLayout->addWidget(new QLabel(tr("GEOM_Y"), myCoordGrp), 1, 0);
+  myY = new QLineEdit(myCoordGrp);
+  myCoordGrpLayout->addWidget(myY, 1, 1);
+  myCoordGrpLayout->addWidget(new QLabel(tr("GEOM_Z"), myCoordGrp), 2, 0);
+  myZ = new QLineEdit(myCoordGrp);
+  myCoordGrpLayout->addWidget(myZ, 2, 1);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(myParamGroup);
+  layout->addWidget(GroupXYZ);
+  layout->addWidget(GroupOnCurve);
+  layout->addWidget(GroupOnSurface);
+  layout->addWidget(GroupRefPoint);
+  layout->addWidget(GroupLineIntersection);
+  layout->addWidget(myCoordGrp);
+
+  myX->setReadOnly(true);
+  myY->setReadOnly(true);
+  myZ->setReadOnly(true);
+
+  myX->setEnabled(false);
+  myY->setEnabled(false);
+  myZ->setEnabled(false);
 
   QPalette aPal = myX->palette();
-  aPal.setColor( QPalette::Disabled, QPalette::Text, QColor( 0, 0, 0 ) );
-  myX->setPalette( aPal );
-  myY->setPalette( aPal );
-  myZ->setPalette( aPal );
+  aPal.setColor(QPalette::Disabled, QPalette::Text, QColor(0, 0, 0));
+  myX->setPalette(aPal);
+  myY->setPalette(aPal);
+  myZ->setPalette(aPal);
 
-  setHelpFileName( "create_point_page.html" );
+  setHelpFileName("create_point_page.html");
 
   Init();
 }
@@ -222,13 +222,14 @@ BasicGUI_PointDlg::~BasicGUI_PointDlg()
 //=================================================================================
 void BasicGUI_PointDlg::Init()
 {
-  GroupOnCurve->LineEdit1->setReadOnly( true );
-  GroupOnSurface->LineEdit1->setReadOnly( true );
-  GroupRefPoint->LineEdit1->setReadOnly( true );
-  GroupLineIntersection->LineEdit1->setReadOnly( true );
-  GroupLineIntersection->LineEdit2->setReadOnly( true );
-  GroupLineIntersection->LineEdit1->setEnabled( true );
-  GroupLineIntersection->LineEdit2->setEnabled( false );
+  GroupOnCurve->LineEdit1->setReadOnly(true);
+  GroupOnCurve->LineEdit2->setReadOnly(true);
+  GroupOnSurface->LineEdit1->setReadOnly(true);
+  GroupRefPoint->LineEdit1->setReadOnly(true);
+  GroupLineIntersection->LineEdit1->setReadOnly(true);
+  GroupLineIntersection->LineEdit2->setReadOnly(true);
+  GroupLineIntersection->LineEdit1->setEnabled(true);
+  GroupLineIntersection->LineEdit2->setEnabled(false);
 
   myEdge.nullify();
   myFace.nullify();
@@ -241,78 +242,77 @@ void BasicGUI_PointDlg::Init()
 
   /* Get setting of step value from file configuration */
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
 
   /* min, max, step and decimals for spin boxes */
-  initSpinBox( GroupXYZ->SpinBox_DX, COORD_MIN, COORD_MAX, step, "length_precision" );
-  initSpinBox( GroupXYZ->SpinBox_DY, COORD_MIN, COORD_MAX, step, "length_precision" );
-  initSpinBox( GroupXYZ->SpinBox_DZ, COORD_MIN, COORD_MAX, step, "length_precision" );
-  GroupXYZ->SpinBox_DX->setValue( 0.0 );
-  GroupXYZ->SpinBox_DY->setValue( 0.0 );
-  GroupXYZ->SpinBox_DZ->setValue( 0.0 );
-
-  initSpinBox( GroupRefPoint->SpinBox_DX, COORD_MIN, COORD_MAX, step, "length_precision" );
-  initSpinBox( GroupRefPoint->SpinBox_DY, COORD_MIN, COORD_MAX, step, "length_precision" );
-  initSpinBox( GroupRefPoint->SpinBox_DZ, COORD_MIN, COORD_MAX, step, "length_precision" );
-  GroupRefPoint->SpinBox_DX->setValue( 0.0 );
-  GroupRefPoint->SpinBox_DY->setValue( 0.0 );
-  GroupRefPoint->SpinBox_DZ->setValue( 0.0 );
+  initSpinBox(GroupXYZ->SpinBox_DX, COORD_MIN, COORD_MAX, step, "length_precision");
+  initSpinBox(GroupXYZ->SpinBox_DY, COORD_MIN, COORD_MAX, step, "length_precision");
+  initSpinBox(GroupXYZ->SpinBox_DZ, COORD_MIN, COORD_MAX, step, "length_precision");
+  GroupXYZ->SpinBox_DX->setValue(0.0);
+  GroupXYZ->SpinBox_DY->setValue(0.0);
+  GroupXYZ->SpinBox_DZ->setValue(0.0);
+
+  initSpinBox(GroupRefPoint->SpinBox_DX, COORD_MIN, COORD_MAX, step, "length_precision");
+  initSpinBox(GroupRefPoint->SpinBox_DY, COORD_MIN, COORD_MAX, step, "length_precision");
+  initSpinBox(GroupRefPoint->SpinBox_DZ, COORD_MIN, COORD_MAX, step, "length_precision");
+  GroupRefPoint->SpinBox_DX->setValue(0.0);
+  GroupRefPoint->SpinBox_DY->setValue(0.0);
+  GroupRefPoint->SpinBox_DZ->setValue(0.0);
 
   step = 0.1;
 
-  initSpinBox( GroupOnCurve->SpinBox_DX, 0., 1., step, "parametric_precision" );
-  GroupOnCurve->SpinBox_DX->setValue( 0.5 );
+  initSpinBox(GroupOnCurve->SpinBox_DX, 0., 1., step, "parametric_precision");
+  GroupOnCurve->SpinBox_DX->setValue(0.5);
 
-  initSpinBox( GroupOnSurface->SpinBox_DX, 0., 1., step, "parametric_precision" );
-  GroupOnSurface->SpinBox_DX->setValue( 0.5 );
-  initSpinBox( GroupOnSurface->SpinBox_DY, 0., 1., step, "parametric_precision" );
-  GroupOnSurface->SpinBox_DY->setValue( 0.5 );
+  initSpinBox(GroupOnSurface->SpinBox_DX, 0., 1., step, "parametric_precision");
+  GroupOnSurface->SpinBox_DX->setValue(0.5);
+  initSpinBox(GroupOnSurface->SpinBox_DY, 0., 1., step, "parametric_precision");
+  GroupOnSurface->SpinBox_DY->setValue(0.5);
 
   /* signals and slots connections */
-  connect( myGeomGUI,      SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
-  connect( myGeomGUI,      SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
+  connect(myGeomGUI,      SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
+  connect(myGeomGUI,      SIGNAL(SignalCloseAllDialogs()),        this, SLOT(ClickOnCancel()));
 
-  connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
-  connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect(buttonOk(),     SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(),  SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
-  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+  connect(this,           SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
-  connect( myParamCoord,   SIGNAL( buttonClicked( int ) ), this, SLOT( ClickParamCoord( int ) ) );
+  connect(myParamCoord,   SIGNAL(buttonClicked(int)), this, SLOT(ClickParamCoord(int)));
 
-  connect( GroupOnCurve->PushButton1,          SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
-  connect( GroupOnSurface->PushButton1,        SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
-  connect( GroupLineIntersection->PushButton1, SIGNAL( pressed() ),      this, SLOT( SetEditCurrentArgument() ) );
-  connect( GroupLineIntersection->PushButton2, SIGNAL( pressed() ),      this, SLOT( SetEditCurrentArgument() ) );
+  connect(GroupOnCurve->PushButton1,          SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupOnCurve->PushButton2,          SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupOnSurface->PushButton1,        SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupLineIntersection->PushButton1, SIGNAL(pressed()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupLineIntersection->PushButton2, SIGNAL(pressed()), this, SLOT(SetEditCurrentArgument()));
 
-  connect( myBtnPopup, SIGNAL( triggered( QAction* ) ), this, SLOT( onBtnPopup( QAction* ) ) );
+  connect(myBtnPopup, SIGNAL(triggered(QAction*)), this, SLOT(onBtnPopup(QAction*)));
 
-  connect( GroupOnCurve->SpinBox_DX,   SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
-  connect( GroupOnSurface->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
-  connect( GroupOnSurface->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
-  connect( GroupXYZ->SpinBox_DX,       SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
-  connect( GroupXYZ->SpinBox_DY,       SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
-  connect( GroupXYZ->SpinBox_DZ,       SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
-  connect( GroupRefPoint->SpinBox_DX,  SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
-  connect( GroupRefPoint->SpinBox_DY,  SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
-  connect( GroupRefPoint->SpinBox_DZ,  SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect(GroupOnCurve->SpinBox_DX,   SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupOnSurface->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupOnSurface->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupXYZ->SpinBox_DX,       SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupXYZ->SpinBox_DY,       SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupXYZ->SpinBox_DZ,       SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupRefPoint->SpinBox_DX,  SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupRefPoint->SpinBox_DY,  SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupRefPoint->SpinBox_DZ,  SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
 
-  connect( GroupOnCurve->CheckButton1, SIGNAL( stateChanged( int ) ), this, SLOT( CheckBoxClicked( int ) ) );
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this,  SLOT(SetDoubleSpinBoxStep(double)));
 
-  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this,  SLOT( SetDoubleSpinBoxStep( double ) ) );
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+           this,  SLOT(SelectionIntoArgument()));
 
-  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged() ),
-           this,  SLOT(SelectionIntoArgument() ) );
+  initName(tr("GEOM_VERTEX"));
 
-  initName( tr( "GEOM_VERTEX" ) );
-
-  ConstructorsClicked( 0 );
+  ConstructorsClicked(0);
 }
 
 //=================================================================================
 // function : SetDoubleSpinBoxStep()
 // purpose  : Double spin box management
 //=================================================================================
-void BasicGUI_PointDlg::SetDoubleSpinBoxStep( double step )
+void BasicGUI_PointDlg::SetDoubleSpinBoxStep(double step)
 {
   GroupOnCurve->SpinBox_DX->setSingleStep(step);
   GroupXYZ->SpinBox_DX->setSingleStep(step);
@@ -330,12 +330,12 @@ void BasicGUI_PointDlg::SetDoubleSpinBoxStep( double step )
 //=================================================================================
 void BasicGUI_PointDlg::ConstructorsClicked(int constructorId)
 {
-  switch ( constructorId ) {
+  switch (constructorId) {
   case GEOM_POINT_XYZ:
     {
       globalSelection(); // close local contexts, if any
       myNeedType = TopAbs_VERTEX;
-      localSelection( GEOM::GEOM_Object::_nil(), myNeedType );
+      localSelection(GEOM::GEOM_Object::_nil(), myNeedType);
 
       GroupRefPoint->hide();
       GroupOnCurve->hide();
@@ -350,10 +350,10 @@ void BasicGUI_PointDlg::ConstructorsClicked(int constructorId)
     {
       globalSelection(); // close local contexts, if any
       myNeedType = TopAbs_VERTEX;
-      localSelection( GEOM::GEOM_Object::_nil(), myNeedType );
+      localSelection(GEOM::GEOM_Object::_nil(), myNeedType);
 
       myEditCurrentArgument = GroupRefPoint->LineEdit1;
-      myEditCurrentArgument->setText( "" );
+      myEditCurrentArgument->setText("");
       myRefPoint.nullify();
       GroupRefPoint->PushButton1->setDown(true);
       myParamGroup->hide();
@@ -369,34 +369,35 @@ void BasicGUI_PointDlg::ConstructorsClicked(int constructorId)
     {
       globalSelection(); // close local contexts, if any
       myNeedType = TopAbs_EDGE;
-      localSelection( GEOM::GEOM_Object::_nil(), myNeedType );
+      localSelection(GEOM::GEOM_Object::_nil(), myNeedType);
 
       myEditCurrentArgument = GroupOnCurve->LineEdit1;
-      myEditCurrentArgument->setText( "" );
+      myEditCurrentArgument->setText("");
       myEdge.nullify();
+      myRefPoint.nullify();
       GroupOnCurve->PushButton1->setDown(true);
       GroupRefPoint->hide();
       GroupLineIntersection->hide();
       GroupOnSurface->hide();
       myParamGroup->show();
-      myParamCoord->button( LENGTH_VALUE )->show();
-      myParamCoord->button( PARAM_VALUE )->setChecked( true );
+      myParamCoord->button(LENGTH_VALUE)->show();
+      myParamCoord->button(PARAM_VALUE)->setChecked(true);
       GroupOnCurve->show();
       myCoordGrp->show();
-      updateParamCoord( false );
+      updateParamCoord(false);
       break;
     }
   case GEOM_POINT_INTINT:
     {
       globalSelection(); // close local contexts, if any
       myNeedType = TopAbs_EDGE;
-      localSelection( GEOM::GEOM_Object::_nil(), myNeedType );
+      localSelection(GEOM::GEOM_Object::_nil(), myNeedType);
 
       myEditCurrentArgument = GroupLineIntersection->LineEdit1;
-      GroupLineIntersection->LineEdit1->setText( "" );
-      GroupLineIntersection->LineEdit2->setText( "" );
-      GroupLineIntersection->LineEdit1->setEnabled( true );
-      GroupLineIntersection->LineEdit2->setEnabled( false );
+      GroupLineIntersection->LineEdit1->setText("");
+      GroupLineIntersection->LineEdit2->setText("");
+      GroupLineIntersection->LineEdit1->setEnabled(true);
+      GroupLineIntersection->LineEdit2->setEnabled(false);
       myLine1.nullify();
       myLine2.nullify();
       GroupLineIntersection->PushButton1->setDown(true);
@@ -414,57 +415,56 @@ void BasicGUI_PointDlg::ConstructorsClicked(int constructorId)
     {
       globalSelection(); // close local contexts, if any
       myNeedType = TopAbs_FACE;
-      localSelection( GEOM::GEOM_Object::_nil(), myNeedType );
+      localSelection(GEOM::GEOM_Object::_nil(), myNeedType);
 
       myEditCurrentArgument = GroupOnSurface->LineEdit1;
-      myEditCurrentArgument->setText( "" );
+      myEditCurrentArgument->setText("");
       myFace.nullify();
       GroupOnSurface->PushButton1->setDown(true);
       GroupRefPoint->hide();
       GroupOnCurve->hide();
       GroupLineIntersection->hide();
       myParamGroup->show();
-      myParamCoord->button( LENGTH_VALUE )->hide();
-      myParamCoord->button( PARAM_VALUE )->setChecked(true);
+      myParamCoord->button(LENGTH_VALUE)->hide();
+      myParamCoord->button(PARAM_VALUE)->setChecked(true);
       GroupOnSurface->show();
       myCoordGrp->show();
-      updateParamCoord( false );
+      updateParamCoord(false);
       break;
     }
   }
 
-  myX->setText( "" );
-  myY->setText( "" );
-  myZ->setText( "" );
+  myX->setText("");
+  myY->setText("");
+  myZ->setText("");
 
   QTimer::singleShot(50, this, SLOT(updateSize()));
 
   SelectionIntoArgument();
 }
 
-
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
 //=================================================================================
 void BasicGUI_PointDlg::ClickOnOk()
 {
-  if ( onAccept() )
+  setIsApplyAndClose(true);
+  if (onAccept())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool BasicGUI_PointDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
-  ConstructorsClicked( getConstructorId() );
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
@@ -478,71 +478,86 @@ void BasicGUI_PointDlg::SelectionIntoArgument()
   erasePreview();
   const int id = getConstructorId();
 
-  if ( ( id == GEOM_POINT_REF || id == GEOM_POINT_EDGE || id == GEOM_POINT_SURF ) && myEditCurrentArgument != 0 )
+  if ((id == GEOM_POINT_REF || id == GEOM_POINT_EDGE || id == GEOM_POINT_SURF)
+       && myEditCurrentArgument != 0)
   {
-    myEditCurrentArgument->setText( "" );
-    myX->setText( "" );
-    myY->setText( "" );
-    myZ->setText( "" );
-    myRefPoint.nullify();
-    myEdge.nullify();
+    myEditCurrentArgument->setText("");
+    myX->setText("");
+    myY->setText("");
+    myZ->setText("");
     myFace.nullify();
-  } else if ( id == GEOM_POINT_INTINT ) {
-    myEditCurrentArgument->setText( "" );
-    if ( myEditCurrentArgument == GroupLineIntersection->LineEdit1 )
+    if (myEditCurrentArgument == GroupOnCurve->LineEdit1)
+      myEdge.nullify();
+    else if (myEditCurrentArgument == GroupOnCurve->LineEdit2)
+      myRefPoint.nullify();
+  }
+  else if (id == GEOM_POINT_INTINT) {
+    myEditCurrentArgument->setText("");
+    if (myEditCurrentArgument == GroupLineIntersection->LineEdit1)
       myLine1.nullify();
-    else if ( myEditCurrentArgument == GroupLineIntersection->LineEdit2 )
+    else if (myEditCurrentArgument == GroupLineIntersection->LineEdit2)
       myLine2.nullify();
   }
 
-  GEOM::GeomObjPtr aSelectedObject = getSelected( myNeedType );
+  GEOM::GeomObjPtr aSelectedObject = getSelected(myNeedType);
   TopoDS_Shape aShape;
-  if ( aSelectedObject && GEOMBase::GetShape( aSelectedObject.get(), aShape ) && !aShape.IsNull() ) {
-    QString aName = GEOMBase::GetName( aSelectedObject.get() );
+  if (aSelectedObject && GEOMBase::GetShape(aSelectedObject.get(), aShape) && !aShape.IsNull()) {
+    QString aName = GEOMBase::GetName(aSelectedObject.get());
     myBusy = true;
-    if ( id == GEOM_POINT_XYZ ) {
-      gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
-      GroupXYZ->SpinBox_DX->setValue( aPnt.X() );
-      GroupXYZ->SpinBox_DY->setValue( aPnt.Y() );
-      GroupXYZ->SpinBox_DZ->setValue( aPnt.Z() );
+    if (id == GEOM_POINT_XYZ) {
+      gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape));
+      GroupXYZ->SpinBox_DX->setValue(aPnt.X());
+      GroupXYZ->SpinBox_DY->setValue(aPnt.Y());
+      GroupXYZ->SpinBox_DZ->setValue(aPnt.Z());
     }
-    else if ( id == GEOM_POINT_REF ) {
+    else if (id == GEOM_POINT_REF) {
       myRefPoint = aSelectedObject;
-      GroupRefPoint->LineEdit1->setText( aName );
+      GroupRefPoint->LineEdit1->setText(aName);
     }
-    else if ( id == GEOM_POINT_EDGE ) {
-      myEdge = aSelectedObject;
-      GroupOnCurve->LineEdit1->setText( aName );
+    else if (id == GEOM_POINT_EDGE) {
+      myEditCurrentArgument->setText(aName);
+      if (myEditCurrentArgument == GroupOnCurve->LineEdit1) {
+        myEdge = aSelectedObject;
+        if (myEdge && !myRefPoint) {
+          GroupOnCurve->PushButton2->click();
+        }
+      }
+      else if (myEditCurrentArgument == GroupOnCurve->LineEdit2) {
+        myRefPoint = aSelectedObject;
+        if (myRefPoint && !myEdge) {
+          GroupOnCurve->PushButton1->click();
+        }
+      }
     }
-    else if ( id == GEOM_POINT_INTINT ) {
-      myEditCurrentArgument->setText( aName );
-      if ( myEditCurrentArgument == GroupLineIntersection->LineEdit1 ) {
-       myLine1 = aSelectedObject;
-       if ( myLine1 && !myLine2 ) {
-         GroupLineIntersection->PushButton2->setMenu( 0 );
-         GroupLineIntersection->PushButton2->click();
-         GroupLineIntersection->PushButton2->setDown(true);
-         GroupLineIntersection->PushButton2->setMenu( myBtnPopup );
-       }
+    else if (id == GEOM_POINT_INTINT) {
+      myEditCurrentArgument->setText(aName);
+      if (myEditCurrentArgument == GroupLineIntersection->LineEdit1) {
+        myLine1 = aSelectedObject;
+        if (myLine1 && !myLine2) {
+          GroupLineIntersection->PushButton2->setMenu(0);
+          GroupLineIntersection->PushButton2->click();
+          GroupLineIntersection->PushButton2->setDown(true);
+          GroupLineIntersection->PushButton2->setMenu(myBtnPopup);
+        }
       }
-      else if ( myEditCurrentArgument == GroupLineIntersection->LineEdit2 ) {
-       myLine2 = aSelectedObject;
-       if ( myLine2 && !myLine1 ) {
-         GroupLineIntersection->PushButton1->setMenu( 0 );
-         GroupLineIntersection->PushButton1->click();
-         GroupLineIntersection->PushButton1->setDown(true);
-         GroupLineIntersection->PushButton1->setMenu( myBtnPopup );
-       }
+      else if (myEditCurrentArgument == GroupLineIntersection->LineEdit2) {
+        myLine2 = aSelectedObject;
+        if (myLine2 && !myLine1) {
+          GroupLineIntersection->PushButton1->setMenu(0);
+          GroupLineIntersection->PushButton1->click();
+          GroupLineIntersection->PushButton1->setDown(true);
+          GroupLineIntersection->PushButton1->setMenu(myBtnPopup);
+        }
       }
     }
-    else if ( id == GEOM_POINT_SURF ) {
+    else if (id == GEOM_POINT_SURF) {
       myFace = aSelectedObject;
-      GroupOnSurface->LineEdit1->setText( aName );
+      GroupOnSurface->LineEdit1->setText(aName);
     }
     myBusy = false;
   }
 
-  displayPreview();
+  displayPreview(true);
 }
 
 
@@ -554,43 +569,57 @@ void BasicGUI_PointDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
 
-  if ( send == GroupRefPoint->PushButton1 ) {
+  if (send == GroupRefPoint->PushButton1) {
     GroupRefPoint->LineEdit1->setFocus();
     myEditCurrentArgument = GroupRefPoint->LineEdit1;
     globalSelection(); // close local contexts, if any
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
   }
-  else if ( send == GroupOnCurve->PushButton1 ) {
+  else if (send == GroupOnCurve->PushButton1) {
     GroupOnCurve->LineEdit1->setFocus();
     myEditCurrentArgument = GroupOnCurve->LineEdit1;
     globalSelection(); // close local contexts, if any
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+    myNeedType = TopAbs_EDGE;
+    localSelection(GEOM::GEOM_Object::_nil(), myNeedType);
+    GroupOnCurve->PushButton2->setDown(false);
+    GroupOnCurve->LineEdit1->setEnabled(true);
+    GroupOnCurve->LineEdit2->setEnabled(false);
+  }
+  else if (send == GroupOnCurve->PushButton2) {
+    GroupOnCurve->LineEdit2->setFocus();
+    myEditCurrentArgument = GroupOnCurve->LineEdit2;
+    globalSelection(); // close local contexts, if any
+    myNeedType = TopAbs_VERTEX;
+    localSelection(GEOM::GEOM_Object::_nil(), myNeedType);
+    GroupOnCurve->PushButton1->setDown(false);
+    GroupOnCurve->LineEdit2->setEnabled(true);
+    GroupOnCurve->LineEdit1->setEnabled(false);
   }
-  else if ( send == GroupOnSurface->PushButton1 )
+  else if (send == GroupOnSurface->PushButton1)
   {
     GroupOnSurface->LineEdit1->setFocus();
     myEditCurrentArgument = GroupOnSurface->LineEdit1;
     globalSelection(); // close local contexts, if any
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE );
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_FACE);
   }
-  else if ( send == GroupLineIntersection->PushButton1 ) {
+  else if (send == GroupLineIntersection->PushButton1) {
     GroupLineIntersection->LineEdit1->setFocus();
     myEditCurrentArgument = GroupLineIntersection->LineEdit1;
-    GroupLineIntersection->PushButton2->setDown( false );
+    GroupLineIntersection->PushButton2->setDown(false);
     GroupLineIntersection->LineEdit1->setEnabled(true);
     GroupLineIntersection->LineEdit2->setEnabled(false);
   }
-  else if ( send == GroupLineIntersection->PushButton2 ) {
+  else if (send == GroupLineIntersection->PushButton2) {
     GroupLineIntersection->LineEdit2->setFocus();
     myEditCurrentArgument = GroupLineIntersection->LineEdit2;
-    GroupLineIntersection->PushButton1->setDown( false );
+    GroupLineIntersection->PushButton1->setDown(false);
     GroupLineIntersection->LineEdit1->setEnabled(false);
     GroupLineIntersection->LineEdit2->setEnabled(true);
   }
   send->setDown(true);
 
-  if ( ( send == GroupLineIntersection->PushButton1 ||
-         send == GroupLineIntersection->PushButton2 ) && !myBusy )
+  if ((send == GroupLineIntersection->PushButton1 ||
+         send == GroupLineIntersection->PushButton2) && !myBusy)
     SelectionIntoArgument();
 }
 
@@ -599,9 +628,9 @@ void BasicGUI_PointDlg::SetEditCurrentArgument()
 // function : enterEvent()
 // purpose  : to reactivate this dialog box when mouse enter onto the window
 //=================================================================================
-void BasicGUI_PointDlg::enterEvent( QEvent* )
+void BasicGUI_PointDlg::enterEvent(QEvent*)
 {
-  if ( !mainFrame()->GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
@@ -610,14 +639,14 @@ void BasicGUI_PointDlg::enterEvent( QEvent* )
 // function : ActivateThisDialog()
 // purpose  :
 //=================================================================================
-void BasicGUI_PointDlg::ActivateThisDialog( )
+void BasicGUI_PointDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
-           this, SLOT( SelectionIntoArgument() ) );
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+           this, SLOT(SelectionIntoArgument()));
 
-  ConstructorsClicked( getConstructorId() );
+  ConstructorsClicked(getConstructorId());
 }
 
 
@@ -627,7 +656,7 @@ void BasicGUI_PointDlg::ActivateThisDialog( )
 //=================================================================================
 void BasicGUI_PointDlg::DeactivateActiveDialog()
 {
-  // myGeomGUI->SetState( -1 );
+  // myGeomGUI->SetState(-1);
   GEOMBase_Skeleton::DeactivateActiveDialog();
 }
 
@@ -638,16 +667,16 @@ void BasicGUI_PointDlg::DeactivateActiveDialog()
 //=================================================================================
 void BasicGUI_PointDlg::ValueChangedInSpinBox(double newValue)
 {
-  displayPreview();
+  displayPreview(true);
 }
 
 //=================================================================================
 // function : CheckBoxClicked()
 // purpose  : Check Boxes Management
 //=================================================================================
-void BasicGUI_PointDlg::CheckBoxClicked( int  State ) 
+void BasicGUI_PointDlg::CheckBoxClicked(int  State)
 {
-  displayPreview();
+  displayPreview(true);
 }
 
 
@@ -685,14 +714,14 @@ double BasicGUI_PointDlg::getVParameter() const
 // function : OnPointSelected
 // purpose  :
 //=================================================================================
-void BasicGUI_PointDlg::OnPointSelected( const gp_Pnt& thePnt )
+void BasicGUI_PointDlg::OnPointSelected(const gp_Pnt& thePnt)
 {
-  if ( getConstructorId() == GEOM_POINT_XYZ ) {
-    GroupXYZ->SpinBox_DX->setValue( thePnt.X() );
-    GroupXYZ->SpinBox_DY->setValue( thePnt.Y() );
-    GroupXYZ->SpinBox_DZ->setValue( thePnt.Z() );
+  if (getConstructorId() == GEOM_POINT_XYZ) {
+    GroupXYZ->SpinBox_DX->setValue(thePnt.X());
+    GroupXYZ->SpinBox_DY->setValue(thePnt.Y());
+    GroupXYZ->SpinBox_DZ->setValue(thePnt.Z());
 
-    displayPreview();
+    displayPreview(true);
   }
 }
 
@@ -702,48 +731,48 @@ void BasicGUI_PointDlg::OnPointSelected( const gp_Pnt& thePnt )
 //=================================================================================
 GEOM::GEOM_IOperations_ptr BasicGUI_PointDlg::createOperation()
 {
-  return myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() );
+  return myGeomGUI->GetGeomGen()->GetIBasicOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool BasicGUI_PointDlg::isValid( QString& msg )
+bool BasicGUI_PointDlg::isValid(QString& msg)
 {
   bool ok = false;
-  switch ( getConstructorId() ) {
+  switch (getConstructorId()) {
   case GEOM_POINT_XYZ :
-    ok = GroupXYZ->SpinBox_DX->isValid( msg, !IsPreview() ) &&
-         GroupXYZ->SpinBox_DY->isValid( msg, !IsPreview() ) &&
-         GroupXYZ->SpinBox_DZ->isValid( msg, !IsPreview() );
+    ok = GroupXYZ->SpinBox_DX->isValid(msg, !IsPreview()) &&
+         GroupXYZ->SpinBox_DY->isValid(msg, !IsPreview()) &&
+         GroupXYZ->SpinBox_DZ->isValid(msg, !IsPreview());
     break;
   case GEOM_POINT_REF:
-    ok = GroupRefPoint->SpinBox_DX->isValid( msg, !IsPreview() ) &&
-         GroupRefPoint->SpinBox_DY->isValid( msg, !IsPreview() ) &&
-         GroupRefPoint->SpinBox_DZ->isValid( msg, !IsPreview() ) &&
+    ok = GroupRefPoint->SpinBox_DX->isValid(msg, !IsPreview()) &&
+         GroupRefPoint->SpinBox_DY->isValid(msg, !IsPreview()) &&
+         GroupRefPoint->SpinBox_DZ->isValid(msg, !IsPreview()) &&
          myRefPoint;
     break;
   case GEOM_POINT_EDGE:
-    if ( myParamCoord->checkedId() == PARAM_VALUE || myParamCoord->checkedId() == LENGTH_VALUE )
-      ok = GroupOnCurve->SpinBox_DX->isValid( msg, !IsPreview() );
+    if (myParamCoord->checkedId() == PARAM_VALUE || myParamCoord->checkedId() == LENGTH_VALUE)
+      ok = GroupOnCurve->SpinBox_DX->isValid(msg, !IsPreview());
     else
-      ok = GroupXYZ->SpinBox_DX->isValid( msg, !IsPreview() ) &&
-          GroupXYZ->SpinBox_DY->isValid( msg, !IsPreview() ) &&
-          GroupXYZ->SpinBox_DZ->isValid( msg, !IsPreview() );
+      ok = GroupXYZ->SpinBox_DX->isValid(msg, !IsPreview()) &&
+           GroupXYZ->SpinBox_DY->isValid(msg, !IsPreview()) &&
+           GroupXYZ->SpinBox_DZ->isValid(msg, !IsPreview());
     ok = myEdge && ok;
     break;
   case GEOM_POINT_INTINT:
     ok = myLine1 && myLine2;
     break;
   case GEOM_POINT_SURF:
-    if ( myParamCoord->checkedId() == PARAM_VALUE )
-      ok = GroupOnSurface->SpinBox_DX->isValid( msg, !IsPreview() ) &&
-          GroupOnSurface->SpinBox_DY->isValid( msg, !IsPreview() );
+    if (myParamCoord->checkedId() == PARAM_VALUE)
+      ok = GroupOnSurface->SpinBox_DX->isValid(msg, !IsPreview()) &&
+           GroupOnSurface->SpinBox_DY->isValid(msg, !IsPreview());
     else
-      ok = GroupXYZ->SpinBox_DX->isValid( msg, !IsPreview() ) &&
-          GroupXYZ->SpinBox_DY->isValid( msg, !IsPreview() ) &&
-          GroupXYZ->SpinBox_DZ->isValid( msg, !IsPreview() );
+      ok = GroupXYZ->SpinBox_DX->isValid(msg, !IsPreview()) &&
+           GroupXYZ->SpinBox_DY->isValid(msg, !IsPreview()) &&
+           GroupXYZ->SpinBox_DZ->isValid(msg, !IsPreview());
     ok = myFace && ok;
     break;
   default:
@@ -756,16 +785,16 @@ bool BasicGUI_PointDlg::isValid( QString& msg )
 // function : execute
 // purpose  :
 //=================================================================================
-bool BasicGUI_PointDlg::execute( ObjectList& objects )
+bool BasicGUI_PointDlg::execute(ObjectList& objects)
 {
   bool res = false;
 
   GEOM::GEOM_Object_var anObj;
   QStringList aParameters;
 
-  GEOM::GEOM_IBasicOperations_var anOper = GEOM::GEOM_IBasicOperations::_narrow( getOperation() );
+  GEOM::GEOM_IBasicOperations_var anOper = GEOM::GEOM_IBasicOperations::_narrow(getOperation());
 
-  switch ( getConstructorId() ) {
+  switch (getConstructorId()) {
   case GEOM_POINT_XYZ :
     {
       double x = GroupXYZ->SpinBox_DX->value();
@@ -776,7 +805,7 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
       aParameters << GroupXYZ->SpinBox_DY->text();
       aParameters << GroupXYZ->SpinBox_DZ->text();
 
-      anObj = anOper->MakePointXYZ( x, y, z );
+      anObj = anOper->MakePointXYZ(x, y, z);
       res = true;
       break;
     }
@@ -790,24 +819,21 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
       aParameters << GroupRefPoint->SpinBox_DY->text();
       aParameters << GroupRefPoint->SpinBox_DZ->text();
 
-      anObj = anOper->MakePointWithReference( myRefPoint.get(), dx, dy, dz );
+      anObj = anOper->MakePointWithReference(myRefPoint.get(), dx, dy, dz);
       res = true;
       break;
     }
   case GEOM_POINT_EDGE :
     {
-      if ( myParamCoord->checkedId() == PARAM_VALUE ) {
-        anObj = anOper->MakePointOnCurve( myEdge.get(), getParameter() );
+      if (myParamCoord->checkedId() == PARAM_VALUE) {
+        anObj = anOper->MakePointOnCurve(myEdge.get(), getParameter());
+        aParameters<<GroupOnCurve->SpinBox_DX->text();
+      }
+      else if (myParamCoord->checkedId() == LENGTH_VALUE) {
+        anObj = anOper->MakePointOnCurveByLength(myEdge.get(), getParameter(), myRefPoint.get());
         aParameters<<GroupOnCurve->SpinBox_DX->text();
-      } 
-      else if ( myParamCoord->checkedId() == LENGTH_VALUE ) {
-       bool reversed = GroupOnCurve->CheckButton1->isChecked();
-       anObj = anOper->MakePointOnCurveByLength( myEdge.get(), getParameter(), reversed );
-       
-       aParameters<<GroupOnCurve->SpinBox_DX->text();
-       aParameters<<QString::number( reversed );
       }
-      else if ( myParamCoord->checkedId() == COORD_VALUE ) {
+      else if (myParamCoord->checkedId() == COORD_VALUE) {
         double x = GroupXYZ->SpinBox_DX->value();
         double y = GroupXYZ->SpinBox_DY->value();
         double z = GroupXYZ->SpinBox_DZ->value();
@@ -816,26 +842,26 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
         aParameters << GroupXYZ->SpinBox_DY->text();
         aParameters << GroupXYZ->SpinBox_DZ->text();
 
-        anObj = anOper->MakePointOnCurveByCoord( myEdge.get(), x, y, z );
+        anObj = anOper->MakePointOnCurveByCoord(myEdge.get(), x, y, z);
       }
       res = true;
       break;
     }
   case GEOM_POINT_INTINT :
-    anObj = anOper->MakePointOnLinesIntersection( myLine1.get(), myLine2.get() );
-    if ( !anObj->_is_nil() ) {
+    anObj = anOper->MakePointOnLinesIntersection(myLine1.get(), myLine2.get());
+    if (!anObj->_is_nil()) {
       QString aName = getNewObjectName();
-      if ( anObj->GetShapeType() == GEOM::COMPOUND && aName.startsWith("Vertex") )
-        initName( tr( "GEOM_COMPOUND" ) );
-      else if (  anObj->GetShapeType() == GEOM::VERTEX && aName.startsWith("Compound"))
-        initName( tr( "GEOM_VERTEX" ) );
+      if (anObj->GetShapeType() == GEOM::COMPOUND && aName.startsWith("Vertex"))
+        initName(tr("GEOM_COMPOUND"));
+      else if (anObj->GetShapeType() == GEOM::VERTEX && aName.startsWith("Compound"))
+        initName(tr("GEOM_VERTEX"));
     }
     res = true;
     break;
   case GEOM_POINT_SURF :
     {
-      if ( myParamCoord->checkedId() == PARAM_VALUE ) {
-        anObj = anOper->MakePointOnSurface( myFace.get(), getUParameter(), getVParameter() );
+      if (myParamCoord->checkedId() == PARAM_VALUE) {
+        anObj = anOper->MakePointOnSurface(myFace.get(), getUParameter(), getVParameter());
         aParameters<<GroupOnSurface->SpinBox_DX->text();
         aParameters<<GroupOnSurface->SpinBox_DY->text();
       } else {
@@ -847,7 +873,7 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
         aParameters << GroupXYZ->SpinBox_DY->text();
         aParameters << GroupXYZ->SpinBox_DZ->text();
 
-        anObj = anOper->MakePointOnSurfaceByCoord( myFace.get(), x, y, z );
+        anObj = anOper->MakePointOnSurfaceByCoord(myFace.get(), x, y, z);
       }
       res = true;
       break;
@@ -858,30 +884,30 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
   if(!anObj->_is_nil() && !IsPreview() && (id == GEOM_POINT_XYZ ||
                                            id == GEOM_POINT_REF ||
                                            id == GEOM_POINT_EDGE ||
-                                           id == GEOM_POINT_SURF) ) {
+                                           id == GEOM_POINT_SURF)) {
       anObj->SetParameters(aParameters.join(":").toLatin1().constData());
   }
 
-  if ( id == GEOM_POINT_REF || id == GEOM_POINT_EDGE || id == GEOM_POINT_SURF ) {
+  if (id == GEOM_POINT_REF || id == GEOM_POINT_EDGE || id == GEOM_POINT_SURF) {
     TopoDS_Shape aShape;
-    if ( GEOMBase::GetShape( anObj, aShape ) && !aShape.IsNull() &&
-         aShape.ShapeType() == TopAbs_VERTEX ) {
-      gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
+    if (GEOMBase::GetShape(anObj, aShape) && !aShape.IsNull() &&
+         aShape.ShapeType() == TopAbs_VERTEX) {
+      gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape));
       SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-      int aPrecision = resMgr->integerValue( "Geometry", "length_precision", 6 );
-      myX->setText( DlgRef::PrintDoubleValue( aPnt.X(), aPrecision ) );
-      myY->setText( DlgRef::PrintDoubleValue( aPnt.Y(), aPrecision ) );
-      myZ->setText( DlgRef::PrintDoubleValue( aPnt.Z(), aPrecision ) );
+      int aPrecision = resMgr->integerValue("Geometry", "length_precision", 6);
+      myX->setText(DlgRef::PrintDoubleValue(aPnt.X(), aPrecision));
+      myY->setText(DlgRef::PrintDoubleValue(aPnt.Y(), aPrecision));
+      myZ->setText(DlgRef::PrintDoubleValue(aPnt.Z(), aPrecision));
     }
     else {
-      myX->setText( "" );
-      myY->setText( "" );
-      myZ->setText( "" );
+      myX->setText("");
+      myY->setText("");
+      myZ->setText("");
     }
   }
 
-  if ( !anObj->_is_nil() ) {
-    objects.push_back( anObj._retn() );
+  if (!anObj->_is_nil()) {
+    objects.push_back(anObj._retn());
   }
 
   return res;
@@ -893,19 +919,19 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
 //=================================================================================
 void BasicGUI_PointDlg::addSubshapesToStudy()
 {
-  switch ( getConstructorId() ) {
+  switch (getConstructorId()) {
   case GEOM_POINT_REF:
-    GEOMBase::PublishSubObject( myRefPoint.get() );
+    GEOMBase::PublishSubObject(myRefPoint.get());
     break;
   case GEOM_POINT_EDGE:
-    GEOMBase::PublishSubObject( myEdge.get() );
+    GEOMBase::PublishSubObject(myEdge.get());
     break;
   case GEOM_POINT_INTINT:
-    GEOMBase::PublishSubObject( myLine1.get() );
-    GEOMBase::PublishSubObject( myLine2.get() );
+    GEOMBase::PublishSubObject(myLine1.get());
+    GEOMBase::PublishSubObject(myLine2.get());
     break;
   case GEOM_POINT_SURF:
-    GEOMBase::PublishSubObject( myFace.get() );
+    GEOMBase::PublishSubObject(myFace.get());
     break;
   default:
     break;
@@ -916,10 +942,10 @@ void BasicGUI_PointDlg::addSubshapesToStudy()
 // function : ClickParamCoord()
 // purpose  :
 //=================================================================================
-void BasicGUI_PointDlg::ClickParamCoord( int id )
+void BasicGUI_PointDlg::ClickParamCoord(int id)
 {
-  updateParamCoord( true );
-  displayPreview();
+  updateParamCoord(true);
+  displayPreview(true);
 }
 
 //=================================================================================
@@ -932,35 +958,36 @@ void BasicGUI_PointDlg::updateParamCoord(bool theIsUpdate)
   bool isLength = myParamCoord->checkedId() == LENGTH_VALUE;
 
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
 
   const int id = getConstructorId();
-  if ( id == GEOM_POINT_EDGE ) {
-    GroupOnCurve->TextLabel2->setVisible( isParam || isLength ); 
-    GroupOnCurve->SpinBox_DX->setVisible( isParam || isLength );
-    if ( isParam ){
-      initSpinBox( GroupOnCurve->SpinBox_DX, 0., 1., 0.1, "parametric_precision" );
-      GroupOnCurve->SpinBox_DX->setValue( 0.5 );
-      GroupOnCurve->TextLabel2->setText(tr( "GEOM_PARAMETER" ));
-      GroupOnCurve->CheckButton1->setVisible(false);
+  if (id == GEOM_POINT_EDGE) {
+    GroupOnCurve->TextLabel2->setVisible(isLength);
+    GroupOnCurve->PushButton2->setVisible(isLength);
+    GroupOnCurve->LineEdit2->setVisible(isLength);
+    GroupOnCurve->TextLabel3->setVisible(isParam || isLength);
+    GroupOnCurve->SpinBox_DX->setVisible(isParam || isLength);
+    if (isParam){
+      initSpinBox(GroupOnCurve->SpinBox_DX, 0., 1., 0.1, "parametric_precision");
+      GroupOnCurve->SpinBox_DX->setValue(0.5);
+      GroupOnCurve->TextLabel3->setText(tr("GEOM_PARAMETER"));
     }
-    else if ( isLength ){
-      initSpinBox( GroupOnCurve->SpinBox_DX, 0.0, COORD_MAX, step, "length_precision" );
-      GroupOnCurve->SpinBox_DX->setValue( 0.0 );
-      GroupOnCurve->TextLabel2->setText(tr( "GEOM_LENGTH" ));
-      GroupOnCurve->CheckButton1->setVisible(true);
+    else if (isLength){
+      initSpinBox(GroupOnCurve->SpinBox_DX, COORD_MIN, COORD_MAX, step, "length_precision");
+      GroupOnCurve->SpinBox_DX->setValue(0.0);
+      GroupOnCurve->TextLabel3->setText(tr("GEOM_LENGTH"));
     }
-  }  
-  else if ( id == GEOM_POINT_SURF ) {
-    GroupOnSurface->TextLabel2->setShown( isParam );
-    GroupOnSurface->TextLabel3->setShown( isParam );
-    GroupOnSurface->SpinBox_DX->setShown( isParam );
-    GroupOnSurface->SpinBox_DY->setShown( isParam );
   }
-    
-  GroupXYZ->setShown( !isParam && !isLength );
+  else if (id == GEOM_POINT_SURF) {
+    GroupOnSurface->TextLabel2->setShown(isParam);
+    GroupOnSurface->TextLabel3->setShown(isParam);
+    GroupOnSurface->SpinBox_DX->setShown(isParam);
+    GroupOnSurface->SpinBox_DY->setShown(isParam);
+  }
+
+  GroupXYZ->setShown(!isParam && !isLength);
 
-  if ( theIsUpdate )
+  if (theIsUpdate)
     QTimer::singleShot(50, this, SLOT(updateSize()));
 }
 
@@ -968,20 +995,20 @@ void BasicGUI_PointDlg::updateParamCoord(bool theIsUpdate)
 // function : onBtnPopup()
 // purpose  :
 //=================================================================================
-void BasicGUI_PointDlg::onBtnPopup( QAction* a )
+void BasicGUI_PointDlg::onBtnPopup(QAction* a)
 {
   globalSelection(); // close local contexts, if any
   myNeedType = myActions[a] == SelectEdge ? TopAbs_EDGE : TopAbs_WIRE;
-  localSelection( GEOM::GEOM_Object::_nil(), myNeedType );
+  localSelection(GEOM::GEOM_Object::_nil(), myNeedType);
 }
 
 //=================================================================================
 // function : updateSize
 // purpose  : adjust dialog size to minimum
 //=================================================================================
-void BasicGUI_PointDlg::updateSize() 
+void BasicGUI_PointDlg::updateSize()
 {
   qApp->processEvents();
   updateGeometry();
-  resize( minimumSizeHint() );
+  resize(minimumSizeHint());
 }