From ab66c1649baba85c1c0629ee087be26027c4c131 Mon Sep 17 00:00:00 2001
From: "quentin.perret" <quentinprrt33@gmail.com>
Date: Wed, 15 Jun 2022 15:46:40 +0200
Subject: [PATCH] def function printPlot

---
 Code-C/main         | Bin 24800 -> 24800 bytes
 Code-C/main.c       |   1 -
 Py-Script/courbe.py | 118 ++++++++++----------------------------------
 3 files changed, 25 insertions(+), 94 deletions(-)

diff --git a/Code-C/main b/Code-C/main
index 69213d78d46a50620a794cc57b661390d41c589d..7269e1e7afd384107a9fe5921b953103e9120832 100755
GIT binary patch
delta 1674
zcmZ9Me@t6d6vyvv`}m=-N1^y=W>>a>Fvgq&%}|5d5XY<hSQ(Tt7aTZ-8!{tG=MtUB
z*fdSkOgu5h86zajWX5ISV~9&s8kE6i6rwK1!~kY!r<?qcDG~H}?t5p^?EG=hz31~i
z=iYnnYo{W7D#Cl?c)V*hGt8yg`7n2UpM5>^cvWuf^1Hdu|KdOM^tw*}uokuC$nsxl
zjH%&7FkIo7wl;Y@fxih0Ykd496uGOp1}EH^yk8q~cg45;dRPrTyrc%tN6-GQ>uM0^
zv|hbvtmhWwBx!3l)(qXV1zjjLoP}dz2aYJ6Ym~D`8&&zKk>Ho2ifvxkL#a)Mq>dye
zx%eB_quO4v*Ri2MN1Hq#T|n8<p}^%=$A<lCa7OL8njSoSRSgEFMx@ioIG!NUg%fcS
zSDf&VMHXbcbP8i3Y55Mu8s*us1vzI_D8NweH0HCh|Ea}+2Sp2`%X8vp(xVt?Q^Wox
zH7q(Xp@vicSkd)QghpKD>lu`V{d0)tOnmO2|KWbbpBnYf{iN%ScgpUgV#Pc=O2dWn
zdYn{ygO@yhZ}7UO$`f4itKm%y!<D5Q{>D4TMb~2i?OINX1U^gB2Y0<-wV(Y{*I$ZZ
z?9h^~ccK4I3+F46tH&t2D(PiQQDThcorGBI!R;7Zv@x~`A_Z<f4$}q2QWSg7wY-gQ
z*<iG=hC8&i4@}z7@uJ-}egW!>-8>1}i+|>qVZU0;_duUovMHIZVvX1dVPBb!?Xfau
zXHGU+VFqwN!<xYERh&nVimU{u8GWCd9>C*O_z9umr=SJL0b@P}-Iz5&S<ksm^_c0{
zBut=k9<F%ZcE?5vlH+(ng*zbc5yhE>mleBS#BWg8i>70lP>=L}qTjmAa1&A0sPMQk
zwn7AzM@aeL8dLHHDUS<{^EA-``n7q8ek>^XN^H=tI{1%JQKEQfQ7gLCOI@NiFeaHN
zUBt&0R%eWi-AeJ9WHT^H@igcwQFw;92QPr>5=Bx`nGPOH3f}?tQpMSTYq8VdP496K
zJV=jG-Q9He`>5{g(1P@BqM(@J7&>MzbR!)i+M8q2TFM<4r+KX`jjsSN+nguk$0(W~
za+v%8$)eOQgofRCzZ9r1Q=A!?WoKzD`=(>(LMPI@ktX4#_7SC$>>-FCt)LyRZ7|~>
z5w3>$G9_;pQ7_RRqRkYq$}j`v6n_>f%CS*I2gQ#E?Mc%yfcA2Q_XrLD5c+WZ!kGVH
zjPqi2+3=r4bl|fTGwD3#Iz-%fsx0tqQ>1)cn@?8;E!z}lE#(E)nF;yS{)5ns^cAAh
zx0!T1Rqcccq$iPz{-slgu-S&a2i&JPKd0R7^r<!wy##qag<sLUz9+27t^1zYTi;N*
z|3IL*zIE@`=D;ECOyw<BZKV1ei`KQX&dTk;Yd6Q=_~kjYduxlWd<oj?w#3)em?dL@
H?{fbO^GKKW

delta 1737
zcmZ8iZ%kWN6u-CSjXwb%EwI<;WNlsN7z>dFiF1*K2DPvJEo_C61%)`7#Nl8_;)fYP
zo!T`oah`-^7!@*g(Zob}5oV%W35GE>3Ll1vAr7+OYMhf*jF{k_=e~Q%OwWgV&i(y<
z=e%>?ySH7MqDxcsvoxAsyp32^Y&hsN&HLv*$NrlicYf2<y{7ksORGNg9oc5YZAG%2
zp%S9$S?68Ml`k4z=UgTohQ#&|{Rk@EP4sgZcJHJUM$A2u-v6tPRki37>ssVWeEd(-
z)FK#*y=%?duO{Risj`si${t1+%|EjX*Q^0tQM%e87tVHQ@(VMO?^zXk$26n)$1F*!
zkZ@-9HrB%grh;Es+|M7ppFQ|=Og`Ofnx;G<O=8+>vA(6Zu1<%w$cpyrEl=d-TUw-V
zX+|1Gj$%hy85pq6GSZlTYAPW+q#?wjQv5+eI^;jDCgh@7reKXG<Q6MlOueV>-qlaY
zMfO_b@l`ge6hNh>hu1ZoH8!v5`8PI9^AeM=reiCp(!;Ar;}DF#aQA=oDAJd$au;wq
z**(Bwe{+pqZa#oPQ!ujN4+kTE`49Oc8(~c^Ud=-MV9oA-al*8CuJKdRR%yKCl-)7=
zw`mS+A>_?<(;Pt`H}q0PDwwniX6L+atIXPB8_!I|(eFoWErpN@nA+#2OR&5zAg$vk
zpoVwPJ1H<*ewg|U?}6(n=xF8BDRdIr18(Yp!N5&A51m?ohG0yqhP+@NZHAtpLQjA{
zsHg*WLUM?UJlDXUde7cq8g&R+C&?xY+c~o-I&ZNP$U2BhVgkngEV~5rnERc`EyKga
zY=}GZGterx!?#Clg}ZH4q*%g%-LxfD%!BqSg*sumTA_t-7UMFUMxpg=RogL(b-AN}
z7kf<9JOOu5dCF1_gBNo@vEnb;3Zd$hd^S1R97<#@!eF%${9V*s+ri;B!LAE@#mRx|
z0+%G-LxqO}Ck5_cJ*ztfdoHQNGH}!=>f^{dY%Y?P)JX&Qk$r}-_>D*jFNqCUb`pA!
zePy#U4#KRLJ8}j_Ym~k33bs_?aGPL16?m+O1FZu8%6h{KY<;`d1tqmEbwfy_d0f*a
zq}QOmR#6EaTXqEIMC*7|EpxzGWL1lGk)uhU(+g9zN`J9nD+KEixd#wupOc8@z7Tk&
z(EF0AX+j^|&4t$e!LUW(9eCZD{lFdR;JA|<@^Pe25M9tvr>OlR?IOE#XwP#;bQr8t
z=zB~<$6yTC87uzLT7P3}!CjI2buLf3B673w_s9u;TQ2p2zh04waqqGA0qCh$)Mm!x
z$bI-r!K{>W-wmV44hnX8D@Pl-BT<+~_I+g8o$(~SmJfi26!o&mZ5013M@8-&><uaO
zh7k-Mvm4U~)9snPon3v$+h2V4$>V)58Q(Ttvq8wV#TaR6vt!e=^`Z35E9)~JZ4KCI
S0tVY2NpC#N3#I}+;{FfgLz`d#

diff --git a/Code-C/main.c b/Code-C/main.c
index 9957208..672a5e9 100644
--- a/Code-C/main.c
+++ b/Code-C/main.c
@@ -57,7 +57,6 @@ void *threadCalculBoth(void *vargp){
             fileName = queueGetTabChar(rawDataQueue);
             power(fileName,nRow,nCol,period,invTimeBandWidth);
             average(fileName,nRow,nCol);
-            remove(fileName);
         }
     }
 }
diff --git a/Py-Script/courbe.py b/Py-Script/courbe.py
index 392ff7d..effe418 100644
--- a/Py-Script/courbe.py
+++ b/Py-Script/courbe.py
@@ -1,104 +1,36 @@
-import math
-import numpy as np
-import matplotlib.pyplot as plt
-import struct
-import csv
-import sys
-
-#"C:\Users\quent\OneDrive\Bureau\ENSC\TransD\Framboisier\02400001.TXT"
 #! /usr/bin/env python3
 # -*- coding: UTF-8 -*-
 
-csv_reader1 = csv.reader(open('./RawDataFiles/RawData1.csv')) #Ouvre le fichier .csv
-bigx = float(-sys.maxsize-1)
-bigy = float(-sys.maxsize-1)
-smallx = float(sys.maxsize)
-smally = float(sys.maxsize)
-capteurs = []
+import numpy as np
+import matplotlib.pyplot as plt
+import csv
 
-for ligne in csv_reader1:
-    capteurs.append(ligne)
-    if float(ligne[0]) > bigx:
-        bigx = float(ligne[0])
-    if float(ligne[1]) > bigy:
-        bigy = float(ligne[1])
-    if float(ligne[0]) < smallx:
-        smallx = float(ligne[0])
-    if float(ligne[1]) < smally:
-        smally = float(ligne[1])
 
-capteurs.sort()
-x_arr = []
-y_arr = []
+tab = np.zeros([1,9])
 
-for capteur in capteurs:
-    x_arr.append(capteur[0])
-    y_arr.append(capteur[1])
+with open('../RawDataFiles/RawData667.csv', 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)
 
-fig1 = plt.figure(1, figsize = (5.91, 2.758))
-fig2 = plt.figure(1, figsize = (5.91, 2.758))
-fig3 = plt.figure(1, figsize = (5.91, 2.758))
-fig4 = plt.figure(1, figsize = (5.91, 2.758))
-fig5 = plt.figure(1, figsize = (5.91, 2.758))
-fig6 = plt.figure(1, figsize = (5.91, 2.758))
-fig7 = plt.figure(1, figsize = (5.91, 2.758))
-fig8 = plt.figure(1, figsize = (5.91, 2.758))
-fig9 = plt.figure(1, figsize = (5.91, 2.758))
-fig10 = plt.figure(1, figsize = (5.91, 2.758))
 
-fig1.xlabel('Temps')
-fig1.ylabel('Tension')
-fig1.title("Données tableau 1")
-fig1.plot(x_arr, y_arr, 'r')
+#print(tab)
+"""
+x = tab[:,0]
+y = tab[:,1]
 
-#fig, (ax1) = plt.subplots(2, 1)
+print(x)
+print("y = " + str(y))
+"""
+def printFig(axe_x , axe_y , title = "new plot" , xlabel = "axe x" , ylabel = "axe y"):
+    plt.plot(axe_x , axe_y)
+    plt.xlabel(xlabel)
+    plt.ylabel(ylabel)
+    plt.title(title)
+    plt.show()
+    return 0
 
-# Fe = 250000 #Fréquence d'échantillonage
-# tstep = 1 / Fe
-# y = capteur[:][0]
-# y2 = capteur[:][0]
-# N = len(y) 
-# t = np.linspace(0, (N-1) * tstep, N)
 
-#Légende des plot 1, 2, 3, 4, 5, 6, 7 et 8
-# ax1.set_xlabel('Temps')
-# ax1.set_ylabel('Tension')
-# ax1.set_title("Données du premier capteur")
-# ax1.plot(t, y)
-
-# ax2.set_xlabel('Temps')
-# ax2.set_ylabel('Tension')
-# ax2.set_title("Données du deuxième capteur")
-# ax2.plot(t, y2)
-
-# ax3.set_xlabel('Temps')
-# ax3.set_ylabel('Tension')
-# ax3.set_title("Données du troisième capteur")
-# ax3.plot(t, y3)
-
-# ax4.set_xlabel('Temps')
-# ax4.set_ylabel('Tension')
-# ax4.set_title("Données du quatrième capteur")
-# ax4.plot(t, y4)
-
-# ax5.set_xlabel('Temps')
-# ax5.set_ylabel('Tension')
-# ax5.set_title("Données du cinquième capteur")
-# ax5.plot(t, y5)
-
-# ax6.set_xlabel('Temps')
-# ax6.set_ylabel('Tension')
-# ax6.set_title("Données du sixième capteur")
-# ax6.plot(t, y6)
-
-# ax7.set_xlabel('Temps')
-# ax7.set_ylabel('Tension')
-# ax7.set_title("Données du septième capteur")
-# ax7.plot(t, y7)
-
-# ax8.set_xlabel('Temps')
-# ax8.set_ylabel('Tension')
-# ax8.set_title("Données du huitième capteur")
-# ax8.plot(t, y8)
-
-plt.show() #Affiche le tableau à l'écran
\ No newline at end of file
+#printFig(x,y)
\ No newline at end of file