Skip to content

Commit ac8b99a

Browse files
committed
Fix #49 Renamed get range and resolution from SpatialMappingParams to get_..._preset()
1 parent f091482 commit ac8b99a

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

pyzed/camera.pyx

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -340,40 +340,40 @@ cdef class PyTrackingParameters:
340340

341341
cdef class PySpatialMappingParameters:
342342
cdef SpatialMappingParameters* spatial
343-
def __cinit__(self, resolution=PyRESOLUTION.PyRESOLUTION_HIGH, range=PyRANGE.PyRANGE_MEDIUM,
343+
def __cinit__(self, resolution=PyRESOLUTION.PyRESOLUTION_HIGH, mapping_range=PyRANGE.PyRANGE_MEDIUM,
344344
max_memory_usage=2048, save_texture=True, use_chunk_only=True,
345345
reverse_vertex_order=False):
346-
if (isinstance(resolution, PyRESOLUTION) and isinstance(range, PyRANGE) and
346+
if (isinstance(resolution, PyRESOLUTION) and isinstance(mapping_range, PyRANGE) and
347347
isinstance(use_chunk_only, bool) and isinstance(reverse_vertex_order, bool)):
348-
self.spatial = new SpatialMappingParameters(resolution.value, range.value, max_memory_usage, save_texture,
348+
self.spatial = new SpatialMappingParameters(resolution.value, mapping_range.value, max_memory_usage, save_texture,
349349
use_chunk_only, reverse_vertex_order)
350350
else:
351351
raise TypeError()
352352

353-
def get_resolution(self, resolution=PyRESOLUTION.PyRESOLUTION_HIGH):
354-
if isinstance(resolution, PyRESOLUTION):
355-
return self.spatial.get(<MAPPING_RESOLUTION> resolution.value)
356-
else:
357-
raise TypeError("Argument is not of PyRESOLUTION type.")
358-
359353
def set_resolution(self, resolution=PyRESOLUTION.PyRESOLUTION_HIGH):
360354
if isinstance(resolution, PyRESOLUTION):
361355
self.spatial.set(<MAPPING_RESOLUTION> resolution.value)
362356
else:
363357
raise TypeError("Argument is not of PyRESOLUTION type.")
364358

365-
def get_range(self, range=PyRANGE.PyRANGE_MEDIUM):
366-
if isinstance(range, PyRANGE):
367-
return self.spatial.get(<MAPPING_RANGE> range.value)
359+
def set_range(self, mapping_range=PyRANGE.PyRANGE_MEDIUM):
360+
if isinstance(mapping_range, PyRANGE):
361+
self.spatial.set(<MAPPING_RANGE> mapping_range.value)
368362
else:
369363
raise TypeError("Argument is not of PyRANGE type.")
370364

371-
def set_range(self, range=PyRANGE.PyRANGE_MEDIUM):
372-
if isinstance(range, PyRANGE):
373-
self.spatial.set(<MAPPING_RANGE> range.value)
365+
def get_range_preset(self, mapping_range):
366+
if isinstance(mapping_range, PyRANGE):
367+
return self.spatial.get(<MAPPING_RANGE> mapping_range.value)
374368
else:
375369
raise TypeError("Argument is not of PyRANGE type.")
376370

371+
def get_resolution_preset(self, resolution):
372+
if isinstance(resolution, PyRESOLUTION):
373+
return self.spatial.get(<MAPPING_RESOLUTION> resolution.value)
374+
else:
375+
raise TypeError("Argument is not of PyRESOLUTION type.")
376+
377377
@property
378378
def max_memory_usage(self):
379379
return self.spatial.max_memory_usage
@@ -416,7 +416,12 @@ cdef class PySpatialMappingParameters:
416416

417417
@range_meter.setter
418418
def range_meter(self, float value):
419+
print("THERE !")
420+
print(value)
419421
self.spatial.range_meter = value
422+
print(self.spatial.range_meter)
423+
print("-")
424+
420425

421426
@property
422427
def allowed_resolution(self):

0 commit comments

Comments
 (0)