Skip to content

Commit 15ce978

Browse files
import threading + move inspector
1 parent 45e3541 commit 15ce978

File tree

4 files changed

+409
-150
lines changed

4 files changed

+409
-150
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
55

66
[project]
77
name = "OpenGeodeWeb-Back"
8-
version = "0.0.12"
8+
version = "0.0.13"
99
authors = [
1010
{ name="Geode-solutions", email="[email protected]" },
1111
]

src/opengeodeweb_back/geode_functions.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import base64
33
import os
44
import time
5+
import threading
56
import uuid
67

78
# Third party imports
@@ -168,6 +169,10 @@ def get_builder(geode_object, data):
168169
return objects_list()[geode_object]["builder"](data)
169170

170171

172+
def get_inspector(geode_object, data):
173+
return objects_list()[geode_object]["inspector"](data)
174+
175+
171176
def load(geode_object, file_absolute_path):
172177
return objects_list()[geode_object]["load"](file_absolute_path)
173178

src/opengeodeweb_back/geode_objects.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import opengeode as og
22
import opengeode_io as og_io
3+
import opengeode_inspector as og_inspector
34
import opengeode_geosciences as og_gs
45
import opengeode_geosciencesio as og_gs_io
56
import geode_viewables as g_v
@@ -22,6 +23,7 @@ def objects_list():
2223
"is_3D": True,
2324
"is_viewable": True,
2425
"save_viewable": g_v.save_viewable_brep,
26+
"inspector": inspector.BRepInspector,
2527
},
2628
"CrossSection": {
2729
"input": [og_gs.CrossSectionInputFactory],
@@ -38,6 +40,7 @@ def objects_list():
3840
"is_3D": False,
3941
"is_viewable": True,
4042
"save_viewable": g_v.save_viewable_cross_section,
43+
"inspector": inspector.SectionInspector,
4144
},
4245
"EdgedCurve2D": {
4346
"input": [og.EdgedCurveInputFactory2D],
@@ -54,6 +57,7 @@ def objects_list():
5457
"is_3D": False,
5558
"is_viewable": True,
5659
"save_viewable": g_v.save_viewable_edged_curve2D,
60+
"inspector": inspector.EdgedCurveInspector2D,
5761
},
5862
"EdgedCurve3D": {
5963
"input": [og.EdgedCurveInputFactory3D],
@@ -70,6 +74,7 @@ def objects_list():
7074
"is_3D": True,
7175
"is_viewable": True,
7276
"save_viewable": g_v.save_viewable_edged_curve3D,
77+
"inspector": inspector.EdgedCurveInspector3D,
7378
},
7479
"Graph": {
7580
"input": [og.GraphInputFactory],
@@ -80,7 +85,6 @@ def objects_list():
8085
"is_model": False,
8186
"is_3D": False,
8287
"is_viewable": True,
83-
"save_viewable": "",
8488
},
8589
"HybridSolid3D": {
8690
"input": [og.HybridSolidInputFactory3D],
@@ -97,6 +101,7 @@ def objects_list():
97101
"is_3D": True,
98102
"is_viewable": True,
99103
"save_viewable": g_v.save_viewable_hybrid_solid3D,
104+
"inspector": inspector.SolidMeshInspector3D,
100105
},
101106
"PointSet2D": {
102107
"input": [og.PointSetInputFactory2D],
@@ -113,6 +118,7 @@ def objects_list():
113118
"is_3D": False,
114119
"is_viewable": True,
115120
"save_viewable": g_v.save_viewable_point_set2D,
121+
"inspector": inspector.PointSetInspector2D,
116122
},
117123
"PointSet3D": {
118124
"input": [og.PointSetInputFactory3D],
@@ -129,6 +135,7 @@ def objects_list():
129135
"is_3D": True,
130136
"is_viewable": True,
131137
"save_viewable": g_v.save_viewable_point_set3D,
138+
"inspector": inspector.PointSetInspector3D,
132139
},
133140
"PolygonalSurface2D": {
134141
"input": [og.PolygonalSurfaceInputFactory2D],
@@ -145,6 +152,7 @@ def objects_list():
145152
"is_3D": False,
146153
"is_viewable": True,
147154
"save_viewable": g_v.save_viewable_polygonal_surface2D,
155+
"inspector": inspector.SurfaceMeshInspector2D,
148156
},
149157
"PolygonalSurface3D": {
150158
"input": [og.PolygonalSurfaceInputFactory3D],
@@ -161,6 +169,7 @@ def objects_list():
161169
"is_3D": True,
162170
"is_viewable": True,
163171
"save_viewable": g_v.save_viewable_polygonal_surface3D,
172+
"inspector": inspector.SurfaceMeshInspector3D,
164173
},
165174
"PolyhedralSolid3D": {
166175
"input": [og.PolyhedralSolidInputFactory3D],
@@ -177,6 +186,7 @@ def objects_list():
177186
"is_3D": True,
178187
"is_viewable": True,
179188
"save_viewable": g_v.save_viewable_polyhedral_solid3D,
189+
"inspector": inspector.SolidMeshInspector3D,
180190
},
181191
"RasterImage2D": {
182192
"input": [og.RasterImageInputFactory2D],
@@ -245,6 +255,7 @@ def objects_list():
245255
"is_3D": False,
246256
"is_viewable": True,
247257
"save_viewable": g_v.save_viewable_section,
258+
"inspector": inspector.SectionInspector,
248259
},
249260
"StructuralModel": {
250261
"input": [og_gs.StructuralModelInputFactory],
@@ -261,6 +272,7 @@ def objects_list():
261272
"is_3D": True,
262273
"is_viewable": True,
263274
"save_viewable": g_v.save_viewable_structural_model,
275+
"inspector": inspector.BRepInspector,
264276
},
265277
"TetrahedralSolid3D": {
266278
"input": [og.TetrahedralSolidInputFactory3D],
@@ -277,6 +289,7 @@ def objects_list():
277289
"is_3D": True,
278290
"is_viewable": True,
279291
"save_viewable": g_v.save_viewable_tetrahedral_solid3D,
292+
"inspector": inspector.SolidMeshInspector3D,
280293
},
281294
"TriangulatedSurface2D": {
282295
"input": [og.TriangulatedSurfaceInputFactory2D],
@@ -293,6 +306,7 @@ def objects_list():
293306
"is_3D": False,
294307
"is_viewable": True,
295308
"save_viewable": g_v.save_viewable_triangulated_surface2D,
309+
"inspector": inspector.TriangulatedSurfaceInspector2D,
296310
},
297311
"TriangulatedSurface3D": {
298312
"input": [og.TriangulatedSurfaceInputFactory3D],
@@ -309,6 +323,7 @@ def objects_list():
309323
"is_3D": True,
310324
"is_viewable": True,
311325
"save_viewable": g_v.save_viewable_triangulated_surface3D,
326+
"inspector": inspector.TriangulatedSurfaceInspector3D,
312327
},
313328
"VertexSet": {
314329
"input": [og.VertexSetInputFactory],
@@ -319,6 +334,5 @@ def objects_list():
319334
"is_model": True,
320335
"is_3D": False,
321336
"is_viewable": False,
322-
"save_viewable": "",
323337
},
324338
}

0 commit comments

Comments
 (0)