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

AIS_InteractiveContext::SetPickClosest() has been removed from vmanipulator command,
and test cases using the manipulator have been updated.

diff --git a/src/AIS/AIS_Manipulator.hxx b/src/AIS/AIS_Manipulator.hxx
index 2aaf315fd19c02ecf56126fc64fa54f4426b6871..c950e7c9aab02283ebfd08917b3750141ce40bfb 100644 (file)
--- a/src/AIS/AIS_Manipulator.hxx
+++ b/src/AIS/AIS_Manipulator.hxx
@@ -93,7 +93,6 @@ DEFINE_STANDARD_HANDLE (AIS_Manipulator, AIS_InteractiveObject)
 //! aManipulator->Detach();
 //! @endcode
 //! The last method erases manipulator object.
-//! @warning
 class AIS_Manipulator : public AIS_InteractiveObject
 {
 public:

diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
index 000537ac573e11bedd88d91e82939f43b6396ac0..5cb578d9389658a1613150c12dd438aabae4fe0e 100644 (file)
--- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
@@ -12821,7 +12821,6 @@ static int VManipulator (Draw_Interpretor& theDi,
 {
   Handle(V3d_View)   aCurrentView   = ViewerTest::CurrentView();
   Handle(V3d_Viewer) aViewer = ViewerTest::GetViewerFromContext();
-  ViewerTest::GetAISContext()->MainSelector()->SetPickClosest (Standard_False);
   if (aCurrentView.IsNull()
    || aViewer.IsNull())
   {

diff --git a/tests/v3d/manipulator/dragg b/tests/v3d/manipulator/dragg
index 512bbac6deaf6ef836eee3dc6509a437f4e0e2c5..fbd212f280294de23bef2817399ff50307a39c0f 100644 (file)
--- a/tests/v3d/manipulator/dragg
+++ b/tests/v3d/manipulator/dragg
@@ -58,7 +58,7 @@ vdump $anImage2
 # rotate around y axis
 # -------------------------------------------
 
-set mouse_pick {316 257}
+set mouse_pick {316 261}
 set mouse_drag {279 286}
 
 vmoveto {*}$mouse_pick

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

diff --git a/tests/v3d/manipulator/scale b/tests/v3d/manipulator/scale
index 1447c255dc9f6f32e3fb7fa6ea3f6a34ddb7fb73..4f17aff40104a18967be0ccb98e1087b3ca9f535 100644 (file)
--- a/tests/v3d/manipulator/scale
+++ b/tests/v3d/manipulator/scale
@@ -40,7 +40,7 @@ vmanipulator m -attach c1 -adjustPosition 1 -adjustSize 0 -enableModes 1 -size 4
 # test hilight and detection
 # --------------------------
 
-set mouse_pick {229 137}
+set mouse_pick {229 141}
 
 vmoveto {*}$mouse_pick
 vdump $anImage1
@@ -49,8 +49,8 @@ vdump $anImage1
 # test scaling of an object
 # -------------------------
 
-set mouse_pick {229 137}
-set mouse_drag {210 127}
+set mouse_pick {229 141}
+set mouse_drag {210 129}
 
 vmoveto {*}$mouse_pick
 vselect {*}$mouse_pick

diff --git a/tests/v3d/manipulator/translate b/tests/v3d/manipulator/translate
index 942001340649c2041c07d3a70fbc15f6d5defb06..b901b1cba7fc27c322695408a387b6ffa72f0fb6 100644 (file)
--- a/tests/v3d/manipulator/translate
+++ b/tests/v3d/manipulator/translate
@@ -110,8 +110,8 @@ vmanipulator m -part 0 4 0
 vmanipulator m -part 1 4 0
 vmanipulator m -part 2 4 0
 
-set mouse_pick {223 143}
-set mouse_drag {181 141}
+set mouse_pick {223 144}
+set mouse_drag {181 140}
 
 vmoveto {*}$mouse_pick
 vselect {*}$mouse_pick

diff --git a/tests/v3d/manipulator/zoom_persistence b/tests/v3d/manipulator/zoom_persistence
index 4cbd69d5cd61baf45aa3f88ad9a187b333ed2e33..5d62ef0d8d18aa92368ec519f55cef92e9ed970d 100644 (file)
--- a/tests/v3d/manipulator/zoom_persistence
+++ b/tests/v3d/manipulator/zoom_persistence
@@ -28,7 +28,7 @@ vfit
 
 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_3 {29 103}
 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
 
-set mouse_pick_1 {341 282}
+set mouse_pick_1 {340 282}
 set mouse_pick_2 {277 245}
 set mouse_pick_3 {277 245}
 set mouse_drag_3 {210 210}