diff --git a/schainpy/gui/__init__.py b/schainpy/gui/__init__.py index 6eac6ef..35d9f68 100644 --- a/schainpy/gui/__init__.py +++ b/schainpy/gui/__init__.py @@ -1 +1 @@ -from viewcontroller import * \ No newline at end of file +# from viewcontroller import * \ No newline at end of file diff --git a/schainpy/gui/testSignalChainGUI.py b/schainpy/gui/testSignalChainGUI.py deleted file mode 100644 index e989eab..0000000 --- a/schainpy/gui/testSignalChainGUI.py +++ /dev/null @@ -1,29 +0,0 @@ - -import sys -from PyQt4 import QtCore, QtGui -from PyQt4.QtGui import QApplication -#from PyQt4.QtCore import pyqtSignature - -from viewcontroller.initwindow import InitWindow -from viewcontroller.basicwindow import BasicWindow -from viewcontroller.workspace import Workspace - -def main(): - import sys - app = QtGui.QApplication(sys.argv) - - Welcome=InitWindow() - if not Welcome.exec_(): - sys.exit(-1) - - WorkPathspace=Workspace() - if not WorkPathspace.exec_(): - sys.exit(-1) - - MainGUI=BasicWindow() - MainGUI.setWorkSpaceGUI(WorkPathspace.dirComBox.currentText()) - MainGUI.show() - sys.exit(app.exec_()) - -if __name__ == "__main__": - main() \ No newline at end of file diff --git a/schainpy/gui/viewer/__init__.py b/schainpy/gui/viewer/__init__.py index fc95419..416f53f 100644 --- a/schainpy/gui/viewer/__init__.py +++ b/schainpy/gui/viewer/__init__.py @@ -1,5 +1,5 @@ -import ui_initwindow -import ui_workspace -import ui_mainwindow -import ui_window -import ui_ftp \ No newline at end of file +# import ui_initwindow +# import ui_workspace +# import ui_mainwindow +# import ui_window +# import ui_ftp \ No newline at end of file diff --git a/setup.py b/setup.py index ac4836b..87a9b30 100644 --- a/setup.py +++ b/setup.py @@ -12,11 +12,18 @@ setup(name="schainpy", author="Miguel Urco", author_email="miguel.urco@jro.igp.gob.pe", url="http://jro.igp.gob.pe", - packages = {'schainpy', 'schainpy.model', + packages = {'schainpy', + 'schainpy.model', 'schainpy.model.data', 'schainpy.model.graphics', 'schainpy.model.io', 'schainpy.model.proc', - 'schainpy.model.utils'}, + 'schainpy.model.utils', + 'schainpy.gui.figure', + 'schainpy.gui.viewcontroller', + 'schainpy.gui.viewer'}, py_modules=['schainpy.serializer.DataTranslate', - 'schainpy.serializer.JROSerializer']) \ No newline at end of file + 'schainpy.serializer.JROSerializer'], + package_data={'schainpy.gui.figure': ['*.jpg', '*.png', '*.gif']}, + include_package_data=True, + scripts =['schainpy/gui/schaingui.py']) \ No newline at end of file diff --git a/setup_gui.py b/setup_gui.py deleted file mode 100644 index 67bb9d0..0000000 --- a/setup_gui.py +++ /dev/null @@ -1,23 +0,0 @@ -''' -Created on Jun 5, 2015 - -@author: Miguel Urco -''' - -from distutils.core import setup, Extension - -setup(name="schainpy", - version="2.0", - description="Signal Chain Graphical Interface", - author="Miguel Urco", - author_email="miguel.urco@jro.igp.gob.pe", - url="http://jro.igp.gob.pe", - packages = {'schainpy', - 'schainpy.gui', - 'schainpy.gui.figure', - 'schainpy.gui.viewcontroller', - 'schainpy.gui.viewer',}, - py_modules=['schainpy.controller'], - package_data={'schainpy.gui.figure': ['*.jpg', '*.png', '*.gif']}, - include_package_data=True, - scripts =['schainpy/gui/schaingui.py']) \ No newline at end of file