From 930d91cfa960101b6a1a7dfde53ca114506d3a72 Mon Sep 17 00:00:00 2001
From: "theo.canaud" <theo7733@gmail.com>
Date: Fri, 17 Jun 2022 17:25:14 +0200
Subject: [PATCH] plot still appearing even if number not valid fixed

---
 Py-Script/courbe.py | 54 +++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/Py-Script/courbe.py b/Py-Script/courbe.py
index b8ec0fa..bdc5b0e 100644
--- a/Py-Script/courbe.py
+++ b/Py-Script/courbe.py
@@ -1,36 +1,39 @@
-import math
 from secrets import choice
+from tracemalloc import stop
 import numpy as np
 import matplotlib.pyplot as plt
-import struct
 import csv
 
 #"C:\Users\quent\OneDrive\Bureau\ENSC\TransD\Framboisier\02400001.TXT"
 #! /usr/bin/env python3
 # -*- coding: UTF-8 -*-
 
-tab = np.zeros([1,9])
+def function():
+    tab = np.zeros([1,9])
 
-#def tab_choix():
-while True:
-    choice = input("Choisis un fichier csv de 1 à 1862: \n")
+    #def tab_choix():
+    while True:
+        choice = input("Choisis un fichier csv de 1 à 1862: \n")
+        print("\n")
+        
+        if float(choice) in range(1, 1863):
+            rawdata = '../RawDataFiles/RawData' + choice + '.csv'
+            with open(rawdata, newline='') as csvfile:
+                reader = csv.reader(csvfile, quoting=csv.QUOTE_NONNUMERIC)
+                for row in reader:
+                    t = np.zeros([1,9])
+                    t[0] = row
+                    tab = np.append(tab ,t , axis = 0)
+            break
+        
+        elif choice > '1862' or choice < '1':
+            print("{} n'est pas un nombre valide.\n".format(choice))
+            exit()
     
-    if float(choice) in range(1, 1863):
-        rawdata = '../RawDataFiles/RawData' + choice + '.csv'
-        with open(rawdata, newline='') as csvfile:
-            reader = csv.reader(csvfile, quoting=csv.QUOTE_NONNUMERIC)
-            for row in reader:
-                t = np.zeros([1,9])
-                t[0] = row
-                tab = np.append(tab ,t , axis = 0)
-        break
-    
-    elif choice > '1862' or choice < '1':
-        print("{} n'est pas un nombre valide.".format(choice))
-        break
-
-x = tab[:,0]
-y = tab[:,1]
+    x = tab[:,0]
+    y = tab[:,1]
+    print(tab)
+    return x , y
 
 #Fonction d'affichage du graphique
 def printFig(axe_x , axe_y , title = "new plot" , xlabel = "Temps" , ylabel = "Tension"):
@@ -41,7 +44,10 @@ def printFig(axe_x , axe_y , title = "new plot" , xlabel = "Temps" , ylabel = "T
     plt.show()
     return 0
 
-print(tab)
 #print(x)
 #print("y = " + str(y))
-printFig(x,y)
\ No newline at end of file
+def final():
+    x, y = function()
+    printFig(x,y)
+
+final()
\ No newline at end of file