DjalimSimaila/AnalyseMorphologique
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Djalim Simaila 2023-04-27 14:17:27 +02:00
parent 5a546b5e9c
commit 31c8820581
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/data_processing/data_processing.py
View File

@ -26,7 +26,13 @@ def get_raw_data(obj:ScannedObject, ndigits:int,delta_z:float=1,update_progress_
data = {} data = {}
for colone in colones: for colone in colones:
data[colone] = [] data[colone] = []
discrete_vertices = obj.get_discrete_vertices(delta_z)
if SettingManager.get_instance().get_setting("discretisation_method") == "Z0-Zi < DeltaZ":
get_discrete_vertices = obj.get_discrete_vertices
else:
get_discrete_vertices = obj.get_discrete_vertices3
discrete_vertices = get_discrete_vertices(delta_z)
progress = 0 progress = 0
for discrete_values in discrete_vertices: for discrete_values in discrete_vertices:
mean_x ,mean_y, mean_z = data_extraction.get_x_y_z_mean(discrete_values) mean_x ,mean_y, mean_z = data_extraction.get_x_y_z_mean(discrete_values)
@ -62,7 +68,7 @@ def get_discrete_data(obj:ScannedObject, ndigits:int, delta_z:float=1, update_pr
if SettingManager.get_instance().get_setting("discretisation_method") == "Z0-Zi < DeltaZ": if SettingManager.get_instance().get_setting("discretisation_method") == "Z0-Zi < DeltaZ":
get_discrete_vertices = obj.get_discrete_vertices get_discrete_vertices = obj.get_discrete_vertices
else: else:
get_discrete_vertices = obj.get_discrete_vertices2 get_discrete_vertices = obj.get_discrete_vertices3
discrete_vertices = get_discrete_vertices(delta_z) discrete_vertices = get_discrete_vertices(delta_z)
progress = 0 progress = 0

2
utils/files/input.py
View File

@ -230,7 +230,7 @@ class ScannedObject:
for index in range(len(sorted)): for index in range(len(sorted)):
L[-1].append(sorted[index]) L[-1].append(sorted[index])
if sorted[index][2] - z > step: if sorted[index][2] - z > step:
z = sorted[index][2] z = sorted[index+1][2]
L.append([]) L.append([])
return L return L