X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasicGUI%2FBasicGUI_MarkerDlg.cxx;h=ee6448c35fadf887ce58c1ba46b03a1d9f1ca859;hb=1146ac90d280e25633cc85180513cf95c5cd1121;hp=8cb1dd447466a920a2dbc33bd141462eecb07fce;hpb=4310bcdf3dfdfdcae0e8b0f53c20d67bccba47ad;p=modules%2Fgeom.git diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx index 8cb1dd447..ee6448c35 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx +++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -228,7 +228,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId ) { if ( myConstructorId == constructorId && myConstructorId == 0 ) { globalSelection(); // close local contexts, if any - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); + localSelection( TopAbs_VERTEX ); activate( GEOM_MARKER ); return; } @@ -244,7 +244,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId ) Group2->hide(); aMainGrp->show(); globalSelection(); // close local contexts, if any - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); + localSelection( TopAbs_VERTEX ); activate( GEOM_MARKER ); break; } @@ -269,7 +269,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId ) Group2->PushButton2->setDown( false ); Group2->PushButton3->setDown( false ); globalSelection(); // close local contexts, if any - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); + localSelection( TopAbs_VERTEX ); myEditCurrentArgument = Group2->LineEdit1; Group2->LineEdit1->setText( "" ); Group2->LineEdit2->setText( "" ); @@ -442,7 +442,7 @@ void BasicGUI_MarkerDlg::SetEditCurrentArgument() } else if ( send == Group2->PushButton1 ) { myEditCurrentArgument = Group2->LineEdit1; - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); + localSelection( TopAbs_VERTEX ); Group2->PushButton2->setDown( false ); Group2->PushButton3->setDown( false ); Group2->LineEdit1->setEnabled( true ); @@ -451,7 +451,7 @@ void BasicGUI_MarkerDlg::SetEditCurrentArgument() } else if ( send == Group2->PushButton2 ) { myEditCurrentArgument = Group2->LineEdit2; - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE ); + localSelection( TopAbs_EDGE ); Group2->PushButton1->setDown( false ); Group2->PushButton3->setDown( false ); Group2->LineEdit1->setEnabled( false ); @@ -460,7 +460,7 @@ void BasicGUI_MarkerDlg::SetEditCurrentArgument() } else if ( send == Group2->PushButton3 ) { myEditCurrentArgument = Group2->LineEdit3; - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE ); + localSelection( TopAbs_EDGE ); Group2->PushButton1->setDown( false ); Group2->PushButton2->setDown( false ); Group2->LineEdit1->setEnabled( false ); @@ -511,7 +511,7 @@ void BasicGUI_MarkerDlg::enterEvent( QEvent* ) //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_MarkerDlg::createOperation() { - return myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetIBasicOperations(); } //=================================================================================