schain-jc Commit - r927:8a8ce128f618

ningun cambio

José Chávez -

r927:8a8ce128f618

parent child

Context file:

r927:8a8ce128f618

Collapse all files

schainpy/controller.py 0 -4

                 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

schainpy/model/graphics/__init__.py 0 -1

             from jroplot_parameters import *
             from jroplot_data import *
             from jroplotter import *
-  No newline at end of file

schainpy/model/graphics/jroplot_data.py +5 -2

             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
             from schainpy.model.proc.jroproc_base import Operation
-            #plt.ion()
+            plt.ioff()
             func = lambda x, pos: ('%s') %(datetime.datetime.fromtimestamp(x).strftime('%H:%M'))
                     print 'plotting...{}'.format(self.CODE)
                     if self.show:
+                        print 'showing'
                         self.figure.show()
                     self.plot()
                     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.)

schainpy/model/graphics/jroplotter.py +5 -5

                 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
                                'CrossSpectraPlot', 'CoherenceMap',
                                'PowerProfilePlot', 'Noise', 'BeaconPhase',
                                'CorrelationPlot',
-                               'SpectraHeisScope','RTIfromSpectraHeis']
+                               'SpectraHeisScope', 'RTIfromSpectraHeis']
                 def __init__(self, plotter_queue):
                         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:

schainpy/model/graphics/mpldriver.py +2 -2

                 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,

schainpy/model/utils/jroutils_publish.py +1 -1

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

schainpy/scripts/PPD.py +3 -3

                 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())
+                procUnitConfObj3 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=readUnitConfObj.getId())
-                # opObj11 = procUnitConfObj3.addOperation(name='SpectralMoments', optype='other')
+                opObj11 = procUnitConfObj3.addOperation(name='SpectralMoments', optype='other')
                 #
                 #     opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other')
                 # 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')

schainpy/scripts/receiver.py +22 -14

                 proc1 = controllerObj.addProcUnit(name='ReceiverData')
                 proc1.addParameter(name='realtime', value='0', format='bool')
-                proc1.addParameter(name='plottypes', value='rti', format='str')
+                proc1.addParameter(name='plottypes', value='rti,coh,phase,snr,dop', format='str')
-                # proc1.addParameter(name='throttle', value='10', format='int')
+                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 = proc1.addOperation(name='PlotCOHData', optype='other')
-                # op2.addParameter(name='wintitle', value='Julia 150Km', format='str')
+                op2.addParameter(name='wintitle', value='Julia 150Km', format='str')
-                # op2.addParameter(name='save', value='/home/nanosat/Pictures', 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 = proc1.addOperation(name='PlotPHASEData', optype='other')
-                # op6.addParameter(name='wintitle', value='Julia 150Km', format='str')
+                op6.addParameter(name='wintitle', value='Julia 150Km', format='str')
-                # op6.addParameter(name='save', value='/home/nanosat/Pictures', 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 = proc1.addOperation(name='PlotSNRData', optype='other')
-                # op3.addParameter(name='wintitle', value='Julia 150Km', format='str')
+                op3.addParameter(name='wintitle', value='Julia 150Km', format='str')
-                # op3.addParameter(name='save', value='/home/nanosat/Pictures', 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 = proc1.addOperation(name='PlotDOPData', optype='other')
-                # op4.addParameter(name='wintitle', value='Julia 150Km', format='str')
+                op4.addParameter(name='wintitle', value='Julia 150Km', format='str')
-                # op4.addParameter(name='save', value='/home/nanosat/Pictures', 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')

schainpy/scripts/schain.xml +1 -1

	@@ -1,1 +1,1
	1	<Project description="Segundo Test" id="191" name="test01"><ProcUnit datatype="ReceiverData" id="1911" inputId="0" name="ReceiverData"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="bool" id="191111" name="realtime" value="1" /><Parameter format="str" id="191112" name="plottypes" value="rti" /><Parameter format="str" id="191113" name="plot_server" value="tcp://10.10.10.82:7000" /></Operation><Operation id="19112" name="PlotRTIData" priority="2" type="other"><Parameter format="str" id="191121" name="wintitle" value="Julia 150Km" /><Parameter format="str" id="191122" name="save" value="/home/nanosat/Pictures" /></Operation></ProcUnit></Project> No newline at end of file		1	<Project description="HF_EXAMPLE" id="191" name="test01"><ReadUnit datatype="SpectraReader" id="1911" inputId="0" name="SpectraReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="datatype" value="SpectraReader" /><Parameter format="str" id="191112" name="path" value="/home/nanosat/data/hysell_data20/pdata" /><Parameter format="date" id="191113" name="startDate" value="2015/09/26" /><Parameter format="date" id="191114" name="endDate" value="2015/09/26" /><Parameter format="time" id="191115" name="startTime" value="00:00:00" /><Parameter format="time" id="191116" name="endTime" value="23:59:59" /><Parameter format="int" id="191118" name="cursor" value="2" /><Parameter format="int" id="191119" name="skip" value="720" /><Parameter format="int" id="191120" name="delay" value="10" /><Parameter format="int" id="191121" name="walk" value="1" /><Parameter format="int" id="191122" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="ParametersProc" id="1913" inputId="1911" name="ParametersProc"><Operation id="19131" name="run" priority="1" type="self" /><Operation id="19132" name="SpectralMoments" priority="2" type="other" /><Operation id="19133" name="PublishData" priority="3" type="other"><Parameter format="int" id="191331" name="zeromq" value="1" /><Parameter format="int" id="191332" name="delay" value="1" /></Operation></ProcUnit><ProcUnit datatype="Spectra" id="1912" inputId="1911" name="SpectraProc"><Operation id="19121" name="run" priority="1" type="self" /></ProcUnit></Project> No newline at end of file

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