Skip to content

Commit ab4f27e

Browse files
committed
test
1 parent 92fd9bb commit ab4f27e

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
vtkAbstractMapper,
1414
vtkWorldPointPicker,
1515
)
16+
from vtkmodules.vtkInteractionStyle import vtkInteractorStyleTrackball
1617
from vtkmodules.vtkCommonCore import reference
1718
from vtkmodules.vtkCommonDataModel import vtkBoundingBox
1819
from vtkmodules.vtkCommonTransforms import vtkTransform
@@ -75,7 +76,8 @@ def resetVisualization(self, rpc_params: RpcParams) -> None:
7576

7677
renderWindowInteractor = vtkRenderWindowInteractor()
7778
renderWindowInteractor.SetRenderWindow(renderWindow)
78-
renderWindowInteractor.GetInteractorStyle().SetCurrentStyleToTrackballCamera()
79+
style = vtkInteractorStyleTrackball()
80+
renderWindowInteractor.SetInteractorStyle(style)
7981
renderWindowInteractor.EnableRenderOff()
8082
widget = vtkOrientationMarkerWidget()
8183
widget.SetInteractor(renderWindowInteractor)

src/opengeodeweb_viewer/vtk_protocol.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from dataclasses import dataclass, field
55

66
# Third party imports
7+
import vtkmodules.vtkRenderingVolumeOpenGL2
78
from vtkmodules.web import protocols as vtk_protocols
89
from vtkmodules.vtkIOXML import (
910
vtkXMLReader,

tests/conftest.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from websocket import create_connection, WebSocketTimeoutException
44
import json
55
from xprocess import ProcessStarter
6-
import vtk
6+
from vtkmodules.vtkIOImage import vtkImageReader2, vtkPNGReader, vtkJPEGReader
7+
from vtkmodules.vtkImagingCore import vtkImageDifference
78
import os
89
import shutil
910
import xml.etree.ElementTree as ET
@@ -69,28 +70,28 @@ def get_response(self) -> bytes | dict[str, object] | str:
6970
return str(response)
7071

7172
@staticmethod
72-
def _reader_for_file(path: str) -> vtk.vtkImageReader2:
73+
def _reader_for_file(path: str) -> vtkImageReader2:
7374
lower = path.lower()
7475
if lower.endswith(".png"):
75-
return vtk.vtkPNGReader()
76+
return vtkPNGReader()
7677
if lower.endswith(".jpg") or lower.endswith(".jpeg"):
77-
return vtk.vtkJPEGReader()
78-
return vtk.vtkJPEGReader()
78+
return vtkJPEGReader()
79+
return vtkJPEGReader()
7980

8081
def images_diff(self, first_image_path: str, second_image_path: str) -> float:
8182
if ".png" in first_image_path:
82-
first_reader = vtk.vtkPNGReader()
83+
first_reader = vtkPNGReader()
8384
elif (".jpg" in first_image_path) or (".jpeg" in first_image_path):
84-
first_reader = vtk.vtkJPEGReader()
85+
first_reader = vtkJPEGReader()
8586
first_reader.SetFileName(first_image_path)
8687

8788
if ".png" in second_image_path:
88-
second_reader = vtk.vtkPNGReader()
89+
second_reader = vtkPNGReader()
8990
elif (".jpg" in second_image_path) or (".jpeg" in second_image_path):
90-
second_reader = vtk.vtkJPEGReader()
91+
second_reader = vtkJPEGReader()
9192
second_reader.SetFileName(second_image_path)
9293

93-
images_diff = vtk.vtkImageDifference()
94+
images_diff = vtkImageDifference()
9495
images_diff.SetInputConnection(first_reader.GetOutputPort())
9596
images_diff.SetImageConnection(second_reader.GetOutputPort())
9697
images_diff.Update()

0 commit comments

Comments
 (0)