diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 9851137..1cc5397 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -10,11 +10,11 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.12" - name: Test run: | pip install pytest pytest-xprocess - pip install https://www.vtk.org/files/release/9.3/vtk_osmesa-9.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + pip install https://www.vtk.org/files/release/9.3/vtk_osmesa-9.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl pip install -e . pytest diff --git a/pyproject.toml b/pyproject.toml index de98b6d..6b3d131 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "OpenGeodeWeb-Viewer" -version = "1.8.1" +version = "1.9.1" dynamic = ["dependencies"] authors = [ { name="Geode-solutions", email="team-web@geode-solutions.com" }, diff --git a/src/opengeodeweb_viewer/object/object_methods.py b/src/opengeodeweb_viewer/object/object_methods.py index 2bc9c7c..2a55c42 100644 --- a/src/opengeodeweb_viewer/object/object_methods.py +++ b/src/opengeodeweb_viewer/object/object_methods.py @@ -108,23 +108,35 @@ def SetColor(self, id, red, green, blue): def SetEdgesVisibility(self, id, visibility): actor = self.get_object(id)["actor"] - actor.GetProperty().SetEdgeVisibility(visibility) + max_dimension = self.get_object(id)["max_dimension"] + if max_dimension == "edges": + self.SetVisibility(id, visibility) + else: + actor.GetProperty().SetEdgeVisibility(visibility) self.render() - def SetEdgesSize(self, id, size): + def SetEdgesWidth(self, id, width): actor = self.get_object(id)["actor"] - actor.GetProperty().SetEdgeWidth(size) + actor.GetProperty().SetEdgeWidth(width) self.render() def SetEdgesColor(self, id, red, green, blue): actor = self.get_object(id)["actor"] - actor.GetProperty().SetEdgeColor([red / 255, green / 255, blue / 255]) + max_dimension = self.get_object(id)["max_dimension"] + if max_dimension == "edges": + self.SetColor(id, red, green, blue) + else: + actor.GetProperty().SetEdgeColor([red / 255, green / 255, blue / 255]) self.render() def SetPointsVisibility(self, id, visibility): actor = self.get_object(id)["actor"] - actor.GetProperty().SetVertexVisibility(visibility) - actor.GetProperty().SetEdgeVisibility(visibility) + max_dimension = self.get_object(id)["max_dimension"] + if max_dimension == "points": + self.SetVisibility(id, visibility) + else: + actor.GetProperty().SetVertexVisibility(visibility) + actor.GetProperty().SetEdgeVisibility(visibility) self.render() def SetPointsSize(self, id, size): @@ -134,7 +146,11 @@ def SetPointsSize(self, id, size): def SetPointsColor(self, id, red, green, blue): actor = self.get_object(id)["actor"] - actor.GetProperty().SetVertexColor([red / 255, green / 255, blue / 255]) + max_dimension = self.get_object(id)["max_dimension"] + if max_dimension == "points": + self.SetColor(id, red, green, blue) + else: + actor.GetProperty().SetVertexColor([red / 255, green / 255, blue / 255]) self.render() def SetBlocksVisibility(self, id, block_ids, visibility): diff --git a/src/opengeodeweb_viewer/rpc/mesh/edges/mesh_edges_protocols.py b/src/opengeodeweb_viewer/rpc/mesh/edges/mesh_edges_protocols.py index fdeea46..a2db0f5 100644 --- a/src/opengeodeweb_viewer/rpc/mesh/edges/mesh_edges_protocols.py +++ b/src/opengeodeweb_viewer/rpc/mesh/edges/mesh_edges_protocols.py @@ -39,10 +39,10 @@ def setMeshEdgesColor(self, params): ) self.SetEdgesColor(id, red, green, blue) - @exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["size"]["rpc"]) - def setMeshEdgesSize(self, params): + @exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["width"]["rpc"]) + def setMeshEdgesWidth(self, params): validate_schema( - params, self.mesh_edges_schemas_dict["size"], self.mesh_edges_prefix + params, self.mesh_edges_schemas_dict["width"], self.mesh_edges_prefix ) - id, size = params["id"], params["size"] - self.SetEdgesSize(id, size) + id, size = params["id"], params["width"] + self.SetEdgesWidth(id, width) diff --git a/src/opengeodeweb_viewer/rpc/mesh/edges/schemas/width.json b/src/opengeodeweb_viewer/rpc/mesh/edges/schemas/width.json new file mode 100644 index 0000000..9495dd5 --- /dev/null +++ b/src/opengeodeweb_viewer/rpc/mesh/edges/schemas/width.json @@ -0,0 +1,18 @@ +{ + "rpc": "size", + "type": "object", + "properties": { + "id": { + "type": "string", + "minLength": 1 + }, + "width": { + "type": "number" + } + }, + "required": [ + "id", + "width" + ], + "additionalProperties": false +} \ No newline at end of file diff --git a/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py b/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py index 30fb3a5..5d61136 100644 --- a/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py +++ b/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py @@ -29,6 +29,27 @@ def registerMesh(self, params): mapper = vtk.vtkDataSetMapper() mapper.SetInputConnection(reader.GetOutputPort()) self.registerObject(id, file_name, reader, filter, mapper) + + data_object = reader.GetOutput() + data_set = vtk.vtkDataSet.SafeDownCast(data_object) + cell_types = vtk.vtkCellTypes() + data_set.GetCellTypes(cell_types) + cell_data = cell_types.GetCellTypesArray() + max_id = -1 + for t in range(cell_data.GetSize()): + t_id = cell_data.GetValue(t) + max_id = max(max_id, t_id) + print(f"{max_id=}", flush=True) + max_dimension = "" + if max_id < 3: + max_dimension = "points" + elif max_id < 5: + max_dimension = "edges" + elif max_id < 7: + max_dimension = "polygons" + elif max_id >= 7: + max_dimension = "polyhedra" + self.get_data_base()[id]["max_dimension"] = max_dimension except Exception as e: print("error : ", str(e), flush=True) diff --git a/src/opengeodeweb_viewer/rpc/model/blocks/blocks_protocols.py b/src/opengeodeweb_viewer/rpc/model/blocks/model_blocks_protocols.py similarity index 100% rename from src/opengeodeweb_viewer/rpc/model/blocks/blocks_protocols.py rename to src/opengeodeweb_viewer/rpc/model/blocks/model_blocks_protocols.py diff --git a/src/opengeodeweb_viewer/rpc/model/corners/corners_protocols.py b/src/opengeodeweb_viewer/rpc/model/corners/model_corners_protocols.py similarity index 100% rename from src/opengeodeweb_viewer/rpc/model/corners/corners_protocols.py rename to src/opengeodeweb_viewer/rpc/model/corners/model_corners_protocols.py diff --git a/src/opengeodeweb_viewer/rpc/model/edges/edges_protocols.py b/src/opengeodeweb_viewer/rpc/model/edges/model_edges_protocols.py similarity index 100% rename from src/opengeodeweb_viewer/rpc/model/edges/edges_protocols.py rename to src/opengeodeweb_viewer/rpc/model/edges/model_edges_protocols.py diff --git a/src/opengeodeweb_viewer/rpc/model/lines/lines_protocols.py b/src/opengeodeweb_viewer/rpc/model/lines/model_lines_protocols.py similarity index 100% rename from src/opengeodeweb_viewer/rpc/model/lines/lines_protocols.py rename to src/opengeodeweb_viewer/rpc/model/lines/model_lines_protocols.py diff --git a/src/opengeodeweb_viewer/rpc/model/model_protocols.py b/src/opengeodeweb_viewer/rpc/model/model_protocols.py index a9d46a8..9b4e579 100644 --- a/src/opengeodeweb_viewer/rpc/model/model_protocols.py +++ b/src/opengeodeweb_viewer/rpc/model/model_protocols.py @@ -33,6 +33,7 @@ def registerModel(self, params): attributes = vtkCompositeDataDisplayAttributes() mapper.SetCompositeDataDisplayAttributes(attributes) self.registerObject(id, file_name, reader, filter, mapper) + self.get_object(id)["max_dimension"] = "default" except Exception as e: print("error : ", str(e), flush=True) diff --git a/src/opengeodeweb_viewer/rpc/model/points/points_protocols.py b/src/opengeodeweb_viewer/rpc/model/points/model_points_protocols.py similarity index 100% rename from src/opengeodeweb_viewer/rpc/model/points/points_protocols.py rename to src/opengeodeweb_viewer/rpc/model/points/model_points_protocols.py diff --git a/src/opengeodeweb_viewer/rpc/model/surfaces/surfaces_protocols.py b/src/opengeodeweb_viewer/rpc/model/surfaces/model_surfaces_protocols.py similarity index 100% rename from src/opengeodeweb_viewer/rpc/model/surfaces/surfaces_protocols.py rename to src/opengeodeweb_viewer/rpc/model/surfaces/model_surfaces_protocols.py diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py index 45dd29f..35135a9 100644 --- a/src/opengeodeweb_viewer/vtkw_server.py +++ b/src/opengeodeweb_viewer/vtkw_server.py @@ -18,22 +18,22 @@ from .rpc.mesh.polygons.polygons_protocols import VtkMeshPolygonsView from .rpc.mesh.polyhedra.polyhedra_protocols import VtkMeshPolyhedraView from .rpc.model.model_protocols import VtkModelView -from .rpc.model.edges.edges_protocols import ( +from .rpc.model.edges.model_edges_protocols import ( VtkModelEdgesView, ) -from .rpc.model.points.points_protocols import ( +from .rpc.model.points.model_points_protocols import ( VtkModelPointsView, ) -from .rpc.model.corners.corners_protocols import ( +from .rpc.model.corners.model_corners_protocols import ( VtkModelCornersView, ) -from .rpc.model.lines.lines_protocols import ( +from .rpc.model.lines.model_lines_protocols import ( VtkModelLinesView, ) -from .rpc.model.surfaces.surfaces_protocols import ( +from .rpc.model.surfaces.model_surfaces_protocols import ( VtkModelSurfacesView, ) -from .rpc.model.blocks.blocks_protocols import ( +from .rpc.model.blocks.model_blocks_protocols import ( VtkModelBlocksView, ) from .rpc.generic.generic_protocols import VtkGenericView diff --git a/src/tests/data/edged_curve.vtp b/src/tests/data/edged_curve.vtp new file mode 100644 index 0000000..3a04efb --- /dev/null +++ b/src/tests/data/edged_curve.vtp @@ -0,0 +1,20 @@ + + + + + + 0.1 0.2 0.3 2.1 9.4 6.7 7.5 5.2 6.3 8.7 1.4 4.7 + + + 0.1 0.2 0.3 2.1 9.4 6.7 7.5 5.2 6.3 8.7 1.4 4.7 + + + 0 1 0 2 3 2 1 2 + + + 0 1 0 2 3 2 1 2 + 2 4 6 8 + + + + diff --git a/src/tests/data/images/mesh/edges/edged_curve_color.jpeg b/src/tests/data/images/mesh/edges/edged_curve_color.jpeg new file mode 100644 index 0000000..d190d02 Binary files /dev/null and b/src/tests/data/images/mesh/edges/edged_curve_color.jpeg differ diff --git a/src/tests/data/images/mesh/edges/edged_curve_visibility.jpeg b/src/tests/data/images/mesh/edges/edged_curve_visibility.jpeg new file mode 100644 index 0000000..35b6a3d Binary files /dev/null and b/src/tests/data/images/mesh/edges/edged_curve_visibility.jpeg differ diff --git a/src/tests/data/images/mesh/edges/register_edged_curve.jpeg b/src/tests/data/images/mesh/edges/register_edged_curve.jpeg new file mode 100644 index 0000000..ab81306 Binary files /dev/null and b/src/tests/data/images/mesh/edges/register_edged_curve.jpeg differ diff --git a/src/tests/data/images/mesh/points/point_set_color.jpeg b/src/tests/data/images/mesh/points/point_set_color.jpeg new file mode 100644 index 0000000..a9f37c2 Binary files /dev/null and b/src/tests/data/images/mesh/points/point_set_color.jpeg differ diff --git a/src/tests/data/images/mesh/points/point_set_size.jpeg b/src/tests/data/images/mesh/points/point_set_size.jpeg new file mode 100644 index 0000000..93123a1 Binary files /dev/null and b/src/tests/data/images/mesh/points/point_set_size.jpeg differ diff --git a/src/tests/data/images/mesh/points/point_set_visibility.jpeg b/src/tests/data/images/mesh/points/point_set_visibility.jpeg new file mode 100644 index 0000000..35b6a3d Binary files /dev/null and b/src/tests/data/images/mesh/points/point_set_visibility.jpeg differ diff --git a/src/tests/data/images/mesh/points/register_point_set.jpeg b/src/tests/data/images/mesh/points/register_point_set.jpeg new file mode 100644 index 0000000..cb0d888 Binary files /dev/null and b/src/tests/data/images/mesh/points/register_point_set.jpeg differ diff --git a/src/tests/data/points.vtp b/src/tests/data/points.vtp new file mode 100644 index 0000000..8962e6a --- /dev/null +++ b/src/tests/data/points.vtp @@ -0,0 +1,19 @@ + + + + + + 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 + 0.5 1 2 20 2 12 1.5 19 12.3 39.1 1.5 7 1.5 39.1 8.5 37.5 38.2 11.1 17.8 35.5 15 13.9 15.1 17 25.9 14 17.5 22 25 25 15 29 20 27 28 22 1 0.5 21 19 1.5 27 1.3 17 29.5 38.7 2.1 25 1.2 37.8 30 38.1 37.7 26.8 17.5 36.2 31 14.2 14.9 29.5 26.5 15 29.5 21.2 23.4 35.5 14.5 28.7 33 26.3 25.7 34 + 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 + + + 0.5 1 2 20 2 12 1.5 19 12.3 39.1 1.5 7 1.5 39.1 8.5 37.5 38.2 11.1 17.8 35.5 15 13.9 15.1 17 25.9 14 17.5 22 25 25 15 29 20 27 28 22 1 0.5 21 19 1.5 27 1.3 17 29.5 38.7 2.1 25 1.2 37.8 30 38.1 37.7 26.8 17.5 36.2 31 14.2 14.9 29.5 26.5 15 29.5 21.2 23.4 35.5 14.5 28.7 33 26.3 25.7 34 + + + 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 + 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 + + + + diff --git a/src/tests/data/take_screenshot_with_background.jpg b/src/tests/data/take_screenshot_with_background.jpg index b490cfc..7edd297 100644 Binary files a/src/tests/data/take_screenshot_with_background.jpg and b/src/tests/data/take_screenshot_with_background.jpg differ diff --git a/src/tests/data/take_screenshot_with_background.png b/src/tests/data/take_screenshot_with_background.png index 6dcfc0b..ef275f9 100644 Binary files a/src/tests/data/take_screenshot_with_background.png and b/src/tests/data/take_screenshot_with_background.png differ diff --git a/src/tests/data/take_screenshot_without_background.png b/src/tests/data/take_screenshot_without_background.png index d67f309..6dda998 100644 Binary files a/src/tests/data/take_screenshot_without_background.png and b/src/tests/data/take_screenshot_without_background.png differ diff --git a/src/tests/mesh/edges/test_edges_protocols.py b/src/tests/mesh/edges/test_edges_protocols.py deleted file mode 100644 index 1c62008..0000000 --- a/src/tests/mesh/edges/test_edges_protocols.py +++ /dev/null @@ -1,31 +0,0 @@ -# Standard library imports - -# Third party imports -from src.opengeodeweb_viewer.rpc.mesh.edges.mesh_edges_protocols import VtkMeshEdgesView - -# Local application imports -from src.tests.mesh.test_mesh_protocols import test_register_mesh - - -def test_edges_visibility(server): - - test_register_mesh(server) - - server.call( - VtkMeshEdgesView.mesh_edges_prefix - + VtkMeshEdgesView.mesh_edges_schemas_dict["visibility"]["rpc"], - [{"id": "123456789", "visibility": True}], - ) - assert server.compare_image(3, "mesh/edges/visibility.jpeg") == True - - -def test_edges_color(server): - - test_edges_visibility(server) - - server.call( - VtkMeshEdgesView.mesh_edges_prefix - + VtkMeshEdgesView.mesh_edges_schemas_dict["color"]["rpc"], - [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}], - ) - assert server.compare_image(3, "mesh/edges/color.jpeg") == True diff --git a/src/tests/mesh/edges/test_mesh_edges_protocols.py b/src/tests/mesh/edges/test_mesh_edges_protocols.py new file mode 100644 index 0000000..214f745 --- /dev/null +++ b/src/tests/mesh/edges/test_mesh_edges_protocols.py @@ -0,0 +1,55 @@ +# Standard library imports + +# Third party imports +from src.opengeodeweb_viewer.rpc.mesh.mesh_protocols import VtkMeshView +from src.opengeodeweb_viewer.rpc.mesh.edges.mesh_edges_protocols import VtkMeshEdgesView + +# Local application imports +from src.tests.mesh.test_mesh_protocols import test_register_mesh + + +def test_edges_visibility(server): + + test_register_mesh(server) + + server.call( + VtkMeshEdgesView.mesh_edges_prefix + + VtkMeshEdgesView.mesh_edges_schemas_dict["visibility"]["rpc"], + [{"id": "123456789", "visibility": True}], + ) + assert server.compare_image(3, "mesh/edges/visibility.jpeg") == True + + +def test_edges_color(server): + + test_edges_visibility(server) + + server.call( + VtkMeshEdgesView.mesh_edges_prefix + + VtkMeshEdgesView.mesh_edges_schemas_dict["color"]["rpc"], + [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}], + ) + assert server.compare_image(3, "mesh/edges/color.jpeg") == True + + +def test_edges_with_edged_curve(server): + + server.call( + VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"], + [{"id": "123456789", "file_name": "edged_curve.vtp"}], + ) + assert server.compare_image(3, "mesh/edges/register_edged_curve.jpeg") == True + + server.call( + VtkMeshEdgesView.mesh_edges_prefix + + VtkMeshEdgesView.mesh_edges_schemas_dict["color"]["rpc"], + [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}], + ) + assert server.compare_image(3, "mesh/edges/edged_curve_color.jpeg") == True + + server.call( + VtkMeshEdgesView.mesh_edges_prefix + + VtkMeshEdgesView.mesh_edges_schemas_dict["visibility"]["rpc"], + [{"id": "123456789", "visibility": False}], + ) + assert server.compare_image(3, "mesh/edges/edged_curve_visibility.jpeg") == True diff --git a/src/tests/mesh/points/test_mesh_points_protocols.py b/src/tests/mesh/points/test_mesh_points_protocols.py index e527153..609f891 100644 --- a/src/tests/mesh/points/test_mesh_points_protocols.py +++ b/src/tests/mesh/points/test_mesh_points_protocols.py @@ -1,6 +1,7 @@ # Standard library imports # Third party imports +from opengeodeweb_viewer.rpc.mesh.mesh_protocols import VtkMeshView from opengeodeweb_viewer.rpc.mesh.points.mesh_points_protocols import VtkMeshPointsView # Local application imports @@ -41,3 +42,33 @@ def test_points_color(server): [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}], ) assert server.compare_image(3, "mesh/points/color.jpeg") == True + + +def test_points_with_point_set(server): + + server.call( + VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"], + [{"id": "123456789", "file_name": "points.vtp"}], + ) + assert server.compare_image(3, "mesh/points/register_point_set.jpeg") == True + + server.call( + VtkMeshPointsView.mesh_points_prefix + + VtkMeshPointsView.mesh_points_schemas_dict["size"]["rpc"], + [{"id": "123456789", "size": 10}], + ) + assert server.compare_image(3, "mesh/points/point_set_size.jpeg") == True + + server.call( + VtkMeshPointsView.mesh_points_prefix + + VtkMeshPointsView.mesh_points_schemas_dict["color"]["rpc"], + [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}], + ) + assert server.compare_image(3, "mesh/points/point_set_color.jpeg") == True + + server.call( + VtkMeshPointsView.mesh_points_prefix + + VtkMeshPointsView.mesh_points_schemas_dict["visibility"]["rpc"], + [{"id": "123456789", "visibility": False}], + ) + assert server.compare_image(3, "mesh/points/point_set_visibility.jpeg") == True diff --git a/src/tests/mesh/polygons/test_polygons_protocols.py b/src/tests/mesh/polygons/test_mesh_polygons_protocols.py similarity index 100% rename from src/tests/mesh/polygons/test_polygons_protocols.py rename to src/tests/mesh/polygons/test_mesh_polygons_protocols.py diff --git a/src/tests/mesh/polyhedra/test_polyhedra_protocols.py b/src/tests/mesh/polyhedra/test_mesh_polyhedra_protocols.py similarity index 100% rename from src/tests/mesh/polyhedra/test_polyhedra_protocols.py rename to src/tests/mesh/polyhedra/test_mesh_polyhedra_protocols.py diff --git a/src/tests/model/blocks/test_model_blocks_protocols.py b/src/tests/model/blocks/test_model_blocks_protocols.py index 457a215..f3682c1 100644 --- a/src/tests/model/blocks/test_model_blocks_protocols.py +++ b/src/tests/model/blocks/test_model_blocks_protocols.py @@ -1,7 +1,7 @@ # Standard library imports # Third party imports -from opengeodeweb_viewer.rpc.model.blocks.blocks_protocols import ( +from opengeodeweb_viewer.rpc.model.blocks.model_blocks_protocols import ( VtkModelBlocksView, ) diff --git a/src/tests/model/corners/test_model_corners_protocols.py b/src/tests/model/corners/test_model_corners_protocols.py index 14f27aa..5ced01f 100644 --- a/src/tests/model/corners/test_model_corners_protocols.py +++ b/src/tests/model/corners/test_model_corners_protocols.py @@ -1,7 +1,7 @@ # Standard library imports # Third party imports -from opengeodeweb_viewer.rpc.model.corners.corners_protocols import ( +from opengeodeweb_viewer.rpc.model.corners.model_corners_protocols import ( VtkModelCornersView, ) diff --git a/src/tests/model/edges/test_model_edges_protocols.py b/src/tests/model/edges/test_model_edges_protocols.py index a14ce1e..ea7876a 100644 --- a/src/tests/model/edges/test_model_edges_protocols.py +++ b/src/tests/model/edges/test_model_edges_protocols.py @@ -1,7 +1,7 @@ # Standard library imports # Third party imports -from opengeodeweb_viewer.rpc.model.edges.edges_protocols import ( +from opengeodeweb_viewer.rpc.model.edges.model_edges_protocols import ( VtkModelEdgesView, ) diff --git a/src/tests/model/lines/test_model_lines_protocols.py b/src/tests/model/lines/test_model_lines_protocols.py index 8f63830..39a26b9 100644 --- a/src/tests/model/lines/test_model_lines_protocols.py +++ b/src/tests/model/lines/test_model_lines_protocols.py @@ -1,7 +1,7 @@ # Standard library imports # Third party imports -from opengeodeweb_viewer.rpc.model.lines.lines_protocols import ( +from opengeodeweb_viewer.rpc.model.lines.model_lines_protocols import ( VtkModelLinesView, ) diff --git a/src/tests/model/points/test_model_points_protocols.py b/src/tests/model/points/test_model_points_protocols.py index 15ca7b5..231ab61 100644 --- a/src/tests/model/points/test_model_points_protocols.py +++ b/src/tests/model/points/test_model_points_protocols.py @@ -1,7 +1,7 @@ # Standard library imports # Third party imports -from opengeodeweb_viewer.rpc.model.points.points_protocols import ( +from opengeodeweb_viewer.rpc.model.points.model_points_protocols import ( VtkModelPointsView, ) diff --git a/src/tests/model/surfaces/test_model_surfaces_protocols.py b/src/tests/model/surfaces/test_model_surfaces_protocols.py index 309daa0..c8323c5 100644 --- a/src/tests/model/surfaces/test_model_surfaces_protocols.py +++ b/src/tests/model/surfaces/test_model_surfaces_protocols.py @@ -1,7 +1,7 @@ # Standard library imports # Third party imports -from opengeodeweb_viewer.rpc.model.surfaces.surfaces_protocols import ( +from opengeodeweb_viewer.rpc.model.surfaces.model_surfaces_protocols import ( VtkModelSurfacesView, )