| @@ -1107,8 +1107,8 class PlotterData(object): | |||||
| 1107 | Object to hold data to be plotted |
|
1107 | Object to hold data to be plotted | |
| 1108 | ''' |
|
1108 | ''' | |
| 1109 |
|
1109 | |||
| 1110 |
MAXNUMX = |
|
1110 | MAXNUMX = 200 | |
| 1111 |
MAXNUMY = |
|
1111 | MAXNUMY = 200 | |
| 1112 |
|
1112 | |||
| 1113 | def __init__(self, code, throttle_value, exp_code, buffering=True, snr=False): |
|
1113 | def __init__(self, code, throttle_value, exp_code, buffering=True, snr=False): | |
| 1114 |
|
1114 | |||
| @@ -1320,9 +1320,10 class PlotterData(object): | |||||
| 1320 | data = self.roundFloats( |
|
1320 | data = self.roundFloats( | |
| 1321 | self.data[self.key][::, ::dx, ::dy].tolist()) |
|
1321 | self.data[self.key][::, ::dx, ::dy].tolist()) | |
| 1322 | else: |
|
1322 | else: | |
| 1323 | data = self.roundFloats(self.data[self.key][tm].tolist()) |
|
|||
| 1324 | if self.key is 'noise': |
|
1323 | if self.key is 'noise': | |
| 1325 | data = [[x] for x in data] |
|
1324 | data = [[x] for x in self.roundFloats(self.data[self.key][tm].tolist())] | |
|
|
1325 | else: | |||
|
|
1326 | data = self.roundFloats(self.data[self.key][tm][::, ::dy].tolist()) | |||
| 1326 |
|
1327 | |||
| 1327 | meta = {} |
|
1328 | meta = {} | |
| 1328 | ret = { |
|
1329 | ret = { | |
| @@ -160,7 +160,7 class Plot(Operation): | |||||
| 160 | self.isConfig = False |
|
160 | self.isConfig = False | |
| 161 | self.isPlotConfig = False |
|
161 | self.isPlotConfig = False | |
| 162 | self.save_counter = 1 |
|
162 | self.save_counter = 1 | |
| 163 |
self.sender_ |
|
163 | self.sender_time = 0 | |
| 164 | self.data = None |
|
164 | self.data = None | |
| 165 | self.firsttime = True |
|
165 | self.firsttime = True | |
| 166 | self.plots_adjust = {'left': 0.125, 'right': 0.9, 'bottom': 0.15, 'top': 0.9, 'wspace': 0.2, 'hspace': 0.2} |
|
166 | self.plots_adjust = {'left': 0.125, 'right': 0.9, 'bottom': 0.15, 'top': 0.9, 'wspace': 0.2, 'hspace': 0.2} | |
| @@ -225,7 +225,7 class Plot(Operation): | |||||
| 225 | self.throttle = kwargs.get('throttle', 0) |
|
225 | self.throttle = kwargs.get('throttle', 0) | |
| 226 | self.exp_code = kwargs.get('exp_code', None) |
|
226 | self.exp_code = kwargs.get('exp_code', None) | |
| 227 | self.plot_server = kwargs.get('plot_server', False) |
|
227 | self.plot_server = kwargs.get('plot_server', False) | |
| 228 |
self.sender_period = kwargs.get('sender_period', |
|
228 | self.sender_period = kwargs.get('sender_period', 60) | |
| 229 | self.height_index = kwargs.get('height_index', None) |
|
229 | self.height_index = kwargs.get('height_index', None) | |
| 230 | self.__throttle_plot = apply_throttle(self.throttle) |
|
230 | self.__throttle_plot = apply_throttle(self.throttle) | |
| 231 | self.data = PlotterData( |
|
231 | self.data = PlotterData( | |
| @@ -564,12 +564,15 class Plot(Operation): | |||||
| 564 | ''' |
|
564 | ''' | |
| 565 | ''' |
|
565 | ''' | |
| 566 |
|
566 | |||
| 567 |
if self.sender_ |
|
567 | if self.data.tm - self.sender_time < self.sender_period: | |
| 568 | self.sender_counter += 1 |
|
|||
| 569 | return |
|
568 | return | |
| 570 |
|
569 | |||
| 571 |
self.sender_ |
|
570 | self.sender_time = self.data.tm | |
| 572 | self.data.meta['titles'] = self.titles |
|
571 | ||
|
|
572 | attrs = ['titles', 'zmin', 'zmax'] | |||
|
|
573 | for attr in attrs: | |||
|
|
574 | self.data.meta[attr] = getattr(self, attr) | |||
|
|
575 | ||||
| 573 | retries = 2 |
|
576 | retries = 2 | |
| 574 | while True: |
|
577 | while True: | |
| 575 | self.socket.send_string(self.data.jsonify(self.plot_name, self.plot_type)) |
|
578 | self.socket.send_string(self.data.jsonify(self.plot_name, self.plot_type)) | |
General Comments 0
You need to be logged in to leave comments.
Login now