From 3904137b97400aff3e4265d2280c6ae5ba59f26b Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Mon, 7 Sep 2015 10:24:28 +0200
Subject: [PATCH] =?UTF-8?q?unparse=20content=20op=C3=A9rationnel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/bmp.py      |  22 +++++++++++++++-------
 code/classes.py  |  17 ++++++++++++++---
 code/classes.pyc | Bin 5917 -> 6195 bytes
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/code/bmp.py b/code/bmp.py
index 893a69b..57c3627 100644
--- a/code/bmp.py
+++ b/code/bmp.py
@@ -15,9 +15,6 @@ img.parse( sys.argv[1] );
 ### print header human-readable data ###
 print img.header.info()
 
-print
-print img.content.readableData
-print
 ### print file human-readable data ###
 #print img.readableData
 
@@ -28,7 +25,18 @@ print
 #print img.content.readableData
 
 
-for line in img.content.map:
-	for pixel in line:
-		print "rgb(%s, %s, %s)" % (pixel.r, pixel.g, pixel.b)
-	print
\ No newline at end of file
+
+
+#for line in img.content.map:
+#	for pixel in line:
+#		print "rgb(%s, %s, %s)" % (pixel.r, pixel.g, pixel.b)
+#	print
+
+for byte in img.content.bin:
+	print ord(byte),
+print
+
+img.content.unparse( img.content.map )
+
+for byte in img.content.bin:
+	print ord(byte),
\ No newline at end of file
diff --git a/code/classes.py b/code/classes.py
index 102df19..b8facba 100644
--- a/code/classes.py
+++ b/code/classes.py
@@ -140,9 +140,20 @@ class BMPContent:
 
 	# unparse une map de pixels en binaire
 	def unparse(self, map):
-		print "To Do!"
-		print "unparsing content and creating header"
-			
+		self.map = map
+		
+		height  = len( map    ) # nb de lignes   = taille de la map
+		width   = len( map[0] ) # nb de colonnes = taille des lignes de la map
+		padding = ( 4 - width*3 % 4 ) % 4 # padding de bourrage de lignes
+		
+		
+		self.bin = ""
+		for line in self.map[::-1]:
+			for pixel in line:
+				self.bin += unichr(pixel.b) + unichr(pixel.g) + unichr(pixel.r)
+			for zero in range(0, padding):
+				self.bin += unichr(0)
+		
 #################################
 # classe contenant un pixel RGB #
 #################################
diff --git a/code/classes.pyc b/code/classes.pyc
index 78f0a29513d4353325041211d799adc40c757ab4..1de96c7ed77dc3b5033d6b4ab3d7f868993dda13 100644
GIT binary patch
delta 572
zcmYk2OH0F05QWbqxv5XARii}|Dn5cpeL?F+5EKyw7je;rh@cg15g#?uAPHTld*QAX
zT`Pj<-*Dkh@Mnl?ok_be<bFAG?>#e<xy`;#+2(h9%je3A{nJrv0+8Uf$m{Hj5fVaR
z8}L~WE(wv*&_zO8ViQFJA=5-RE2mEoStweu)j)6~q6`%4ufny7^wL&<NFi82sIas(
zhsZ{a?^$IoU?Q|pwxnJ|E784;z>b5wv2Eb=0EJ)zegfQ2$PR;(^&?71%|<RhVRQZZ
z8w#hJC~zwquFXHVUSgnR3CtSPON;#F$CYV#!-7!(F?{iyAC-0wDm)QjC+2?4iZ{kP
zbyt#A-74es#N|y0vJ77_PD;Vvp)YkW_A19Nf8pw?J+GgV$=PlRso7|wBspd?4NyDf
z$RSspUPdq^=oAbJa(W@PrpG(4M!Z>xX9Uv>S4wzsKmQK&RO_-5_k+%)j_CgNCUs}f
kv!3kvP&wXy*UHIIoK)pGe$-WGp7LB|RsTBu=1N!VAE7p2v;Y7A

delta 229
zcmdmNFjtR_`7<w9rrSogul$TmlS{=^UD+5I7(((DT=Er*Re{XXyn@7{;>^5sh2;Fa
zlGMBsg~YrRh2)~t#1fETMrvY8YLNy|A%g}JkO&e05h{}}h`UYRDk#9t0+L~5oqR`7
zn$cjgt+@AOXQ3925=NkC5tvK|lSvvNg%Hh#AeIq`FrI9{?ZzqyWKNrGE}X|Wb@MXe
uc}$FpC%cMWWHkT^ADS#Jt_U%g)da|2Fu7OUmeB-gkJn^T32A0qVQv7OAT=!j