소스 검색

bug corrigé pour un nombre de capteurs >2

tags/PoDoCor-v0.2^2
lilian 2 년 전
부모
커밋
6c10b3f1d8
3개의 변경된 파일23개의 추가작업 그리고 5개의 파일을 삭제
  1. +2
    -2
      bin/data.py
  2. +20
    -2
      bin/functions.py
  3. +1
    -1
      main.py

+ 2
- 2
bin/data.py 파일 보기

@@ -52,7 +52,7 @@ class Arduino_data():

coma = ","
capt.captor_name = str(input("Nom du capteur : "))
while(capt.captor_name.find(coma) != -1):
while(capt.captor_name.find_all(coma) != -1):
capt.captor_name = str(input("Nom du capteur ("," non accepté): "))
capt.unit = str(input("Unité : "))
while(capt.unit.find(coma) != -1):
@@ -121,7 +121,7 @@ class Arduino_data():
"""Lecture d'une ligne envoyée par Arduino, et parsing des données
par rapport aux virgules dans un tableau"""
coma = ","
coma_places = raw_data_txt.find(coma)
coma_places = fc.find_all(raw_data_txt, coma)
if(type(coma_places) == type(int())):
coma_places = [coma_places]
if(coma_places == -1 and len(raw_data_txt) < 2):


+ 20
- 2
bin/functions.py 파일 보기

@@ -1,7 +1,7 @@
import os
from multiprocessing import Process, Queue
if(os.name == "posix"):
import readchar as gt #clavier linux
import getch as gt #clavier linux
else:
import msvcrt as gt #clavier linux; à tester!

@@ -23,7 +23,7 @@ def press_key(caracters, numbers, actual, queue = None):
état (actual) à l'un de ceux contenus dans numbers, et déclenchés
par leur caractère correspondant."""

pressed_key = gt.readchar() #detection de touche pressee (blocant)
pressed_key = gt.getch() #detection de touche pressee (blocant)
place = caracters.find(pressed_key)
if(queue != None): #si dans un thread (press_key_timeout)
if(place == -1):
@@ -53,3 +53,21 @@ def read_line_file(path):
line = file.readline() #lis la 1e ligne
file.close() #fermer avant de renvoyer la valeur
return line

def find_all(string, substring):

""" Méthode find mais retourne toutes les places au lieu d'une seule."""

if(string.count(substring) == 0):
return -1
else:
if(string.count(substring) == 1):
return string.find(substring)
else:
result = [string.find(substring)]
for i in range(string.count(substring)-1):
string = string[result[-1]+1:]
string.find(substring)
temp = string.find(substring) + result[-1]+1
result.append(temp)
return result

+ 1
- 1
main.py 파일 보기

@@ -96,7 +96,7 @@ while(flag_state > 0):
data_buff_nb +=1
data_buff = data_buff + str(raw_data_txt)[2:-5] + "\n" #add 1 data line in buffer
#procedure extraction donnees pour affichage
#print(str(raw_data_txt)[2:-5], "azerty")
#print(str(raw_data_txt), "azerty")
arduino_data.extract_data_to_array(str(raw_data_txt)[2:-5])




불러오는 중...
취소
저장