schain Commit - r827:7c8bc1e62102 · Jicamarca Repository

Version 2.2.5

Miguel Valdez -

r827:7c8bc1e62102

parent child

Context file:

r827:7c8bc1e62102

Collapse all files

schainpy/VERSION +6 -1

             VERSIONS:
 .1.2:
             -jroutils_ftp.py: Bug fixed, Any error sending file stopped the Server Thread
             				  Server thread opens and closes remote server each time file list is sent
             -jroplot_spectra.py: Noise path was not being created when noise data is saved.
             -jroIO_base.py: startTime can be greater than endTime. Example: SpreadF [18:00 - 07:00]
 .1.3:
             -jroplot_heispectra.py: SpectraHeisScope was not showing the right channels
             -jroproc_voltage.py: Bug fixed selecting profiles (self.nProfiles took a wrong value),
             					 Bug fixed selecting heights by block (selecting profiles instead heights)
             -jroproc_voltage.py: New feature added: decoding data by block using FFT.
             -jroIO_heispectra.py: Bug fixed in FitsReader. Using local Fits instance instead schainpy.mode.data.jrodata.Fits.
             -jroIO_heispectra.py: Channel index list does not exist.
 .1.3.1:
             -GUI: every icon were resized
             -jroproc_voltage.py: Print a message when "Read from code" option is selected and the code is not defined inside data file
 .1.3.2:
             -GUI: user interaction enhanced
             -controller_api.py: Safe access to ControllerThead
 .1.3.3:
             -Colored Button Icons were added to GUI
 .1.4:
             -Sending error notifications to signal chain administrator
             -Login to email server added
 .1.4.1:
             -Send notifications when an error different to ValueError is detected
 .1.4.2:
             -A new Plotter Class was added
             -Project.start() does not accept filename as a parameter anymore
 .1.5:
             -serializer module added to Signal Chain
             -jroplotter.py added to Signal Chain
 .2.0:
             -GUI: use of external plotter
             -Compatible with matplotlib 1.5.0
 .2.1:
             -Bugs fixed in GUI
             -Views were improved in GUI
             -Support to MST-ISR experiments
             -Bug fixed getting noise using hyldebrant. (minimum number of points > 20%)
             -handleError added to jroplotter.py
 .2.2:
             -VoltageProc: ProfileSelector, Reshape, Decoder with nTxs!=1 and getblock=True was tested
             -Rawdata and testRawdata.py added to Signal Chain project
 .2.3:
             -Bug fixed in GUI: Error getting(reading) Code value
             -Bug fixed in GUI: Flip option always needs channelList field
             -Bug fixed in jrodata: when one branch modified a value in "dataOut" (example: dataOut.code) this value
             was modified for every branch (because this was a reference). It was modified in data.copy()
             -Bug fixed in jroproc_voltage.profileSelector(): rangeList replaces to profileRangeList.
 .2.3.1:
             -Filtering block by time has been added.
             -Bug fixed plotting RTI, CoherenceMap and others using xmin and xmax parameters. The first day worked
             properly but the next days did not.
 .2.4:
             -jroproc_spectra_lags.py added to schainpy
             -Bug fixed in schainGUI: ProcUnit was created with the same id in some cases.
             -Bug fixed in jroHeaderIO: Header size validation.
 .2.4.1:
             -jroIO_usrp.py is update to read Sandra's data
             -decimation in Spectra and RTI plots is always enabled.
-            -time-window option added to GUI
  No newline at end of file
+            -time-window option added to GUI
+.2.5:
+            -splitProfiles and combineProfiles modules were added to VoltageProc and Signal Chain GUI.
+            -nProfiles of USRP data (hdf5) is the number of profiles thera are in one second.
+            -jroPlotter works directly with data objects instead of dictionaries
  No newline at end of file

schainpy/__init__.py +1 -1

             '''
             Created on Feb 7, 2012
             @author $Author$
             @version $Id$
             '''
-            __version__ = "2.2.4.1"
  No newline at end of file
+            __version__ = "2.2.5"
  No newline at end of file

schainpy/controller_api.py +2 -2

             import threading
-            import Queue
+            from Queue import Queue
             from schainpy.controller import Project
             from schainpy.model.graphics.jroplotter import PlotManager
             class ControllerThread(threading.Thread, Project):
                 def __init__(self, plotter_queue=None):
                     threading.Thread.__init__(self)
                     Project.__init__(self, plotter_queue)
                     self.setDaemon(True)
                     self.lock = threading.Lock()
                     self.control = {'stop':False, 'pause':False}
                 def __del__(self):
                     self.control['stop'] = True
                 def stop(self):
                     self.lock.acquire()
                     self.control['stop'] = True
                     self.lock.release()
                 def pause(self):
                     self.lock.acquire()
                     self.control['pause'] = not(self.control['pause'])
                     paused = self.control['pause']
                     self.lock.release()
                     return paused
                 def isPaused(self):
                     self.lock.acquire()
                     paused = self.control['pause']
                     self.lock.release()
                     return paused
                 def isStopped(self):
                     self.lock.acquire()
                     stopped = self.control['stop']
                     self.lock.release()
                     return stopped
                 def run(self):
                     self.control['stop'] = False
                     self.control['pause'] = False
                     self.writeXml()
                     self.createObjects()
                     self.connectObjects()
                     Project.run(self)
                 def isRunning(self):
                     return self.is_alive()
                 def isFinished(self):
                     return not self.is_alive()
                 def setPlotters(self):
                     plotterList = PlotManager.plotterList
                     for thisPUConfObj in self.procUnitConfObjDict.values():
                         inputId = thisPUConfObj.getInputId()
                         if int(inputId) == 0:
                             continue
                         for thisOpObj in thisPUConfObj.getOperationObjList():
                             if thisOpObj.type == "self":
                                 continue
                             if thisOpObj.name in plotterList:
                                 thisOpObj.type = "plotter"
                 def setPlotterQueue(self, plotter_queue):
                     self.plotterQueue = plotter_queue
                 def getPlotterQueue(self):
                     return self.plotterQueue
                 def useExternalPlotter(self):
-                    self.plotterQueue = Queue.Queue(10)
+                    self.plotterQueue = Queue(10)
                     self.setPlotters()
                     plotManagerObj = PlotManager(self.plotterQueue)
                     plotManagerObj.setController(self)
                     return plotManagerObj
             # from PyQt4 import QtCore
             # from PyQt4.QtCore import SIGNAL
             #
             # class ControllerQThread(QtCore.QThread, Project):
             #
             #     def __init__(self, filename):
             #
             #         QtCore.QThread.__init__(self)
             #         Project.__init__(self)
             #
             #         self.filename = filename
             #
             #         self.lock = threading.Lock()
             #         self.control = {'stop':False, 'pause':False}
             #
             #     def __del__(self):
             #
             #         self.control['stop'] = True
             #         self.wait()
             #
             #     def stop(self):
             #
             #         self.lock.acquire()
             #
             #         self.control['stop'] = True
             #
             #         self.lock.release()
             #
             #     def pause(self):
             #
             #         self.lock.acquire()
             #
             #         self.control['pause'] = not(self.control['pause'])
             #         paused = self.control['pause']
             #
             #         self.lock.release()
             #
             #         return paused
             #
             #     def isPaused(self):
             #
             #         self.lock.acquire()
             #         paused = self.control['pause']
             #         self.lock.release()
             #
             #         return paused
             #
             #     def isStopped(self):
             #
             #         self.lock.acquire()
             #         stopped = self.control['stop']
             #         self.lock.release()
             #
             #         return stopped
             #
             #     def run(self):
             #
             #         self.control['stop'] = False
             #         self.control['pause'] = False
             #
             #         self.readXml(self.filename)
             #         self.createObjects()
             #         self.connectObjects()
             #         self.emit( SIGNAL( "jobStarted( PyQt_PyObject )" ), 1)
             #         Project.run(self)
             #         self.emit( SIGNAL( "jobFinished( PyQt_PyObject )" ), 1)
             #

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