Skip to content

Commit 07e9ed7

Browse files
test_apply_textures working
1 parent b980258 commit 07e9ed7

File tree

3 files changed

+48
-36
lines changed

3 files changed

+48
-36
lines changed

schemas/apply_textures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"rpc": "toggle_object_visibility",
2+
"rpc": "apply_textures",
33
"type": "object",
44
"properties": {
55
"id": {

tests/test_protocol.py

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,70 @@
33
images_dir_path = os.path.abspath("./tests/data/images")
44

55

6-
# def test_create_visualization(server):
7-
# server.call("create_visualization")
8-
# abs_path = os.path.join(images_dir_path, "create_visualization.jpeg")
9-
# assert server.compare_image(3, abs_path) == True
6+
def test_create_visualization(server):
7+
server.call("create_visualization")
8+
abs_path = os.path.join(images_dir_path, "create_visualization.jpeg")
9+
assert server.compare_image(3, abs_path) == True
1010

1111

12-
# def test_reset_camera(server):
13-
# server.call("reset_camera")
14-
# abs_path = os.path.join(images_dir_path, "reset_camera.jpeg")
15-
# assert server.compare_image(3, abs_path) == True
12+
def test_reset_camera(server):
13+
server.call("reset_camera")
14+
abs_path = os.path.join(images_dir_path, "reset_camera.jpeg")
15+
assert server.compare_image(3, abs_path) == True
1616

1717

18-
# def test_create_object_pipeline(server):
19-
# server.call("create_object_pipeline", [{"id": "123456", "file_name": "hat.vtp"}])
20-
# abs_path = os.path.join(images_dir_path, "create_object_pipeline.jpeg")
21-
# assert server.compare_image(3, abs_path) == True
18+
def test_create_object_pipeline(server):
19+
server.call("create_object_pipeline", [{"id": "123456", "file_name": "hat.vtp"}])
20+
abs_path = os.path.join(images_dir_path, "create_object_pipeline.jpeg")
21+
assert server.compare_image(3, abs_path) == True
2222

2323

24-
# def test_delete_object_pipeline(server):
25-
# server.call("create_object_pipeline", [{"id": "123456789", "file_name": "hat.vtp"}])
26-
# abs_path = os.path.join(images_dir_path, "create_object_pipeline.jpeg")
27-
# assert server.compare_image(3, abs_path) == True
24+
def test_delete_object_pipeline(server):
25+
server.call("create_object_pipeline", [{"id": "123456789", "file_name": "hat.vtp"}])
26+
abs_path = os.path.join(images_dir_path, "create_object_pipeline.jpeg")
27+
assert server.compare_image(3, abs_path) == True
2828

29-
# server.call("delete_object_pipeline", [{"id": "123456789"}])
30-
# abs_path = os.path.join(images_dir_path, "delete_object_pipeline.jpeg")
31-
# assert server.compare_image(3, abs_path) == True
29+
server.call("delete_object_pipeline", [{"id": "123456789"}])
30+
abs_path = os.path.join(images_dir_path, "delete_object_pipeline.jpeg")
31+
assert server.compare_image(3, abs_path) == True
3232

3333

34-
# def test_toggle_object_visibility(server):
35-
# server.call("create_object_pipeline", [{"id": "123456789", "file_name": "hat.vtp"}])
36-
# abs_path = os.path.join(images_dir_path, "create_object_pipeline.jpeg")
37-
# assert server.compare_image(3, abs_path) == True
34+
def test_toggle_object_visibility(server):
35+
server.call("create_object_pipeline", [{"id": "123456789", "file_name": "hat.vtp"}])
36+
abs_path = os.path.join(images_dir_path, "create_object_pipeline.jpeg")
37+
assert server.compare_image(3, abs_path) == True
3838

39-
# server.call("toggle_object_visibility", [{"id": "123456789", "is_visible": False}])
40-
# abs_path = os.path.join(images_dir_path, "toggle_object_visibility_1.jpeg")
41-
# assert server.compare_image(3, abs_path) == True
39+
server.call("toggle_object_visibility", [{"id": "123456789", "is_visible": False}])
40+
abs_path = os.path.join(images_dir_path, "toggle_object_visibility_1.jpeg")
41+
assert server.compare_image(3, abs_path) == True
4242

43-
# server.call("toggle_object_visibility", [{"id": "123456789", "is_visible": True}])
44-
# abs_path = os.path.join(images_dir_path, "toggle_object_visibility_2.jpeg")
45-
# assert server.compare_image(3, abs_path) == True
43+
server.call("toggle_object_visibility", [{"id": "123456789", "is_visible": True}])
44+
abs_path = os.path.join(images_dir_path, "toggle_object_visibility_2.jpeg")
45+
assert server.compare_image(3, abs_path) == True
4646

4747

4848
def test_apply_textures(server):
4949

50-
server.call("create_object_pipeline", [{"id": "123456789", "file_name": "hat.vtp"}])
51-
abs_path = os.path.join(images_dir_path, "create_object_pipeline.jpeg")
50+
server.call(
51+
"create_object_pipeline",
52+
[{"id": "123456789", "file_name": "emperor_penguin.vtp"}],
53+
)
54+
abs_path = os.path.join(images_dir_path, "apply_textures_1.jpeg")
5255
assert server.compare_image(3, abs_path) == True
5356

5457
server.call(
5558
"apply_textures",
5659
[
5760
{
5861
"id": "123456789",
59-
"textures": {"texture_name": "lambert2SG", "texture_file_name": ""},
62+
"textures": [
63+
{
64+
"texture_name": "PenguinMat",
65+
"texture_file_name": "penguin_colors.vti",
66+
}
67+
],
6068
}
6169
],
6270
)
63-
abs_path = os.path.join(images_dir_path, "apply_textures.jpeg")
64-
assert server.compare_image(1, abs_path) == True
71+
abs_path = os.path.join(images_dir_path, "apply_textures_2.jpeg")
72+
assert server.compare_image(3, abs_path) == True

vtk_protocol.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ def toggle_object_visibility(self, params):
122122

123123
@exportRpc(apply_textures_json["rpc"])
124124
def apply_textures(self, params):
125+
print(f"{params=}", flush=True)
125126
id = params["id"]
126127
textures = params["textures"]
127128
textures_array = []
@@ -138,10 +139,13 @@ def apply_textures(self, params):
138139
for index, value in enumerate(textures):
139140
texture_name = value["texture_name"]
140141
texture_file_name = value["texture_file_name"]
142+
print(f"{texture_name=} {texture_file_name=}", flush=True)
141143

142144
new_texture = vtk.vtkTexture()
143145
image_reader = vtk.vtkXMLImageDataReader()
144-
image_reader.SetFileName(os.path.join(DATA_FOLDER_PATH, texture_file_name))
146+
image_reader.SetFileName(
147+
os.path.join(self.DATA_FOLDER_PATH, texture_file_name)
148+
)
145149

146150
shader_texture_name = f"VTK_TEXTURE_UNIT_{index}"
147151
polydata_mapper.MapDataArrayToMultiTextureAttribute(

0 commit comments

Comments
 (0)