diff --git a/CHANGELOG.md b/CHANGELOG.md index 15f9cf0..6a42fc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # CHANGELOG +## v1.1.2-rc.1 (2025-01-03) + +### Bug Fixes + +- **colors**: R/g/b between 0 & 1 + ([`2e68158`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/2e68158e19c8b8023b34c49f3fa5a482164c3cf5)) + + ## v1.1.1 (2024-12-20) diff --git a/pyproject.toml b/pyproject.toml index cb81c6b..5ba2eff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "OpenGeodeWeb-Viewer" -version = "1.1.1" +version = "1.1.2-rc.1" dynamic = ["dependencies"] authors = [ { name="Geode-solutions", email="team-web@geode-solutions.com" }, diff --git a/src/opengeodeweb_viewer/rpc/mesh/edges/edges_protocols.py b/src/opengeodeweb_viewer/rpc/mesh/edges/edges_protocols.py index 09e8e12..7c9c772 100644 --- a/src/opengeodeweb_viewer/rpc/mesh/edges/edges_protocols.py +++ b/src/opengeodeweb_viewer/rpc/mesh/edges/edges_protocols.py @@ -28,7 +28,7 @@ def setMeshEdgesColor(self, params): print(self.mesh_edges_prefix + self.mesh_edges_schemas_dict["color"]["rpc"], f"{params=}", flush=True) validate_schema(params, self.mesh_edges_schemas_dict["color"]) id = params["id"] - red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"] + red, green, blue = params["color"]["r"]/255, params["color"]["g"]/255, params["color"]["b"]/255 self.SetEdgesColor(id, [red, green, blue]) @exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["size"]["rpc"]) diff --git a/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py b/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py index e01eaf2..3614143 100644 --- a/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py +++ b/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py @@ -59,7 +59,7 @@ def setMeshColor(self, params): print(self.mesh_prefix + self.mesh_schemas_dict["color"]["rpc"], f"{params=}", flush=True) validate_schema(params, self.mesh_schemas_dict["color"]) id = params["id"] - red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"] + red, green, blue = params["color"]["r"]/255, params["color"]["g"]/255, params["color"]["b"]/255 self.SetColor(id, red, green, blue) def setMeshVertexAttribute(self, id, name): diff --git a/src/opengeodeweb_viewer/rpc/mesh/points/points_protocols.py b/src/opengeodeweb_viewer/rpc/mesh/points/points_protocols.py index e2ec634..5039c33 100644 --- a/src/opengeodeweb_viewer/rpc/mesh/points/points_protocols.py +++ b/src/opengeodeweb_viewer/rpc/mesh/points/points_protocols.py @@ -28,9 +28,7 @@ def setMeshPointsColor(self, params): print(self.mesh_points_prefix + self.mesh_points_schemas_dict["color"]["rpc"], f"{params=}", flush=True) validate_schema(params, self.mesh_points_schemas_dict["color"]) id = str(params["id"]) - red = params["color"]["r"] - green = params["color"]["g"] - blue = params["color"]["b"] + red, green, blue = params["color"]["r"]/255, params["color"]["g"]/255, params["color"]["b"]/255 self.SetPointsColor(id, [red, green, blue]) @exportRpc(mesh_points_prefix + mesh_points_schemas_dict["size"]["rpc"]) diff --git a/src/opengeodeweb_viewer/rpc/mesh/polygons/polygons_protocols.py b/src/opengeodeweb_viewer/rpc/mesh/polygons/polygons_protocols.py index d274e96..d6ffc1e 100644 --- a/src/opengeodeweb_viewer/rpc/mesh/polygons/polygons_protocols.py +++ b/src/opengeodeweb_viewer/rpc/mesh/polygons/polygons_protocols.py @@ -28,7 +28,7 @@ def setMeshPolygonsColor(self, params): print(self.mesh_polygons_prefix + self.mesh_polygons_schemas_dict["color"]["rpc"], f"{params=}", flush=True) validate_schema(params, self.mesh_polygons_schemas_dict["color"]) id = params["id"] - red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"] + red, green, blue = params["color"]["r"]/255, params["color"]["g"]/255, params["color"]["b"]/255 self.SetPolygonsColor(id, [red, green, blue]) @exportRpc(mesh_polygons_prefix + mesh_polygons_schemas_dict["vertex_attribute"]["rpc"]) diff --git a/src/tests/data/images/mesh/color.jpeg b/src/tests/data/images/mesh/color.jpeg index f2912cd..2344c6e 100644 Binary files a/src/tests/data/images/mesh/color.jpeg and b/src/tests/data/images/mesh/color.jpeg differ diff --git a/src/tests/data/images/mesh/polygons/color.jpeg b/src/tests/data/images/mesh/polygons/color.jpeg index e77373b..ce8c332 100644 Binary files a/src/tests/data/images/mesh/polygons/color.jpeg and b/src/tests/data/images/mesh/polygons/color.jpeg differ