diff --git a/.gitignore b/.gitignore index 2b1af11..5a38976 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ MANIFEST packaging doc/build *~ +README.rst diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..cab8b21 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding//doc/source/conf.py=utf-8 diff --git a/Facemoviefier.py b/Facemoviefier.py index 75a96e8..60e1a71 100644 --- a/Facemoviefier.py +++ b/Facemoviefier.py @@ -1,8 +1,7 @@ """ .. module:: FaceMovifier :platform: Unix, Windows - :synopsis: Higher class of the application. Used to handle the command line interface. - Direclty interfaces user commands with FaceMovie actions. + :synopsis: Higher class of the application. Used to handle the command line interface. Direclty interfaces user commands with FaceMovie actions. .. moduleauthor:: Julien Lengrand-Lambert diff --git a/README.markdown b/README.markdown index fdd5dba..213ba81 100644 --- a/README.markdown +++ b/README.markdown @@ -192,4 +192,4 @@ I would enjoy having feedback if you like this idea, or even used it. Send me a You can contact me at julien at lengrand dot fr, or on my [current website](http://www.lengrand.fr). -Version : 0.8.1 \ No newline at end of file +Version : 0.8.2 \ No newline at end of file diff --git a/build.xml b/build.xml index b65b217..0807cb0 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ - + @@ -66,6 +66,9 @@ + + + @@ -122,9 +125,6 @@ - - - diff --git a/doc/source/index.rst b/doc/source/index.rst index 7010b56..baef5e0 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -20,7 +20,7 @@ FaceMovie Facemoviefier ============= -.. automodule:: facemovie.Facemoviefier +.. automodule:: Facemoviefier :members: Eye diff --git a/facemovie/Facemovie.py b/facemovie/Facemovie.py index 179bd67..227a628 100644 --- a/facemovie/Facemovie.py +++ b/facemovie/Facemovie.py @@ -1,10 +1,7 @@ """ .. module:: Facemovie :platform: Unix, Windows - :synopsis: Main class of the application. Contains the core image processing - functions. - Plays the role of a controller for the application, as it supports the - communication layer with the end user interface. + :synopsis: Main class of the application. Contains the core image processing functions.Plays the role of a controller for the application, as it supports the communication layer with the end user interface. .. moduleauthor:: Julien Lengrand-Lambert diff --git a/facemovie/Guy.py b/facemovie/Guy.py index d7968c7..ac19583 100644 --- a/facemovie/Guy.py +++ b/facemovie/Guy.py @@ -1,8 +1,7 @@ """ .. module:: Guy :platform: Unix, Windows - :synopsis: Class defining a Guy in the sense of the FaceMovie. Corresponds - to one input image. An input folder is transformed in fact to a list of guys. + :synopsis: Class defining a Guy in the sense of the FaceMovie. Corresponds to one input image. An input folder is transformed in fact to a list of guys. .. moduleauthor:: Julien Lengrand-Lambert diff --git a/facemovie/__init__.py b/facemovie/__init__.py index 7d111e6..77fb6a8 100644 --- a/facemovie/__init__.py +++ b/facemovie/__init__.py @@ -1,6 +1,7 @@ """ - Aims at helping you create videos of yourself over time, using photos as input. - Take great pictures, FaceMovie will do the rest ! +.. module:: FaceMovifier + :platform: Unix, Windows + :synopsis: Aims at helping you create videos of yourself over time, using photos as input. Take great pictures, FaceMovie will do the rest ! .. moduleauthor:: Julien Lengrand-Lambert diff --git a/facemovie/lib/__init__.py b/facemovie/lib/__init__.py index 4257bd0..6727d28 100644 --- a/facemovie/lib/__init__.py +++ b/facemovie/lib/__init__.py @@ -1,5 +1,8 @@ """ - This package aims at containing all libraries or external elements needed to create the FaceMovie + +.. module:: FaceMovifier + :platform: Unix, Windows + :synopsis: This package aims at containing all libraries or external elements needed to create the FaceMovie .. moduleauthor:: Julien Lengrand-Lambert diff --git a/facemovie/training_types.py b/facemovie/training_types.py index 2b7a300..dfb5ce3 100644 --- a/facemovie/training_types.py +++ b/facemovie/training_types.py @@ -1,8 +1,7 @@ """ .. module:: training_types :platform: Unix, Windows - :synopsis: Dumb class aiming at regrouping all information concerning the trainers for classification. - Each entry is linked to a label, corresponding to a different type of recognition (frontal, profile, . . . ) + :synopsis: Dumb class aiming at regrouping all information concerning the trainers for classification. Each entry is linked to a label, corresponding to a different type of recognition (frontal, profile, . . . ) .. moduleauthor:: Julien Lengrand-Lambert diff --git a/setup.py b/setup.py index b8e669f..a1448a1 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ haar_files = find_data_files('facemovie','',['haarcascades/*.xml']) setup( name = "Facemovie", - version = "0.8.1", + version = "0.8.2", author = "Julien Lengrand-Lambert", author_email = "jlengrand@gmail.com", description = ("Take one picture of yourself a day, automatically generate a movie!"), @@ -54,7 +54,7 @@ setup( keywords = "image_processing computer_vision one_picture_a_day photography", url = "http://jlengrand.github.com/FaceMovie/", download_url = "http://jlengrand.github.com/FaceMovie/", - packages=['facemovie', 'facemovie.lib', 'facemovie.haarcascades'], + packages=['facemovie', 'facemovie.lib', 'haarcascades'], long_description=read('README.rst'), classifiers=[ "Development Status :: 3 - Alpha",