Skip to content

Feat/get viewer object #107

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.

Sign up for GitHub

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 3 commits into from
Nov 28, 2024
Merged

Feat/get viewer object #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da54ee3
feat(routes): save_viewable return object_type
JulienChampagnol Nov 28, 2024
a363b8b
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWe…
JulienChampagnol Nov 28, 2024
d7c4b03
Apply prepare changes
JulienChampagnol Nov 28, 2024
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
4 changes: 2 additions & 2 deletions src/opengeodeweb_back/geode_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ def create_crs(
)


def is_model(geode_object: str):
return geode_object_value(geode_object)["is_model"]
def get_object_type(geode_object: str):
return geode_object_value(geode_object)["object_type"]


def is_3D(geode_object: str):
Expand Down
50 changes: 25 additions & 25 deletions src/opengeodeweb_back/geode_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def geode_objects_dict():
"convert": og_gs.convert_brep_coordinate_reference_system,
"create": og.create_brep_coordinate_system,
},
"is_model": True,
"object_type": "model",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_brep,
Expand All @@ -50,7 +50,7 @@ def geode_objects_dict():
"convert": og_gs.convert_section_coordinate_reference_system,
"create": og.create_section_coordinate_system,
},
"is_model": True,
"object_type": "model",
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_cross_section,
Expand All @@ -71,7 +71,7 @@ def geode_objects_dict():
"convert": og_gs.convert_edged_curve_coordinate_reference_system2D,
"create": og.create_edged_curve_coordinate_system2D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_edged_curve2D,
Expand All @@ -92,7 +92,7 @@ def geode_objects_dict():
"convert": og_gs.convert_edged_curve_coordinate_reference_system3D,
"create": og.create_edged_curve_coordinate_system3D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_edged_curve3D,
Expand All @@ -108,7 +108,7 @@ def geode_objects_dict():
"is_saveable": og.is_graph_saveable,
"save": og.save_graph,
"builder": og.GraphBuilder.create,
"is_model": False,
"object_type": "mesh",
"is_3D": False,
"is_viewable": True,
},
Expand All @@ -127,7 +127,7 @@ def geode_objects_dict():
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
"create": og.create_solid_mesh_coordinate_system3D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_hybrid_solid3D,
Expand All @@ -149,7 +149,7 @@ def geode_objects_dict():
"convert": og_gs.convert_section_coordinate_reference_system,
"create": og.create_section_coordinate_system,
},
"is_model": True,
"object_type": "model",
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_implicit_cross_section,
Expand All @@ -171,7 +171,7 @@ def geode_objects_dict():
"convert": og_gs.convert_brep_coordinate_reference_system,
"create": og.create_brep_coordinate_system,
},
"is_model": True,
"object_type": "model",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_implicit_structural_model,
Expand All @@ -186,7 +186,7 @@ def geode_objects_dict():
"load": og.load_light_regular_grid2D,
"is_saveable": og.is_light_regular_grid_saveable2D,
"save": og.save_light_regular_grid2D,
"is_model": False,
"object_type": "mesh",
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_light_regular_grid2D,
Expand All @@ -200,7 +200,7 @@ def geode_objects_dict():
"load": og.load_light_regular_grid3D,
"is_saveable": og.is_light_regular_grid_saveable3D,
"save": og.save_light_regular_grid3D,
"is_model": False,
"object_type": "mesh",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_light_regular_grid3D,
Expand All @@ -220,7 +220,7 @@ def geode_objects_dict():
"convert": og_gs.convert_point_set_coordinate_reference_system2D,
"create": og.create_point_set_coordinate_system2D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_point_set2D,
Expand All @@ -241,7 +241,7 @@ def geode_objects_dict():
"convert": og_gs.convert_point_set_coordinate_reference_system3D,
"create": og.create_point_set_coordinate_system3D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_point_set3D,
Expand All @@ -262,7 +262,7 @@ def geode_objects_dict():
"convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
"create": og.create_surface_mesh_coordinate_system2D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_polygonal_surface2D,
Expand All @@ -283,7 +283,7 @@ def geode_objects_dict():
"convert": og_gs.convert_surface_mesh_coordinate_reference_system3D,
"create": og.create_surface_mesh_coordinate_system3D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_polygonal_surface3D,
Expand All @@ -304,7 +304,7 @@ def geode_objects_dict():
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
"create": og.create_solid_mesh_coordinate_system3D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_polyhedral_solid3D,
Expand All @@ -319,7 +319,7 @@ def geode_objects_dict():
"load": og.load_raster_image2D,
"is_saveable": og.is_raster_image_saveable2D,
"save": og.save_raster_image2D,
"is_model": False,
"object_type": "mesh",
"is_3D": False,
"is_viewable": False,
"save_viewable": g_v.save_viewable_raster_image2D,
Expand All @@ -333,7 +333,7 @@ def geode_objects_dict():
"load": og.load_raster_image3D,
"is_saveable": og.is_raster_image_saveable3D,
"save": og.save_raster_image3D,
"is_model": False,
"object_type": "mesh",
"is_3D": False,
"is_viewable": False,
"save_viewable": g_v.save_viewable_raster_image3D,
Expand All @@ -353,7 +353,7 @@ def geode_objects_dict():
"convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
"create": og.create_surface_mesh_coordinate_system2D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_regular_grid2D,
Expand All @@ -373,7 +373,7 @@ def geode_objects_dict():
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
"create": og.create_surface_mesh_coordinate_system3D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_regular_grid3D,
Expand All @@ -393,7 +393,7 @@ def geode_objects_dict():
"convert": og_gs.convert_section_coordinate_reference_system,
"create": og.create_section_coordinate_system,
},
"is_model": True,
"object_type": "model",
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_section,
Expand All @@ -415,7 +415,7 @@ def geode_objects_dict():
"convert": og_gs.convert_brep_coordinate_reference_system,
"create": og.create_brep_coordinate_system,
},
"is_model": True,
"object_type": "model",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_structural_model,
Expand All @@ -436,7 +436,7 @@ def geode_objects_dict():
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
"create": og.create_solid_mesh_coordinate_system3D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_tetrahedral_solid3D,
Expand All @@ -457,7 +457,7 @@ def geode_objects_dict():
"convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
"create": og.create_surface_mesh_coordinate_system2D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_triangulated_surface2D,
Expand All @@ -478,7 +478,7 @@ def geode_objects_dict():
"convert": og_gs.convert_surface_mesh_coordinate_reference_system3D,
"create": og.create_surface_mesh_coordinate_system3D,
},
"is_model": False,
"object_type": "mesh",
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_triangulated_surface3D,
Expand All @@ -494,7 +494,7 @@ def geode_objects_dict():
"is_saveable": og.is_vertex_set_saveable,
"save": og.save_vertex_set,
"builder": og.VertexSetBuilder.create,
"is_model": False,
"object_type": "mesh",
"is_3D": False,
"is_viewable": False,
},
Expand Down
4 changes: 4 additions & 0 deletions src/opengeodeweb_back/routes/blueprint_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,9 @@ def save_viewable_file():
DATA_FOLDER_PATH,
generated_id + "." + native_extension,
)
object_type = geode_functions.get_object_type(
flask.request.json["input_geode_object"]
)

native_file_name = os.path.basename(absolute_native_file_path)
viewable_file_name = os.path.basename(saved_viewable_file_path)
Expand All @@ -269,6 +272,7 @@ def save_viewable_file():
"native_file_name": native_file_name,
"viewable_file_name": viewable_file_name,
"id": generated_id,
"object_type": object_type,
},
200,
)
Expand Down
7 changes: 4 additions & 3 deletions tests/test_geode_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,11 @@ def test_load():
os.remove(saved_file)


def test_is_model():
def test_get_object_type():
for geode_object, value in geode_objects.geode_objects_dict().items():
is_model = geode_functions.is_model(geode_object)
assert type(is_model) is bool
object_type = geode_functions.get_object_type(geode_object)
assert type(object_type) is str
assert object_type in ["model", "mesh"]


def test_is_3D():
Expand Down
3 changes: 3 additions & 0 deletions tests/test_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ def get_full_data():
assert type(viewable_file_name) is str
id = response.json["id"]
assert type(id) is str
object_type = response.json["object_type"]
assert type(object_type) is str
assert object_type in ["model", "mesh"]

# Test all params
test_utils.test_route_wrong_params(client, route, get_full_data)
Expand Down