| @@ -37,15 +37,12 PLOT_CODES = { | |||||
| 37 | 'power' : 16, |
|
37 | 'power' : 16, | |
| 38 | 'noise' : 17, |
|
38 | 'noise' : 17, | |
| 39 | 'beacon' : 18, |
|
39 | 'beacon' : 18, | |
| 40 | #USED IN jroplot_parameters.py |
|
|||
| 41 | 'wind' : 22, |
|
40 | 'wind' : 22, | |
| 42 | 'skymap' : 23, |
|
41 | 'skymap' : 23, | |
| 43 |
|
|
42 | 'V-E' : 25, | |
| 44 |
' |
|
43 | 'Z-E' : 26, | |
| 45 |
' |
|
44 | 'V-A' : 27, | |
| 46 |
' |
|
45 | 'Z-A' : 28, | |
| 47 | 'ew_drifts' : 28, |
|
|||
| 48 | 'reflectivity': 30 |
|
|||
| 49 | } |
|
46 | } | |
| 50 |
|
47 | |||
| 51 | class PrettyFloat(float): |
|
48 | class PrettyFloat(float): | |
| @@ -117,6 +114,7 class Data(object): | |||||
| 117 | self.buffering = buffering |
|
114 | self.buffering = buffering | |
| 118 | self.ended = False |
|
115 | self.ended = False | |
| 119 | self.localtime = False |
|
116 | self.localtime = False | |
|
|
117 | self.meta = {} | |||
| 120 | self.__times = [] |
|
118 | self.__times = [] | |
| 121 | self.__heights = [] |
|
119 | self.__heights = [] | |
| 122 |
|
120 | |||
| @@ -181,6 +179,8 class Data(object): | |||||
| 181 | self.parameters = getattr(dataOut, 'parameters', []) |
|
179 | self.parameters = getattr(dataOut, 'parameters', []) | |
| 182 | if hasattr(dataOut, 'pairsList'): |
|
180 | if hasattr(dataOut, 'pairsList'): | |
| 183 | self.pairs = dataOut.pairsList |
|
181 | self.pairs = dataOut.pairsList | |
|
|
182 | if hasattr(dataOut, 'meta'): | |||
|
|
183 | self.meta = dataOut.meta | |||
| 184 | self.channels = dataOut.channelList |
|
184 | self.channels = dataOut.channelList | |
| 185 | self.interval = dataOut.getTimeInterval() |
|
185 | self.interval = dataOut.getTimeInterval() | |
| 186 | self.localtime = dataOut.useLocalTime |
|
186 | self.localtime = dataOut.useLocalTime | |
| @@ -275,6 +275,10 class Data(object): | |||||
| 275 | ret['xrange'] = [] |
|
275 | ret['xrange'] = [] | |
| 276 | if hasattr(self, 'pairs'): |
|
276 | if hasattr(self, 'pairs'): | |
| 277 | ret['pairs'] = self.pairs |
|
277 | ret['pairs'] = self.pairs | |
|
|
278 | ||||
|
|
279 | for key, value in self.meta: | |||
|
|
280 | ret[key] = value | |||
|
|
281 | ||||
| 278 | return json.dumps(ret) |
|
282 | return json.dumps(ret) | |
| 279 |
|
283 | |||
| 280 | @property |
|
284 | @property | |
| @@ -690,7 +694,7 class SendToFTP(Operation, Process): | |||||
| 690 | self.username = kwargs.get('username') |
|
694 | self.username = kwargs.get('username') | |
| 691 | self.password = kwargs.get('password') |
|
695 | self.password = kwargs.get('password') | |
| 692 | self.patterns = kwargs.get('patterns') |
|
696 | self.patterns = kwargs.get('patterns') | |
| 693 |
self.timeout = kwargs.get('timeout', |
|
697 | self.timeout = kwargs.get('timeout', 30) | |
| 694 | self.times = [time.time() for p in self.patterns] |
|
698 | self.times = [time.time() for p in self.patterns] | |
| 695 | self.latest = ['' for p in self.patterns] |
|
699 | self.latest = ['' for p in self.patterns] | |
| 696 | self.mp = False |
|
700 | self.mp = False | |
| @@ -819,11 +823,10 class SendToFTP(Operation, Process): | |||||
| 819 | if self.ftp is not None: |
|
823 | if self.ftp is not None: | |
| 820 | self.check() |
|
824 | self.check() | |
| 821 | self.send_files() |
|
825 | self.send_files() | |
| 822 |
time.sleep( |
|
826 | time.sleep(10) | |
| 823 |
|
827 | |||
| 824 | def close(): |
|
828 | def close(): | |
| 825 |
|
829 | |||
| 826 | if self.ftp is not None: |
|
830 | if self.ftp is not None: | |
| 827 | if self.ftp is not None: |
|
|||
| 828 |
|
|
831 | self.ftp.close() | |
| 829 | self.terminate() |
|
832 | self.terminate() | |
General Comments 0
You need to be logged in to leave comments.
Login now