ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-01 08:35:38 +05:00
Code Issues Packages Projects Releases Wiki Activity

Test Integration: 0019050: EDF 521 GEOM SMESH : Improve selection process in the dialogs

Browse Source
This commit is contained in:
dmv 2008-09-04 06:59:10 +00:00
parent 8c3c6ae133
commit 6ac3c0b187
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BasicGUI/BasicGUI_LineDlg.cxx
View File

@ -190,6 +190,7 @@ void BasicGUI_LineDlg::ConstructorsClicked( int constructorId )
myEditCurrentArgument = GroupPoints->LineEdit1; myEditCurrentArgument = GroupPoints->LineEdit1;
myEditCurrentArgument->setText( "" ); myEditCurrentArgument->setText( "" );
GroupPoints->LineEdit2->setText( "" );
myPoint1 = GEOM::GEOM_Object::_nil(); myPoint1 = GEOM::GEOM_Object::_nil();
myPoint2 = GEOM::GEOM_Object::_nil(); myPoint2 = GEOM::GEOM_Object::_nil();
GroupPoints->PushButton1->setDown(true); GroupPoints->PushButton1->setDown(true);
@ -231,7 +232,6 @@ void BasicGUI_LineDlg::SelectionIntoArgument()
myEditCurrentArgument->setText( "" ); myEditCurrentArgument->setText( "" );
if ( IObjectCount() != 1 ) { if ( IObjectCount() != 1 ) {
// printf ( "IObjectCount() != 1 \n" );
if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint1 = GEOM::GEOM_Object::_nil(); if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint1 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myPoint2 = GEOM::GEOM_Object::_nil(); else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myPoint2 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupFaces->LineEdit1 ) myFace1 = GEOM::GEOM_Object::_nil(); else if ( myEditCurrentArgument == GroupFaces->LineEdit1 ) myFace1 = GEOM::GEOM_Object::_nil();
@ -239,8 +239,7 @@ void BasicGUI_LineDlg::SelectionIntoArgument()
displayPreview(); displayPreview();
return; return;
} }
// printf ( "IObjectCount() == 1 \n" );
// nbSel == 1
Standard_Boolean aRes = Standard_False; Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes ); GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes ) { if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
@ -314,6 +313,10 @@ void BasicGUI_LineDlg::SelectionIntoArgument()
//================================================================================= //=================================================================================
void BasicGUI_LineDlg::SetEditCurrentArgument() void BasicGUI_LineDlg::SetEditCurrentArgument()
{ {
if ( IObjectCount() != 0 ) {
globalSelection(); // close local selection to clear it
localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
}
QPushButton* send = (QPushButton*)sender(); QPushButton* send = (QPushButton*)sender();
if ( send == GroupPoints->PushButton1 ) { if ( send == GroupPoints->PushButton1 ) {
myEditCurrentArgument = GroupPoints->LineEdit1; myEditCurrentArgument = GroupPoints->LineEdit1;
@ -332,8 +335,9 @@ void BasicGUI_LineDlg::SetEditCurrentArgument()
GroupFaces->PushButton1->setDown(false); GroupFaces->PushButton1->setDown(false);
} }
myEditCurrentArgument->setFocus(); myEditCurrentArgument->setFocus();
SelectionIntoArgument(); // SelectionIntoArgument();
send->setDown(true); send->setDown(true);
displayPreview();
} }