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

0026217: Visualization, Select3D_SensitiveCircle - fix compilation with CLang for iOS

Browse Source 
Inclusion detection for filled sensitive circles was corrected
This commit is contained in:
vpa 2015-05-13 12:30:38 +03:00 committed by bugmaster
parent b6ec1ef98c
commit 14cda02f82
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Select3D/Select3D_SensitiveCircle.cxx
View File

@ -256,9 +256,11 @@ Standard_Boolean Select3D_SensitiveCircle::Matches (SelectBasics_SelectingVolume
if (!theMgr.IsOverlapAllowed()) if (!theMgr.IsOverlapAllowed())
{ {
thePickResult = SelectBasics_PickResult (aDepth, aDistToCOG); thePickResult = SelectBasics_PickResult (aDepth, aDistToCOG);
if (!theMgr.Overlaps (myBndBox.CornerMin(), myBndBox.CornerMax(), Standard_False)) for (Standard_Integer aPntIdx = anArrayOfPnt->Lower(); aPntIdx <= anArrayOfPnt->Upper(); ++aPntIdx)
{ {
return Standard_False; Standard_Real aDummy;
if (!theMgr.Overlaps (anArrayOfPnt->Value (aPntIdx), aDummy))
return Standard_False;
} }
return Standard_True; return Standard_True;
} }

2
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

@ -4337,7 +4337,7 @@ class Triangle: public AIS_InteractiveObject
{ {
public: public:
// CASCADE RTTI // CASCADE RTTI
DEFINE_STANDARD_RTTI(FilledCircle); DEFINE_STANDARD_RTTI(Triangle);
Triangle (const gp_Pnt& theP1, Triangle (const gp_Pnt& theP1,
const gp_Pnt& theP2, const gp_Pnt& theP2,
const gp_Pnt& theP3); const gp_Pnt& theP3);

33
tests/bugs/vis/bug26217 Normal file
View File

@ -0,0 +1,33 @@
puts "============"
puts "CR26217"
puts "============"
puts ""
##########################################################################################
puts "Visualization, Select3D_SensitiveCircle - fix compilation with CLang for iOS"
##########################################################################################
pload VISUALIZATION
vinit View1
vpoint radP1 0 0 0
vpoint radP2 50 50 0
vpoint radP3 100 0 0
vcircle circle radP1 radP2 radP3 1
vfit
vselect 40 120 185 320
set aColor [vreadpixel 120 200 rgb name]
if {$aColor != "DARKGOLDENROD3"} {
puts "ERROR: the circle is selected with no overlap mode activated"
}
vselect 0 0
vselect 40 120 185 320 -allowoverlap 1
set aColor [vreadpixel 120 200 rgb name]
if {$aColor != "GRAY80"} {
puts "ERROR: the circle is not selected with overlap mode activated"
}
vdump ${imagedir}/${casename}.png