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

0031793: Draw Harness, vmanipulator - disable sorting picking result workaround

Browse Source 
AIS_InteractiveContext::SetPickClosest() has been removed from vmanipulator command,
and test cases using the manipulator have been updated.
This commit is contained in:
mzernova 2020-09-26 21:47:58 +03:00 committed by bugmaster
parent 9211c8ffbc
commit e2409d34b5
7 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/AIS/AIS_Manipulator.hxx
View File

@ -93,7 +93,6 @@ DEFINE_STANDARD_HANDLE (AIS_Manipulator, AIS_InteractiveObject)
//! aManipulator->Detach(); //! aManipulator->Detach();
//! @endcode //! @endcode
//! The last method erases manipulator object. //! The last method erases manipulator object.
//! @warning
class AIS_Manipulator : public AIS_InteractiveObject class AIS_Manipulator : public AIS_InteractiveObject
{ {
public: public:

1
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -12821,7 +12821,6 @@ static int VManipulator (Draw_Interpretor& theDi,
{ {
Handle(V3d_View) aCurrentView = ViewerTest::CurrentView(); Handle(V3d_View) aCurrentView = ViewerTest::CurrentView();
Handle(V3d_Viewer) aViewer = ViewerTest::GetViewerFromContext(); Handle(V3d_Viewer) aViewer = ViewerTest::GetViewerFromContext();
ViewerTest::GetAISContext()->MainSelector()->SetPickClosest (Standard_False);
if (aCurrentView.IsNull() if (aCurrentView.IsNull()
|| aViewer.IsNull()) || aViewer.IsNull())
{ {

2
tests/v3d/manipulator/dragg
View File

@ -58,7 +58,7 @@ vdump $anImage2
# rotate around y axis # rotate around y axis
# ------------------------------------------- # -------------------------------------------
set mouse_pick {316 257} set mouse_pick {316 261}
set mouse_drag {279 286} set mouse_drag {279 286}
vmoveto {*}$mouse_pick vmoveto {*}$mouse_pick

10
tests/v3d/manipulator/rotate
View File

@ -45,7 +45,7 @@ vmanipulator m -attach c1 -adjustPosition 1 -adjustSize 0 -enableModes 1 -size 4
vmanipulator m -followRotation 1 vmanipulator m -followRotation 1
set mouse_pick {201 092} set mouse_pick {200 092}
set mouse_drag {176 142} set mouse_drag {176 142}
vmoveto {*}$mouse_pick vmoveto {*}$mouse_pick
@ -64,7 +64,7 @@ vdump $anImage1
vmanipulator m -followRotation 1 vmanipulator m -followRotation 1
set mouse_pick {173 137} set mouse_pick {173 137}
set mouse_drag {233 140} set mouse_drag {233 144}
vmoveto {*}$mouse_pick vmoveto {*}$mouse_pick
vselect {*}$mouse_pick vselect {*}$mouse_pick
@ -111,8 +111,8 @@ vmanipulator m -followRotation 0
# test rotation around y axis (world reference frame) # test rotation around y axis (world reference frame)
# --------------------------------------------------- # ---------------------------------------------------
set mouse_pick {211 095} set mouse_pick {211 087}
set mouse_drag {230 127} set mouse_drag {232 127}
vmoveto {*}$mouse_pick vmoveto {*}$mouse_pick
vselect {*}$mouse_pick vselect {*}$mouse_pick
@ -127,7 +127,7 @@ vdump $anImage4
# test rotation around z axis (world reference frame) # test rotation around z axis (world reference frame)
# --------------------------------------------------- # ---------------------------------------------------
set mouse_pick {225 143} set mouse_pick {228 141}
set mouse_drag {184 143} set mouse_drag {184 143}
vmoveto {*}$mouse_pick vmoveto {*}$mouse_pick

6
tests/v3d/manipulator/scale
View File

@ -40,7 +40,7 @@ vmanipulator m -attach c1 -adjustPosition 1 -adjustSize 0 -enableModes 1 -size 4
# test hilight and detection # test hilight and detection
# -------------------------- # --------------------------
set mouse_pick {229 137} set mouse_pick {229 141}
vmoveto {*}$mouse_pick vmoveto {*}$mouse_pick
vdump $anImage1 vdump $anImage1
@ -49,8 +49,8 @@ vdump $anImage1
# test scaling of an object # test scaling of an object
# ------------------------- # -------------------------
set mouse_pick {229 137} set mouse_pick {229 141}
set mouse_drag {210 127} set mouse_drag {210 129}
vmoveto {*}$mouse_pick vmoveto {*}$mouse_pick
vselect {*}$mouse_pick vselect {*}$mouse_pick

4
tests/v3d/manipulator/translate
View File

@ -110,8 +110,8 @@ vmanipulator m -part 0 4 0
vmanipulator m -part 1 4 0 vmanipulator m -part 1 4 0
vmanipulator m -part 2 4 0 vmanipulator m -part 2 4 0
set mouse_pick {223 143} set mouse_pick {223 144}
set mouse_drag {181 141} set mouse_drag {181 140}
vmoveto {*}$mouse_pick vmoveto {*}$mouse_pick
vselect {*}$mouse_pick vselect {*}$mouse_pick

4
tests/v3d/manipulator/zoom_persistence
View File

@ -28,7 +28,7 @@ vfit
vmanipulator m1 -attach b1 -adjustPosition 1 -adjustSize 1 -enableModes 1 -zoomable 1 vmanipulator m1 -attach b1 -adjustPosition 1 -adjustSize 1 -enableModes 1 -zoomable 1
set mouse_pick_1 {84 133} set mouse_pick_1 {80 133}
set mouse_pick_2 {29 103} set mouse_pick_2 {29 103}
set mouse_pick_3 {29 103} set mouse_pick_3 {29 103}
set mouse_drag_3 {121 126} set mouse_drag_3 {121 126}
@ -60,7 +60,7 @@ vfit
vmanipulator m2 -attach b2 -adjustPosition 1 -adjustSize 0 -enableModes 1 -zoomable 0 -size 40 vmanipulator m2 -attach b2 -adjustPosition 1 -adjustSize 0 -enableModes 1 -zoomable 0 -size 40
set mouse_pick_1 {341 282} set mouse_pick_1 {340 282}
set mouse_pick_2 {277 245} set mouse_pick_2 {277 245}
set mouse_pick_3 {277 245} set mouse_pick_3 {277 245}
set mouse_drag_3 {210 210} set mouse_drag_3 {210 210}