diff --git a/README b/README index 8a3cafb..8fb2bf8 100644 --- a/README +++ b/README @@ -9,6 +9,7 @@ Prerequisites: -paramiko and scp (optional for using SendTFilesToServer) -stuffr (optional for using jroIO_hf) -PyQt4 (for using GUI) + -pyfits (Fits data) Signal Chain Installation: diff --git a/schainpy/VERSION b/schainpy/VERSION index 269abe4..f015b5a 100644 --- a/schainpy/VERSION +++ b/schainpy/VERSION @@ -12,4 +12,8 @@ VERSIONS: 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 object instead schainpy.mode.data.jrodata.Fits object. --jroIO_heispectra.py: Channel index list does not exist. \ No newline at end of file +-jroIO_heispectra.py: Channel index list does not exist. + +2.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 diff --git a/schainpy/__init__.py b/schainpy/__init__.py index a4fd748..2ff5957 100644 --- a/schainpy/__init__.py +++ b/schainpy/__init__.py @@ -4,4 +4,4 @@ Created on Feb 7, 2012 @author $Author$ @version $Id$ ''' -__version__ = "2.1.3" \ No newline at end of file +__version__ = "2.1.3.1" \ No newline at end of file diff --git a/schainpy/model/graphics/mpldriver.py b/schainpy/model/graphics/mpldriver.py index bbd55d9..afded75 100644 --- a/schainpy/model/graphics/mpldriver.py +++ b/schainpy/model/graphics/mpldriver.py @@ -7,7 +7,7 @@ if 'linux' in sys.platform: matplotlib.use("TKAgg") if 'darwin' in sys.platform: - matplotlib.use("WXAgg") + matplotlib.use('GTKAgg') #Qt4Agg', 'GTK', 'GTKAgg', 'ps', 'agg', 'cairo', 'MacOSX', 'GTKCairo', 'WXAgg', 'template', 'TkAgg', 'GTK3Cairo', 'GTK3Agg', 'svg', 'WebAgg', 'CocoaAgg', 'emf', 'gdk', 'WX' import matplotlib.pyplot diff --git a/schainpy/model/proc/jroproc_voltage.py b/schainpy/model/proc/jroproc_voltage.py index 9ef780d..76413af 100644 --- a/schainpy/model/proc/jroproc_voltage.py +++ b/schainpy/model/proc/jroproc_voltage.py @@ -647,12 +647,18 @@ class Decoder(Operation): def run(self, dataOut, code=None, nCode=None, nBaud=None, mode = 0, osamp=None, times=None): + dataOut.flagNoData = True + if dataOut.flagDecodeData: print "This data is already decoded, recoding again ..." if not self.isConfig: if code is None: + if not dataOut.code: + print "Code is not defined" + raise ValueError, "Code could not be read from %s object. Enter a value in Code parameter" %dataOut.type + code = dataOut.code else: code = numpy.array(code).reshape(nCode,nBaud) @@ -707,6 +713,8 @@ class Decoder(Operation): self.__profIndex += 1 + dataOut.flagNoData = False + return 1 # dataOut.flagDeflipData = True #asumo q la data no esta sin flip diff --git a/schainpy/model/setup.py b/schainpy/model/setup.py deleted file mode 100644 index f680492..0000000 --- a/schainpy/model/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -from distutils.core import setup -from distutils.extension import Extension -from Cython.Distutils import build_ext -setup( - cmdclass = {'build_ext': build_ext}, - ext_modules = [Extension("cfunctions", ["cfunctions.pyx"])] ) \ No newline at end of file diff --git a/setup.py b/setup.py index f7f1285..7065dcc 100644 --- a/setup.py +++ b/setup.py @@ -27,11 +27,11 @@ setup(name="schainpy", 'schainpy.gui.viewer.windows'}, py_modules=['schainpy.serializer.DataTranslate', 'schainpy.serializer.JROSerializer'], - package_data={'schainpy.gui.figures': ['*.jpg', '*.jpeg', '*.png', '*.gif']}, + package_data={'schainpy.gui.figures': ['*.png']}, include_package_data=True, scripts =['schainpy/gui/schainGUI'], install_requires=["numpy >= 1.6.0", - "scipy >= 0.11.0", + "scipy >= 0.9.0", "h5py >= 2.0.1", "matplotlib >= 1.0.0" ],