From f99eeef6f6e9a0ebe9f858300842b53177a8102a Mon Sep 17 00:00:00 2001
From: yalmansour1998 <120363766+yalmansour1998@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:11:07 +0200
Subject: [PATCH] Add files via upload

---
 3D_app/pages/ascan.py | 49 ++++++++-----------------------------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/3D_app/pages/ascan.py b/3D_app/pages/ascan.py
index 8c69c6e..c7be9f8 100644
--- a/3D_app/pages/ascan.py
+++ b/3D_app/pages/ascan.py
@@ -8,6 +8,7 @@ import plotly.io as pio
 from util import *
 from filtrage import *
 from selection_filtre import *
+from Bscan_Cscan_trait import *
 
 
 dash.register_page(
@@ -440,24 +441,8 @@ def update_heatmap_ascan(
     print("fin du traitement")
     bouton = "Valider"
     if n_clicks != None:
-        data_traits = switch_case(data_traits, int(selec_transforme_hilbert))
-        data_traits = switch_case(
-            data_traits,
-            int(select_filtre_1),
-            float(fs_filtre_1),
-            float(cutoff_filtre_1),
-            int(order_filtre_1),
-            int(windowsize_filtre_1),
-        )
-        data_traits = switch_case(
-            data_traits,
-            int(select_filtre_2),
-            float(fs_filtre_2),
-            float(cutoff_filtre_2),
-            int(order_filtre_2),
-            int(windowsize_filtre_2),
-        )
-
+        data_traits= Cscant(volume,int(selec_transforme_hilbert),int(select_filtre_1),int(select_filtre_2),
+                            float(fs_filtre_1),float(cutoff_filtre_1),int(order_filtre_1),int(windowsize_filtre_1),float(fs_filtre_2),float(cutoff_filtre_2),int(order_filtre_2),int(windowsize_filtre_2))
         bouton = "Valider"
     fig = px.line(title="A-scan")
     new_trace = go.Scatter(y=data_avec_traitement, mode="lines", name=" Ascan trait ")
@@ -468,33 +453,17 @@ def update_heatmap_ascan(
     fig.add_trace(new_trace)
     fig.update_layout(xaxis_title="indix", yaxis_title="amplitude")
 
-    data_bscan = switch_case(
-        volume[select_ascan_y - 1, select_ascan_z[0] : select_ascan_z[1], :],
-        int(selec_transforme_hilbert),
-    )
-    data_bscan = switch_case(
-        data_bscan,
-        int(select_filtre_1),
-        float(fs_filtre_1),
-        float(cutoff_filtre_1),
-        int(order_filtre_1),
-        int(windowsize_filtre_1),
-    )
-    data_bscan = switch_case(
-        data_bscan,
-        int(select_filtre_2),
-        float(fs_filtre_2),
-        float(cutoff_filtre_2),
-        int(order_filtre_2),
-        int(windowsize_filtre_2),
-    )
+
+    data_bscan=Bscant(volume[select_ascan_y - 1, select_ascan_z[0] : select_ascan_z[1], :],int(selec_transforme_hilbert),int(select_filtre_1),int(select_filtre_2),float(fs_filtre_1),
+        float(cutoff_filtre_1),int(order_filtre_1),int(windowsize_filtre_1),float(fs_filtre_2),float(cutoff_filtre_2),int(order_filtre_2),int(windowsize_filtre_2),)
+    
     fig2 = px.imshow(
         data_bscan,
         color_continuous_scale="Jet",
         aspect="auto",
-        title="B-scan ZX",
+        title="B-scan XZ",
     )
-    fig2.update_layout(xaxis_title="X", yaxis_title="Z ")
+    fig2.update_layout(xaxis_title="Z", yaxis_title=" X")
     data_sans_traitement_fft = np.fft.fft(
         volume[
             int(select_ascan_y) - 1,