Skip to content

Commit d0f03a7

Browse files
JulienChampagnolJulienChampagnol
authored
Merge pull request #51 from Geode-solutions/revert-49-feat/is_loadable
Revert "Feat/is loadable"
2 parents aa060f5 + 2aab775 commit d0f03a7

File tree

4 files changed

+71
-114
lines changed

4 files changed

+71
-114
lines changed

‎requirements.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ colorama==0.4.6
1818
# via click
1919
flask[async]==3.0.0
2020
# via -r requirements.in
21-
geode-background==7.4.9
21+
geode-background==7.4.8
2222
# via
2323
# geode-explicit
2424
# geode-implicit
2525
# geode-simplex
26-
geode-common==30.0.5
26+
geode-common==30.0.4
2727
# via
2828
# -r requirements.in
2929
# geode-background
@@ -32,24 +32,24 @@ geode-common==30.0.5
3232
# geode-numerics
3333
# geode-simplex
3434
# geode-viewables
35-
geode-conversion==5.1.7
35+
geode-conversion==5.1.6
3636
# via
3737
# geode-explicit
3838
# geode-implicit
39-
geode-explicit==4.3.10
39+
geode-explicit==4.3.9
4040
# via
4141
# -r requirements.in
4242
# geode-implicit
43-
geode-implicit==2.5.4
43+
geode-implicit==2.5.3
4444
# via -r requirements.in
45-
geode-numerics==4.2.3
45+
geode-numerics==4.2.2
4646
# via
4747
# -r requirements.in
4848
# geode-implicit
4949
# geode-simplex
50-
geode-simplex==6.3.0
50+
geode-simplex==6.2.9
5151
# via -r requirements.in
52-
geode-viewables==2.1.8
52+
geode-viewables==2.1.7
5353
# via -r requirements.in
5454
importlib-metadata==7.0.0
5555
# via flask
@@ -65,7 +65,7 @@ markupsafe==2.1.3
6565
# via
6666
# jinja2
6767
# werkzeug
68-
opengeode-core==14.10.3
68+
opengeode-core==14.10.2
6969
# via
7070
# -r requirements.in
7171
# geode-background
@@ -80,22 +80,22 @@ opengeode-core==14.10.3
8080
# opengeode-geosciencesio
8181
# opengeode-inspector
8282
# opengeode-io
83-
opengeode-geosciences==7.3.3
83+
opengeode-geosciences==7.3.2
8484
# via
8585
# -r requirements.in
8686
# geode-implicit
8787
# geode-viewables
8888
# opengeode-geosciencesio
89-
opengeode-geosciencesio==4.5.5
89+
opengeode-geosciencesio==4.5.4
9090
# via
9191
# -r requirements.in
9292
# geode-implicit
93-
opengeode-inspector==4.0.5
93+
opengeode-inspector==4.0.4
9494
# via
9595
# -r requirements.in
9696
# geode-explicit
9797
# geode-implicit
98-
opengeode-io==6.2.5
98+
opengeode-io==6.2.4
9999
# via
100100
# -r requirements.in
101101
# geode-implicit

‎src/opengeodeweb_back/geode_functions.py‎

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ def missing_files(geode_object: str, file_absolute_path: str):
3434
return geode_object_value(geode_object)["missing_files"](file_absolute_path)
3535

3636

37-
def is_loadable(geode_object: str, file_absolute_path: str):
38-
return geode_object_value(geode_object)["is_loadable"](file_absolute_path)
39-
40-
4137
def load(geode_object: str, file_absolute_path: str):
4238
return geode_object_value(geode_object)["load"](file_absolute_path)
4339

@@ -135,28 +131,23 @@ def has_creator(geode_object: str, extension: str):
135131
return input_factory(geode_object).has_creator(extension)
136132

137133

138-
def list_geode_objects(
139-
file_absolute_path: str,
140-
key: str = None,
141-
):
142-
return_dict = {}
143-
file_extension = extension_from_filename(os.path.basename(file_absolute_path))
144-
134+
def list_geode_objects(extension: str, key: str = None):
135+
geode_objects_list = []
145136
for geode_object, value in geode_objects_dict().items():
146-
if has_creator(geode_object, file_extension):
147-
file_is_loadable = is_loadable(geode_object, file_absolute_path)
148-
if key != None:
149-
if key in value:
150-
if type(value[key]) == bool:
151-
if value[key] == True:
152-
return_dict[geode_object] = {
153-
"is_loadable": file_is_loadable
154-
}
155-
else:
156-
return_dict[geode_object] = {"is_loadable": file_is_loadable}
157-
else:
158-
return_dict[geode_object] = {"is_loadable": file_is_loadable}
159-
return return_dict
137+
if key != None:
138+
if key in value:
139+
if type(value[key]) == bool:
140+
if value[key] == True:
141+
if has_creator(geode_object, extension):
142+
geode_objects_list.append(geode_object)
143+
elif has_creator(geode_object, extension):
144+
geode_objects_list.append(geode_object)
145+
else:
146+
if has_creator(geode_object, extension):
147+
geode_objects_list.append(geode_object)
148+
149+
geode_objects_list.sort()
150+
return geode_objects_list
160151

161152

162153
def geode_objects_output_extensions(geode_object: str, data):

‎src/opengeodeweb_back/geode_objects.py‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ def geode_objects_dict():
1212
"input_factory": og.BRepInputFactory,
1313
"output_factory": og.BRepOutputFactory,
1414
"missing_files": og.check_brep_missing_files,
15-
"is_loadable": og.is_brep_loadable,
1615
"load": og.load_brep,
1716
"is_saveable": og.is_brep_saveable,
1817
"save": og.save_brep,
@@ -33,7 +32,6 @@ def geode_objects_dict():
3332
"input_factory": og_gs.CrossSectionInputFactory,
3433
"output_factory": og_gs.CrossSectionOutputFactory,
3534
"missing_files": og_gs.check_cross_section_missing_files,
36-
"is_loadable": og_gs.is_cross_section_loadable,
3735
"load": og_gs.load_cross_section,
3836
"is_saveable": og_gs.is_cross_section_saveable,
3937
"save": og_gs.save_cross_section,
@@ -53,7 +51,6 @@ def geode_objects_dict():
5351
"input_factory": og.EdgedCurveInputFactory2D,
5452
"output_factory": og.EdgedCurveOutputFactory2D,
5553
"missing_files": og.check_edged_curve_missing_files2D,
56-
"is_loadable": og.is_edged_curve_loadable2D,
5754
"load": og.load_edged_curve2D,
5855
"is_saveable": og.is_edged_curve_saveable2D,
5956
"save": og.save_edged_curve2D,
@@ -73,7 +70,6 @@ def geode_objects_dict():
7370
"input_factory": og.EdgedCurveInputFactory3D,
7471
"output_factory": og.EdgedCurveOutputFactory3D,
7572
"missing_files": og.check_edged_curve_missing_files3D,
76-
"is_loadable": og.is_edged_curve_loadable3D,
7773
"load": og.load_edged_curve3D,
7874
"is_saveable": og.is_edged_curve_saveable3D,
7975
"save": og.save_edged_curve3D,
@@ -93,7 +89,6 @@ def geode_objects_dict():
9389
"input_factory": og.GraphInputFactory,
9490
"output_factory": og.GraphOutputFactory,
9591
"missing_files": og.check_graph_missing_files,
96-
"is_loadable": og.is_graph_loadable,
9792
"load": og.load_graph,
9893
"is_saveable": og.is_graph_saveable,
9994
"save": og.save_graph,
@@ -106,7 +101,6 @@ def geode_objects_dict():
106101
"input_factory": og.HybridSolidInputFactory3D,
107102
"output_factory": og.HybridSolidOutputFactory3D,
108103
"missing_files": og.check_hybrid_solid_missing_files3D,
109-
"is_loadable": og.is_hybrid_solid_loadable3D,
110104
"load": og.load_hybrid_solid3D,
111105
"is_saveable": og.is_hybrid_solid_saveable3D,
112106
"save": og.save_hybrid_solid3D,
@@ -126,7 +120,6 @@ def geode_objects_dict():
126120
"input_factory": og.PointSetInputFactory2D,
127121
"output_factory": og.PointSetOutputFactory2D,
128122
"missing_files": og.check_point_set_missing_files2D,
129-
"is_loadable": og.is_point_set_loadable2D,
130123
"load": og.load_point_set2D,
131124
"is_saveable": og.is_point_set_saveable2D,
132125
"save": og.save_point_set2D,
@@ -146,7 +139,6 @@ def geode_objects_dict():
146139
"input_factory": og.PointSetInputFactory3D,
147140
"output_factory": og.PointSetOutputFactory3D,
148141
"missing_files": og.check_point_set_missing_files3D,
149-
"is_loadable": og.is_point_set_loadable3D,
150142
"load": og.load_point_set3D,
151143
"is_saveable": og.is_point_set_saveable3D,
152144
"save": og.save_point_set3D,
@@ -166,7 +158,6 @@ def geode_objects_dict():
166158
"input_factory": og.PolygonalSurfaceInputFactory2D,
167159
"output_factory": og.PolygonalSurfaceOutputFactory2D,
168160
"missing_files": og.check_polygonal_surface_missing_files2D,
169-
"is_loadable": og.is_polygonal_surface_loadable2D,
170161
"load": og.load_polygonal_surface2D,
171162
"is_saveable": og.is_polygonal_surface_saveable2D,
172163
"save": og.save_polygonal_surface2D,
@@ -186,7 +177,6 @@ def geode_objects_dict():
186177
"input_factory": og.PolygonalSurfaceInputFactory3D,
187178
"output_factory": og.PolygonalSurfaceOutputFactory3D,
188179
"missing_files": og.check_polygonal_surface_missing_files3D,
189-
"is_loadable": og.is_polygonal_surface_loadable3D,
190180
"load": og.load_polygonal_surface3D,
191181
"is_saveable": og.is_polygonal_surface_saveable3D,
192182
"save": og.save_polygonal_surface3D,
@@ -206,7 +196,6 @@ def geode_objects_dict():
206196
"input_factory": og.PolyhedralSolidInputFactory3D,
207197
"output_factory": og.PolyhedralSolidOutputFactory3D,
208198
"missing_files": og.check_polyhedral_solid_missing_files3D,
209-
"is_loadable": og.is_polyhedral_solid_loadable3D,
210199
"load": og.load_polyhedral_solid3D,
211200
"is_saveable": og.is_polyhedral_solid_saveable3D,
212201
"save": og.save_polyhedral_solid3D,
@@ -226,7 +215,6 @@ def geode_objects_dict():
226215
"input_factory": og.RasterImageInputFactory2D,
227216
"output_factory": og.RasterImageOutputFactory2D,
228217
"missing_files": og.check_raster_image_missing_files2D,
229-
"is_loadable": og.is_raster_image_loadable2D,
230218
"load": og.load_raster_image2D,
231219
"is_saveable": og.is_raster_image_saveable2D,
232220
"save": og.save_raster_image2D,
@@ -239,7 +227,6 @@ def geode_objects_dict():
239227
"input_factory": og.RasterImageInputFactory3D,
240228
"output_factory": og.RasterImageOutputFactory3D,
241229
"missing_files": og.check_raster_image_missing_files3D,
242-
"is_loadable": og.is_raster_image_loadable3D,
243230
"load": og.load_raster_image3D,
244231
"is_saveable": og.is_raster_image_saveable3D,
245232
"save": og.save_raster_image3D,
@@ -252,7 +239,6 @@ def geode_objects_dict():
252239
"input_factory": og.RegularGridInputFactory2D,
253240
"output_factory": og.RegularGridOutputFactory2D,
254241
"missing_files": og.check_regular_grid_missing_files2D,
255-
"is_loadable": og.is_regular_grid_loadable2D,
256242
"load": og.load_regular_grid2D,
257243
"is_saveable": og.is_regular_grid_saveable2D,
258244
"save": og.save_regular_grid2D,
@@ -271,7 +257,6 @@ def geode_objects_dict():
271257
"input_factory": og.RegularGridInputFactory3D,
272258
"output_factory": og.RegularGridOutputFactory3D,
273259
"missing_files": og.check_regular_grid_missing_files3D,
274-
"is_loadable": og.is_regular_grid_loadable3D,
275260
"load": og.load_regular_grid3D,
276261
"is_saveable": og.is_regular_grid_saveable3D,
277262
"save": og.save_regular_grid3D,
@@ -290,7 +275,6 @@ def geode_objects_dict():
290275
"input_factory": og.SectionInputFactory,
291276
"output_factory": og.SectionOutputFactory,
292277
"missing_files": og.check_section_missing_files,
293-
"is_loadable": og.is_section_loadable,
294278
"load": og.load_section,
295279
"is_saveable": og.is_section_saveable,
296280
"save": og.save_section,
@@ -311,7 +295,6 @@ def geode_objects_dict():
311295
"input_factory": og_gs.StructuralModelInputFactory,
312296
"output_factory": og_gs.StructuralModelOutputFactory,
313297
"missing_files": og_gs.check_structural_model_missing_files,
314-
"is_loadable": og_gs.is_structural_model_loadable,
315298
"load": og_gs.load_structural_model,
316299
"is_saveable": og_gs.is_structural_model_saveable,
317300
"save": og_gs.save_structural_model,
@@ -331,7 +314,6 @@ def geode_objects_dict():
331314
"input_factory": og.TetrahedralSolidInputFactory3D,
332315
"output_factory": og.TetrahedralSolidOutputFactory3D,
333316
"missing_files": og.check_tetrahedral_solid_missing_files3D,
334-
"is_loadable": og.is_tetrahedral_solid_loadable3D,
335317
"load": og.load_tetrahedral_solid3D,
336318
"is_saveable": og.is_tetrahedral_solid_saveable3D,
337319
"save": og.save_tetrahedral_solid3D,
@@ -351,7 +333,6 @@ def geode_objects_dict():
351333
"input_factory": og.TriangulatedSurfaceInputFactory2D,
352334
"output_factory": og.TriangulatedSurfaceOutputFactory2D,
353335
"missing_files": og.check_triangulated_surface_missing_files2D,
354-
"is_loadable": og.is_triangulated_surface_loadable2D,
355336
"load": og.load_triangulated_surface2D,
356337
"is_saveable": og.is_triangulated_surface_saveable2D,
357338
"save": og.save_triangulated_surface2D,
@@ -371,7 +352,6 @@ def geode_objects_dict():
371352
"input_factory": og.TriangulatedSurfaceInputFactory3D,
372353
"output_factory": og.TriangulatedSurfaceOutputFactory3D,
373354
"missing_files": og.check_triangulated_surface_missing_files3D,
374-
"is_loadable": og.is_triangulated_surface_loadable3D,
375355
"load": og.load_triangulated_surface3D,
376356
"is_saveable": og.is_triangulated_surface_saveable3D,
377357
"save": og.save_triangulated_surface3D,
@@ -391,7 +371,6 @@ def geode_objects_dict():
391371
"input_factory": og.VertexSetInputFactory,
392372
"output_factory": og.VertexSetOutputFactory,
393373
"missing_files": og.check_vertex_set_missing_files,
394-
"is_loadable": og.is_vertex_set_loadable,
395374
"load": og.load_vertex_set,
396375
"is_saveable": og.is_vertex_set_saveable,
397376
"save": og.save_vertex_set,

0 commit comments

Comments
 (0)