| @@ -219,10 +219,10 class Plot(Operation): | |||||
| 219 | self.type = kwargs.get('type', 'iq') |
|
219 | self.type = kwargs.get('type', 'iq') | |
| 220 | self.grid = kwargs.get('grid', False) |
|
220 | self.grid = kwargs.get('grid', False) | |
| 221 | self.pause = kwargs.get('pause', False) |
|
221 | self.pause = kwargs.get('pause', False) | |
| 222 |
self.save_ |
|
222 | self.save_code = kwargs.get('save_code', None) | |
| 223 | self.realtime = kwargs.get('realtime', True) |
|
223 | self.realtime = kwargs.get('realtime', True) | |
| 224 | self.buffering = kwargs.get('buffering', True) |
|
224 | self.buffering = kwargs.get('buffering', True) | |
| 225 |
self.throttle = kwargs.get('throttle', |
|
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', 1) |
|
228 | self.sender_period = kwargs.get('sender_period', 1) | |
| @@ -625,21 +625,19 class Plot(Operation): | |||||
| 625 |
|
625 | |||
| 626 | fig = self.figures[n] |
|
626 | fig = self.figures[n] | |
| 627 |
|
627 | |||
| 628 |
if self.save_ |
|
628 | if self.save_code: | |
| 629 |
|
|
629 | if isinstance(self.save_code, str): | |
|
|
630 | labels = [self.save_code for x in self.figures] | |||
|
|
631 | else: | |||
|
|
632 | labels = self.save_code | |||
| 630 | else: |
|
633 | else: | |
| 631 | labels = list(range(self.nrows)) |
|
634 | labels = [self.CODE for x in self.figures] | |
| 632 |
|
635 | |||
| 633 | if self.oneFigure: |
|
|||
| 634 | label = '' |
|
|||
| 635 | else: |
|
|||
| 636 | label = '-{}'.format(labels[n]) |
|
|||
| 637 | figname = os.path.join( |
|
636 | figname = os.path.join( | |
| 638 | self.save, |
|
637 | self.save, | |
| 639 |
|
|
638 | labels[n], | |
| 640 |
' |
|
639 | '{}_{}.png'.format( | |
| 641 |
|
|
640 | labels[n], | |
| 642 | label, |
|
|||
| 643 | self.getDateTime(self.data.max_time).strftime( |
|
641 | self.getDateTime(self.data.max_time).strftime( | |
| 644 | '%Y%m%d_%H%M%S' |
|
642 | '%Y%m%d_%H%M%S' | |
| 645 | ), |
|
643 | ), | |
| @@ -650,12 +648,11 class Plot(Operation): | |||||
| 650 | os.makedirs(os.path.dirname(figname)) |
|
648 | os.makedirs(os.path.dirname(figname)) | |
| 651 | fig.savefig(figname) |
|
649 | fig.savefig(figname) | |
| 652 |
|
650 | |||
| 653 |
if self. |
|
651 | if self.throttle == 0: | |
| 654 | figname = os.path.join( |
|
652 | figname = os.path.join( | |
| 655 | self.save, |
|
653 | self.save, | |
| 656 |
' |
|
654 | '{}_{}.png'.format( | |
| 657 |
|
|
655 | labels[n], | |
| 658 | label, |
|
|||
| 659 | self.getDateTime(self.data.min_time).strftime( |
|
656 | self.getDateTime(self.data.min_time).strftime( | |
| 660 | '%Y%m%d' |
|
657 | '%Y%m%d' | |
| 661 | ), |
|
658 | ), | |
| @@ -788,7 +785,7 class Plot(Operation): | |||||
| 788 | self.__setup_plot() |
|
785 | self.__setup_plot() | |
| 789 | self.isPlotConfig = True |
|
786 | self.isPlotConfig = True | |
| 790 |
|
787 | |||
| 791 |
if self. |
|
788 | if self.throttle == 0: | |
| 792 | self.__plot() |
|
789 | self.__plot() | |
| 793 | else: |
|
790 | else: | |
| 794 | self.__throttle_plot(self.__plot)#, coerce=coerce) |
|
791 | self.__throttle_plot(self.__plot)#, coerce=coerce) | |
| @@ -644,7 +644,7 class Reader(object): | |||||
| 644 | nextFile = False |
|
644 | nextFile = False | |
| 645 | continue |
|
645 | continue | |
| 646 |
|
646 | |||
| 647 | if fullfilename: |
|
647 | if fullfilename is not None: | |
| 648 | break |
|
648 | break | |
| 649 |
|
649 | |||
| 650 | self.nTries = 1 |
|
650 | self.nTries = 1 | |
| @@ -652,7 +652,8 class Reader(object): | |||||
| 652 |
|
652 | |||
| 653 | if nFiles == (self.nFiles - 1): |
|
653 | if nFiles == (self.nFiles - 1): | |
| 654 | log.log('Trying with next day...', self.name) |
|
654 | log.log('Trying with next day...', self.name) | |
| 655 |
nextDay = True |
|
655 | nextDay = True | |
|
|
656 | self.nTries = 3 | |||
| 656 |
|
657 | |||
| 657 | if fullfilename: |
|
658 | if fullfilename: | |
| 658 | self.fileSize = os.path.getsize(fullfilename) |
|
659 | self.fileSize = os.path.getsize(fullfilename) | |
| @@ -211,11 +211,11 class InputQueue(Thread): | |||||
| 211 |
|
211 | |||
| 212 | def get(self): |
|
212 | def get(self): | |
| 213 |
|
213 | |||
| 214 |
if not self.islocked and self.size/1000000 > 1 |
|
214 | if not self.islocked and self.size/1000000 > 512: | |
| 215 | self.lock.n.value += 1 |
|
215 | self.lock.n.value += 1 | |
| 216 | self.islocked = True |
|
216 | self.islocked = True | |
| 217 | self.lock.clear() |
|
217 | self.lock.clear() | |
| 218 |
elif self.islocked and self.size/1000000 <= 1 |
|
218 | elif self.islocked and self.size/1000000 <= 512: | |
| 219 | self.islocked = False |
|
219 | self.islocked = False | |
| 220 | self.lock.n.value -= 1 |
|
220 | self.lock.n.value -= 1 | |
| 221 | if self.lock.n.value == 0: |
|
221 | if self.lock.n.value == 0: | |
General Comments 0
You need to be logged in to leave comments.
Login now