X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasicGUI%2FBasicGUI_PointDlg.cxx;h=ef68dfb54d07a0512f9609b62631f612e7f1bdaf;hb=7e21a68ba07185cd1dddcf9e1522a28111c2cee4;hp=95f12b7502c2a1560eb61cbbce9da5e01e37710f;hpb=521dab878e0ff6bf99fe59292761517c015c5888;p=modules%2Fgeom.git diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx index 95f12b750..ef68dfb54 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.cxx +++ b/src/BasicGUI/BasicGUI_PointDlg.cxx @@ -1,110 +1,182 @@ -// 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, -// 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_PointDlg.cxx -// Author : Lucien PIGNOLONI -// Module : GEOM -// $Header$ -using namespace std; +// GEOM GEOMGUI : GUI for Geometry component +// File : BasicGUI_PointDlg.cxx +// Author : Lucien PIGNOLONI, Open CASCADE S.A.S. +// #include "BasicGUI_PointDlg.h" -#include "SUIT_Session.h" -#include "SalomeApp_Application.h" -#include "SalomeApp_SelectionMgr.h" +#include +#include +#include +#include -#include "GEOMImpl_Types.hxx" +#include +#include -#include +#include -#include "utilities.h" +#include + +#include +#include +#include +#include +#include +#include +#include #include #include -#include #include #include #include +#include +#include +#include + +#define PARAM_VALUE 0 +#define COORD_VALUE 1 + +#define GEOM_POINT_XYZ 0 +#define GEOM_POINT_REF 1 +#define GEOM_POINT_EDGE 2 +#define GEOM_POINT_INTINT 3 +#define GEOM_POINT_SURF 4 -#include +#define SPACING 6 +#define MARGIN 9 //================================================================================= // class : BasicGUI_PointDlg() -// purpose : Constructs a BasicGUI_PointDlg which is a child of 'parent', with the +// purpose : Constructs a BasicGUI_PointDlg 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_PointDlg::BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, fl ), myGeometryGUI(theGeometryGUI) +BasicGUI_PointDlg::BasicGUI_PointDlg( 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_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 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" ) ) ); - setCaption(tr("GEOM_POINT_TITLE")); + setWindowTitle( tr( "GEOM_POINT_TITLE" ) ); - QGroupBox* aFrame = new QGroupBox( 1, Qt::Horizontal, this ); - aFrame->setInsideMargin( 0 ); - aFrame->setFrameStyle( QFrame::NoFrame ); - - /***************************************************************/ - GroupConstructors->setTitle(tr("GEOM_POINTS")); - RadioButton1->setPixmap(image0); - RadioButton2->setPixmap(image3); - RadioButton3->setPixmap(image1); - - GroupXYZ = new DlgRef_3Spin( aFrame, "GroupXYZ" ); - 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_1Sel1Spin( aFrame, "GroupOnCurve" ); - GroupOnCurve->GroupBox1->setTitle(tr("GEOM_PARAM_POINT")); - GroupOnCurve->TextLabel1->setText(tr("GEOM_EDGE")); - GroupOnCurve->TextLabel2->setText(tr("GEOM_PARAMETER")); - GroupOnCurve->PushButton1->setPixmap(image2); - - GroupRefPoint = new DlgRef_1Sel3Spin( aFrame, "GoupRefPoint" ); - GroupRefPoint->GroupBox1->setTitle(tr("GEOM_REF_POINT")); - GroupRefPoint->TextLabel1->setText(tr("GEOM_POINT")); - GroupRefPoint->PushButton1->setPixmap(image2); - GroupRefPoint->TextLabel2->setText(tr("GEOM_DX")); - GroupRefPoint->TextLabel3->setText(tr("GEOM_DY")); - GroupRefPoint->TextLabel4->setText(tr("GEOM_DZ")); - - Layout1->addWidget( aFrame, 2, 0 ); /***************************************************************/ - - myCoordGrp = new QGroupBox( 2, Qt::Horizontal, tr( "GEOM_COORDINATES" ), aFrame ); - new QLabel( tr( "GEOM_X" ), myCoordGrp ); + 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()->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_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_1Sel1Spin( centralWidget() ); + GroupOnCurve->GroupBox1->setTitle( tr( "GEOM_POINT_ON_EDGE" ) ); + GroupOnCurve->TextLabel1->setText( tr( "GEOM_EDGE" ) ); + GroupOnCurve->TextLabel2->setText( tr( "GEOM_PARAMETER" ) ); + 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" ) ); + + /* 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" ) )] = 0; + myActions[myBtnPopup->addAction( ico_wire, tr( "GEOM_WIRE" ) )] = 1; + + 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 ); - new QLabel( tr( "GEOM_Y" ), myCoordGrp ); + myCoordGrpLayout->addWidget( myX, 0, 1 ); + myCoordGrpLayout->addWidget( new QLabel( tr( "GEOM_Y" ), myCoordGrp ), 1, 0 ); myY = new QLineEdit( myCoordGrp ); - new QLabel( tr( "GEOM_Z" ), 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 ); @@ -115,19 +187,21 @@ BasicGUI_PointDlg::BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* paren myZ->setEnabled( false ); QPalette aPal = myX->palette(); - aPal.setColor( QPalette::Disabled, QColorGroup::Text, QColor( 0, 0, 0 ) ) ; + aPal.setColor( QPalette::Disabled, QPalette::Text, QColor( 0, 0, 0 ) ); myX->setPalette( aPal ); myY->setPalette( aPal ); myZ->setPalette( aPal ); - + + setHelpFileName( "create_point_page.html" ); + Init(); } -//======================================================================= +//================================================================================= // function : ~BasicGUI_PointDlg() // purpose : Destructor -//======================================================================= +//================================================================================= BasicGUI_PointDlg::~BasicGUI_PointDlg() { } @@ -140,125 +214,203 @@ 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 ); myEdge = GEOM::GEOM_Object::_nil(); myRefPoint = GEOM::GEOM_Object::_nil(); + myNeedType = TopAbs_VERTEX; myEditCurrentArgument = 0; - // myGeometryGUI->SetState( 0 ); - /* 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 */ - GroupXYZ->SpinBox_DX->RangeStepAndValidator(-999.999, 999.999, step, 3); - GroupXYZ->SpinBox_DY->RangeStepAndValidator(-999.999, 999.999, step, 3); - GroupXYZ->SpinBox_DZ->RangeStepAndValidator(-999.999, 999.999, step, 3); - GroupXYZ->SpinBox_DX->SetValue(0.0); - GroupXYZ->SpinBox_DY->SetValue(0.0); - GroupXYZ->SpinBox_DZ->SetValue(0.0); - - GroupRefPoint->SpinBox_DX->RangeStepAndValidator(-999.999, 999.999, step, 3); - GroupRefPoint->SpinBox_DY->RangeStepAndValidator(-999.999, 999.999, step, 3); - GroupRefPoint->SpinBox_DZ->RangeStepAndValidator(-999.999, 999.999, step, 3); - 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; - GroupOnCurve->SpinBox_DX->RangeStepAndValidator(0., 1., step, 3); - 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 ); /* 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(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); - connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); - connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int))); - - connect(GroupOnCurve->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); - connect(GroupOnCurve->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); - - connect(GroupOnCurve->SpinBox_DX, 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(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupOnCurve->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DZ, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DZ, SLOT(SetStep(double))); - - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), - SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - - initName( tr("GEOM_VERTEX") ); - + 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( this, SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) ); + + connect( myParamCoord, SIGNAL( buttonClicked( int ) ), this, SLOT( ClickParamCoord( int ) ) ); + connect( GroupOnCurve->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); + connect( GroupOnCurve->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); + + connect( GroupOnSurface->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); + connect( GroupOnSurface->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); + + connect( myBtnPopup, SIGNAL( triggered( QAction* ) ), SLOT( onBtnPopup( QAction* ) ) ); + connect( GroupLineIntersection->PushButton1, SIGNAL( pressed() ), this, SLOT( SetEditCurrentArgument() ) ); + connect( GroupLineIntersection->PushButton2, SIGNAL( pressed() ), this, SLOT( SetEditCurrentArgument() ) ); + connect( GroupLineIntersection->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); + connect( GroupLineIntersection->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); + + 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( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) ); + + connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged() ), + this, SLOT(SelectionIntoArgument() ) ); + + initName( tr( "GEOM_VERTEX" ) ); + ConstructorsClicked( 0 ); } +//================================================================================= +// function : SetDoubleSpinBoxStep() +// purpose : Double spin box management +//================================================================================= +void BasicGUI_PointDlg::SetDoubleSpinBoxStep( double step ) +{ + GroupOnCurve->SpinBox_DX->setSingleStep(step); + GroupXYZ->SpinBox_DX->setSingleStep(step); + GroupXYZ->SpinBox_DY->setSingleStep(step); + GroupXYZ->SpinBox_DZ->setSingleStep(step); + GroupRefPoint->SpinBox_DX->setSingleStep(step); + GroupRefPoint->SpinBox_DY->setSingleStep(step); + GroupRefPoint->SpinBox_DZ->setSingleStep(step); +} + //================================================================================= // function : ConstructorsClicked() // purpose : Radio button management //================================================================================= void BasicGUI_PointDlg::ConstructorsClicked(int constructorId) -{ - switch ( constructorId ) - { - case 0: +{ + switch ( constructorId ) { + case GEOM_POINT_XYZ: { + globalSelection(); // close local contexts, if any localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); GroupRefPoint->hide(); GroupOnCurve->hide(); - - GroupXYZ->show(); - + GroupLineIntersection->hide(); + GroupOnSurface->hide(); myCoordGrp->hide(); + myParamGroup->hide(); + GroupXYZ->show(); break; } - case 1: + case GEOM_POINT_REF: { + globalSelection(); // close local contexts, if any + localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); + myEditCurrentArgument = GroupRefPoint->LineEdit1; - myEditCurrentArgument->setText(""); + myEditCurrentArgument->setText( "" ); myRefPoint = GEOM::GEOM_Object::_nil(); - - globalSelection( GEOM_POINT ); - + GroupRefPoint->PushButton1->setDown(true); + myParamGroup->hide(); GroupXYZ->hide(); GroupOnCurve->hide(); - + GroupLineIntersection->hide(); + GroupOnSurface->hide(); GroupRefPoint->show(); - myCoordGrp->show(); break; } - case 2: + case GEOM_POINT_EDGE: { + globalSelection(); // close local contexts, if any + localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE ); + myEditCurrentArgument = GroupOnCurve->LineEdit1; - myEditCurrentArgument->setText(""); + myEditCurrentArgument->setText( "" ); myEdge = GEOM::GEOM_Object::_nil(); - - globalSelection( GEOM_EDGE ); - + GroupOnCurve->PushButton1->setDown(true); + GroupRefPoint->hide(); + GroupLineIntersection->hide(); + GroupOnSurface->hide(); + myParamGroup->show(); + GroupOnCurve->show(); + myCoordGrp->show(); + updateParamCoord( false ); + break; + } + case GEOM_POINT_INTINT: + { + globalSelection(); // close local contexts, if any + localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE ); + myNeedType = TopAbs_EDGE; + + myEditCurrentArgument = GroupLineIntersection->LineEdit1; + GroupLineIntersection->LineEdit1->setText( "" ); + GroupLineIntersection->LineEdit2->setText( "" ); + GroupLineIntersection->LineEdit1->setEnabled( true ); + GroupLineIntersection->LineEdit2->setEnabled( false ); + myLine1 = GEOM::GEOM_Object::_nil(); + myLine2 = GEOM::GEOM_Object::_nil(); + GroupLineIntersection->PushButton1->setDown(true); + GroupLineIntersection->PushButton2->setDown(false); + myParamGroup->hide(); GroupXYZ->hide(); GroupRefPoint->hide(); + GroupOnCurve->hide(); + GroupOnSurface->hide(); + myCoordGrp->hide(); + GroupLineIntersection->show(); + break; + } + case GEOM_POINT_SURF: + { + globalSelection(); // close local contexts, if any + localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE ); - GroupOnCurve->show(); - + myEditCurrentArgument = GroupOnSurface->LineEdit1; + myEditCurrentArgument->setText( "" ); + myFace = GEOM::GEOM_Object::_nil(); + GroupOnSurface->PushButton1->setDown(true); + GroupRefPoint->hide(); + GroupOnCurve->hide(); + GroupLineIntersection->hide(); + myParamGroup->show(); + GroupOnSurface->show(); myCoordGrp->show(); + updateParamCoord( false ); break; } } @@ -267,11 +419,9 @@ void BasicGUI_PointDlg::ConstructorsClicked(int constructorId) myY->setText( "" ); myZ->setText( "" ); - qApp->processEvents(); - updateGeometry(); - resize( minimumSize() ); + QTimer::singleShot(50, this, SLOT(updateSize())); - displayPreview(); + SelectionIntoArgument(); } @@ -294,71 +444,137 @@ bool BasicGUI_PointDlg::ClickOnApply() { if ( !onAccept() ) return false; - + initName(); ConstructorsClicked( getConstructorId() ); return true; } -//======================================================================= -// function : ClickOnCancel() -// purpose : -//======================================================================= -void BasicGUI_PointDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed (for constructors not using local context) //================================================================================= void BasicGUI_PointDlg::SelectionIntoArgument() { + erasePreview(); const int id = getConstructorId(); - if ( ( id == 1 || id == 2 ) && myEditCurrentArgument != 0 ) - { - myEditCurrentArgument->setText(""); - myX->setText( "" ); - myY->setText( "" ); - myZ->setText( "" ); - myRefPoint = myEdge = GEOM::GEOM_Object::_nil(); - } - - if ( IObjectCount() == 1 ) - { - Standard_Boolean aRes = Standard_False; - GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes ); - if ( !CORBA::is_nil( aSelectedObject ) && aRes ) - { - if ( id == 0 ) - { - // get CORBA reference to data object - TopoDS_Shape aShape = myGeometryGUI->GetShapeReader().GetShape( myGeometryGUI->GetGeomGen(), aSelectedObject ); - if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX ) - { - 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 == 1 ) - { - myRefPoint = aSelectedObject; - GroupRefPoint->LineEdit1->setText( GEOMBase::GetName( aSelectedObject ) ); - } - else if ( id == 2 ) - { - myEdge = aSelectedObject; - GroupOnCurve->LineEdit1->setText( GEOMBase::GetName( aSelectedObject ) ); - } - } + if ( ( id == GEOM_POINT_REF || id == GEOM_POINT_EDGE || id == GEOM_POINT_SURF ) && myEditCurrentArgument != 0 ) + { + myEditCurrentArgument->setText( "" ); + myX->setText( "" ); + myY->setText( "" ); + myZ->setText( "" ); + myRefPoint = myEdge = myFace = GEOM::GEOM_Object::_nil(); + } else if ( id == GEOM_POINT_INTINT ) { + myEditCurrentArgument->setText( "" ); + if ( myEditCurrentArgument == GroupLineIntersection->LineEdit1 ) + myLine1 = GEOM::GEOM_Object::_nil(); + else if ( myEditCurrentArgument == GroupLineIntersection->LineEdit2 ) + myLine2 = GEOM::GEOM_Object::_nil(); + } + + LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr(); + SALOME_ListIO aSelList; + aSelMgr->selectedObjects(aSelList); + + if (aSelList.Extent() == 1) { + Standard_Boolean aRes = Standard_False; + Handle(SALOME_InteractiveObject) anIO = aSelList.First(); + GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes ); + if ( !CORBA::is_nil( aSelectedObject ) && aRes ) { + QString aName = GEOMBase::GetName(aSelectedObject); + TopoDS_Shape aShape; + if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) { + if ( id == GEOM_POINT_XYZ || id == GEOM_POINT_REF) + myNeedType = TopAbs_VERTEX; + else if ( id == GEOM_POINT_EDGE ) + myNeedType = TopAbs_EDGE; + else if ( id == GEOM_POINT_SURF ) + myNeedType = TopAbs_FACE; + + TColStd_IndexedMapOfInteger aMap; + aSelMgr->GetIndexes(anIO, aMap); + if ( aMap.Extent() == 1 ) { // Local Selection + int anIndex = aMap( 1 ); + if ( myNeedType == TopAbs_FACE ) + aName += QString( ":face_%1" ).arg( anIndex ); + else if ( myNeedType == TopAbs_WIRE ) + aName += QString( ":wire_%1" ).arg( anIndex ); + else if ( myNeedType == TopAbs_EDGE ) + aName += QString( ":edge_%1" ).arg( anIndex ); + else if ( myNeedType == TopAbs_VERTEX ) + aName += QString( ":vertex_%1" ).arg( anIndex ); + + //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 + } + GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ); + } + else { // Global Selection + if ( aShape.ShapeType() != myNeedType ) { + aSelectedObject = GEOM::GEOM_Object::_nil(); + aName = ""; + if ( id == GEOM_POINT_XYZ ) return; + } + } + } + + if ( aShape.IsNull() || aShape.ShapeType() != myNeedType) + return; + + 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 ) { + myRefPoint = aSelectedObject; + GroupRefPoint->LineEdit1->setText( aName ); + } + else if ( id == GEOM_POINT_EDGE ) { + myEdge = aSelectedObject; + GroupOnCurve->LineEdit1->setText( aName ); + } + else if ( id == GEOM_POINT_INTINT ) { + myEditCurrentArgument->setText( aName ); + if ( myEditCurrentArgument == GroupLineIntersection->LineEdit1 ) { + myLine1 = aSelectedObject; + if ( !myLine1->_is_nil() && myLine2->_is_nil() ) { + GroupLineIntersection->PushButton2->setMenu( 0 ); + GroupLineIntersection->PushButton2->click(); + GroupLineIntersection->PushButton2->setDown(true); + GroupLineIntersection->PushButton2->setMenu( myBtnPopup ); + } + } + else if ( myEditCurrentArgument == GroupLineIntersection->LineEdit2 ) { + myLine2 = aSelectedObject; + if ( !myLine2->_is_nil() && myLine1->_is_nil() ) { + GroupLineIntersection->PushButton1->setMenu( 0 ); + GroupLineIntersection->PushButton1->click(); + GroupLineIntersection->PushButton1->setDown(true); + GroupLineIntersection->PushButton1->setMenu( myBtnPopup ); + } + } + } + else if ( id == GEOM_POINT_SURF ) + { + myFace = aSelectedObject; + GroupOnSurface->LineEdit1->setText( aName ); + } } - + } + displayPreview(); } @@ -370,11 +586,13 @@ void BasicGUI_PointDlg::SelectionIntoArgument() void BasicGUI_PointDlg::LineEditReturnPressed() { QLineEdit* send = (QLineEdit*)sender(); - if ( send == GroupRefPoint->LineEdit1 || send == GroupOnCurve->LineEdit1 ) - { - myEditCurrentArgument = send; - GEOMBase_Skeleton::LineEditReturnPressed(); - } + if ( send == GroupRefPoint->LineEdit1 || + send == GroupOnCurve->LineEdit1 || + send == GroupLineIntersection->LineEdit1 || + send == GroupLineIntersection->LineEdit2 ) { + myEditCurrentArgument = send; + GEOMBase_Skeleton::LineEditReturnPressed(); + } } @@ -386,20 +604,40 @@ void BasicGUI_PointDlg::SetEditCurrentArgument() { QPushButton* send = (QPushButton*)sender(); - if ( send == GroupRefPoint->PushButton1 ) - { + if ( send == GroupRefPoint->PushButton1 ) { GroupRefPoint->LineEdit1->setFocus(); myEditCurrentArgument = GroupRefPoint->LineEdit1; - - globalSelection( GEOM_POINT ); + globalSelection(); // close local contexts, if any + localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); } - else if ( send == GroupOnCurve->PushButton1 ) - { + else if ( send == GroupOnCurve->PushButton1 ) { GroupOnCurve->LineEdit1->setFocus(); myEditCurrentArgument = GroupOnCurve->LineEdit1; - - globalSelection( GEOM_EDGE ); + globalSelection(); // close local contexts, if any + localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE ); } + else if ( send == GroupOnSurface->PushButton1 ) + { + GroupOnSurface->LineEdit1->setFocus(); + myEditCurrentArgument = GroupOnSurface->LineEdit1; + globalSelection(); // close local contexts, if any + localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE ); + } + else if ( send == GroupLineIntersection->PushButton1 ) { + GroupLineIntersection->LineEdit1->setFocus(); + myEditCurrentArgument = GroupLineIntersection->LineEdit1; + GroupLineIntersection->PushButton2->setDown( false ); + GroupLineIntersection->LineEdit1->setEnabled(true); + GroupLineIntersection->LineEdit2->setEnabled(false); + } + else if ( send == GroupLineIntersection->PushButton2 ) { + GroupLineIntersection->LineEdit2->setFocus(); + myEditCurrentArgument = GroupLineIntersection->LineEdit2; + GroupLineIntersection->PushButton1->setDown( false ); + GroupLineIntersection->LineEdit1->setEnabled(false); + GroupLineIntersection->LineEdit2->setEnabled(true); + } + send->setDown(true); } @@ -407,9 +645,9 @@ void BasicGUI_PointDlg::SetEditCurrentArgument() // function : enterEvent() // purpose : to reactivate this dialog box when mouse enter onto the window //================================================================================= -void BasicGUI_PointDlg::enterEvent(QEvent* e) +void BasicGUI_PointDlg::enterEvent( QEvent* ) { - if ( !GroupConstructors->isEnabled() ) + if ( !mainFrame()->GroupConstructors->isEnabled() ) ActivateThisDialog(); } @@ -421,7 +659,10 @@ void BasicGUI_PointDlg::enterEvent(QEvent* e) void BasicGUI_PointDlg::ActivateThisDialog( ) { GEOMBase_Skeleton::ActivateThisDialog(); - // myGeometryGUI->SetState( 0 ); + + connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), + this, SLOT( SelectionIntoArgument() ) ); + ConstructorsClicked( getConstructorId() ); } @@ -432,7 +673,7 @@ void BasicGUI_PointDlg::ActivateThisDialog( ) //================================================================================= void BasicGUI_PointDlg::DeactivateActiveDialog() { - // myGeometryGUI->SetState( -1 ); + // myGeomGUI->SetState( -1 ); GEOMBase_Skeleton::DeactivateActiveDialog(); } @@ -446,26 +687,46 @@ void BasicGUI_PointDlg::ValueChangedInSpinBox(double newValue) displayPreview(); } -//======================================================================= +//================================================================================= // funcion : getParameter() // purpose : -//======================================================================= +//================================================================================= double BasicGUI_PointDlg::getParameter() const { - return GroupOnCurve->SpinBox_DX->GetValue(); + return GroupOnCurve->SpinBox_DX->value(); } + +//================================================================================= +// funcion : getUParameter() +// purpose : +//================================================================================= +double BasicGUI_PointDlg::getUParameter() const +{ + return GroupOnSurface->SpinBox_DX->value(); +} + + +//================================================================================= +// funcion : getVParameter() +// purpose : +//================================================================================= +double BasicGUI_PointDlg::getVParameter() const +{ + return GroupOnSurface->SpinBox_DY->value(); +} + + //================================================================================= // function : OnPointSelected // purpose : //================================================================================= void BasicGUI_PointDlg::OnPointSelected( const gp_Pnt& thePnt ) { - if ( getConstructorId() == 0 ) - { - 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(); } @@ -477,7 +738,7 @@ void BasicGUI_PointDlg::OnPointSelected( const gp_Pnt& thePnt ) //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_PointDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); } //================================================================================= @@ -487,12 +748,47 @@ GEOM::GEOM_IOperations_ptr BasicGUI_PointDlg::createOperation() bool BasicGUI_PointDlg::isValid( QString& msg ) { const int id = getConstructorId(); - if ( id == 0 ) - return true; - else if ( id == 1 ) - return !myRefPoint->_is_nil(); - else if ( id == 2 ) - return !myEdge->_is_nil(); + if ( id == GEOM_POINT_XYZ ) { + bool ok = true; + ok = GroupXYZ->SpinBox_DX->isValid( msg, !IsPreview() ) && ok; + ok = GroupXYZ->SpinBox_DY->isValid( msg, !IsPreview() ) && ok; + ok = GroupXYZ->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok; + return ok; + } + else if ( id == GEOM_POINT_REF ) { + bool ok = true; + ok = GroupRefPoint->SpinBox_DX->isValid( msg, !IsPreview() ) && ok; + ok = GroupRefPoint->SpinBox_DY->isValid( msg, !IsPreview() ) && ok; + ok = GroupRefPoint->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok; + + return !myRefPoint->_is_nil() && ok; + } + else if ( id == GEOM_POINT_EDGE ) { + bool ok = true; + if ( myParamCoord->checkedId() == PARAM_VALUE ) + ok = GroupOnCurve->SpinBox_DX->isValid( msg, !IsPreview() ); + else { + ok = GroupXYZ->SpinBox_DX->isValid( msg, !IsPreview() ) && ok; + ok = GroupXYZ->SpinBox_DY->isValid( msg, !IsPreview() ) && ok; + ok = GroupXYZ->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok; + } + return !myEdge->_is_nil() && ok; + } + else if ( id == GEOM_POINT_INTINT ) + return ( !myLine1->_is_nil() && !myLine2->_is_nil() ); + else if ( id == GEOM_POINT_SURF ) { + bool ok = true; + if ( myParamCoord->checkedId() == PARAM_VALUE ) { + ok = GroupOnSurface->SpinBox_DX->isValid( msg, !IsPreview() ) && ok; + ok = GroupOnSurface->SpinBox_DY->isValid( msg, !IsPreview() ) && ok; + } + else { + ok = GroupXYZ->SpinBox_DX->isValid( msg, !IsPreview() ) && ok; + ok = GroupXYZ->SpinBox_DY->isValid( msg, !IsPreview() ) && ok; + ok = GroupXYZ->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok; + } + return !myFace->_is_nil() && ok; + } return false; } @@ -505,56 +801,116 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects ) bool res = false; GEOM::GEOM_Object_var anObj; + QStringList aParameters; - switch ( getConstructorId() ) - { - case 0 : - { - double x = GroupXYZ->SpinBox_DX->GetValue(); - double y = GroupXYZ->SpinBox_DY->GetValue(); - double z = GroupXYZ->SpinBox_DZ->GetValue(); - - anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakePointXYZ( x,y,z ); - res = true; - break; - } - case 1 : - { - double dx = GroupRefPoint->SpinBox_DX->GetValue(); - double dy = GroupRefPoint->SpinBox_DY->GetValue(); - double dz = GroupRefPoint->SpinBox_DZ->GetValue(); - - anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakePointWithReference( myRefPoint, dx, dy, dz ); + GEOM::GEOM_IBasicOperations_var anOper = GEOM::GEOM_IBasicOperations::_narrow( getOperation() ); + + switch ( getConstructorId() ) { + case GEOM_POINT_XYZ : + { + double x = GroupXYZ->SpinBox_DX->value(); + double y = GroupXYZ->SpinBox_DY->value(); + double z = GroupXYZ->SpinBox_DZ->value(); + + aParameters << GroupXYZ->SpinBox_DX->text(); + aParameters << GroupXYZ->SpinBox_DY->text(); + aParameters << GroupXYZ->SpinBox_DZ->text(); + + anObj = anOper->MakePointXYZ( x, y, z ); + res = true; + break; + } + case GEOM_POINT_REF : + { + double dx = GroupRefPoint->SpinBox_DX->value(); + double dy = GroupRefPoint->SpinBox_DY->value(); + double dz = GroupRefPoint->SpinBox_DZ->value(); + + aParameters << GroupRefPoint->SpinBox_DX->text(); + aParameters << GroupRefPoint->SpinBox_DY->text(); + aParameters << GroupRefPoint->SpinBox_DZ->text(); + + anObj = anOper->MakePointWithReference( myRefPoint, dx, dy, dz ); + res = true; + break; + } + case GEOM_POINT_EDGE : + { + if ( myParamCoord->checkedId() == PARAM_VALUE ) { + anObj = anOper->MakePointOnCurve( myEdge, getParameter() ); + aParameters<SpinBox_DX->text(); + } else { + double x = GroupXYZ->SpinBox_DX->value(); + double y = GroupXYZ->SpinBox_DY->value(); + double z = GroupXYZ->SpinBox_DZ->value(); + + aParameters << GroupXYZ->SpinBox_DX->text(); + aParameters << GroupXYZ->SpinBox_DY->text(); + aParameters << GroupXYZ->SpinBox_DZ->text(); + + anObj = anOper->MakePointOnCurveByCoord( myEdge, x, y, z ); + } + res = true; + break; + } + case GEOM_POINT_INTINT : + anObj = anOper->MakePointOnLinesIntersection( myLine1, myLine2 ); + 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" ) ); + } res = true; break; + case GEOM_POINT_SURF : + { + if ( myParamCoord->checkedId() == PARAM_VALUE ) { + anObj = anOper->MakePointOnSurface( myFace, getUParameter(), getVParameter() ); + aParameters<SpinBox_DX->text(); + aParameters<SpinBox_DY->text(); + } else { + double x = GroupXYZ->SpinBox_DX->value(); + double y = GroupXYZ->SpinBox_DY->value(); + double z = GroupXYZ->SpinBox_DZ->value(); + + aParameters << GroupXYZ->SpinBox_DX->text(); + aParameters << GroupXYZ->SpinBox_DY->text(); + aParameters << GroupXYZ->SpinBox_DZ->text(); + + anObj = anOper->MakePointOnSurfaceByCoord( myFace, x, y, z ); + } + res = true; + break; + } } - case 2 : - anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakePointOnCurve( myEdge, getParameter() ); - res = true; - break; + + const int id = getConstructorId(); + if(!anObj->_is_nil() && !IsPreview() && (id == GEOM_POINT_XYZ || + id == GEOM_POINT_REF || + id == GEOM_POINT_EDGE || + id == GEOM_POINT_SURF) ) { + anObj->SetParameters(aParameters.join(":").toLatin1().constData()); } - if ( getConstructorId() == 1 || getConstructorId() == 2 ) - { + 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 ) - { + if ( GEOMBase::GetShape( anObj, aShape ) && !aShape.IsNull() && + aShape.ShapeType() == TopAbs_VERTEX ) { gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) ); myX->setText( QString( "%1" ).arg( aPnt.X() ) ); myY->setText( QString( "%1" ).arg( aPnt.Y() ) ); myZ->setText( QString( "%1" ).arg( aPnt.Z() ) ); } - else - { + else { myX->setText( "" ); myY->setText( "" ); myZ->setText( "" ); } } - - if ( !anObj->_is_nil() ) - { - //printf( "--> a valid point is created\n" ); + + if ( !anObj->_is_nil() ) { objects.push_back( anObj._retn() ); } @@ -562,11 +918,93 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects ) } //================================================================================= -// function : closeEvent +// function : addSubshapeToStudy +// purpose : virtual method to add new SubObjects if local selection +//================================================================================= +void BasicGUI_PointDlg::addSubshapesToStudy() +{ + QMap objMap; + + switch ( getConstructorId() ) { + case GEOM_POINT_XYZ: + break; + case GEOM_POINT_REF: + objMap[GroupRefPoint->LineEdit1->text()] = myRefPoint; + break; + case GEOM_POINT_EDGE: + objMap[GroupOnCurve->LineEdit1->text()] = myEdge; + break; + case GEOM_POINT_INTINT: + objMap[GroupLineIntersection->LineEdit1->text()] = myLine1; + objMap[GroupLineIntersection->LineEdit2->text()] = myLine2; + break; + case GEOM_POINT_SURF: + objMap[GroupOnSurface->LineEdit1->text()] = myFace; + break; + } + addSubshapesToFather( objMap ); +} + +//================================================================================= +// function : ClickParamCoord() +// purpose : +//================================================================================= +void BasicGUI_PointDlg::ClickParamCoord( int id ) +{ + updateParamCoord( true ); + displayPreview(); +} + +//================================================================================= +// function : updateParamCoord // purpose : //================================================================================= -void BasicGUI_PointDlg::closeEvent( QCloseEvent* e ) +void BasicGUI_PointDlg::updateParamCoord(bool theIsUpdate) { - // myGeometryGUI->SetState( -1 ); - GEOMBase_Skeleton::closeEvent( e ); + bool isParam = myParamCoord->checkedId() == PARAM_VALUE; + + const int id = getConstructorId(); + if ( id == GEOM_POINT_EDGE ) { + GroupOnCurve->TextLabel2->setShown( isParam ); + GroupOnCurve->SpinBox_DX->setShown( isParam ); + } + 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 ); + + if ( theIsUpdate ) + QTimer::singleShot(50, this, SLOT(updateSize())); +} + +//================================================================================= +// function : onBtnPopup() +// purpose : +//================================================================================= +void BasicGUI_PointDlg::onBtnPopup( QAction* a ) +{ + int index = myActions[a]; + globalSelection(); // close local contexts, if any + QString type; + if ( index == 0 ) + myNeedType = TopAbs_EDGE; + else + myNeedType = TopAbs_WIRE; + + localSelection( GEOM::GEOM_Object::_nil(), myNeedType ); +} + +//================================================================================= +// function : updateSize +// purpose : adjust dialog size to minimum +//================================================================================= +void BasicGUI_PointDlg::updateSize() +{ + qApp->processEvents(); + updateGeometry(); + resize( minimumSizeHint() ); }