diff --git a/CHANGELOG.md b/CHANGELOG.md index 43df70b..e9af45f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # CHANGELOG +## v1.2.1-rc.1 (2025-01-16) + +### Bug Fixes + +- **dfp**: Fix broken arg + ([`08b22db`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/08b22dbfd56ea861dd57abcce3fdd9959dc597b7)) + + ## v1.2.0 (2025-01-14) diff --git a/pyproject.toml b/pyproject.toml index 3309a2d..96c1c6c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "OpenGeodeWeb-Viewer" -version = "1.2.0" +version = "1.2.1-rc.1" dynamic = ["dependencies"] authors = [ { name="Geode-solutions", email="team-web@geode-solutions.com" }, diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py index 70ca9ac..a9d10c4 100644 --- a/src/opengeodeweb_viewer/vtkw_server.py +++ b/src/opengeodeweb_viewer/vtkw_server.py @@ -30,17 +30,6 @@ 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): @@ -63,10 +52,17 @@ def initialize(self): self.setSharedObject("db", dict()) # Custom API - print("Nb protocols", len(_Server.custom_protocols)) - for protocol in _Server.custom_protocols: - self.registerVtkWebProtocol(protocol) - + 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)) + # tell the C++ web app to use no encoding. # ParaViewWebPublishImageDelivery must be set to decode=False to match. self.getApplication().SetImageEncoding(0) @@ -102,7 +98,7 @@ def initialize(self): # ============================================================================= -def run_server(): +def run_server(Server=_Server): PYTHON_ENV = os.environ.get("PYTHON_ENV", default="prod").strip().lower() if PYTHON_ENV == "prod": prod_config() @@ -112,7 +108,7 @@ def run_server(): parser = argparse.ArgumentParser(description="Vtk server") server.add_arguments(parser) - _Server.add_arguments(parser) + Server.add_arguments(parser) args = parser.parse_args() if not "host" in args: @@ -123,8 +119,8 @@ def run_server(): os.environ["DATA_FOLDER_PATH"] = args.data_folder_path print(f"{args=}", flush=True) - _Server.configure(args) - server.start_webserver(options=args, protocol=_Server) + Server.configure(args) + server.start_webserver(options=args, protocol=Server) if __name__ == "__main__":