Skip to content

Commit 0a0fe70

Browse files
committed
Update for 3.5.4
1 parent 205bc57 commit 0a0fe70

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

src/pyzed/sl.pyx

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ class COORDINATE_SYSTEM(enum.Enum):
926926
# | Enumerator | |
927927
# |------------|-------------------------|
928928
# | DISPARITY | Disparity map. Each pixel contains 1 float. [sl.MAT_TYPE.F32_C1] (\ref sl.MAT_TYPE) |
929-
# | DEPTH | Depth map. Each pixel contains 1 float. [sl.MAT_TYPE.F32_C1] (\ref sl.MAT_TYPE) |
929+
# | DEPTH | Depth map, in \ref sl.UNIT defined in \ref sl.InitParameters. Each pixel contains 1 float. [sl.MAT_TYPE.F32_C1] (\ref sl.MAT_TYPE) |
930930
# | CONFIDENCE | Certainty/confidence of the depth map. Each pixel contains 1 float. [sl.MAT_TYPE.F32_C1] (\ref sl.MAT_TYPE) |
931931
# | XYZ | Point cloud. Each pixel contains 4 float (X, Y, Z, not used). [sl.MAT_TYPE.F32_C4] (\ref sl.MAT_TYPE) |
932932
# | XYZRGBA | Colored point cloud. Each pixel contains 4 float (X, Y, Z, color). The color needs to be read as an usigned char[4] representing the RGBA color. [sl.MAT_TYPE.F32_C4] (\ref sl.MAT_TYPE) |
@@ -942,7 +942,7 @@ class COORDINATE_SYSTEM(enum.Enum):
942942
# | XYZARGB_RIGHT | Colored point cloud for right sensor. Each pixel contains 4 float (X, Y, Z, color). The color needs to be read as an usigned char[4] representing the ARGB color. [sl.MAT_TYPE.F32_C4] (\ref sl.MAT_TYPE)|
943943
# | XYZABGR_RIGHT | Colored point cloud for right sensor. Each pixel contains 4 float (X, Y, Z, color). The color needs to be read as an usigned char[4] representing the ABGR color. [sl.MAT_TYPE.F32_C4] (\ref sl.MAT_TYPE)|
944944
# | NORMALS_RIGHT | Normals vector for right view. Each pixel contains 4 float (X, Y, Z, 0). [sl.MAT_TYPE.F32_C4] (\ref sl.MAT_TYPE)|
945-
# | DEPTH_U16_MM | Depth map in millimeter. Each pixel contains 1 unsigned short. [sl.MAT_TYPE.U16_C1] (\ref sl.MAT_TYPE)|
945+
# | DEPTH_U16_MM | Depth map in millimeter whatever the \ref sl.UNIT defined in \ref sl.InitParameters. Invalid values are set to 0, depth values are clamped at 65000. Each pixel contains 1 unsigned short. [sl.MAT_TYPE.U16_C1] (\ref sl.MAT_TYPE)|
946946
# | DEPTH_U16_MM_RIGHT | Depth map in millimeter for right sensor. Each pixel contains 1 unsigned short. [sl.MAT_TYPE.U16_C1] (\ref sl.MAT_TYPE)|
947947
class MEASURE(enum.Enum):
948948
DISPARITY = <int>c_MEASURE.DISPARITY
@@ -3283,8 +3283,8 @@ cdef class Mat:
32833283

32843284
##
32853285
# Returns the value of a specific point in the matrix.
3286-
# \param x : specifies the column
3287-
# \param y : specifies the row
3286+
# \param x : specifies the row
3287+
# \param y : specifies the column
32883288
# \param memory_type : defines which memory should be read. Default: [MEM.CPU](\ref MEM)
32893289
# \return ERROR_CODE.SUCCESS if everything went well, \ref ERROR_CODE.FAILURE otherwise.
32903290
#
@@ -3304,7 +3304,7 @@ cdef class Mat:
33043304

33053305
if self.get_data_type() == MAT_TYPE.U8_C1:
33063306
status = getValueUchar1(self.mat, x, y, &value1u, <c_MEM>(<unsigned int>memory_type.value))
3307-
return ERROR_CODE(<int>status), self.get_data()[x, y]
3307+
return ERROR_CODE(<int>status), value1u
33083308
elif self.get_data_type() == MAT_TYPE.U8_C2:
33093309
status = getValueUchar2(self.mat, x, y, &value2u, <c_MEM>(<unsigned int>memory_type.value))
33103310
return ERROR_CODE(<int>status), np.array([value2u.ptr()[0], value2u.ptr()[1]])
@@ -3317,10 +3317,10 @@ cdef class Mat:
33173317
value4u.ptr()[3]])
33183318
elif self.get_data_type() == MAT_TYPE.U16_C1:
33193319
status = getValueUshort1(self.mat, x, y, &value1us, <c_MEM>(<unsigned int>memory_type.value))
3320-
return ERROR_CODE(<int>status), self.get_data()[x, y]
3320+
return ERROR_CODE(<int>status), value1us
33213321
elif self.get_data_type() == MAT_TYPE.F32_C1:
33223322
status = getValueFloat1(self.mat, x, y, &value1f, <c_MEM>(<unsigned int>memory_type.value))
3323-
return ERROR_CODE(<int>status), self.get_data()[x, y]
3323+
return ERROR_CODE(<int>status), value1f
33243324
elif self.get_data_type() == MAT_TYPE.F32_C2:
33253325
status = getValueFloat2(self.mat, x, y, &value2f, <c_MEM>(<unsigned int>memory_type.value))
33263326
return ERROR_CODE(<int>status), np.array([value2f.ptr()[0], value2f.ptr()[1]])
@@ -4945,8 +4945,12 @@ cdef class InitParameters:
49454945
# This parameter allows you to specify the minimum depth value (from the camera) that will be computed, measured in the \ref UNIT you define.
49464946
# In stereovision (the depth technology used by the camera), looking for closer depth values can have a slight impact on performance. However, this difference is almost invisible on modern GPUs.
49474947
# In cases of limited computational power, increasing this value can provide better performance.
4948-
# default : (-1) corresponding to 700 mm for a ZED and 200 mm for ZED Mini.
4949-
# \note With a ZED camera you can decrease this value to 300 mm whereas you can set it to 100 mm using a ZED Mini. In any case this value cannot be greater than 3 meters.
4948+
# default : (-1) corresponding to 700 mm for a ZED/ZED2 and 200 mm for ZED Mini.
4949+
# \note With a ZED camera you can decrease this value to 300 mm whereas you can set it to 100 mm using a ZED Mini and 200 mm for a ZED2. In any case this value cannot be greater than 3 meters.
4950+
# Specific value (0): This will set the depth minimum distance to the minimum authorized value :
4951+
# - 300mm for ZED
4952+
# - 100mm for ZED-M
4953+
# - 200mm for ZED2
49504954
@property
49514955
def depth_minimum_distance(self):
49524956
return self.init.depth_minimum_distance

0 commit comments

Comments
 (0)