Ce serveur Gitlab sera éteint le 30 juin 2020, pensez à migrer vos projets vers les serveurs gitlab-research.centralesupelec.fr et gitlab-student.centralesupelec.fr !

Commit 8f848843 authored by Duchamp Solene's avatar Duchamp Solene

Merge branch 'PY/ImproveLAB' into 'master'

Py/improve lab

See merge request !11
parents 9ea6f2e1 671d45bd
......@@ -16,11 +16,11 @@ import moviepy.editor as mp
follow = True
queue = Queue()
linkFile = './link-dictionnaries/link-dictionnary2003.txt'
linkFile = './link-dictionnaries/link-dictionnary2004.txt'
linkDict = {}
exceptDict = {}
videoDir = './video/'
spectrumDir = '../spectrumImages/spectrumImages2003/'
spectrumDir = '../spectrumImages/spectrumImages2004/'
countDownload = 1
countSpectrum = 1
......@@ -139,8 +139,8 @@ def imgSpectrum(vidPath, spectrumOut):
res2 = tableSpectrum(resizeVideo(vidPath, vidPath))
else:
res2 = tableSpectrum(vidPath)
output = cv2.cvtColor(res2, cv2.COLOR_LAB2BGR)
cv2.imwrite(spectrumOut, res2)
output= cv2.cvtColor(res2, cv2.COLOR_LAB2BGR)
cv2.imwrite(spectrumOut, output)
print()
print("--------------------------------------------------------")
print("Duration : {} s".format(time() - start))
......@@ -153,7 +153,8 @@ def main():
global linkDict
global linkFile
global follow
if not os.path.isdir(spectrumDir):
os.makedirs(spectrumDir)
linkDict = reading(linkFile)
TRAILER = Thread(target=downloadTrailer)
SPECTRUM = Thread(target=createSpectrum)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment