From 7739f7677767da14aee89100f673a546d8889976 Mon Sep 17 00:00:00 2001 From: Martin Baeuml Date: Tue, 17 May 2011 14:04:02 +0200 Subject: [PATCH] make sloth its own package --- {annotations => sloth}/__init__.py | 0 {core => sloth/annotations}/__init__.py | 0 {annotations => sloth/annotations}/container.py | 0 {annotations => sloth/annotations}/model.py | 0 labeltool.py => sloth/bin/labeltool.py | 12 ++++++------ {conf => sloth/conf}/__init__.py | 0 {conf => sloth/conf}/default_config.py | 0 sloth/core/__init__.py | 0 {core => sloth/core}/exceptions.py | 0 sloth/gui/__init__.py | 0 annotationscene.py => sloth/gui/annotationscene.py | 0 buttonarea.py => sloth/gui/buttonarea.py | 0 frameviewer.py => sloth/gui/frameviewer.py | 0 icons.qrc => sloth/gui/icons.qrc | 0 {icons => sloth/gui/icons}/arrow_left.png | Bin {icons => sloth/gui/icons}/arrow_right.png | Bin {icons => sloth/gui/icons}/disk.png | Bin {icons => sloth/gui/icons}/door_in.png | Bin {icons => sloth/gui/icons}/door_out.png | Bin {icons => sloth/gui/icons}/folder_table.png | Bin {icons => sloth/gui/icons}/page_white.png | Bin {icons => sloth/gui/icons}/page_white_text.png | Bin {icons => sloth/gui/icons}/picture_add.png | Bin {icons => sloth/gui/icons}/zoom.png | Bin {icons => sloth/gui/icons}/zoom_in.png | Bin {icons => sloth/gui/icons}/zoom_out.png | Bin labeltool.ui => sloth/gui/labeltool.ui | 0 qrc_icons.py => sloth/gui/qrc_icons.py | 0 {items => sloth/items}/__init__.py | 0 {items => sloth/items}/factory.py | 0 {items => sloth/items}/inserters.py | 0 {items => sloth/items}/items.py | 0 32 files changed, 6 insertions(+), 6 deletions(-) rename {annotations => sloth}/__init__.py (100%) rename {core => sloth/annotations}/__init__.py (100%) rename {annotations => sloth/annotations}/container.py (100%) rename {annotations => sloth/annotations}/model.py (100%) rename labeltool.py => sloth/bin/labeltool.py (97%) rename {conf => sloth/conf}/__init__.py (100%) rename {conf => sloth/conf}/default_config.py (100%) create mode 100644 sloth/core/__init__.py rename {core => sloth/core}/exceptions.py (100%) create mode 100644 sloth/gui/__init__.py rename annotationscene.py => sloth/gui/annotationscene.py (100%) rename buttonarea.py => sloth/gui/buttonarea.py (100%) rename frameviewer.py => sloth/gui/frameviewer.py (100%) rename icons.qrc => sloth/gui/icons.qrc (100%) rename {icons => sloth/gui/icons}/arrow_left.png (100%) rename {icons => sloth/gui/icons}/arrow_right.png (100%) rename {icons => sloth/gui/icons}/disk.png (100%) rename {icons => sloth/gui/icons}/door_in.png (100%) rename {icons => sloth/gui/icons}/door_out.png (100%) rename {icons => sloth/gui/icons}/folder_table.png (100%) rename {icons => sloth/gui/icons}/page_white.png (100%) rename {icons => sloth/gui/icons}/page_white_text.png (100%) rename {icons => sloth/gui/icons}/picture_add.png (100%) rename {icons => sloth/gui/icons}/zoom.png (100%) rename {icons => sloth/gui/icons}/zoom_in.png (100%) rename {icons => sloth/gui/icons}/zoom_out.png (100%) rename labeltool.ui => sloth/gui/labeltool.ui (100%) rename qrc_icons.py => sloth/gui/qrc_icons.py (100%) rename {items => sloth/items}/__init__.py (100%) rename {items => sloth/items}/factory.py (100%) rename {items => sloth/items}/inserters.py (100%) rename {items => sloth/items}/items.py (100%) diff --git a/annotations/__init__.py b/sloth/__init__.py similarity index 100% rename from annotations/__init__.py rename to sloth/__init__.py diff --git a/core/__init__.py b/sloth/annotations/__init__.py similarity index 100% rename from core/__init__.py rename to sloth/annotations/__init__.py diff --git a/annotations/container.py b/sloth/annotations/container.py similarity index 100% rename from annotations/container.py rename to sloth/annotations/container.py diff --git a/annotations/model.py b/sloth/annotations/model.py similarity index 100% rename from annotations/model.py rename to sloth/annotations/model.py diff --git a/labeltool.py b/sloth/bin/labeltool.py similarity index 97% rename from labeltool.py rename to sloth/bin/labeltool.py index ae45f09..0600c4d 100755 --- a/labeltool.py +++ b/sloth/bin/labeltool.py @@ -1,18 +1,18 @@ #!/usr/bin/python import sys, os -INSTALLDIR=os.path.dirname(__file__) +INSTALLDIR=os.path.join(os.path.dirname(__file__), '../gui') sys.path.append(INSTALLDIR) import functools, importlib from PyQt4.QtGui import * from PyQt4.QtCore import * import PyQt4.uic as uic -import qrc_icons -from buttonarea import * +from gui import qrc_icons +from gui.buttonarea import * from annotations.model import * from annotations.container import AnnotationContainerFactory, AnnotationContainer -from annotationscene import * -from frameviewer import * +from gui.annotationscene import * +from gui.frameviewer import * from optparse import OptionParser from conf import config @@ -82,7 +82,7 @@ class MainWindow(QMainWindow): ### GUI/Application setup ###___________________________________________________________________________________________ def setupGui(self): - self.ui = uic.loadUi(os.path.join(INSTALLDIR,"labeltool.ui"), self) + self.ui = uic.loadUi(os.path.join(INSTALLDIR, "labeltool.ui"), self) self.scene = AnnotationScene(items=config.ITEMS, inserters=config.INSERTERS) self.view = GraphicsView(self) diff --git a/conf/__init__.py b/sloth/conf/__init__.py similarity index 100% rename from conf/__init__.py rename to sloth/conf/__init__.py diff --git a/conf/default_config.py b/sloth/conf/default_config.py similarity index 100% rename from conf/default_config.py rename to sloth/conf/default_config.py diff --git a/sloth/core/__init__.py b/sloth/core/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/exceptions.py b/sloth/core/exceptions.py similarity index 100% rename from core/exceptions.py rename to sloth/core/exceptions.py diff --git a/sloth/gui/__init__.py b/sloth/gui/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/annotationscene.py b/sloth/gui/annotationscene.py similarity index 100% rename from annotationscene.py rename to sloth/gui/annotationscene.py diff --git a/buttonarea.py b/sloth/gui/buttonarea.py similarity index 100% rename from buttonarea.py rename to sloth/gui/buttonarea.py diff --git a/frameviewer.py b/sloth/gui/frameviewer.py similarity index 100% rename from frameviewer.py rename to sloth/gui/frameviewer.py diff --git a/icons.qrc b/sloth/gui/icons.qrc similarity index 100% rename from icons.qrc rename to sloth/gui/icons.qrc diff --git a/icons/arrow_left.png b/sloth/gui/icons/arrow_left.png similarity index 100% rename from icons/arrow_left.png rename to sloth/gui/icons/arrow_left.png diff --git a/icons/arrow_right.png b/sloth/gui/icons/arrow_right.png similarity index 100% rename from icons/arrow_right.png rename to sloth/gui/icons/arrow_right.png diff --git a/icons/disk.png b/sloth/gui/icons/disk.png similarity index 100% rename from icons/disk.png rename to sloth/gui/icons/disk.png diff --git a/icons/door_in.png b/sloth/gui/icons/door_in.png similarity index 100% rename from icons/door_in.png rename to sloth/gui/icons/door_in.png diff --git a/icons/door_out.png b/sloth/gui/icons/door_out.png similarity index 100% rename from icons/door_out.png rename to sloth/gui/icons/door_out.png diff --git a/icons/folder_table.png b/sloth/gui/icons/folder_table.png similarity index 100% rename from icons/folder_table.png rename to sloth/gui/icons/folder_table.png diff --git a/icons/page_white.png b/sloth/gui/icons/page_white.png similarity index 100% rename from icons/page_white.png rename to sloth/gui/icons/page_white.png diff --git a/icons/page_white_text.png b/sloth/gui/icons/page_white_text.png similarity index 100% rename from icons/page_white_text.png rename to sloth/gui/icons/page_white_text.png diff --git a/icons/picture_add.png b/sloth/gui/icons/picture_add.png similarity index 100% rename from icons/picture_add.png rename to sloth/gui/icons/picture_add.png diff --git a/icons/zoom.png b/sloth/gui/icons/zoom.png similarity index 100% rename from icons/zoom.png rename to sloth/gui/icons/zoom.png diff --git a/icons/zoom_in.png b/sloth/gui/icons/zoom_in.png similarity index 100% rename from icons/zoom_in.png rename to sloth/gui/icons/zoom_in.png diff --git a/icons/zoom_out.png b/sloth/gui/icons/zoom_out.png similarity index 100% rename from icons/zoom_out.png rename to sloth/gui/icons/zoom_out.png diff --git a/labeltool.ui b/sloth/gui/labeltool.ui similarity index 100% rename from labeltool.ui rename to sloth/gui/labeltool.ui diff --git a/qrc_icons.py b/sloth/gui/qrc_icons.py similarity index 100% rename from qrc_icons.py rename to sloth/gui/qrc_icons.py diff --git a/items/__init__.py b/sloth/items/__init__.py similarity index 100% rename from items/__init__.py rename to sloth/items/__init__.py diff --git a/items/factory.py b/sloth/items/factory.py similarity index 100% rename from items/factory.py rename to sloth/items/factory.py diff --git a/items/inserters.py b/sloth/items/inserters.py similarity index 100% rename from items/inserters.py rename to sloth/items/inserters.py diff --git a/items/items.py b/sloth/items/items.py similarity index 100% rename from items/items.py rename to sloth/items/items.py