diff --git a/code/bmp.py b/code/bmp.py index fd3627e..b00e2d4 100644 --- a/code/bmp.py +++ b/code/bmp.py @@ -102,8 +102,12 @@ elif action == 11: print startStr testAdditiveNoise() # teste le bruitage/débruitage de type "Additif" elif action == 12: + s = raw_input("Seuil [5]: "); + arg1 = 5 + if s != "": + arg1 = int(s) print startStr - testSmooth() # teste le lissage + testSmooth(arg1) # teste le lissage # performances elif action == 20: diff --git a/code/mask.bmp b/code/mask.bmp deleted file mode 100644 index e199a71..0000000 Binary files a/code/mask.bmp and /dev/null differ diff --git a/code/mergeSub.bmp b/code/mergeSub.bmp new file mode 100644 index 0000000..2220fe1 Binary files /dev/null and b/code/mergeSub.bmp differ diff --git a/code/new.bmp b/code/new.bmp new file mode 100644 index 0000000..50ad60f Binary files /dev/null and b/code/new.bmp differ diff --git a/code/tests.py b/code/tests.py index d79acfc..5a25e0f 100644 --- a/code/tests.py +++ b/code/tests.py @@ -374,8 +374,7 @@ def testAdditiveNoise(): # Parse le fichier d'origine # Lisse le fichier # Unparse l'image et l'enregistre dans le fichier de sortie -def testSmooth(): - +def testSmooth(seuil=5): t = Timer(); @@ -395,8 +394,9 @@ def testSmooth(): img.parse( binFile ); print "%s |" % (t.get()) - print "| Smooth image |",; t.reset(); - noise.smooth(img.content.map, seuil=5) + + print "| Lissage |",; t.reset(); + noise.smooth(img.content.map, seuil=seuil); print "%s |" % (t.get()) # Unparsing diff --git a/docs/shapes/AM_Contours.pdf b/docs/shapes/AM_Contours.pdf new file mode 100644 index 0000000..b18b905 Binary files /dev/null and b/docs/shapes/AM_Contours.pdf differ diff --git a/docs/shapes/IN_GBM_04_CONTOURS.PDF b/docs/shapes/IN_GBM_04_CONTOURS.PDF new file mode 100644 index 0000000..3c18c11 Binary files /dev/null and b/docs/shapes/IN_GBM_04_CONTOURS.PDF differ diff --git a/docs/shapes/c3.pdf b/docs/shapes/c3.pdf new file mode 100644 index 0000000..5d1b2f6 Binary files /dev/null and b/docs/shapes/c3.pdf differ