ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for the "52700: Bad processing of selection button in Point creation dialog box" issue.

Browse Source
This commit is contained in:
rnv 2015-04-29 16:44:24 +03:00
parent 462ad02a36
commit 8620d4d735
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BasicGUI/BasicGUI_PointDlg.cxx
View File

@ -613,9 +613,9 @@ void BasicGUI_PointDlg::SetEditCurrentArgument()
}
send->setDown(true);
if ((send == GroupLineIntersection->PushButton1 ||
send == GroupLineIntersection->PushButton2) && !myBusy)
SelectionIntoArgument();
// if ((send == GroupLineIntersection->PushButton1 ||
// send == GroupLineIntersection->PushButton2) && !myBusy)
// SelectionIntoArgument();
}

18
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -439,11 +439,17 @@ void GroupGUI_GroupDlg::SetEditCurrentArgument()
if (send == mySelBtn) {
myEditCurrentArgument = myMainName;
myShape2Name->setText("");
mySelBtn->setDown(true);
mySelBtn2->setDown(false);
}
else if (send == mySelBtn2 || sender() == myRestrictGroup) {
setInPlaceObj(GEOM::GEOM_Object::_nil());
myShape2Name->setText("");
if (subSelectionWay() != ALL_SUBSHAPES) {
if ( send == mySelBtn2 ) {
mySelBtn2->setDown(true);
mySelBtn->setDown(false);
}
if (subSelectionWay() != ALL_SUBSHAPES) {
myEditCurrentArgument = myShape2Name;
}
else {
@ -451,7 +457,11 @@ void GroupGUI_GroupDlg::SetEditCurrentArgument()
}
}
activateSelection();
// activateSelection();
if(myEditCurrentArgument) {
myEditCurrentArgument->setFocus();
send->setDown(true);
}
updateState();
}
@ -558,6 +568,9 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
{
if (subSelectionWay() != ALL_SUBSHAPES && myEditCurrentArgument == myShape2Name) {
onGetInPlace();
if( !myInPlaceObj->_is_nil() ) {
mySelBtn2->setDown(false);
}
return;
}
@ -582,6 +595,7 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
}
myMainObj = anObj;
if (!CORBA::is_nil(myMainObj)) {
mySelBtn->setDown(false);
SALOME_View* view = GEOM_Displayer::GetActiveView();
if (view) {
CORBA::String_var aMainEntry = myMainObj->GetStudyEntry();