Merge pull request #45 from Geode-solutions/next

No commit message

Author: JulienChampagnol

CHANGELOG.md

@@ -1,6 +1,14 @@
 # CHANGELOG
 
 
+## v1.2.0-rc.1 (2025-01-14)
+
+### Features
+
+- **protocols**: Global custom_protocols to be able to add manually
+  ([`b4980d2`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/b4980d2fae2f547362a40c8f2b7ebe9691fff4a2))
+
+
 ## v1.1.3 (2025-01-14)
 
 

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": {

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.1.3"
+version = "1.2.0-rc.1"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="[email protected]" },

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.