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