diff --git a/package.json b/package.json index 94811aa..cd14927 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@geode/opengeodeweb-viewer", "scripts": { - "json": "npm explore @geode/opengeodeweb-back -- npm run json opengeodeweb_viewer rpc rpc .", + "json": "node ./node_modules/@geode/opengeodeweb-back/generate_schemas.js opengeodeweb_viewer rpc rpc .", "test": "npm run json && pytest" }, "dependencies": { diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py index 5592922..70ca9ac 100644 --- a/src/opengeodeweb_viewer/vtkw_server.py +++ b/src/opengeodeweb_viewer/vtkw_server.py @@ -1,7 +1,6 @@ # Standard library imports import argparse import os -import sys # Third party imports import vtk @@ -31,6 +30,17 @@ class _Server(vtk_wslink.ServerProtocol): authKey = "wslink-secret" view = None debug = False + custom_protocols = [] + mesh_protocols = VtkMeshView() + model_protocols = VtkModelView() + custom_protocols.append(VtkView()) + custom_protocols.append(VtkViewerView()) + custom_protocols.append(mesh_protocols) + custom_protocols.append(VtkMeshPointsView()) + custom_protocols.append(VtkMeshEdgesView()) + custom_protocols.append(VtkMeshPolygonsView()) + custom_protocols.append(model_protocols) + custom_protocols.append(VtkGenericView(mesh_protocols, model_protocols)) @staticmethod def add_arguments(parser): @@ -53,16 +63,9 @@ def initialize(self): self.setSharedObject("db", dict()) # Custom API - mesh_protocols = VtkMeshView() - model_protocols = VtkModelView() - self.registerVtkWebProtocol(VtkView()) - self.registerVtkWebProtocol(VtkViewerView()) - self.registerVtkWebProtocol(mesh_protocols) - self.registerVtkWebProtocol(VtkMeshPointsView()) - self.registerVtkWebProtocol(VtkMeshEdgesView()) - self.registerVtkWebProtocol(VtkMeshPolygonsView()) - self.registerVtkWebProtocol(model_protocols) - self.registerVtkWebProtocol(VtkGenericView(mesh_protocols, model_protocols)) + print("Nb protocols", len(_Server.custom_protocols)) + for protocol in _Server.custom_protocols: + self.registerVtkWebProtocol(protocol) # tell the C++ web app to use no encoding. # ParaViewWebPublishImageDelivery must be set to decode=False to match.