##// END OF EJS Templates
Bug fixed in SchainGUI: figures were not been loaded
Miguel Valdez -
r583:e5ed8fbe1d1e
parent child
Show More
@@ -0,0 +1,23
1 Prerequisites:
2
3 -numpy 1.8.0
4 -
5
6 Signal Chain Installation:
7
8 1. Install numpy, matplotlib, TKAgg
9 2. Install digital_rf_hdf5 module (developed by Haystack Observatory) if you will use USRP data
10 3. untar schainpy-x.x.x.tar.gz
11 4. cd schainpy-x.x.x
12 5. execute:
13 [hostname]$ sudo pyhon setup.py install
14 6. testing gui:
15 [hostname]$ schainGUI (enter)
16
17 If you want to use serialization and zerorpc you will need to install the next packages:
18
19 1. zerorpc
20 [hostname]$ sudo port install zerorpc
21
22 2. cPickle, msgpack and msgpack_numpy
23 [hostname]$ sudo port install cPickle msgpack mspack_numpy No newline at end of file
@@ -0,0 +1,15
1 import os, sys
2
3 def get_path ():
4 """Borrowed from wxglade.py"""
5 try:
6 root = __file__
7 if os.path.islink (root):
8 root = os.path.realpath (root)
9
10 return os.path.dirname (os.path.abspath (root))
11 except:
12 print "I'm sorry, but something is wrong."
13 print "There is no __file__ variable. Please contact the author."
14 return ""
15 No newline at end of file
1 NO CONTENT: file renamed from schainpy/gui/figure/.bash_logout to schainpy/gui/figures/.bash_logout
1 NO CONTENT: file renamed from schainpy/gui/figure/Crear.jpg to schainpy/gui/figures/Crear.jpg
1 NO CONTENT: file renamed from schainpy/gui/figure/Open Sign.jpg to schainpy/gui/figures/Open Sign.jpg
1 NO CONTENT: file renamed from schainpy/gui/figure/__init__.py to schainpy/gui/figures/__init__.py
1 NO CONTENT: file renamed from schainpy/gui/figure/add_PU.gif to schainpy/gui/figures/add_PU.gif
1 NO CONTENT: file renamed from schainpy/gui/figure/adn.jpg to schainpy/gui/figures/adn.jpg
1 NO CONTENT: file renamed from schainpy/gui/figure/guardar.jpeg to schainpy/gui/figures/guardar.jpeg
1 NO CONTENT: file renamed from schainpy/gui/figure/open.gif to schainpy/gui/figures/open.gif
1 NO CONTENT: file renamed from schainpy/gui/figure/open.png to schainpy/gui/figures/open.png
1 NO CONTENT: file renamed from schainpy/gui/figure/pause.png to schainpy/gui/figures/pause.png
1 NO CONTENT: file renamed from schainpy/gui/figure/pausered.png to schainpy/gui/figures/pausered.png
1 NO CONTENT: file renamed from schainpy/gui/figure/play.jpg to schainpy/gui/figures/play.jpg
1 NO CONTENT: file renamed from schainpy/gui/figure/project.gif to schainpy/gui/figures/project.gif
1 NO CONTENT: file renamed from schainpy/gui/figure/saveicon.jpeg to schainpy/gui/figures/saveicon.jpeg
1 NO CONTENT: file renamed from schainpy/gui/figure/startServer.png to schainpy/gui/figures/startServer.png
1 NO CONTENT: file renamed from schainpy/gui/figure/stop.jpg to schainpy/gui/figures/stop.jpg
1 NO CONTENT: file renamed from schainpy/gui/figure/stopServer.png to schainpy/gui/figures/stopServer.png
1 NO CONTENT: file renamed from schainpy/gui/figure/w.jpg to schainpy/gui/figures/w.jpg
1 NO CONTENT: file renamed from schainpy/gui/schaingui.py to schainpy/gui/schainGUI
@@ -24,6 +24,10 from os.path import expanduser
24 24 #from CodeWarrior.Standard_Suite import file
25 25 from comm import *
26 26
27 from schainpy.gui.figures import tools
28
29 FIGURES_PATH = tools.get_path()
30
27 31 def isRadarFile(file):
28 32 try:
29 33 year = int(file[1:5])
@@ -5975,7 +5979,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
5975 5979 def setParameter(self):
5976 5980
5977 5981 self.setWindowTitle("ROJ-Signal Chain")
5978 self.setWindowIcon(QtGui.QIcon("schainpy/gui/figure/adn.jpg"))
5982 self.setWindowIcon(QtGui.QIcon( os.path.join(FIGURES_PATH,"adn.jpg") ))
5979 5983 sys.stdout = ShowMeConsole(textWritten=self.normalOutputWritten)
5980 5984 # sys.stderr = ShowMeConsole(textWritten=self.normalOutputWritten)
5981 5985 self.tabWidgetProject.setEnabled(False)
@@ -3,6 +3,7
3 3 """
4 4 Module implementing InitWindow.
5 5 """
6 import os
6 7
7 8 from PyQt4.QtGui import QDialog
8 9 from PyQt4.QtCore import pyqtSignature
@@ -10,6 +11,9 from PyQt4 import QtCore
10 11 from PyQt4 import QtGui
11 12
12 13 from schainpy.gui.viewer.ui_initwindow import Ui_InitWindow
14 from schainpy.gui.figures import tools
15
16 FIGURES_PATH = tools.get_path()
13 17
14 18 class InitWindow(QDialog, Ui_InitWindow):
15 19 """
@@ -22,7 +26,7 class InitWindow(QDialog, Ui_InitWindow):
22 26 QDialog.__init__(self, parent)
23 27 self.setupUi(self)
24 28 self.setWindowTitle("ROJ-Signal Chain")
25 self.setWindowIcon(QtGui.QIcon("schainpy/gui/figure/adn.jpg"))
29 self.setWindowIcon(QtGui.QIcon( os.path.join(FIGURES_PATH,"adn.jpg") ))
26 30
27 31 @pyqtSignature("")
28 32 def on_ExitBtn_clicked(self):
@@ -8,6 +8,9 from PyQt4.QtCore import pyqtSignal
8 8 from PyQt4 import QtGui, QtCore
9 9
10 10 from schainpy.gui.viewer.ui_workspace import Ui_Workspace
11 from schainpy.gui.figures import tools
12
13 FIGURES_PATH = tools.get_path()
11 14
12 15 class Workspace(QDialog, Ui_Workspace):
13 16 """
@@ -22,7 +25,7 class Workspace(QDialog, Ui_Workspace):
22 25 self.dirList=[]
23 26 self.setupUi(self)
24 27 self.setWindowTitle("ROJ-Signal Chain")
25 self.setWindowIcon(QtGui.QIcon("schainpy/gui/figure/adn.jpg"))
28 self.setWindowIcon(QtGui.QIcon( os.path.join(FIGURES_PATH,"adn.jpg") ))
26 29 #*####### DIRECTORIO DE TRABAJO #########*#
27 30 #self.dirCmbBox.setItemText(0, QtGui.QApplication.translate("MainWindow", "C:\WorkSpaceGui", None, QtGui.QApplication.UnicodeUTF8))
28 31 home=expanduser("~")
@@ -14,6 +14,11 try:
14 14 except AttributeError:
15 15 _fromUtf8 = lambda s: s
16 16
17 import os
18 from schainpy.gui.figures import tools
19
20 FIGURES_PATH = tools.get_path()
21
17 22 class Ui_InitWindow(object):
18 23 def setupUi(self, Dialog):
19 24 Dialog.setObjectName(_fromUtf8("Dialog"))
@@ -42,7 +47,7 class Ui_InitWindow(object):
42 47 self.verticalLayout_4.addWidget(self.line_2)
43 48 self.label_4 = QtGui.QLabel(Dialog)
44 49 self.label_4.setText(_fromUtf8(""))
45 self.label_4.setPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/w.jpg")))
50 self.label_4.setPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"w.jpg") )))
46 51 self.label_4.setScaledContents(True)
47 52 self.label_4.setObjectName(_fromUtf8("label_4"))
48 53 self.verticalLayout_4.addWidget(self.label_4)
@@ -24,6 +24,11 except AttributeError:
24 24 def _translate(context, text, disambig):
25 25 return QtGui.QApplication.translate(context, text, disambig)
26 26
27 import os
28 from schainpy.gui.figures import tools
29
30 FIGURES_PATH = tools.get_path()
31
27 32 class Ui_MainWindow(object):
28 33
29 34 def setupUi(self, MainWindow):
@@ -954,25 +959,25 class Ui_MainWindow(object):
954 959 self.actionOpen = QtGui.QAction(MainWindow)
955 960
956 961 iconOpen = QtGui.QIcon()
957 iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/open.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
962 iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"open.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
958 963
959 964 iconCreate = QtGui.QIcon()
960 iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/project.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
965 iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"project.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
961 966
962 967 iconSave = QtGui.QIcon()
963 iconSave.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/saveicon.jpeg")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
968 iconSave.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"saveicon.jpeg") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
964 969
965 970 iconStart = QtGui.QIcon()
966 iconStart.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/startServer.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
971 iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"startServer.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
967 972
968 973 iconStop = QtGui.QIcon()
969 iconStop.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/stopServer.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
974 iconStop.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"stopServer.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
970 975
971 976 iconPause = QtGui.QIcon()
972 iconPause.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pause.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
977 iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
973 978
974 979 iconAddPU = QtGui.QIcon()
975 iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/add_PU.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
980 iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"add_PU.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
976 981
977 982 self.actionOpen.setIcon(iconOpen)
978 983 self.actionOpen.setObjectName(_fromUtf8("actionOpen"))
@@ -1065,13 +1070,13 class Ui_MainWindow(object):
1065 1070
1066 1071 if self.a==1:
1067 1072 iconPauseRed = QtGui.QIcon()
1068 iconPauseRed.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pausered.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1073 iconPauseRed.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pausered.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1069 1074 self.actionPauseToolbar.setIcon(iconPauseRed)
1070 1075 self.a+=1
1071 1076 return 0
1072 1077 if self.a==2:
1073 1078 iconPause = QtGui.QIcon()
1074 iconPause.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pause.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1079 iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1075 1080 self.actionPauseToolbar.setIcon(iconPause)
1076 1081 self.a-=1
1077 1082 return 0
@@ -1278,13 +1283,13 class Ui_EnvWindow(object):
1278 1283
1279 1284 if self.a==1:
1280 1285 iconPauseRed = QtGui.QIcon()
1281 iconPauseRed.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pausered.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1286 iconPauseRed.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pausered.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1282 1287 self.actionPauseToolbar.setIcon(iconPauseRed)
1283 1288 self.a+=1
1284 1289 return 0
1285 1290 if self.a==2:
1286 1291 iconPause = QtGui.QIcon()
1287 iconPause.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pause.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1292 iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1288 1293 self.actionPauseToolbar.setIcon(iconPause)
1289 1294 self.a-=1
1290 1295 return 0
@@ -1353,19 +1358,19 class Ui_EnvWindow(object):
1353 1358 MainWindow.setMenuBar(self.menuBar)
1354 1359
1355 1360 iconOpen = QtGui.QIcon()
1356 iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/open.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1361 iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"open.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1357 1362 iconCreate = QtGui.QIcon()
1358 iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/project.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1363 iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"project.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1359 1364 iconSave = QtGui.QIcon()
1360 iconSave.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/saveicon.jpeg")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1365 iconSave.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"saveicon.jpeg") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1361 1366 iconStart = QtGui.QIcon()
1362 iconStart.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/startServer.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1367 iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"startServer.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1363 1368 iconStop = QtGui.QIcon()
1364 iconStop.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/stopServer.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1369 iconStop.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"stopServer.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1365 1370 iconPause = QtGui.QIcon()
1366 iconPause.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/pause.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1371 iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1367 1372 iconAddPU = QtGui.QIcon()
1368 iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8("schainpy/gui/figure/add_PU.gif")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1373 iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"add_PU.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1369 1374
1370 1375 self.actionOpen = QtGui.QAction(MainWindow)
1371 1376 self.actionOpen.setIcon(iconOpen)
@@ -126,7 +126,7 class SpectraPlot(Figure):
126 126 z = numpy.where(numpy.isfinite(z), z, numpy.NAN)
127 127 zdB = 10*numpy.log10(z)
128 128
129 avg = numpy.nanmean(z, axis=1)
129 avg = numpy.average(z, axis=1)
130 130 avgdB = 10*numpy.log10(avg)
131 131
132 132 noise = dataOut.getNoise()/factor
1 NO CONTENT: file renamed from schainpy/test/150km_January_longPulse.py to schainpy/scripts/150km_January_longPulse.py
1 NO CONTENT: file renamed from schainpy/test/150km_January_shortPulse.py to schainpy/scripts/150km_January_shortPulse.py
1 NO CONTENT: file renamed from schainpy/test/150km_january_1.py to schainpy/scripts/150km_january_1.py
1 NO CONTENT: file renamed from schainpy/test/150km_january_3.py to schainpy/scripts/150km_january_3.py
1 NO CONTENT: file renamed from schainpy/test/150km_jicamarca.xml to schainpy/scripts/150km_jicamarca.xml
1 NO CONTENT: file renamed from schainpy/test/EWDrifts_estimation01.py to schainpy/scripts/EWDrifts_estimation01.py
1 NO CONTENT: file renamed from schainpy/test/EWDrifts_estimation02.py to schainpy/scripts/EWDrifts_estimation02.py
1 NO CONTENT: file renamed from schainpy/test/Meteor_JASMET30MHz_Winds.py to schainpy/scripts/Meteor_JASMET30MHz_Winds.py
1 NO CONTENT: file renamed from schainpy/test/Meteor_JASMET30Mhz_Beacon.py to schainpy/scripts/Meteor_JASMET30Mhz_Beacon.py
1 NO CONTENT: file renamed from schainpy/test/Meteor_JASMET50MHz_Winds.py to schainpy/scripts/Meteor_JASMET50MHz_Winds.py
1 NO CONTENT: file renamed from schainpy/test/Meteor_JASMET50Mhz_Beacon.py to schainpy/scripts/Meteor_JASMET50Mhz_Beacon.py
1 NO CONTENT: file renamed from schainpy/test/WindProfiler_DBS01.py to schainpy/scripts/WindProfiler_DBS01.py
1 NO CONTENT: file renamed from schainpy/test/WindProfiler_SA01.py to schainpy/scripts/WindProfiler_SA01.py
1 NO CONTENT: file renamed from schainpy/test/__init__.py to schainpy/scripts/__init__.py
1 NO CONTENT: file renamed from schainpy/test/amisr_EEJ.py to schainpy/scripts/amisr_EEJ.py
1 NO CONTENT: file renamed from schainpy/test/amisr_proc.py to schainpy/scripts/amisr_proc.py
1 NO CONTENT: file renamed from schainpy/test/amisr_reader.py to schainpy/scripts/amisr_reader.py
1 NO CONTENT: file renamed from schainpy/test/amisr_reader_exp.py to schainpy/scripts/amisr_reader_exp.py
1 NO CONTENT: file renamed from schainpy/test/amisr_reader_exp_ex2.py to schainpy/scripts/amisr_reader_exp_ex2.py
1 NO CONTENT: file renamed from schainpy/test/amisr_spreadF.py to schainpy/scripts/amisr_spreadF.py
1 NO CONTENT: file renamed from schainpy/test/amisr_windEstimation.py to schainpy/scripts/amisr_windEstimation.py
1 NO CONTENT: file renamed from schainpy/test/beacon_phase.py to schainpy/scripts/beacon_phase.py
1 NO CONTENT: file renamed from schainpy/test/hf_plot_pdata.py to schainpy/scripts/hf_plot_pdata.py
1 NO CONTENT: file renamed from schainpy/test/hf_test.py to schainpy/scripts/hf_test.py
1 NO CONTENT: file renamed from schainpy/test/hf_write_pdata.py to schainpy/scripts/hf_write_pdata.py
1 NO CONTENT: file renamed from schainpy/test/jasmet30_16april.py to schainpy/scripts/jasmet30_16april.py
1 NO CONTENT: file renamed from schainpy/test/jasmet50_16april.py to schainpy/scripts/jasmet50_16april.py
1 NO CONTENT: file renamed from schainpy/test/mst_isr_eej_blocks.py to schainpy/scripts/mst_isr_eej_blocks.py
1 NO CONTENT: file renamed from schainpy/test/mst_isr_eej_processing.py to schainpy/scripts/mst_isr_eej_processing.py
1 NO CONTENT: file renamed from schainpy/test/plot_eej.py to schainpy/scripts/plot_eej.py
1 NO CONTENT: file renamed from schainpy/test/plot_isr.py to schainpy/scripts/plot_isr.py
1 NO CONTENT: file renamed from schainpy/test/plot_mst.py to schainpy/scripts/plot_mst.py
1 NO CONTENT: file renamed from schainpy/test/sousy.py to schainpy/scripts/sousy.py
1 NO CONTENT: file renamed from schainpy/test/testRawData.py to schainpy/scripts/testRawData.py
1 NO CONTENT: file renamed from schainpy/test/test_eej_blocks.py to schainpy/scripts/test_eej_blocks.py
1 NO CONTENT: file renamed from schainpy/test/test_isr_blocks.py to schainpy/scripts/test_isr_blocks.py
1 NO CONTENT: file renamed from schainpy/test/test_mst_blocks.py to schainpy/scripts/test_mst_blocks.py
@@ -20,12 +20,12 setup(name="schainpy",
20 20 'schainpy.model.proc',
21 21 'schainpy.model.utils',
22 22 'schainpy.gui',
23 'schainpy.gui.figure',
23 'schainpy.gui.figures',
24 24 'schainpy.gui.viewcontroller',
25 25 'schainpy.gui.viewer',
26 26 'schainpy.gui.viewer.windows'},
27 27 py_modules=['schainpy.serializer.DataTranslate',
28 28 'schainpy.serializer.JROSerializer'],
29 package_data={'schainpy.gui.figure': ['*.jpg', '*.png', '*.gif']},
29 package_data={'schainpy.gui.figures': ['*.jpg', '*.jpeg', '*.png', '*.gif']},
30 30 include_package_data=True,
31 scripts =['schainpy/gui/schaingui.py']) No newline at end of file
31 scripts =['schainpy/gui/schainGUI']) No newline at end of file
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now