From e5ed8fbe1d1ea9d6ac8db8a4b8f3301871ead154 2015-06-16 15:50:16 From: Miguel Valdez Date: 2015-06-16 15:50:16 Subject: [PATCH] Bug fixed in SchainGUI: figures were not been loaded --- diff --git a/README b/README new file mode 100644 index 0000000..99bbc49 --- /dev/null +++ b/README @@ -0,0 +1,23 @@ +Prerequisites: + + -numpy 1.8.0 + - + +Signal Chain Installation: + + 1. Install numpy, matplotlib, TKAgg + 2. Install digital_rf_hdf5 module (developed by Haystack Observatory) if you will use USRP data + 3. untar schainpy-x.x.x.tar.gz + 4. cd schainpy-x.x.x + 5. execute: + [hostname]$ sudo pyhon setup.py install + 6. testing gui: + [hostname]$ schainGUI (enter) + +If you want to use serialization and zerorpc you will need to install the next packages: + + 1. zerorpc + [hostname]$ sudo port install zerorpc + + 2. cPickle, msgpack and msgpack_numpy + [hostname]$ sudo port install cPickle msgpack mspack_numpy \ No newline at end of file diff --git a/schainpy/gui/figure/.bash_logout b/schainpy/gui/figures/.bash_logout similarity index 100% rename from schainpy/gui/figure/.bash_logout rename to schainpy/gui/figures/.bash_logout diff --git a/schainpy/gui/figure/Crear.jpg b/schainpy/gui/figures/Crear.jpg similarity index 100% rename from schainpy/gui/figure/Crear.jpg rename to schainpy/gui/figures/Crear.jpg Binary files a/schainpy/gui/figure/Crear.jpg and b/schainpy/gui/figures/Crear.jpg differ diff --git a/schainpy/gui/figure/Open Sign.jpg b/schainpy/gui/figures/Open Sign.jpg similarity index 100% rename from schainpy/gui/figure/Open Sign.jpg rename to schainpy/gui/figures/Open Sign.jpg Binary files a/schainpy/gui/figure/Open Sign.jpg and b/schainpy/gui/figures/Open Sign.jpg differ diff --git a/schainpy/gui/figure/__init__.py b/schainpy/gui/figures/__init__.py similarity index 100% rename from schainpy/gui/figure/__init__.py rename to schainpy/gui/figures/__init__.py diff --git a/schainpy/gui/figure/add_PU.gif b/schainpy/gui/figures/add_PU.gif similarity index 100% rename from schainpy/gui/figure/add_PU.gif rename to schainpy/gui/figures/add_PU.gif Binary files a/schainpy/gui/figure/add_PU.gif and b/schainpy/gui/figures/add_PU.gif differ diff --git a/schainpy/gui/figure/adn.jpg b/schainpy/gui/figures/adn.jpg similarity index 100% rename from schainpy/gui/figure/adn.jpg rename to schainpy/gui/figures/adn.jpg Binary files a/schainpy/gui/figure/adn.jpg and b/schainpy/gui/figures/adn.jpg differ diff --git a/schainpy/gui/figure/guardar.jpeg b/schainpy/gui/figures/guardar.jpeg similarity index 100% rename from schainpy/gui/figure/guardar.jpeg rename to schainpy/gui/figures/guardar.jpeg Binary files a/schainpy/gui/figure/guardar.jpeg and b/schainpy/gui/figures/guardar.jpeg differ diff --git a/schainpy/gui/figure/open.gif b/schainpy/gui/figures/open.gif similarity index 100% rename from schainpy/gui/figure/open.gif rename to schainpy/gui/figures/open.gif Binary files a/schainpy/gui/figure/open.gif and b/schainpy/gui/figures/open.gif differ diff --git a/schainpy/gui/figure/open.png b/schainpy/gui/figures/open.png similarity index 100% rename from schainpy/gui/figure/open.png rename to schainpy/gui/figures/open.png Binary files a/schainpy/gui/figure/open.png and b/schainpy/gui/figures/open.png differ diff --git a/schainpy/gui/figure/pause.png b/schainpy/gui/figures/pause.png similarity index 100% rename from schainpy/gui/figure/pause.png rename to schainpy/gui/figures/pause.png Binary files a/schainpy/gui/figure/pause.png and b/schainpy/gui/figures/pause.png differ diff --git a/schainpy/gui/figure/pausered.png b/schainpy/gui/figures/pausered.png similarity index 100% rename from schainpy/gui/figure/pausered.png rename to schainpy/gui/figures/pausered.png Binary files a/schainpy/gui/figure/pausered.png and b/schainpy/gui/figures/pausered.png differ diff --git a/schainpy/gui/figure/play.jpg b/schainpy/gui/figures/play.jpg similarity index 100% rename from schainpy/gui/figure/play.jpg rename to schainpy/gui/figures/play.jpg Binary files a/schainpy/gui/figure/play.jpg and b/schainpy/gui/figures/play.jpg differ diff --git a/schainpy/gui/figure/project.gif b/schainpy/gui/figures/project.gif similarity index 100% rename from schainpy/gui/figure/project.gif rename to schainpy/gui/figures/project.gif Binary files a/schainpy/gui/figure/project.gif and b/schainpy/gui/figures/project.gif differ diff --git a/schainpy/gui/figure/saveicon.jpeg b/schainpy/gui/figures/saveicon.jpeg similarity index 100% rename from schainpy/gui/figure/saveicon.jpeg rename to schainpy/gui/figures/saveicon.jpeg Binary files a/schainpy/gui/figure/saveicon.jpeg and b/schainpy/gui/figures/saveicon.jpeg differ diff --git a/schainpy/gui/figure/startServer.png b/schainpy/gui/figures/startServer.png similarity index 100% rename from schainpy/gui/figure/startServer.png rename to schainpy/gui/figures/startServer.png Binary files a/schainpy/gui/figure/startServer.png and b/schainpy/gui/figures/startServer.png differ diff --git a/schainpy/gui/figure/stop.jpg b/schainpy/gui/figures/stop.jpg similarity index 100% rename from schainpy/gui/figure/stop.jpg rename to schainpy/gui/figures/stop.jpg Binary files a/schainpy/gui/figure/stop.jpg and b/schainpy/gui/figures/stop.jpg differ diff --git a/schainpy/gui/figure/stopServer.png b/schainpy/gui/figures/stopServer.png similarity index 100% rename from schainpy/gui/figure/stopServer.png rename to schainpy/gui/figures/stopServer.png Binary files a/schainpy/gui/figure/stopServer.png and b/schainpy/gui/figures/stopServer.png differ diff --git a/schainpy/gui/figures/tools.py b/schainpy/gui/figures/tools.py new file mode 100644 index 0000000..0b5e891 --- /dev/null +++ b/schainpy/gui/figures/tools.py @@ -0,0 +1,15 @@ +import os, sys + +def get_path (): + """Borrowed from wxglade.py""" + try: + root = __file__ + if os.path.islink (root): + root = os.path.realpath (root) + + return os.path.dirname (os.path.abspath (root)) + except: + print "I'm sorry, but something is wrong." + print "There is no __file__ variable. Please contact the author." + return "" + \ No newline at end of file diff --git a/schainpy/gui/figure/w.jpg b/schainpy/gui/figures/w.jpg similarity index 100% rename from schainpy/gui/figure/w.jpg rename to schainpy/gui/figures/w.jpg Binary files a/schainpy/gui/figure/w.jpg and b/schainpy/gui/figures/w.jpg differ diff --git a/schainpy/gui/schaingui.py b/schainpy/gui/schainGUI similarity index 100% rename from schainpy/gui/schaingui.py rename to schainpy/gui/schainGUI diff --git a/schainpy/gui/signalchain_gui.py b/schainpy/gui/signalchain_gui.py deleted file mode 100644 index 24005d9..0000000 --- a/schainpy/gui/signalchain_gui.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python -import os, sys -from PyQt4 import QtCore, QtGui -from PyQt4.QtGui import QApplication - -path = os.path.dirname(os.getcwd()) -path = os.path.dirname(path) - -sys.path.insert(0, path) - -from schainpy.gui.viewcontroller.initwindow import InitWindow -from schainpy.gui.viewcontroller.basicwindow import BasicWindow -from schainpy.gui.viewcontroller.workspace import Workspace - -def main(): - - 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/viewcontroller/basicwindow.py b/schainpy/gui/viewcontroller/basicwindow.py index 3e187ec..3070db8 100644 --- a/schainpy/gui/viewcontroller/basicwindow.py +++ b/schainpy/gui/viewcontroller/basicwindow.py @@ -24,6 +24,10 @@ from os.path import expanduser #from CodeWarrior.Standard_Suite import file from comm import * +from schainpy.gui.figures import tools + +FIGURES_PATH = tools.get_path() + def isRadarFile(file): try: year = int(file[1:5]) @@ -5975,7 +5979,7 @@ class BasicWindow(QMainWindow, Ui_BasicWindow): def setParameter(self): self.setWindowTitle("ROJ-Signal Chain") - self.setWindowIcon(QtGui.QIcon("schainpy/gui/figure/adn.jpg")) + self.setWindowIcon(QtGui.QIcon( os.path.join(FIGURES_PATH,"adn.jpg") )) sys.stdout = ShowMeConsole(textWritten=self.normalOutputWritten) # sys.stderr = ShowMeConsole(textWritten=self.normalOutputWritten) self.tabWidgetProject.setEnabled(False) diff --git a/schainpy/gui/viewcontroller/initwindow.py b/schainpy/gui/viewcontroller/initwindow.py index 603091e..197103a 100644 --- a/schainpy/gui/viewcontroller/initwindow.py +++ b/schainpy/gui/viewcontroller/initwindow.py @@ -3,6 +3,7 @@ """ Module implementing InitWindow. """ +import os from PyQt4.QtGui import QDialog from PyQt4.QtCore import pyqtSignature @@ -10,6 +11,9 @@ from PyQt4 import QtCore from PyQt4 import QtGui from schainpy.gui.viewer.ui_initwindow import Ui_InitWindow +from schainpy.gui.figures import tools + +FIGURES_PATH = tools.get_path() class InitWindow(QDialog, Ui_InitWindow): """ @@ -22,7 +26,7 @@ class InitWindow(QDialog, Ui_InitWindow): QDialog.__init__(self, parent) self.setupUi(self) self.setWindowTitle("ROJ-Signal Chain") - self.setWindowIcon(QtGui.QIcon("schainpy/gui/figure/adn.jpg")) + self.setWindowIcon(QtGui.QIcon( os.path.join(FIGURES_PATH,"adn.jpg") )) @pyqtSignature("") def on_ExitBtn_clicked(self): diff --git a/schainpy/gui/viewcontroller/workspace.py b/schainpy/gui/viewcontroller/workspace.py index d8d1a3a..9e920ce 100644 --- a/schainpy/gui/viewcontroller/workspace.py +++ b/schainpy/gui/viewcontroller/workspace.py @@ -8,6 +8,9 @@ from PyQt4.QtCore import pyqtSignal from PyQt4 import QtGui, QtCore from schainpy.gui.viewer.ui_workspace import Ui_Workspace +from schainpy.gui.figures import tools + +FIGURES_PATH = tools.get_path() class Workspace(QDialog, Ui_Workspace): """ @@ -22,7 +25,7 @@ class Workspace(QDialog, Ui_Workspace): self.dirList=[] self.setupUi(self) self.setWindowTitle("ROJ-Signal Chain") - self.setWindowIcon(QtGui.QIcon("schainpy/gui/figure/adn.jpg")) + self.setWindowIcon(QtGui.QIcon( os.path.join(FIGURES_PATH,"adn.jpg") )) #*####### DIRECTORIO DE TRABAJO #########*# #self.dirCmbBox.setItemText(0, QtGui.QApplication.translate("MainWindow", "C:\WorkSpaceGui", None, QtGui.QApplication.UnicodeUTF8)) home=expanduser("~") diff --git a/schainpy/gui/viewer/ui_initwindow.py b/schainpy/gui/viewer/ui_initwindow.py index 7948a41..928616a 100644 --- a/schainpy/gui/viewer/ui_initwindow.py +++ b/schainpy/gui/viewer/ui_initwindow.py @@ -14,6 +14,11 @@ try: except AttributeError: _fromUtf8 = lambda s: s +import os +from schainpy.gui.figures import tools + +FIGURES_PATH = tools.get_path() + class Ui_InitWindow(object): def setupUi(self, Dialog): Dialog.setObjectName(_fromUtf8("Dialog")) @@ -42,7 +47,7 @@ class Ui_InitWindow(object): self.verticalLayout_4.addWidget(self.line_2) self.label_4 = QtGui.QLabel(Dialog) self.label_4.setText(_fromUtf8("")) - self.label_4.setPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/w.jpg"))) + self.label_4.setPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"w.jpg") ))) self.label_4.setScaledContents(True) self.label_4.setObjectName(_fromUtf8("label_4")) self.verticalLayout_4.addWidget(self.label_4) diff --git a/schainpy/gui/viewer/ui_mainwindow.py b/schainpy/gui/viewer/ui_mainwindow.py index 6dbec66..a8d6c35 100644 --- a/schainpy/gui/viewer/ui_mainwindow.py +++ b/schainpy/gui/viewer/ui_mainwindow.py @@ -24,6 +24,11 @@ except AttributeError: def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig) +import os +from schainpy.gui.figures import tools + +FIGURES_PATH = tools.get_path() + class Ui_MainWindow(object): def setupUi(self, MainWindow): @@ -954,25 +959,25 @@ class Ui_MainWindow(object): self.actionOpen = QtGui.QAction(MainWindow) iconOpen = QtGui.QIcon() - iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/open.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"open.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconCreate = QtGui.QIcon() - iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/project.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"project.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconSave = QtGui.QIcon() - iconSave.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/saveicon.jpeg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconSave.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"saveicon.jpeg") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconStart = QtGui.QIcon() - iconStart.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/startServer.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"startServer.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconStop = QtGui.QIcon() - iconStop.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/stopServer.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconStop.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"stopServer.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconPause = QtGui.QIcon() - iconPause.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pause.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconAddPU = QtGui.QIcon() - iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/add_PU.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"add_PU.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionOpen.setIcon(iconOpen) self.actionOpen.setObjectName(_fromUtf8("actionOpen")) @@ -1065,13 +1070,13 @@ class Ui_MainWindow(object): if self.a==1: iconPauseRed = QtGui.QIcon() - iconPauseRed.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pausered.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconPauseRed.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pausered.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionPauseToolbar.setIcon(iconPauseRed) self.a+=1 return 0 if self.a==2: iconPause = QtGui.QIcon() - iconPause.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pause.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionPauseToolbar.setIcon(iconPause) self.a-=1 return 0 @@ -1278,13 +1283,13 @@ class Ui_EnvWindow(object): if self.a==1: iconPauseRed = QtGui.QIcon() - iconPauseRed.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pausered.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconPauseRed.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pausered.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionPauseToolbar.setIcon(iconPauseRed) self.a+=1 return 0 if self.a==2: iconPause = QtGui.QIcon() - iconPause.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pause.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionPauseToolbar.setIcon(iconPause) self.a-=1 return 0 @@ -1353,19 +1358,19 @@ class Ui_EnvWindow(object): MainWindow.setMenuBar(self.menuBar) iconOpen = QtGui.QIcon() - iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/open.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"open.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconCreate = QtGui.QIcon() - iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/project.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"project.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconSave = QtGui.QIcon() - iconSave.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/saveicon.jpeg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconSave.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"saveicon.jpeg") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconStart = QtGui.QIcon() - iconStart.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/startServer.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"startServer.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconStop = QtGui.QIcon() - iconStop.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/stopServer.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconStop.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"stopServer.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconPause = QtGui.QIcon() - iconPause.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pause.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) iconAddPU = QtGui.QIcon() - iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/add_PU.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"add_PU.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionOpen = QtGui.QAction(MainWindow) self.actionOpen.setIcon(iconOpen) diff --git a/schainpy/model/graphics/jroplot_spectra.py b/schainpy/model/graphics/jroplot_spectra.py index 872701f..8d495cb 100644 --- a/schainpy/model/graphics/jroplot_spectra.py +++ b/schainpy/model/graphics/jroplot_spectra.py @@ -126,7 +126,7 @@ class SpectraPlot(Figure): z = numpy.where(numpy.isfinite(z), z, numpy.NAN) zdB = 10*numpy.log10(z) - avg = numpy.nanmean(z, axis=1) + avg = numpy.average(z, axis=1) avgdB = 10*numpy.log10(avg) noise = dataOut.getNoise()/factor diff --git a/schainpy/test/150km_January_longPulse.py b/schainpy/scripts/150km_January_longPulse.py similarity index 100% rename from schainpy/test/150km_January_longPulse.py rename to schainpy/scripts/150km_January_longPulse.py diff --git a/schainpy/test/150km_January_shortPulse.py b/schainpy/scripts/150km_January_shortPulse.py similarity index 100% rename from schainpy/test/150km_January_shortPulse.py rename to schainpy/scripts/150km_January_shortPulse.py diff --git a/schainpy/test/150km_january_1.py b/schainpy/scripts/150km_january_1.py similarity index 100% rename from schainpy/test/150km_january_1.py rename to schainpy/scripts/150km_january_1.py diff --git a/schainpy/test/150km_january_3.py b/schainpy/scripts/150km_january_3.py similarity index 100% rename from schainpy/test/150km_january_3.py rename to schainpy/scripts/150km_january_3.py diff --git a/schainpy/test/150km_jicamarca.xml b/schainpy/scripts/150km_jicamarca.xml similarity index 100% rename from schainpy/test/150km_jicamarca.xml rename to schainpy/scripts/150km_jicamarca.xml diff --git a/schainpy/test/EWDrifts_estimation01.py b/schainpy/scripts/EWDrifts_estimation01.py similarity index 100% rename from schainpy/test/EWDrifts_estimation01.py rename to schainpy/scripts/EWDrifts_estimation01.py diff --git a/schainpy/test/EWDrifts_estimation02.py b/schainpy/scripts/EWDrifts_estimation02.py similarity index 100% rename from schainpy/test/EWDrifts_estimation02.py rename to schainpy/scripts/EWDrifts_estimation02.py diff --git a/schainpy/test/Meteor_JASMET30MHz_Winds.py b/schainpy/scripts/Meteor_JASMET30MHz_Winds.py similarity index 100% rename from schainpy/test/Meteor_JASMET30MHz_Winds.py rename to schainpy/scripts/Meteor_JASMET30MHz_Winds.py diff --git a/schainpy/test/Meteor_JASMET30Mhz_Beacon.py b/schainpy/scripts/Meteor_JASMET30Mhz_Beacon.py similarity index 100% rename from schainpy/test/Meteor_JASMET30Mhz_Beacon.py rename to schainpy/scripts/Meteor_JASMET30Mhz_Beacon.py diff --git a/schainpy/test/Meteor_JASMET50MHz_Winds.py b/schainpy/scripts/Meteor_JASMET50MHz_Winds.py similarity index 100% rename from schainpy/test/Meteor_JASMET50MHz_Winds.py rename to schainpy/scripts/Meteor_JASMET50MHz_Winds.py diff --git a/schainpy/test/Meteor_JASMET50Mhz_Beacon.py b/schainpy/scripts/Meteor_JASMET50Mhz_Beacon.py similarity index 100% rename from schainpy/test/Meteor_JASMET50Mhz_Beacon.py rename to schainpy/scripts/Meteor_JASMET50Mhz_Beacon.py diff --git a/schainpy/test/WindProfiler_DBS01.py b/schainpy/scripts/WindProfiler_DBS01.py similarity index 100% rename from schainpy/test/WindProfiler_DBS01.py rename to schainpy/scripts/WindProfiler_DBS01.py diff --git a/schainpy/test/WindProfiler_SA01.py b/schainpy/scripts/WindProfiler_SA01.py similarity index 100% rename from schainpy/test/WindProfiler_SA01.py rename to schainpy/scripts/WindProfiler_SA01.py diff --git a/schainpy/test/__init__.py b/schainpy/scripts/__init__.py similarity index 100% rename from schainpy/test/__init__.py rename to schainpy/scripts/__init__.py diff --git a/schainpy/test/amisr_EEJ.py b/schainpy/scripts/amisr_EEJ.py similarity index 100% rename from schainpy/test/amisr_EEJ.py rename to schainpy/scripts/amisr_EEJ.py diff --git a/schainpy/test/amisr_proc.py b/schainpy/scripts/amisr_proc.py similarity index 100% rename from schainpy/test/amisr_proc.py rename to schainpy/scripts/amisr_proc.py diff --git a/schainpy/test/amisr_reader.py b/schainpy/scripts/amisr_reader.py similarity index 100% rename from schainpy/test/amisr_reader.py rename to schainpy/scripts/amisr_reader.py diff --git a/schainpy/test/amisr_reader_exp.py b/schainpy/scripts/amisr_reader_exp.py similarity index 100% rename from schainpy/test/amisr_reader_exp.py rename to schainpy/scripts/amisr_reader_exp.py diff --git a/schainpy/test/amisr_reader_exp_ex2.py b/schainpy/scripts/amisr_reader_exp_ex2.py similarity index 100% rename from schainpy/test/amisr_reader_exp_ex2.py rename to schainpy/scripts/amisr_reader_exp_ex2.py diff --git a/schainpy/test/amisr_spreadF.py b/schainpy/scripts/amisr_spreadF.py similarity index 100% rename from schainpy/test/amisr_spreadF.py rename to schainpy/scripts/amisr_spreadF.py diff --git a/schainpy/test/amisr_windEstimation.py b/schainpy/scripts/amisr_windEstimation.py similarity index 100% rename from schainpy/test/amisr_windEstimation.py rename to schainpy/scripts/amisr_windEstimation.py diff --git a/schainpy/test/beacon_phase.py b/schainpy/scripts/beacon_phase.py similarity index 100% rename from schainpy/test/beacon_phase.py rename to schainpy/scripts/beacon_phase.py diff --git a/schainpy/test/hf_plot_pdata.py b/schainpy/scripts/hf_plot_pdata.py similarity index 100% rename from schainpy/test/hf_plot_pdata.py rename to schainpy/scripts/hf_plot_pdata.py diff --git a/schainpy/test/hf_test.py b/schainpy/scripts/hf_test.py similarity index 100% rename from schainpy/test/hf_test.py rename to schainpy/scripts/hf_test.py diff --git a/schainpy/test/hf_write_pdata.py b/schainpy/scripts/hf_write_pdata.py similarity index 100% rename from schainpy/test/hf_write_pdata.py rename to schainpy/scripts/hf_write_pdata.py diff --git a/schainpy/test/jasmet30_16april.py b/schainpy/scripts/jasmet30_16april.py similarity index 100% rename from schainpy/test/jasmet30_16april.py rename to schainpy/scripts/jasmet30_16april.py diff --git a/schainpy/test/jasmet50_16april.py b/schainpy/scripts/jasmet50_16april.py similarity index 100% rename from schainpy/test/jasmet50_16april.py rename to schainpy/scripts/jasmet50_16april.py diff --git a/schainpy/test/mst_isr_eej_blocks.py b/schainpy/scripts/mst_isr_eej_blocks.py similarity index 100% rename from schainpy/test/mst_isr_eej_blocks.py rename to schainpy/scripts/mst_isr_eej_blocks.py diff --git a/schainpy/test/mst_isr_eej_processing.py b/schainpy/scripts/mst_isr_eej_processing.py similarity index 100% rename from schainpy/test/mst_isr_eej_processing.py rename to schainpy/scripts/mst_isr_eej_processing.py diff --git a/schainpy/test/plot_eej.py b/schainpy/scripts/plot_eej.py similarity index 100% rename from schainpy/test/plot_eej.py rename to schainpy/scripts/plot_eej.py diff --git a/schainpy/test/plot_isr.py b/schainpy/scripts/plot_isr.py similarity index 100% rename from schainpy/test/plot_isr.py rename to schainpy/scripts/plot_isr.py diff --git a/schainpy/test/plot_mst.py b/schainpy/scripts/plot_mst.py similarity index 100% rename from schainpy/test/plot_mst.py rename to schainpy/scripts/plot_mst.py diff --git a/schainpy/test/sousy.py b/schainpy/scripts/sousy.py similarity index 100% rename from schainpy/test/sousy.py rename to schainpy/scripts/sousy.py diff --git a/schainpy/test/testRawData.py b/schainpy/scripts/testRawData.py similarity index 100% rename from schainpy/test/testRawData.py rename to schainpy/scripts/testRawData.py diff --git a/schainpy/test/test_eej_blocks.py b/schainpy/scripts/test_eej_blocks.py similarity index 100% rename from schainpy/test/test_eej_blocks.py rename to schainpy/scripts/test_eej_blocks.py diff --git a/schainpy/test/test_isr_blocks.py b/schainpy/scripts/test_isr_blocks.py similarity index 100% rename from schainpy/test/test_isr_blocks.py rename to schainpy/scripts/test_isr_blocks.py diff --git a/schainpy/test/test_mst_blocks.py b/schainpy/scripts/test_mst_blocks.py similarity index 100% rename from schainpy/test/test_mst_blocks.py rename to schainpy/scripts/test_mst_blocks.py diff --git a/setup.py b/setup.py index 240f18f..41c7890 100644 --- a/setup.py +++ b/setup.py @@ -20,12 +20,12 @@ setup(name="schainpy", 'schainpy.model.proc', 'schainpy.model.utils', 'schainpy.gui', - 'schainpy.gui.figure', + 'schainpy.gui.figures', 'schainpy.gui.viewcontroller', 'schainpy.gui.viewer', 'schainpy.gui.viewer.windows'}, py_modules=['schainpy.serializer.DataTranslate', 'schainpy.serializer.JROSerializer'], - package_data={'schainpy.gui.figure': ['*.jpg', '*.png', '*.gif']}, + package_data={'schainpy.gui.figures': ['*.jpg', '*.jpeg', '*.png', '*.gif']}, include_package_data=True, - scripts =['schainpy/gui/schaingui.py']) \ No newline at end of file + scripts =['schainpy/gui/schainGUI']) \ No newline at end of file