diff --git a/schainpy/model/utils/jroutils_publish.py b/schainpy/model/utils/jroutils_publish.py index 97983d9..e7945ad 100644 --- a/schainpy/model/utils/jroutils_publish.py +++ b/schainpy/model/utils/jroutils_publish.py @@ -283,6 +283,7 @@ class ReceiverData(ProcessingUnit, Process): self.data['throttle'] = self.throttle_value self.data['ENDED'] = False self.isConfig = True + self.data_web = {} def event_monitor(self, monitor): @@ -327,7 +328,6 @@ class ReceiverData(ProcessingUnit, Process): self.data['times'].append(t) self.data['dataOut'] = self.dataOut for plottype in self.plottypes: - if plottype == 'spc': z = self.dataOut.data_spc/self.dataOut.normFactor self.data[plottype] = 10*numpy.log10(z) @@ -342,7 +342,9 @@ class ReceiverData(ProcessingUnit, Process): self.data[plottype][t] = self.dataOut.getCoherence() if plottype == 'phase': self.data[plottype][t] = self.dataOut.getCoherence(phase=True) - + if self.realtime: + self.data_web[plottype] = self.data[plottype][t] + self.data_web['time'] = t def run(self): print '[Starting] {} from {}'.format(self.name, self.address) @@ -352,10 +354,12 @@ class ReceiverData(ProcessingUnit, Process): self.receiver.bind(self.address) monitor = self.receiver.get_monitor_socket() self.sender = self.context.socket(zmq.PUB) - + if self.realtime: + self.sender_web = self.context.socket(zmq.PUB) + self.sender.bind("ipc:///tmp/zmq.web") self.sender.bind("ipc:///tmp/zmq.plots") - t = Thread(target=self.event_monitor, args=(monitor,)) + t = Thread(target=self.event_monitor) t.start() while True: @@ -376,6 +380,7 @@ class ReceiverData(ProcessingUnit, Process): else: if self.realtime: self.send(self.data) + self.sender_web.send_json(json.dumps(self.data_web)) else: self.sendData(self.send, self.data) self.started = True diff --git a/schainpy/scripts/receiver.py b/schainpy/scripts/receiver.py index 54d3409..fa7b082 100644 --- a/schainpy/scripts/receiver.py +++ b/schainpy/scripts/receiver.py @@ -15,21 +15,23 @@ if __name__ == '__main__': controllerObj.setup(id='191', name='test01', description=desc) proc1 = controllerObj.addProcUnit(name='ReceiverData') - proc1.addParameter(name='realtime', value='0', format='bool') - proc1.addParameter(name='plottypes', value='rti,coh,phase', format='str') - proc1.addParameter(name='throttle', value='10', format='int') + proc1.addParameter(name='realtime', value='1', format='bool') - 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') + proc1.addParameter(name='plottypes', value='rti', format='str') + proc1.addParameter(name='throttle', value='10', format='int') + ## TODO Agregar direccion de server de publicacion a graficos como variable - 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') + # 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') # - 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') + # 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') + # # + # 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') # # proc2 = controllerObj.addProcUnit(name='ReceiverData') # proc2.addParameter(name='server', value='juanca', format='str')