Browse code

Version bataille navale

rep authored on 27/11/2015 16:50:09
Showing 2 changed files
... ...
@@ -5,6 +5,9 @@ pylone3/
5 5
 screen/
6 6
 test/
7 7
 tth/
8
-drone.mp4
8
+*.mp4
9
+*.png
10
+*.mkv
11
+*.jpg
9 12
 drone.2.mp4
10 13
 test.jpg2015-09-29-21h22m05s.jpg
... ...
@@ -1,6 +1,7 @@
1 1
 #!/usr/bin/python
2 2
 # coding: utf-8
3 3
 
4
+<<<<<<< HEAD
4 5
 '''
5 6
 ffmpeg -i drone.mp4 -vf fps=30 ./drone/img%03d.jpg
6 7
 '''
... ...
@@ -8,18 +9,33 @@ ffmpeg -i drone.mp4 -vf fps=30 ./drone/img%03d.jpg
8 8
 import sys 		# sys.argv[]
9 9
 import Image 	# Image.open()
10 10
 import os 		# os.getcwd
11
+=======
12
+import sys
13
+import Image
14
+>>>>>>> adc56b0f751a338bfe5c843061889df049d4390b
11 15
 
12 16
 '''
13 17
 im1 = Image.open(str(sys.argv[1]))
14 18
 width, height = im1.size
19
+<<<<<<< HEAD
15 20
 print "width  =% 5.2i" % width
16 21
 print "height =% 5.2i" % height
17 22
 allongement = 8
18 23
 im4 = Image.new("RGBA",(im1.size[0]*allongement, im1.size[1]))
24
+=======
25
+print 
26
+print "width  =% 5.2i" % width
27
+print "height =% 5.2i" % height
28
+print
29
+allongement = 8
30
+im4 = Image.new("RGBA",(im1.size[0]*allongement, im1.size[1]))
31
+
32
+>>>>>>> adc56b0f751a338bfe5c843061889df049d4390b
19 33
 for x in range(1,allongement+1):
20 34
     print('%03.1i' % x)
21 35
 '''
22 36
 
37
+<<<<<<< HEAD
23 38
 script = os.getcwd()
24 39
 print script
25 40
 
... ...
@@ -109,3 +125,29 @@ im2.save(script+"/"+str(x)+".2.png",'PNG', quality=100)
109 109
  2009  history | grep ffmpeg
110 110
 
111 111
 '''
112
+=======
113
+
114
+index = 1
115
+allongement = 300      #4818
116
+
117
+
118
+im1 = Image.open("./drone/img001.jpg")
119
+im2 = Image.new("RGBA",(im1.size[0]*allongement, im1.size[1]))
120
+
121
+largeur = im1.size[0]
122
+
123
+for x in range(0,allongement/10):
124
+	position = 0
125
+	
126
+	for y in range(1,11):
127
+		im1 = Image.open("./drone/img%03.1i.jpg" % y)
128
+		im2.paste(im1, (position,0))
129
+		#print position
130
+		#print("./drone/img%03.1i.jpg" % x)
131
+		position = position + largeur
132
+		
133
+	scriptpy = str(sys.argv[1])
134
+	script = scriptpy[:-3]
135
+	im2.save(script+"_"+str(x)+".png",'PNG', quality=100)
136
+
137
+>>>>>>> adc56b0f751a338bfe5c843061889df049d4390b