Pb de couleur 24 réglé, Salt&Pepper fonctionnel dans les 2 sens, controle de qualité dans le main et image de différence.

code/BMPFile.py

@@ -288,7 +288,7 @@ class RGBPixel:
 			self.binData = chr( self.intData[0] )
 		else:
 			self.intData = [ r, g, b                       ]
-			self.binData = chr(b) + chr(g) + chr(r)
+			self.binData = chr(g) + chr(b) + chr(r)
 
 
 	def setRGB(self, r, g, b, bpp=24):

code/Noise.py

@@ -25,7 +25,7 @@ class Noise:
 
 
 	# enlève le bruit "poivre et sel"
-	def SaltAndPepper_unset(self, pixelMap, seuil=10, borne=20):
+	def SaltAndPepper_unset(self, pixelMap, seuil=5, borne=5):
 		width  = len( pixelMap[0] )
 		height = len( pixelMap    )
 

code/bmp.py

@@ -99,7 +99,7 @@ def testSaltAndPepper():
 
 
 	print "Creating Salt&Pepper  -",; t.reset();
-	noise.SaltAndPepper_set(img.content.map, seuil=1)
+	noise.SaltAndPepper_set(img.content.map, seuil=10)
 	print "Done in %s s" % (t.get())
 
 	# Unparsing
@@ -253,7 +253,7 @@ def imageForImageQuality():
 	modelPixelCount = model.header.width * model.header.height 
 	
 	if imagePixelCount != modelPixelCount:
-		print "*** Taille de matrices différentes"
+		print "*** Taille de images différentes"
 		exit()
 
 
@@ -284,17 +284,79 @@ def imageForImageQuality():
 
 
 
-############ TESTS ############
-#testManualCreation()
-testSaltAndPepper()
-#testFileIntegrity()
-#printIntPalette()
-#printImageQuality()
-imageForImageQuality()
 
 
 
 
+def mergeImages():
+	t = Timer();
+	total = Timer(); total.reset();
+	imageFile, modelFile = "", ""
+	image, model, newImg = BMPFile(), BMPFile(), BMPFile()
+
+
+	# lecture des fichiers
+	print "Reading files        -",; t.reset();
+	with open( sys.argv[1] ) as f:
+		imageFile = f.read();
+	with open( sys.argv[2] ) as f:
+		modelFile = f.read();
+	print "Done in %s s" % (t.get())
+
+	# parsage
+	print "Parsing images       -",; t.reset();
+	image.parse( imageFile );
+	model.parse( modelFile );
+	print "Done in %s s" % (t.get())
+
+	
+	# condition
+	imagePixelCount = image.header.width * image.header.height
+	modelPixelCount = model.header.width * model.header.height 
+
+	if imagePixelCount != modelPixelCount:
+		print "*** Taille de images différentes"
+		exit()
+
+
+	# comparaison
+	print "Merging              -",; t.reset();
+	for y in range(0, image.header.height):
+		newImg.content.map.append( [] );
+		for x in range(0, image.header.width):
+			newImg.content.map[y].append( RGBPixel(
+				( image.content.map[y][x].r + model.content.map[y][x].r ) % 256,
+				( image.content.map[y][x].g + model.content.map[y][x].g ) % 256,
+				( image.content.map[y][x].b + model.content.map[y][x].b ) % 256
+			) )
+
+	print "Done in %s s" % (t.get())
+	
+	print "Unparsing            -",; t.reset();
+	newImg.unparse(newBpp=24);
+	print "Done in %s s" % (t.get())
+
+	print "Writing File         -",; t.reset();
+	with open("merge.bmp", "w") as f:
+		f.write( newImg.binData );
+	print "Done in %s s" % (t.get())
+
+ 
+	print "\nExecution Time: %s seconds" % total.get()
+
+
+############ TESTS ############
+# testManualCreation()
+testSaltAndPepper()
+# testFileIntegrity()
+# printIntPalette()
+printImageQuality()
+
+# imageForImageQuality()
+# mergeImages()
+
+
+