| @@ -354,16 +354,10 class ReceiverData(ProcessingUnit, Process): | |||
|
|
354 | 354 | if plottype == 'phase': |
|
|
355 | 355 | self.data[plottype][t] = self.dataOut.getCoherence(phase=True) |
|
|
356 | 356 | if self.realtime: |
|
|
357 | <<<<<<< HEAD | |
|
|
358 | self.data_web[plottype] = roundFloats(decimate(self.data[plottype][t]).tolist()) | |
|
|
359 | self.data_web['timestamp'] = t | |
|
|
360 | ======= | |
|
|
361 | 357 | if plottype == 'spc': |
|
|
362 | 358 | self.data_web[plottype] = roundFloats(decimate(self.data[plottype]).tolist()) |
|
|
363 | 359 | else: |
|
|
364 | 360 | self.data_web[plottype] = roundFloats(decimate(self.data[plottype][t]).tolist()) |
|
|
365 | self.data_web['time'] = t | |
|
|
366 | >>>>>>> f65929d2cf32d4dddb2d5fa2a72f3970d4d51812 | |
|
|
367 | 361 | self.data_web['interval'] = self.dataOut.getTimeInterval() |
|
|
368 | 362 | self.data_web['type'] = plottype |
|
|
369 | 363 | |
| @@ -420,11 +414,7 class ReceiverData(ProcessingUnit, Process): | |||
|
|
420 | 414 | else: |
|
|
421 | 415 | conf_address = self.plot_address + '.config' |
|
|
422 | 416 | sender_web_config.bind(conf_address) |
|
|
423 | <<<<<<< HEAD | |
|
|
424 | ||
|
|
425 | ======= | |
|
|
426 | 417 | time.sleep(1) |
|
|
427 | >>>>>>> f65929d2cf32d4dddb2d5fa2a72f3970d4d51812 | |
|
|
428 | 418 | for kwargs in self.operationKwargs.values(): |
|
|
429 | 419 | if 'plot' in kwargs: |
|
|
430 | 420 | print '[Sending] Config data to web for {}'.format(kwargs['code'].upper()) |
General Comments 0
You need to be logged in to leave comments.
Login now