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