schain-jc Commit - r642:c6531a7a640a

About window was added to SChainGUI...

Miguel Valdez -

r642:c6531a7a640a

parent child

Context file:

r642:c6531a7a640a

Collapse all files

README +10 -2

             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:
 . Install numpy, matplotlib, TKAgg
-. Install digital_rf_hdf5 module (developed by Haystack Observatory) if you will use USRP data
+. Install digital_rf_hdf5 module (developed by Haystack Observatory)
+            	   if you want to use USRP data
 . untar schainpy-x.x.x.tar.gz
 . cd schainpy-x.x.x
 . execute:

schainpy/__init__.py +1 0

             @author $Author$
             @version $Id$
             '''
+            __version__ = "2.1.5.1"
  No newline at end of file

schainpy/gui/viewcontroller/basicwindow.py +7 -34

@@ -165,7 +165,13 class BasicWindow(QMainWindow, Ui_BasicWindow):
165	"""	165	"""
166	"""	166	"""
167	self.stopProject()	167	self.stopProject()
168		168
		169	@pyqtSignature("")
		170	def on_actionAbout_triggered(self):
		171	"""
		172	"""
		173	self.aboutEvent()
		174
169	@pyqtSignature("")	175	@pyqtSignature("")
170	def on_actionFTP_triggered(self):	176	def on_actionFTP_triggered(self):
171	"""	177	"""
@@ -5683,36 +5689,3 class ShowMeConsole(QtCore.QObject):
5683	textWritten = QtCore.pyqtSignal(str)	5689	textWritten = QtCore.pyqtSignal(str)
5684	def write (self, text):	5690	def write (self, text):
5685	self.textWritten.emit(str(text))	5691	self.textWritten.emit(str(text))
5686
5687	class PlotManager():
5688	def __init__(self, queue):
5689	self.queue = queue
5690	self.objPlotDict = {}
5691
5692	def processIncoming(self):
5693	while self.queue.qsize():
5694	try:
5695	dataFromQueue = self.queue.get(True)
5696	if dataFromQueue == None:
5697	continue
5698
5699	dataPlot = dataFromQueue['data']
5700	kwargs = dataFromQueue['kwargs']
5701	id = kwargs['id']
5702	if 'channelList' in kwargs.keys():
5703	channelList = kwargs['channelList']
5704	else:
5705	channelList = None
5706	plotname = kwargs.pop('type')
5707
5708	if not(id in self.objPlotDict.keys()):
5709	className = eval(plotname)
5710	self.objPlotDict[id] = className(id, channelList, dataPlot)
5711	self.objPlotDict[id].show()
5712
5713	self.objPlotDict[id].run(dataPlot , **kwargs)
5714
5715	except Queue.Empty:
5716	pass
5717
5718

schainpy/gui/viewer/ui_initwindow.py +2 -1

             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):

schainpy/gui/viewer/ui_mainwindow.py +13 -2

             import os
             from schainpy.gui.figures import tools
+            from schainpy import __version__
             FIGURES_PATH = tools.get_path()
                 def setupUi(self, MainWindow):
+                    self.paused=False
                     MainWindow.setObjectName(_fromUtf8("MainWindow"))
                     MainWindow.resize(1200, 800)
                     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"))
                     self.toolBar.addAction(self.actionStopToolbar)
                     self.toolBar.addSeparator()
-                    self.paused=False
                     self.actionPause.triggered.connect(self.changePauseIcon)
                     self.actionPauseToolbar.triggered.connect(self.changePauseIcon)
                     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))
                         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):

setup.py +2 -1

             '''
             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",

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages