From 2756b40d564f4c8c378849919d162ba955c0e506 Mon Sep 17 00:00:00 2001
From: Martin Baeuml <baeuml@kit.edu>
Date: Tue, 17 May 2011 14:43:30 +0200
Subject: [PATCH] fix import paths

---
 setup.py                       |  2 ++
 sloth/annotations/container.py |  2 +-
 sloth/bin/labeltool.py         | 16 ++++++++--------
 sloth/conf/__init__.py         |  2 +-
 sloth/conf/default_config.py   |  8 ++++----
 sloth/gui/annotationscene.py   |  4 ++--
 sloth/items/__init__.py        |  6 +++---
 sloth/items/factory.py         |  2 +-
 sloth/items/items.py           |  2 +-
 9 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/setup.py b/setup.py
index aac14f1..cee767d 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,8 @@ for dirpath, dirnames, filenames in os.walk(sloth_dir):
         if dirname.startswith('.'): del dirnames[i]
     if '__init__.py' in filenames:
         packages.append('.'.join(fullsplit(dirpath)))
+        if 'labeltool.ui' in filenames:
+            data_files.append([dirpath, [os.path.join(dirpath, 'labeltool.ui')]])
     elif filenames:
         data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
 
diff --git a/sloth/annotations/container.py b/sloth/annotations/container.py
index 9552ec2..35a8fd4 100644
--- a/sloth/annotations/container.py
+++ b/sloth/annotations/container.py
@@ -1,6 +1,6 @@
 import os
 import fnmatch
-from core.exceptions import ImproperlyConfigured, NotImplementedException
+from sloth.core.exceptions import ImproperlyConfigured, NotImplementedException
 try:
     import cPickle as pickle
 except:
diff --git a/sloth/bin/labeltool.py b/sloth/bin/labeltool.py
index 1eb5596..d22f7ee 100755
--- a/sloth/bin/labeltool.py
+++ b/sloth/bin/labeltool.py
@@ -4,17 +4,17 @@ INSTALLDIR=os.path.join(os.path.dirname(__file__), '../gui')
 sys.path.append(INSTALLDIR)
 
 import functools, importlib
+from optparse import OptionParser
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 import PyQt4.uic as uic
-from gui import qrc_icons
-from gui.buttonarea import *
-from annotations.model import *
-from annotations.container import AnnotationContainerFactory, AnnotationContainer
-from gui.annotationscene import *
-from gui.frameviewer import *
-from optparse import OptionParser
-from conf import config
+from sloth.gui import qrc_icons
+from sloth.gui.buttonarea import *
+from sloth.annotations.model import *
+from sloth.annotations.container import AnnotationContainerFactory, AnnotationContainer
+from sloth.gui.annotationscene import *
+from sloth.gui.frameviewer import *
+from sloth.conf import config
 
 APP_NAME            = """labeltool"""
 ORGANIZATION_NAME   = """CV:HCI Research Group"""
diff --git a/sloth/conf/__init__.py b/sloth/conf/__init__.py
index cfc3db9..cf67951 100644
--- a/sloth/conf/__init__.py
+++ b/sloth/conf/__init__.py
@@ -1,4 +1,4 @@
-from conf import default_config
+from sloth.conf import default_config
 import importlib
 
 class Config:
diff --git a/sloth/conf/default_config.py b/sloth/conf/default_config.py
index ca185b7..c90e284 100644
--- a/sloth/conf/default_config.py
+++ b/sloth/conf/default_config.py
@@ -5,13 +5,13 @@ HOTKEYS = (
 )
 
 ITEMS = {
-    'rect':  'items.RectItem',
-    'point': 'items.PointItem',
+    'rect':  'sloth.items.RectItem',
+    'point': 'sloth.items.PointItem',
 }
 
 INSERTERS = {
-    'rect':  'items.RectItemInserter',
-    'point': 'items.PointItemInserter',
+    'rect':  'sloth.items.RectItemInserter',
+    'point': 'sloth.items.PointItemInserter',
 }
 
 CONTAINERS = (
diff --git a/sloth/gui/annotationscene.py b/sloth/gui/annotationscene.py
index 3ef6a30..a38104a 100644
--- a/sloth/gui/annotationscene.py
+++ b/sloth/gui/annotationscene.py
@@ -1,8 +1,8 @@
 """Dies ist das AnnotationScene module"""
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
-from items import *
-from annotations.model import TypeRole, ImageRole
+from sloth.items import *
+from sloth.annotations.model import TypeRole, ImageRole
 import math
 import okapy
 from okapy.guiqt.utilities import toQImage
diff --git a/sloth/items/__init__.py b/sloth/items/__init__.py
index 9d6aeaa..6613b85 100644
--- a/sloth/items/__init__.py
+++ b/sloth/items/__init__.py
@@ -1,4 +1,4 @@
-from items import *
-from inserters import *
-from factory import Factory
+from sloth.items.items import *
+from sloth.items.inserters import *
+from sloth.items.factory import Factory
 
diff --git a/sloth/items/factory.py b/sloth/items/factory.py
index 58f16e8..1bb1249 100644
--- a/sloth/items/factory.py
+++ b/sloth/items/factory.py
@@ -1,4 +1,4 @@
-import exceptions
+from sloth.core import exceptions
 import importlib
 
 class Factory:
diff --git a/sloth/items/items.py b/sloth/items/items.py
index 2dc3685..2b2c468 100644
--- a/sloth/items/items.py
+++ b/sloth/items/items.py
@@ -1,6 +1,6 @@
 from PyQt4.QtGui import *
 from PyQt4.Qt import *
-from annotations.model import DataRole
+from sloth.annotations.model import DataRole
 
 class ControlItem(QGraphicsItem):
     def __init__(self, parent=None):