From 31c8820581d1b54dec58729bcad3b2d394ec22e6 Mon Sep 17 00:00:00 2001 From: Djalim Simaila Date: Thu, 27 Apr 2023 14:17:27 +0200 Subject: [PATCH] Bug fixes --- utils/data_processing/data_processing.py | 10 ++++++++-- utils/files/input.py | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/utils/data_processing/data_processing.py b/utils/data_processing/data_processing.py index 5e16ee6..56ce978 100644 --- a/utils/data_processing/data_processing.py +++ b/utils/data_processing/data_processing.py @@ -26,7 +26,13 @@ def get_raw_data(obj:ScannedObject, ndigits:int,delta_z:float=1,update_progress_ data = {} for colone in colones: 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 for discrete_values in discrete_vertices: 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": get_discrete_vertices = obj.get_discrete_vertices else: - get_discrete_vertices = obj.get_discrete_vertices2 + get_discrete_vertices = obj.get_discrete_vertices3 discrete_vertices = get_discrete_vertices(delta_z) progress = 0 diff --git a/utils/files/input.py b/utils/files/input.py index 040f5f9..46a340e 100644 --- a/utils/files/input.py +++ b/utils/files/input.py @@ -230,7 +230,7 @@ class ScannedObject: for index in range(len(sorted)): L[-1].append(sorted[index]) if sorted[index][2] - z > step: - z = sorted[index][2] + z = sorted[index+1][2] L.append([]) return L