diff --git a/README b/README index 99bbc49..8a3cafb 100644 --- a/README +++ b/README @@ -1,12 +1,20 @@ Prerequisites: -numpy 1.8.0 - - + -scipy + -math + -matplotlib + -h5py + -ftplib + -paramiko and scp (optional for using SendTFilesToServer) + -stuffr (optional for using jroIO_hf) + -PyQt4 (for using GUI) Signal Chain Installation: 1. Install numpy, matplotlib, TKAgg - 2. Install digital_rf_hdf5 module (developed by Haystack Observatory) if you will use USRP data + 2. Install digital_rf_hdf5 module (developed by Haystack Observatory) + if you want to use USRP data 3. untar schainpy-x.x.x.tar.gz 4. cd schainpy-x.x.x 5. execute: diff --git a/schainpy/__init__.py b/schainpy/__init__.py index afa4d9a..16b360d 100644 --- a/schainpy/__init__.py +++ b/schainpy/__init__.py @@ -4,3 +4,4 @@ Created on Feb 7, 2012 @author $Author$ @version $Id$ ''' +__version__ = "2.1.5.1" \ No newline at end of file diff --git a/schainpy/gui/viewcontroller/basicwindow.py b/schainpy/gui/viewcontroller/basicwindow.py index 8028268..b9d02cf 100644 --- a/schainpy/gui/viewcontroller/basicwindow.py +++ b/schainpy/gui/viewcontroller/basicwindow.py @@ -165,7 +165,13 @@ class BasicWindow(QMainWindow, Ui_BasicWindow): """ """ self.stopProject() - + + @pyqtSignature("") + def on_actionAbout_triggered(self): + """ + """ + self.aboutEvent() + @pyqtSignature("") def on_actionFTP_triggered(self): """ @@ -5683,36 +5689,3 @@ class ShowMeConsole(QtCore.QObject): textWritten = QtCore.pyqtSignal(str) def write (self, text): self.textWritten.emit(str(text)) - -class PlotManager(): - def __init__(self, queue): - self.queue = queue - self.objPlotDict = {} - - def processIncoming(self): - while self.queue.qsize(): - try: - dataFromQueue = self.queue.get(True) - if dataFromQueue == None: - continue - - dataPlot = dataFromQueue['data'] - kwargs = dataFromQueue['kwargs'] - id = kwargs['id'] - if 'channelList' in kwargs.keys(): - channelList = kwargs['channelList'] - else: - channelList = None - plotname = kwargs.pop('type') - - if not(id in self.objPlotDict.keys()): - className = eval(plotname) - self.objPlotDict[id] = className(id, channelList, dataPlot) - self.objPlotDict[id].show() - - self.objPlotDict[id].run(dataPlot , **kwargs) - - except Queue.Empty: - pass - - diff --git a/schainpy/gui/viewer/ui_initwindow.py b/schainpy/gui/viewer/ui_initwindow.py index b0fb671..d6bc947 100644 --- a/schainpy/gui/viewer/ui_initwindow.py +++ b/schainpy/gui/viewer/ui_initwindow.py @@ -16,8 +16,9 @@ except AttributeError: import os from schainpy.gui.figures import tools +from schainpy import __version__ -INITIAL_MSG = "Signal Chain GUI - v2.1.5" +INITIAL_MSG = "Signal Chain GUI - v%s" %__version__ FIGURES_PATH = tools.get_path() class Ui_InitWindow(object): diff --git a/schainpy/gui/viewer/ui_mainwindow.py b/schainpy/gui/viewer/ui_mainwindow.py index c322a2e..507560a 100644 --- a/schainpy/gui/viewer/ui_mainwindow.py +++ b/schainpy/gui/viewer/ui_mainwindow.py @@ -26,6 +26,7 @@ except AttributeError: import os from schainpy.gui.figures import tools +from schainpy import __version__ FIGURES_PATH = tools.get_path() @@ -58,6 +59,8 @@ class Ui_EnvWindow(object): def setupUi(self, MainWindow): + self.paused=False + MainWindow.setObjectName(_fromUtf8("MainWindow")) MainWindow.resize(1200, 800) @@ -156,6 +159,7 @@ class Ui_EnvWindow(object): self.actionStop.setObjectName(_fromUtf8("actionStop")) self.actionAbout = QtGui.QAction(MainWindow) self.actionAbout.setObjectName(_fromUtf8("actionAbout")) + self.actionOpenToolbar = QtGui.QAction(MainWindow) self.actionOpenToolbar.setIcon(iconOpen) self.actionOpenToolbar.setObjectName(_fromUtf8("actionOpenToolbar")) @@ -195,7 +199,6 @@ class Ui_EnvWindow(object): self.toolBar.addAction(self.actionStopToolbar) self.toolBar.addSeparator() - self.paused=False self.actionPause.triggered.connect(self.changePauseIcon) self.actionPauseToolbar.triggered.connect(self.changePauseIcon) @@ -235,7 +238,7 @@ class Ui_EnvWindow(object): self.actionStart.setText(_translate("MainWindow", "Start", None)) self.actionPause.setText(_translate("MainWindow", "Pause", None)) self.actionStop.setText(_translate("MainWindow", "Stop", None)) - self.actionAbout.setText(_translate("MainWindow", "About", None)) + self.actionAbout.setText(_translate("MainWindow", "About SChain", None)) self.actionOpenToolbar.setText(_translate("MainWindow", "openToolbar", None)) self.actionOpenToolbar.setToolTip(_translate("MainWindow", "Open a project", None)) self.actionCreateToolbar.setText(_translate("MainWindow", "createToolbar", None)) @@ -260,6 +263,14 @@ class Ui_EnvWindow(object): event.accept() else: event.ignore() + + def aboutEvent(self): + + reply = QtGui.QMessageBox.information(self, + 'About', + "Signal Chain Processing Software v%s" %__version__, + "Developed by Jicamarca Radio Observatory\nComments to miguel.urco@jro.igp.gob.pe") + class Ui_BasicWindow(Ui_EnvWindow, Ui_ProjectTab, Ui_VoltageTab, Ui_SpectraTab, Ui_SpectraHeisTab, Ui_CorrelationTab): diff --git a/setup.py b/setup.py index bea2de3..7d28584 100644 --- a/setup.py +++ b/setup.py @@ -5,9 +5,10 @@ Created on Jul 16, 2014 ''' from distutils.core import setup, Extension +from schainpy import __version__ setup(name="schainpy", - version="2.1.5", + version=__version__, description="Python tools to read, write and process Jicamarca data", author="Miguel Urco", author_email="miguel.urco@jro.igp.gob.pe",