diff --git a/Ivolution.py b/Ivolution.py index 23a2a2b..f4646c3 100755 --- a/Ivolution.py +++ b/Ivolution.py @@ -5,8 +5,6 @@ from ivolution.gui import IvolutionWindow import os -print "Script" -print os.getcwd() my_app = IvolutionWindow.IvolutionWindow("Ivolution") GObject.threads_init() Gtk.main() diff --git a/ivolution/__init__.py b/ivolution/__init__.py index 77fb6a8..c6e306b 100644 --- a/ivolution/__init__.py +++ b/ivolution/__init__.py @@ -1,9 +1,15 @@ """ -.. module:: FaceMovifier +.. module:: ivolution :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 """ -import Eye \ No newline at end of file +import os + +_ROOT = os.path.abspath(os.path.dirname(__file__)) +def get_data(path): + return os.path.join(_ROOT, 'data', path) + +print get_data('resource1/foo.txt') \ No newline at end of file diff --git a/ivolution/gui/AboutDialog.py b/ivolution/gui/AboutDialog.py index 8e2047e..8e8b6b2 100755 --- a/ivolution/gui/AboutDialog.py +++ b/ivolution/gui/AboutDialog.py @@ -1,5 +1,7 @@ from gi.repository import Gtk +from .. import get_data + class AboutDialog(): def __init__(self): @@ -9,7 +11,7 @@ class AboutDialog(): Returns a fully instantiated AboutDialog object. """ self.builder = Gtk.Builder() - self.builder.add_from_file("ivolution/data/ui/AboutIvolutionDialog.glade") + self.builder.add_from_file(get_data("/ui/AboutIvolutionDialog.glade")) self.window = self.builder.get_object("about_ivolution_dialog") self.window.run() diff --git a/ivolution/gui/IvolutionWindow.py b/ivolution/gui/IvolutionWindow.py index 5b260d7..fadd3db 100755 --- a/ivolution/gui/IvolutionWindow.py +++ b/ivolution/gui/IvolutionWindow.py @@ -10,13 +10,15 @@ from gi.repository import Gtk, GLib from AboutDialog import AboutDialog -import os -parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -os.sys.path.insert(0,parentdir) # import parent folder +from .. import get_data -import Facemovie_lib -import FaceParams -import FacemovieThread +# import os +# parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +# os.sys.path.insert(0,parentdir) # import parent folder + +from .. import Facemovie_lib +from .. import FaceParams +from .. import FacemovieThread import time @@ -28,10 +30,9 @@ class IvolutionWindow(FacemovieThread.Observer, FacemovieThread.Observable): self.my_logger = None self.console_logger = None - print "GUI" - print os.getcwd() self.builder = Gtk.Builder() - self.builder.add_from_file("ivolution/data/ui/IvolutionWindow.glade") + self.builder.add_from_file(get_data('ui/IvolutionWindow.glade')) + #self.builder.add_from_file("ivolution/data/ui/IvolutionWindow.glade") #self.builder.connect_signals({ "on_ivolutionwindow_destroy" : Gtk.main_quit }) self.window = self.builder.get_object("ivolution_window") self.window.show() @@ -163,7 +164,7 @@ class IvolutionWindow(FacemovieThread.Observer, FacemovieThread.Observable): self.speed = self.speedcombobox.get_active() # We need and integer between 0 and 2 # Instantiating the face_params object that will be needed by the facemovie - par_fo = os.path.join(self.root_fo, "ivolution/data/haarcascades") + par_fo = os.path.join(self.root_fo, get_data("haarcascades")) self.face_params = FaceParams.FaceParams(par_fo, self.in_fo, self.out_fo,