diff --git a/schainpy/controller.py b/schainpy/controller.py index b1ccc06..51b03e9 100644 --- a/schainpy/controller.py +++ b/schainpy/controller.py @@ -31,10 +31,6 @@ def multiSchain(child, nProcess=cpu_count(), startDate=None, endDate=None, by_da cursor = 0 nFiles = None processes = [] - - - - dt1 = datetime.datetime.strptime(startDate, '%Y/%m/%d') dt2 = datetime.datetime.strptime(endDate, '%Y/%m/%d') days = (dt2 - dt1).days diff --git a/schainpy/model/graphics/__init__.py b/schainpy/model/graphics/__init__.py index 191ec0a..4b0542b 100644 --- a/schainpy/model/graphics/__init__.py +++ b/schainpy/model/graphics/__init__.py @@ -5,4 +5,3 @@ from jroplot_correlation import * from jroplot_parameters import * from jroplot_data import * from jroplotter import * - \ No newline at end of file diff --git a/schainpy/model/graphics/jroplot_data.py b/schainpy/model/graphics/jroplot_data.py index 8cfbde5..72074c7 100644 --- a/schainpy/model/graphics/jroplot_data.py +++ b/schainpy/model/graphics/jroplot_data.py @@ -5,6 +5,8 @@ import time import numpy import datetime import numpy as np +import matplotlib +matplotlib.use('TkAgg') import matplotlib.pyplot as plt from mpl_toolkits.axes_grid1 import make_axes_locatable from matplotlib.ticker import FuncFormatter, LinearLocator @@ -12,7 +14,7 @@ from multiprocessing import Process from schainpy.model.proc.jroproc_base import Operation -#plt.ion() +plt.ioff() func = lambda x, pos: ('%s') %(datetime.datetime.fromtimestamp(x).strftime('%H:%M')) @@ -90,6 +92,7 @@ class PlotData(Operation, Process): print 'plotting...{}'.format(self.CODE) if self.show: + print 'showing' self.figure.show() self.plot() @@ -628,7 +631,7 @@ class PlotWindProfilerData(PlotRTIData): self.z = np.array(self.z) self.z = numpy.ma.masked_invalid(self.z) - + cmap=plt.get_cmap(self.colormap) cmap.set_bad('white', 1.) diff --git a/schainpy/model/graphics/jroplotter.py b/schainpy/model/graphics/jroplotter.py index 610622c..1a632b0 100644 --- a/schainpy/model/graphics/jroplotter.py +++ b/schainpy/model/graphics/jroplotter.py @@ -30,10 +30,10 @@ class Plotter(Operation): name = None __queue = None - def __init__(self, plotter_name, plotter_queue=None): + def __init__(self, plotter_name, plotter_queue=None, **kwargs): + + Operation.__init__(self, **kwargs) - Operation.__init__(self) - self.isConfig = False self.name = plotter_name self.__queue = plotter_queue @@ -84,7 +84,7 @@ class PlotManager(): 'CrossSpectraPlot', 'CoherenceMap', 'PowerProfilePlot', 'Noise', 'BeaconPhase', 'CorrelationPlot', - 'SpectraHeisScope','RTIfromSpectraHeis'] + 'SpectraHeisScope', 'RTIfromSpectraHeis'] def __init__(self, plotter_queue): @@ -170,7 +170,7 @@ class PlotManager(): if plot_id not in self.plotInstanceDict.keys(): className = eval(plot_name) - self.plotInstanceDict[plot_id] = className() + self.plotInstanceDict[plot_id] = className(**kwargs) plotter = self.plotInstanceDict[plot_id] try: diff --git a/schainpy/model/graphics/mpldriver.py b/schainpy/model/graphics/mpldriver.py index 46a3d60..c09ec41 100644 --- a/schainpy/model/graphics/mpldriver.py +++ b/schainpy/model/graphics/mpldriver.py @@ -262,11 +262,11 @@ def addpcolorbuffer(ax, x, y, z, zmin, zmax, xlabel='', ylabel='', title='', col ax.collections.remove(ax.collections[0]) z = numpy.ma.masked_invalid(z) - + cmap=matplotlib.pyplot.get_cmap(colormap) cmap.set_bad('white', 1.) - + ax.pcolormesh(x,y,z.T,vmin=zmin,vmax=zmax, cmap=cmap) def createPmultiline(ax, x, y, xmin, xmax, ymin, ymax, xlabel='', ylabel='', title='', legendlabels=None, diff --git a/schainpy/model/utils/jroutils_publish.py b/schainpy/model/utils/jroutils_publish.py index 68620aa..b9a5d70 100644 --- a/schainpy/model/utils/jroutils_publish.py +++ b/schainpy/model/utils/jroutils_publish.py @@ -245,7 +245,7 @@ class PublishData(Operation): def close(self): if self.zeromq is 1: self.dataOut.finished = True - # self.zmq_socket.send_pyobj(self.dataOut) CHECK IT!!! + self.zmq_socket.send_pyobj(self.dataOut) if self.client: self.client.loop_stop() diff --git a/schainpy/scripts/PPD.py b/schainpy/scripts/PPD.py index 94a21db..f9f46d4 100644 --- a/schainpy/scripts/PPD.py +++ b/schainpy/scripts/PPD.py @@ -31,8 +31,8 @@ def fiber(cursor, skip, q, dt): procUnitConfObj2 = controllerObj.addProcUnit(datatype='Spectra', inputId=readUnitConfObj.getId()) # opObj11 = procUnitConfObj2.addParameter(name='pairsList', value='(0,1)', format='pairslist') # - # procUnitConfObj3 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=readUnitConfObj.getId()) - # opObj11 = procUnitConfObj3.addOperation(name='SpectralMoments', optype='other') + procUnitConfObj3 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=readUnitConfObj.getId()) + opObj11 = procUnitConfObj3.addOperation(name='SpectralMoments', optype='other') # # opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other') @@ -58,7 +58,7 @@ def fiber(cursor, skip, q, dt): # opObj11.addParameter(name='save', value='0', format='int') # # opObj11.addParameter(name='figpath', value='/tmp/', format='str') # - opObj12 = procUnitConfObj2.addOperation(name='PublishData', optype='other') + opObj12 = procUnitConfObj3.addOperation(name='PublishData', optype='other') opObj12.addParameter(name='zeromq', value=1, format='int') diff --git a/schainpy/scripts/receiver.py b/schainpy/scripts/receiver.py index 9c5997f..ba5dcf5 100644 --- a/schainpy/scripts/receiver.py +++ b/schainpy/scripts/receiver.py @@ -16,34 +16,42 @@ if __name__ == '__main__': proc1 = controllerObj.addProcUnit(name='ReceiverData') proc1.addParameter(name='realtime', value='0', format='bool') - proc1.addParameter(name='plottypes', value='rti', format='str') - # proc1.addParameter(name='throttle', value='10', format='int') + proc1.addParameter(name='plottypes', value='rti,coh,phase,snr,dop', format='str') + proc1.addParameter(name='throttle', value='10', format='int') proc1.addParameter(name='plot_server', value='tcp://10.10.10.82:7000', format='str') ## TODO Agregar direccion de server de publicacion a graficos como variable op1 = proc1.addOperation(name='PlotRTIData', optype='other') op1.addParameter(name='wintitle', value='Julia 150Km', format='str') op1.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + op1.addParameter(name='show', value='0', format='bool') + op1.addParameter(name='colormap', value='jet', format='str') # - # op2 = proc1.addOperation(name='PlotCOHData', optype='other') - # op2.addParameter(name='wintitle', value='Julia 150Km', format='str') - # op2.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + op2 = proc1.addOperation(name='PlotCOHData', optype='other') + op2.addParameter(name='wintitle', value='Julia 150Km', format='str') + op2.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + op2.addParameter(name='colormap', value='jet', format='str') + op2.addParameter(name='show', value='0', format='bool') # # - # op6 = proc1.addOperation(name='PlotPHASEData', optype='other') - # op6.addParameter(name='wintitle', value='Julia 150Km', format='str') - # op6.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + op6 = proc1.addOperation(name='PlotPHASEData', optype='other') + op6.addParameter(name='wintitle', value='Julia 150Km', format='str') + op6.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + op6.addParameter(name='show', value='1', format='bool') # # proc2 = controllerObj.addProcUnit(name='ReceiverData') # proc2.addParameter(name='server', value='juanca', format='str') # proc2.addParameter(name='plottypes', value='snr,dop', format='str') # - # op3 = proc2.addOperation(name='PlotSNRData', optype='other') - # op3.addParameter(name='wintitle', value='Julia 150Km', format='str') - # op3.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + op3 = proc1.addOperation(name='PlotSNRData', optype='other') + op3.addParameter(name='wintitle', value='Julia 150Km', format='str') + op3.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + op3.addParameter(name='show', value='0', format='bool') # - # op4 = proc2.addOperation(name='PlotDOPData', optype='other') - # op4.addParameter(name='wintitle', value='Julia 150Km', format='str') - # op4.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + op4 = proc1.addOperation(name='PlotDOPData', optype='other') + op4.addParameter(name='wintitle', value='Julia 150Km', format='str') + op4.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + op4.addParameter(name='show', value='0', format='bool') + op4.addParameter(name='colormap', value='jet', format='str') diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml index dc0e9a5..6497cc5 100644 --- a/schainpy/scripts/schain.xml +++ b/schainpy/scripts/schain.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file