Skip to content

feat(model): new rpcs #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 19, 2025
Merged
Show file tree
Hide file tree
Changes from 10 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
10 changes: 10 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ where = ["src"]
"opengeodeweb_viewer.rpc.mesh.polygons.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.mesh.polyhedrons.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.corners.points.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.lines.points.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.lines.edges.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.surfaces.points.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.surfaces.edges.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.surfaces.polygons.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.blocks.points.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.blocks.edges.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.blocks.polygons.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.model.blocks.polyhedrons.schemas" = ["*.json"]
"opengeodeweb_viewer.rpc.viewer.schemas" = ["*.json"]

[tool.semantic_release]
Expand Down
13 changes: 13 additions & 0 deletions src/opengeodeweb_viewer/object/object_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,19 @@ def SetPointsColor(self, id, red, green, blue):
actor.GetProperty().SetVertexColor([red / 255, green / 255, blue / 255])
self.render()

def SetBlocksVisibility(self, id, block_ids, visibility):
mapper = self.get_object(id)["mapper"]
for block_id in block_ids:
mapper.SetBlockVisibility(block_id, visibility)
print(f"{block_id=}{mapper.GetBlockVisibility(block_id)=}", flush=True)
self.render()

# def SetBlocksPointsSize(self, id, block_ids, size):
# actor = self.get_object(id)["actor"]
# for block_id in block_ids:
# block_actor = actor.GetChildren().GetItemAsObject(block_id)
# block_actor.GetProperty().SetPointSize(size)

def clearColors(self, id):
db = self.get_object(id)
mapper = db["mapper"]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Standard library imports
import os

# Third party imports
from wslink import register as exportRpc

# Local application imports
from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
from opengeodeweb_viewer.rpc.model.model_protocols import VtkModelView


class VtkModelBlocksPolyhedronsView(VtkModelView):
model_blocks_polyhedrons_prefix = "opengeodeweb_viewer.model.blocks.polyhedrons."
model_blocks_polyhedrons_schemas_dict = get_schemas_dict(
os.path.join(os.path.dirname(__file__), "schemas")
)

def __init__(self):
super().__init__()

@exportRpc(
model_blocks_polyhedrons_prefix
+ model_blocks_polyhedrons_schemas_dict["visibility"]["rpc"]
)
def setModelBlocksPolyhedronsVisibility(self, params):
print(
self.model_blocks_polyhedrons_prefix
+ self.model_blocks_polyhedrons_schemas_dict["visibility"]["rpc"],
f"{params=}",
flush=True,
)
validate_schema(
params, self.model_blocks_polyhedrons_schemas_dict["visibility"]
)
id, block_ids, visibility = (
params["id"],
params["block_ids"],
params["visibility"],
)
self.SetBlocksVisibility(id, block_ids, visibility)
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"rpc": "color",
"type": "object",
"properties": {
"id": {
"type": "string",
"minLength": 1
},
"block_ids": {
"type": "array",
"items": {
"type": "integer",
"minLength": 1
},
"minItems": 1
},
"color": {
"type": "object",
"properties": {
"r": {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"g": {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"b": {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"a": {
"type": "number",
"minimum": 0,
"maximum": 1,
"default": 1
}
},
"required": [
"r",
"g",
"b"
],
"additionalProperties": false
}
},
"required": [
"id",
"block_ids",
"color"
],
"additionalProperties": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"rpc": "visibility",
"type": "object",
"properties": {
"id": {
"type": "string",
"minLength": 1
},
"block_ids": {
"type": "array",
"items": {
"type": "integer",
"minLength": 1
},
"minItems": 1
},
"visibility": {
"type": "boolean"
}
},
"required": [
"id",
"block_ids",
"visibility"
],
"additionalProperties": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Standard library imports
import os

# Third party imports
from wslink import register as exportRpc

# Local application imports
from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
from opengeodeweb_viewer.rpc.model.model_protocols import VtkModelView


class VtkModelCornersPointsView(VtkModelView):
model_corners_points_prefix = "opengeodeweb_viewer.model.corners.points."
model_corners_points_schemas_dict = get_schemas_dict(
os.path.join(os.path.dirname(__file__), "schemas")
)

def __init__(self):
super().__init__()

@exportRpc(
model_corners_points_prefix
+ model_corners_points_schemas_dict["visibility"]["rpc"]
)
def setCornersPointsVisibility(self, params):
print(
self.model_corners_points_prefix
+ self.model_corners_points_schemas_dict["visibility"]["rpc"],
f"{params=}",
flush=True,
)
validate_schema(params, self.model_corners_points_schemas_dict["visibility"])
id, block_ids, visibility = (
params["id"],
params["block_ids"],
params["visibility"],
)
self.SetBlocksVisibility(id, block_ids, visibility)
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"rpc": "color",
"type": "object",
"properties": {
"id": {
"type": "string",
"minLength": 1
},
"block_idss": {
"type": "array",
"items": {
"type": "integer",
"minLength": 1
},
"minItems": 1
},
"color": {
"type": "object",
"properties": {
"r": {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"g": {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"b": {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"a": {
"type": "number",
"minimum": 0,
"maximum": 1,
"default": 1
}
},
"required": [
"r",
"g",
"b"
],
"additionalProperties": false
}
},
"required": [
"id",
"block_idss",
"color"
],
"additionalProperties": false
}
27 changes: 27 additions & 0 deletions src/opengeodeweb_viewer/rpc/model/corners/points/schemas/size.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"rpc": "size",
"type": "object",
"properties": {
"id": {
"type": "string",
"minLength": 1
},
"block_ids": {
"type": "array",
"items": {
"type": "integer",
"minLength": 1
},
"minItems": 1
},
"size": {
"type": "integer"
}
},
"required": [
"id",
"block_ids",
"size"
],
"additionalProperties": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"rpc": "visibility",
"type": "object",
"properties": {
"id": {
"type": "string",
"minLength": 1
},
"block_ids": {
"type": "array",
"items": {
"type": "integer",
"minLength": 1
},
"minItems": 1
},
"visibility": {
"type": "boolean"
}
},
"required": [
"id",
"block_ids",
"visibility"
],
"additionalProperties": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Standard library imports
import os

# Third party imports
from wslink import register as exportRpc

# Local application imports
from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
from opengeodeweb_viewer.rpc.model.model_protocols import VtkModelView


class VtkModelLinesEdgesView(VtkModelView):
model_lines_edges_prefix = "opengeodeweb_viewer.model.lines.edges."
model_lines_edges_schemas_dict = get_schemas_dict(
os.path.join(os.path.dirname(__file__), "schemas")
)

def __init__(self):
super().__init__()

@exportRpc(
model_lines_edges_prefix + model_lines_edges_schemas_dict["visibility"]["rpc"]
)
def setModelSurfacesPolygonsVisibility(self, params):
print(
self.model_lines_edges_prefix
+ self.model_lines_edges_schemas_dict["visibility"]["rpc"],
f"{params=}",
flush=True,
)
validate_schema(params, self.model_lines_edges_schemas_dict["visibility"])
id, block_ids, visibility = (
params["id"],
params["block_ids"],
params["visibility"],
)
self.SetBlocksVisibility(id, block_ids, visibility)
Loading
Loading