Merge from master. Corrects imports problems

README.markdown

@@ -1,7 +1,7 @@
-#Take one picture of yourself a day, automatically generate a movie!
+#[Take one picture of yourself a day, automatically generate a movie!](http://jlengrand.github.com/FaceMovie/)
 
 
-**[FaceMovie](http://www.youtube.com/watch?v=JueOY7EtXrQ)** is a simple project that aims at helping you create videos of yourself over time, using photos as input.
+**[FaceMovie](http://www.youtube.com/watch?v=9ZpKnSjvmXo)** is a simple project that aims at helping you create videos of yourself over time, using photos as input.
 Simply take several pictures of yourself in the same position, and decide when to compile everything into a video. Just indicate the location of your pictures, Facemovie does everything else for you. 
 
 I see a growing interest for projects where people take one picture of themselves a day for several months (years ?) and compile it into a [video](http://www.youtube.com/watch?v=6B26asyGKDo). 
@@ -10,8 +10,6 @@ The main difference with everyday is that Facemovie searches automatically for f
 
 Due to its general implementation, FaceMovie may be used for faces, but also profiles (for projects showing [women along pregnancy for example](http://www.youtube.com/watch?v=CG_KArKYTq4) or full body([for people workouting](http://www.youtube.com/watch?v=02Pzfv7JV48)). The only limitation comes from you ! 
 
-**[You can check out an example here.](http://www.youtube.com/watch?v=2pUHK7Sf23I)**.
-
 
 ## Installation
 

facemovie/FaceParams.py

@@ -9,7 +9,7 @@
 import cv
 import os
 
-from facemovie import training_types
+import training_types
 
 class FaceParams(object):
     '''

facemovie/Facemovie.py

@@ -14,8 +14,8 @@ import sys
 
 import cv
 
-from facemovie.lib import exif
-from facemovie import Guy
+from lib import exif
+import Guy
 
 class FaceMovie(object):
     '''

run.sh

@@ -2,8 +2,8 @@
 
 echo "Running FaceMovie from Script !"
 
-ROOT="./facemovie"
-IN_DATA="data/input/Aurelie"
+ROOT="."
+IN_DATA="data/input/samples"
 OUT_DATA="data/output"
 
-python ${ROOT}/Facemoviefier.py -r $ROOT -i $IN_DATA -o $OUT_DATA -t i
+python ${ROOT}/Facemoviefier.py -r $ROOT -i $IN_DATA -o $OUT_DATA

run_windows.sh

@@ -1,11 +0,0 @@
-#! /bin/sh
-
-## Used through bash using git bash
-
-echo "Running FaceMovie from Script !"
-
-ROOT="./dist"
-IN_DATA="data/input/sample"
-OUT_DATA="data/output"
-
-${ROOT}/Facemoviefier.exe -r $ROOT -i $IN_DATA -o $OUT_DATA

setup.py

@@ -48,11 +48,11 @@ setup(
     version = "0.9",
     author = "Julien Lengrand-Lambert",
     author_email = "jlengrand@gmail.com",
-    description = ("An application aiming at creating a video of faces for people taking 'one picture a day' of themselves"),
+    description = ("Take one picture of yourself a day, automatically generate a movie!"),
     license = "BSD License",
     keywords = "image_processing computer_vision one_picture_a_day photography",
-    url = "https://github.com/jlengrand/FaceMovie",
-    download_url = "https://github.com/jlengrand/FaceMovie", # FIXME : To be updated
+    url = "http://jlengrand.github.com/FaceMovie/",
+    download_url = "http://jlengrand.github.com/FaceMovie/", # FIXME : To be updated
     packages=['facemovie', 'facemovie.lib', 'facemovie.haarcascades'],
     long_description=read('README.rst'),
     classifiers=[
@@ -68,6 +68,6 @@ setup(
 	data_files = haar_files,
     options = {'py2exe': {'bundle_files': 1, # 3 dont bundle, 2 bundle but python interpreter, 1 bundle everything
                           'includes': ['numpy'] } },
-    console=['facemovie/Facemoviefier.py'],
+    console=['Facemoviefier.py'],
     zipfile = None,
 )