Skip to content

Commit a4a41fa

Browse files
committed
Merge pull request #1206 from chaosphere2112/slider_jump
Made slider jump instead of animate, added test
2 parents e6aa63a + ef145bf commit a4a41fa

File tree

3 files changed

+36
-1
lines changed

3 files changed

+36
-1
lines changed

Packages/vcs/Lib/vtk_ui/slider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def __init__(self, interactor, value=0, min_val=0, max_val=1, point1=(0,.1), poi
5050
self.repr.SetTitleHeight( 0.02 )
5151
self.repr.SetTitleText(title)
5252

53-
sliderWidget.SetAnimationModeToAnimate()
53+
sliderWidget.SetAnimationModeToJump()
5454

5555
sliderWidget.AddObserver("EndInteractionEvent", self.end_slide)
5656
sliderWidget.AddObserver("InteractionEvent", self.slide_value)

testing/vcs/vtk_ui/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,10 @@ add_test(test_vtk_ui_button_tooltip_hide
6464
"${PYTHON_EXECUTABLE}"
6565
${TEST_DIR}/test_vtk_ui_button_tooltip_hide.py
6666
${BASELINE_DIR}/test_vtk_ui_button_tooltip_hide.png
67+
)
68+
69+
add_test(test_vtk_ui_slider_jumps
70+
"${PYTHON_EXECUTABLE}"
71+
${TEST_DIR}/test_vtk_ui_slider_jumps.py
72+
${BASELINE_DIR}/test_vtk_ui_slider_jumps.png
6773
)
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
"""
2+
Test slider jumps to new values instead of animating
3+
"""
4+
import vcs.vtk_ui
5+
from time import sleep
6+
from vtk_ui_test import vtk_ui_test
7+
8+
class test_vtk_ui_slider_jumps(vtk_ui_test):
9+
def __init__(self):
10+
self.failed = False
11+
self.updated = False
12+
super(test_vtk_ui_slider_jumps, self).__init__()
13+
def do_test(self):
14+
self.win.SetSize(100, 100)
15+
16+
slider = vcs.vtk_ui.Slider(self.inter, value=0, min_val=0, max_val=5, point1=(0, .5), point2=(1, .5), update=self.update_test)
17+
slider.show()
18+
19+
self.click_event(80, 50)
20+
if self.failed:
21+
self.passed = 1
22+
else:
23+
self.passed = 0
24+
25+
def update_test(self, value):
26+
if value < 4:
27+
self.failed = True
28+
29+
test_vtk_ui_slider_jumps().test()

0 commit comments

Comments
 (0)