OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0027986: Visualization - AIS_InteractiveContext::SetLocation() does not update dynamic highlighting

Browse Source 
AIS_InteractiveContext::SetLocation() - update HilightMode instead of DisplayMode.
PrsMgr_PresentationManager::UpdateHighlightTrsf() - fix accessing NULL presentation.
This commit is contained in:
kgv 2016-10-20 12:07:54 +03:00 committed by apn
parent d94bed0e26
commit 7bbccb5f4e
4 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/AIS/AIS_InteractiveContext.cxx
View File

@ -1331,9 +1331,10 @@ void AIS_InteractiveContext::SetLocation (const Handle(AIS_InteractiveObject)& t
// to its highlight structure immediately // to its highlight structure immediately
if (!myLastPicked.IsNull() && myLastPicked->IsSameSelectable (theIObj)) if (!myLastPicked.IsNull() && myLastPicked->IsSameSelectable (theIObj))
{ {
const Standard_Integer aHiMod = theIObj->HasHilightMode() ? theIObj->HilightMode() : 0;
myLastPicked->UpdateHighlightTrsf (myMainVwr, myLastPicked->UpdateHighlightTrsf (myMainVwr,
myMainPM, myMainPM,
theIObj->HasDisplayMode() ? theIObj->DisplayMode() : 0); aHiMod);
} }
} }

15
src/PrsMgr/PrsMgr_PresentationManager.cxx
View File

@ -641,12 +641,15 @@ void PrsMgr_PresentationManager::UpdateHighlightTrsf (const Handle(V3d_Viewer)&
if (theObj.IsNull()) if (theObj.IsNull())
return; return;
const Handle(Prs3d_Presentation)& aBasePrs = Presentation (theObj, theMode, Standard_False)->Presentation(); Handle(PrsMgr_Presentation) aPrs = Presentation (!theSelObj.IsNull() ? theSelObj : theObj, theMode, Standard_False);
const Handle(Prs3d_Presentation)& aParentPrs = theSelObj.IsNull() ? if (aPrs.IsNull())
aBasePrs : Presentation (theSelObj, theMode, Standard_False)->Presentation(); {
const Standard_Integer aParentId = aParentPrs->CStructure()->Id; return;
}
updatePrsTransformation (myImmediateList, aParentId, aBasePrs->CStructure()->Transformation()); Handle(Geom_Transformation) aTrsf = theObj->LocalTransformationGeom();
const Standard_Integer aParentId = aPrs->Presentation()->CStructure()->Id;
updatePrsTransformation (myImmediateList, aParentId, aTrsf);
if (!myViewDependentImmediateList.IsEmpty()) if (!myViewDependentImmediateList.IsEmpty())
{ {
@ -658,7 +661,7 @@ void PrsMgr_PresentationManager::UpdateHighlightTrsf (const Handle(V3d_Viewer)&
{ {
updatePrsTransformation (myViewDependentImmediateList, updatePrsTransformation (myViewDependentImmediateList,
aViewDepParentPrs->CStructure()->Id, aViewDepParentPrs->CStructure()->Id,
aBasePrs->CStructure()->Transformation()); aTrsf);
} }
} }
} }

23
tests/bugs/vis/bug27986_1 Normal file
View File

@ -0,0 +1,23 @@
puts "==========="
puts "OCC27986"
puts "Visualization - AIS_InteractiveContext::SetLocation() does not update dynamic highlighting"
puts "Test global selection"
puts "==========="
puts ""
pload MODELING VISUALIZATION
box b 1 2 3
vclear
vinit View1
vaxo
vdisplay -dispMode 0 -highMode 1 b
vfit
vzoom 0.5
vmoveto 250 250
vsetlocation b 2 1 0
set aColor1 [vreadpixel 220 200 rgb name]
set aColor2 [vreadpixel 350 220 rgb name]
if { "$aColor1" != "BLACK" || "$aColor2" != "DARKTURQUOISE" } { puts "Error: dynamic highlighting is not updated" }
vdump $imagedir/${casename}.png

24
tests/bugs/vis/bug27986_2 Normal file
View File

@ -0,0 +1,24 @@
puts "==========="
puts "OCC27986"
puts "Visualization - AIS_InteractiveContext::SetLocation() does not update dynamic highlighting"
puts "Test local selection"
puts "==========="
puts ""
pload MODELING VISUALIZATION
box b 1 2 3
vclear
vinit View1
vaxo
vdisplay -dispMode 0 -highMode 1 b
vfit
vzoom 0.5
vselmode b 4 1
vmoveto 250 250
vsetlocation b 2 1 0
set aColor1 [vreadpixel 220 200 rgb name]
set aColor2 [vreadpixel 350 220 rgb name]
if { "$aColor1" != "BLACK" || "$aColor2" != "DARKTURQUOISE" } { puts "Error: dynamic highlighting is not updated" }
vdump $imagedir/${casename}.png