diff --git a/cams/10s.mp4 b/cams/10s.mp4 new file mode 100644 index 0000000..836e684 Binary files /dev/null and b/cams/10s.mp4 differ diff --git a/cams/2sec.mp4 b/cams/2sec.mp4 new file mode 100644 index 0000000..f37555d Binary files /dev/null and b/cams/2sec.mp4 differ diff --git a/cams/5s.mp4 b/cams/5s.mp4 new file mode 100644 index 0000000..b42ac3c Binary files /dev/null and b/cams/5s.mp4 differ diff --git a/cams/output.mp4 b/cams/output.mp4 new file mode 100644 index 0000000..3755ea4 Binary files /dev/null and b/cams/output.mp4 differ diff --git a/cams/html/index.html b/cams/scrap/html/index.html similarity index 100% rename from cams/html/index.html rename to cams/scrap/html/index.html diff --git a/cams/html/keep.txt b/cams/scrap/html/keep.txt similarity index 100% rename from cams/html/keep.txt rename to cams/scrap/html/keep.txt diff --git a/cams/html/script.js b/cams/scrap/html/script.js similarity index 100% rename from cams/html/script.js rename to cams/scrap/html/script.js diff --git a/cams/result.txt b/cams/scrap/result.txt similarity index 100% rename from cams/result.txt rename to cams/scrap/result.txt diff --git a/cams/resultV1.txt b/cams/scrap/resultV1.txt similarity index 100% rename from cams/resultV1.txt rename to cams/scrap/resultV1.txt diff --git a/cams/resultV2.txt b/cams/scrap/resultV2.txt similarity index 100% rename from cams/resultV2.txt rename to cams/scrap/resultV2.txt diff --git a/cams/scrap.py b/cams/scrap/scrap.py similarity index 100% rename from cams/scrap.py rename to cams/scrap/scrap.py diff --git a/cams/test.html b/cams/scrap/test.html similarity index 100% rename from cams/test.html rename to cams/scrap/test.html diff --git a/detec/open.py b/detec/open.py new file mode 100644 index 0000000..e69de29 diff --git a/detec/test.py b/detec/test.py new file mode 100644 index 0000000..8366aa8 --- /dev/null +++ b/detec/test.py @@ -0,0 +1,15 @@ +import numpy as np +import cv2 as cv +cap = cv.VideoCapture('cams/10s.mp4') +while cap.isOpened(): + ret, frame = cap.read() + # if frame is read correctly ret is True + if not ret: + print("Can't receive frame (stream end?). Exiting ...") + break + gray = cv.cvtColor(frame, cv.COLOR_BGR2GRAY) + cv.imshow('frame', gray) + if cv.waitKey(1) == ord('q'): + break + cap.release() + cv.destroyAllWindows() \ No newline at end of file diff --git a/gipps/gipps.py b/gipps/gippsV1.py similarity index 92% rename from gipps/gipps.py rename to gipps/gippsV1.py index bdc083e..944c1b5 100644 --- a/gipps/gipps.py +++ b/gipps/gippsV1.py @@ -3,6 +3,9 @@ import matplotlib.pyplot as plt import time from colour import Color import imagesV1 as images +import imagesV2 as images2 + +fps = 4 # =========== t0 = 0 @@ -43,7 +46,7 @@ def rainbow_gradient(num_colors): colors = rainbow_gradient(nbv) def px(tt): # Avance au cours du temps - tt += 1 + tt += 1/fps return tt def vitesseatt(vtold): # Vitesse qu'il peut réellement atteindre d'un point de vue dynamique @@ -59,7 +62,7 @@ def vitesseadop(vtold, xxpold): # Vitesse qu'il est possible d'adopter en c return newvalue def vitessereelle(t, vtold, xxpold): # Vitesse du véhicule - t+=t + # t+=t if t==0: vtold[-1] = 0.1 elif (t> 0) and (t<=10): # Accélération du leader @@ -70,7 +73,7 @@ def vitessereelle(t, vtold, xxpold): # Vitesse du véhicule a = - (Vd - Vmin) / 10 vtleader = Vd + 2 * a * (t - 16) vtold[-1] = vtleader - elif (t>= 20) and (t<=30): # Accélération du leader + elif (t> 20) and (t<=30): # Accélération du leader a = (Vd - Vmin) / 10 vtleader = Vmin + a * (t-20) vtold[-1] = vtleader @@ -116,11 +119,12 @@ while(t