X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasicGUI%2FBasicGUI_ArcDlg.cxx;h=255b9f04711744974e2cd85796fa6c7cfb11c4f3;hb=0c1af31f5408860fef60c451bb2692ffbc352d63;hp=59d13172081e1a7e2577f9e6fdab1a4325a2ad2b;hpb=0b6826bc5f36b5420f41af1475e1a79371a25323;p=modules%2Fgeom.git diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx index 59d131720..255b9f047 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.cxx +++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx @@ -1,24 +1,25 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// 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 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. +// 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 +// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // GEOM GEOMGUI : GUI for Geometry component // File : BasicGUI_ArcDlg.cxx // Author : Lucien PIGNOLONI, Open CASCADE S.A.S. @@ -158,7 +159,9 @@ void BasicGUI_ArcDlg::Init() /* init variables */ myEditCurrentArgument = Group3Pnts->LineEdit1; - myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil(); + myPoint1.nullify(); + myPoint2.nullify(); + myPoint3.nullify(); Group3Pnts2->CheckButton1->setChecked( false ); Group3Pnts->PushButton1->setDown(true); @@ -175,28 +178,16 @@ void BasicGUI_ArcDlg::Init() connect( Group3Pnts->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect( Group3Pnts->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); - connect( Group3Pnts->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); - connect( Group3Pnts->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); - connect( Group3Pnts->LineEdit3, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); - connect( Group3Pnts2->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect( Group3Pnts2->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect( Group3Pnts2->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); - connect( Group3Pnts2->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); - connect( Group3Pnts2->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); - connect( Group3Pnts2->LineEdit3, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); - connect( Group3Pnts2->CheckButton1, SIGNAL( toggled( bool ) ), this, SLOT( ReverseSense() ) ); connect( Group3Pnts3->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect( Group3Pnts3->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect( Group3Pnts3->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); - connect( Group3Pnts3->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); - connect( Group3Pnts3->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); - connect( Group3Pnts3->LineEdit3, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); - connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); @@ -213,6 +204,7 @@ void BasicGUI_ArcDlg::Init() //================================================================================= void BasicGUI_ArcDlg::ClickOnOk() { + setIsApplyAndClose( true ); if ( ClickOnApply() ) ClickOnCancel(); } @@ -248,124 +240,87 @@ void BasicGUI_ArcDlg::SelectionIntoArgument() if (aSelList.Extent() != 1) { switch (getConstructorId()) { case 0: - if ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) myPoint1 = GEOM::GEOM_Object::_nil(); - else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) myPoint2 = GEOM::GEOM_Object::_nil(); - else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 ) myPoint3 = GEOM::GEOM_Object::_nil(); - return; + if ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) myPoint1.nullify(); + else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) myPoint2.nullify(); + else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 ) myPoint3.nullify(); break; case 1: - if ( myEditCurrentArgument == Group3Pnts2->LineEdit1 ) myPoint1 = GEOM::GEOM_Object::_nil(); - else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 ) myPoint2 = GEOM::GEOM_Object::_nil(); - else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 ) myPoint3 = GEOM::GEOM_Object::_nil(); - return; + if ( myEditCurrentArgument == Group3Pnts2->LineEdit1 ) myPoint1.nullify(); + else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 ) myPoint2.nullify(); + else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 ) myPoint3.nullify(); break; case 2: - if ( myEditCurrentArgument == Group3Pnts3->LineEdit1 ) myPoint1 = GEOM::GEOM_Object::_nil(); - else if ( myEditCurrentArgument == Group3Pnts3->LineEdit2 ) myPoint2 = GEOM::GEOM_Object::_nil(); - else if ( myEditCurrentArgument == Group3Pnts3->LineEdit3 ) myPoint3 = GEOM::GEOM_Object::_nil(); - return; + if ( myEditCurrentArgument == Group3Pnts3->LineEdit1 ) myPoint1.nullify(); + else if ( myEditCurrentArgument == Group3Pnts3->LineEdit2 ) myPoint2.nullify(); + else if ( myEditCurrentArgument == Group3Pnts3->LineEdit3 ) myPoint3.nullify(); + break; + default: break; } + return; } - // nbSel == 1 - Standard_Boolean aRes = Standard_False; - GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes); - if ( !CORBA::is_nil( aSelectedObject ) && aRes ) { - QString aName = GEOMBase::GetName(aSelectedObject); - - // Get Selected object if selected subshape - TopoDS_Shape aShape; - if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull()) - { - TColStd_IndexedMapOfInteger aMap; - aSelMgr->GetIndexes(aSelList.First(), aMap); - if (aMap.Extent() == 1) // Local Selection - { - int anIndex = aMap(1); - aName += QString(":vertex_%1").arg(anIndex); - - //Find SubShape Object in Father - GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName); - - if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study - GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId()); - aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex); - } - else - aSelectedObject = aFindedObject; // get Object from study - } - else // Global Selection - { - if (aShape.ShapeType() != TopAbs_VERTEX) { - aSelectedObject = GEOM::GEOM_Object::_nil(); - aName = ""; - } - } - } + GEOM::GeomObjPtr aSelectedObject = getSelected( TopAbs_VERTEX ); + TopoDS_Shape aShape; + if ( aSelectedObject && GEOMBase::GetShape( aSelectedObject.get(), aShape ) && !aShape.IsNull() ) { + QString aName = GEOMBase::GetName( aSelectedObject.get() ); myEditCurrentArgument->setText(aName); - - if (!aSelectedObject->_is_nil()) { // clear selection if something selected - globalSelection(); - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); - } - switch ( getConstructorId() ) { case 0: - if ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) { + if ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) { myPoint1 = aSelectedObject; - if ( !myPoint1->_is_nil() && myPoint2->_is_nil() ) + if ( myPoint1 && !myPoint2 ) Group3Pnts->PushButton2->click(); } else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) { myPoint2 = aSelectedObject; - if ( !myPoint2->_is_nil() && myPoint3->_is_nil() ) + if ( myPoint2 && !myPoint3 ) Group3Pnts->PushButton3->click(); } else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 ) { myPoint3 = aSelectedObject; - if ( !myPoint3->_is_nil() && myPoint1->_is_nil() ) + if ( myPoint3 && !myPoint1 ) Group3Pnts->PushButton1->click(); } break; case 1: if ( myEditCurrentArgument == Group3Pnts2->LineEdit1 ) { myPoint1 = aSelectedObject; - if ( !myPoint1->_is_nil() && myPoint2->_is_nil() ) + if ( myPoint1 && !myPoint2 ) Group3Pnts2->PushButton2->click(); } else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 ) { myPoint2 = aSelectedObject; - if ( !myPoint2->_is_nil() && myPoint3->_is_nil() ) + if ( myPoint2 && !myPoint3 ) Group3Pnts2->PushButton3->click(); } else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 ) { myPoint3 = aSelectedObject; - if ( !myPoint3->_is_nil() && myPoint1->_is_nil() ) + if ( myPoint3 && !myPoint1 ) Group3Pnts2->PushButton1->click(); } break; case 2: if ( myEditCurrentArgument == Group3Pnts3->LineEdit1 ) { myPoint1 = aSelectedObject; - if ( !myPoint1->_is_nil() && myPoint2->_is_nil() ) + if ( myPoint1 && !myPoint2 ) Group3Pnts3->PushButton2->click(); } else if ( myEditCurrentArgument == Group3Pnts3->LineEdit2 ) { myPoint2 = aSelectedObject; - if ( !myPoint2->_is_nil() && myPoint3->_is_nil() ) + if ( myPoint2 && !myPoint3 ) Group3Pnts3->PushButton3->click(); } else if ( myEditCurrentArgument == Group3Pnts3->LineEdit3 ) { myPoint3 = aSelectedObject; - if ( !myPoint3->_is_nil() && myPoint1->_is_nil() ) + if ( myPoint3 && !myPoint1 ) Group3Pnts3->PushButton1->click(); } break; } } - displayPreview(); + displayPreview(true); } @@ -462,23 +417,7 @@ void BasicGUI_ArcDlg::SetEditCurrentArgument() myEditCurrentArgument->setFocus(); // SelectionIntoArgument(); send->setDown(true); - displayPreview(); -} - - -//================================================================================= -// function : LineEditReturnPressed() -// purpose : -//================================================================================= -void BasicGUI_ArcDlg::LineEditReturnPressed() -{ - QLineEdit* send = (QLineEdit*)sender(); - if ( send == Group3Pnts->LineEdit1 || send == Group3Pnts->LineEdit2 || send == Group3Pnts->LineEdit3 || - send == Group3Pnts2->LineEdit1 || send == Group3Pnts2->LineEdit2 || send == Group3Pnts2->LineEdit3 || - send == Group3Pnts3->LineEdit1 || send == Group3Pnts3->LineEdit2 || send == Group3Pnts3->LineEdit3 ) { - myEditCurrentArgument = send; - GEOMBase_Skeleton::LineEditReturnPressed(); - } + displayPreview(true); } @@ -517,49 +456,15 @@ GEOM::GEOM_IOperations_ptr BasicGUI_ArcDlg::createOperation() return myGeomGUI->GetGeomGen()->GetICurvesOperations( getStudyId() ); } -//================================================================================= -// function : isEqual -// purpose : it may also be needed to check for min distance between gp_Pnt-s... -//================================================================================= -static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Object_var& thePnt2 ) -{ - return thePnt1->_is_equivalent( thePnt2 ); -} - //================================================================================= // function : isValid // purpose : //================================================================================= bool BasicGUI_ArcDlg::isValid( QString& msg ) { - switch (getConstructorId()) { - case 0: - { - if (Group3Pnts->LineEdit1->text().trimmed().isEmpty() || - Group3Pnts->LineEdit2->text().trimmed().isEmpty() || - Group3Pnts->LineEdit3->text().trimmed().isEmpty()) - return false; - break; - } - case 1: - { - if (Group3Pnts2->LineEdit1->text().trimmed().isEmpty() || - Group3Pnts2->LineEdit2->text().trimmed().isEmpty() || - Group3Pnts2->LineEdit3->text().trimmed().isEmpty()) - return false; - break; - } - case 2: - { - if (Group3Pnts3->LineEdit1->text().trimmed().isEmpty() || - Group3Pnts3->LineEdit2->text().trimmed().isEmpty() || - Group3Pnts3->LineEdit3->text().trimmed().isEmpty()) - return false; - break; - } - } - return !myPoint1->_is_nil() && !myPoint2->_is_nil() && !myPoint3->_is_nil() && - !isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 ); + bool ok = myPoint1 && myPoint2 && myPoint3 && + myPoint1 != myPoint2 && myPoint1 != myPoint3 && myPoint2 != myPoint3; + return ok; } //================================================================================= @@ -576,8 +481,8 @@ bool BasicGUI_ArcDlg::execute( ObjectList& objects ) switch ( getConstructorId() ) { case 0: { - if ( !CORBA::is_nil( myPoint1 ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) ) { - anObj = anOper->MakeArc( myPoint1, myPoint2, myPoint3 ); + if ( myPoint1 && myPoint2 && myPoint3 ) { + anObj = anOper->MakeArc( myPoint1.get(), myPoint2.get(), myPoint3.get() ); res = true; } break; @@ -585,16 +490,16 @@ bool BasicGUI_ArcDlg::execute( ObjectList& objects ) case 1: { bool Sense = Group3Pnts2->CheckButton1->isChecked(); - if ( !CORBA::is_nil( myPoint1 ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) ) { - anObj = anOper->MakeArcCenter( myPoint1, myPoint2, myPoint3, Sense ); + if ( myPoint1 && myPoint2 && myPoint3 ) { + anObj = anOper->MakeArcCenter( myPoint1.get(), myPoint2.get(), myPoint3.get(), Sense ); res = true; } break; } case 2: { - if ( !CORBA::is_nil( myPoint1 ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) ) { - anObj = anOper->MakeArcOfEllipse( myPoint1, myPoint2, myPoint3 ); + if ( myPoint1 && myPoint2 && myPoint3 ) { + anObj = anOper->MakeArcOfEllipse( myPoint1.get(), myPoint2.get(), myPoint3.get() ); res = true; } break; @@ -614,12 +519,13 @@ void BasicGUI_ArcDlg::ConstructorsClicked( int constructorId ) { disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 ); + myPoint1.nullify(); + myPoint2.nullify(); + myPoint3.nullify(); + switch ( constructorId ) { case 0: { - globalSelection(); // close local contexts, if any - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes - Group3Pnts->show(); Group3Pnts2->hide(); Group3Pnts3->hide(); @@ -632,16 +538,12 @@ void BasicGUI_ArcDlg::ConstructorsClicked( int constructorId ) Group3Pnts->LineEdit1->setEnabled(true); Group3Pnts->LineEdit2->setEnabled(false); Group3Pnts->LineEdit3->setEnabled(false); - myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil(); myEditCurrentArgument = Group3Pnts->LineEdit1; break; } case 1: { - globalSelection(); // close local contexts, if any - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes - Group3Pnts->hide(); Group3Pnts2->show(); Group3Pnts3->hide(); @@ -654,16 +556,12 @@ void BasicGUI_ArcDlg::ConstructorsClicked( int constructorId ) Group3Pnts2->LineEdit1->setEnabled(true); Group3Pnts2->LineEdit2->setEnabled(false); Group3Pnts2->LineEdit3->setEnabled(false); - myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil(); myEditCurrentArgument = Group3Pnts2->LineEdit1; break; } case 2: { - globalSelection(); // close local contexts, if any - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes - Group3Pnts->hide(); Group3Pnts2->hide(); Group3Pnts3->show(); @@ -676,13 +574,15 @@ void BasicGUI_ArcDlg::ConstructorsClicked( int constructorId ) Group3Pnts3->LineEdit1->setEnabled(true); Group3Pnts3->LineEdit2->setEnabled(false); Group3Pnts3->LineEdit3->setEnabled(false); - myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil(); myEditCurrentArgument = Group3Pnts3->LineEdit1; break; } } + globalSelection(); // close local contexts, if any + localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes + qApp->processEvents(); updateGeometry(); resize( minimumSizeHint() ); @@ -691,10 +591,9 @@ void BasicGUI_ArcDlg::ConstructorsClicked( int constructorId ) connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); - if ( CORBA::is_nil( myPoint1 ) ) - SelectionIntoArgument(); + SelectionIntoArgument(); - displayPreview(); + displayPreview(true); } //================================================================================= @@ -703,7 +602,7 @@ void BasicGUI_ArcDlg::ConstructorsClicked( int constructorId ) //================================================================================= void BasicGUI_ArcDlg::ReverseSense() { - displayPreview(); + displayPreview(true); } //================================================================================= @@ -712,24 +611,15 @@ void BasicGUI_ArcDlg::ReverseSense() //================================================================================= void BasicGUI_ArcDlg::addSubshapesToStudy() { - QMap objMap; - switch ( getConstructorId() ) { case 0: - objMap[Group3Pnts->LineEdit1->text()] = myPoint1; - objMap[Group3Pnts->LineEdit2->text()] = myPoint2; - objMap[Group3Pnts->LineEdit3->text()] = myPoint3; - break; case 1: - objMap[Group3Pnts2->LineEdit1->text()] = myPoint1; - objMap[Group3Pnts2->LineEdit2->text()] = myPoint2; - objMap[Group3Pnts2->LineEdit3->text()] = myPoint3; - break; case 2: - objMap[Group3Pnts3->LineEdit1->text()] = myPoint1; - objMap[Group3Pnts3->LineEdit2->text()] = myPoint2; - objMap[Group3Pnts3->LineEdit3->text()] = myPoint3; + GEOMBase::PublishSubObject( myPoint1.get() ); + GEOMBase::PublishSubObject( myPoint2.get() ); + GEOMBase::PublishSubObject( myPoint3.get() ); + break; + default: break; } - addSubshapesToFather( objMap ); }