Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]" },
Expand Down
34 changes: 15 additions & 19 deletions src/opengeodeweb_viewer/vtkw_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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)
Expand Down Expand Up @@ -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()
Expand All @@ -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:
Expand All @@ -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__":
Expand Down
Loading