OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0024777: Visualization - AIS_InteractiveContext::MoveTo() doesn't keep detected object at first call

Browse Source 
Draw Harness, ViewerTest - ignore rectangular selection for empty rectangle
This commit is contained in:
kgv
2014-04-03 16:24:28 +04:00
committed by apn
parent 7da5f7b1c2
commit 8abada55ca
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/AIS/AIS_InteractiveContext_1.cxx
View File

@@ -179,7 +179,9 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer th
// does nothing if previously detected object is equal to the current one
if (myMainSel->OnePicked()->Selectable() == myLastPicked)
{
return AIS_SOD_OnlyOneDetected;
return myLastPicked->State() == 1
? AIS_SOD_Selected
: AIS_SOD_OnlyOneDetected;
}
// Previously detected object is unhilighted if it is not selected or hilighted
@@ -216,10 +218,9 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer th
toUpdateViewer = Standard_True;
}
if (myLastPicked->State() == 1)
{
aStatus = AIS_SOD_Selected;
}
aStatus = myLastPicked->State() == 1
? AIS_SOD_Selected
: AIS_SOD_OnlyOneDetected;
}
}
else
@@ -243,6 +244,7 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer th
}
myLastinMain.Nullify();
myLastPicked.Nullify();
}
if (toUpdateViewer)
@@ -257,7 +259,6 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer th
}
}
myLastPicked.Nullify();
mylastmoveview = theView;
return aStatus;
}