diff --git a/Code-C/main b/Code-C/main index 69213d7..7269e1e 100755 Binary files a/Code-C/main and b/Code-C/main differ diff --git a/Code-C/main.c b/Code-C/main.c index 9957208..967b025 100644 --- a/Code-C/main.c +++ b/Code-C/main.c @@ -57,7 +57,7 @@ void *threadCalculBoth(void *vargp){ fileName = queueGetTabChar(rawDataQueue); power(fileName,nRow,nCol,period,invTimeBandWidth); average(fileName,nRow,nCol); - remove(fileName); + //remove(fileName); } } } diff --git a/Py-Script/courbe.py b/Py-Script/courbe.py index 9999f91..eea86a1 100644 --- a/Py-Script/courbe.py +++ b/Py-Script/courbe.py @@ -3,53 +3,34 @@ 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) +csv_reader1 = csv.reader(open('../RawDataFiles/RawData1.csv')) #Ouvre le fichier .csv capteurs = [] -# 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]) +for ligne in csv_reader1: + capteurs.append(ligne) -# capteurs.sort() -x_arr = [] -y_arr = [] +x = [] +y = [] for capteur in capteurs: - x_arr.append(capteur[0]) - y_arr.append(capteur[1]) + x.append(capteur[0]) + y.append(capteur[1]) -fig1 = plt.figure(1, figsize = (5.91, 2.758)) -ax1 = plt.axes() -# 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, (ax1, ax2) = plt.subplots(2, 1) +# fig1 = plt.figure(1, figsize = (5.91, 2.758)) +# ax1 = fig1 -ax1.set_xlabel('Temps') -ax1.set_ylabel('Tension') -ax1.title("Données tableau 1") -ax1.plot(x_arr, y_arr, color = 'r') +np.empty([8, 500]) +np.array([[]]) -plt.show() #Affiche le tableau à l'écran \ No newline at end of file +plt.xlabel('Temps') +plt.ylabel('Tension') +plt.title("Données tableau 1") +plt.plot(x, y, color = 'r') + +plt.show() #Affichage du plot \ No newline at end of file